espressif/arduino-esp32
1
0
Fork 1
mirror of https://github.com/0xFEEDC0DE64/arduino-esp32.git synced 2025-07-29 18:27:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix double promotions in rmtSetTick() (#5847)

Browse Source
This commit is contained in:
Frank
2021-11-04 13:24:14 +01:00
committed by GitHub
parent 418ac74be0
commit 10258b4cc2
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cores/esp32/esp32-hal-rmt.c
View File

@ -546,16 +546,16 @@ float rmtSetTick(rmt_obj_t* rmt, float tick)
size_t channel = rmt->channel; size_t channel = rmt->channel;
#if CONFIG_IDF_TARGET_ESP32C3 #if CONFIG_IDF_TARGET_ESP32C3
int apb_div = _LIMIT(tick/25.0, 256); int apb_div = _LIMIT(tick/25.0f, 256);
float apb_tick = 25.0 * apb_div; float apb_tick = 25.0f * apb_div;
RMT.tx_conf[channel].div_cnt = apb_div & 0xFF; RMT.tx_conf[channel].div_cnt = apb_div & 0xFF;
RMT.tx_conf[channel].conf_update = 1; RMT.tx_conf[channel].conf_update = 1;
return apb_tick; return apb_tick;
#else #else
int apb_div = _LIMIT(tick/12.5, 256); int apb_div = _LIMIT(tick/12.5f, 256);
int ref_div = _LIMIT(tick/1000, 256); int ref_div = _LIMIT(tick/1000, 256);
float apb_tick = 12.5 * apb_div; float apb_tick = 12.5f * apb_div;
float ref_tick = 1000.0 * ref_div; float ref_tick = 1000.0f * ref_div;
if (_ABS(apb_tick - tick) < _ABS(ref_tick - tick)) { if (_ABS(apb_tick - tick) < _ABS(ref_tick - tick)) {
RMT.conf_ch[channel].conf0.div_cnt = apb_div & 0xFF; RMT.conf_ch[channel].conf0.div_cnt = apb_div & 0xFF;
RMT.conf_ch[channel].conf1.ref_always_on = 1; RMT.conf_ch[channel].conf1.ref_always_on = 1;