TonBERRY/micropython
3
0
Fork 0
Code Pull Requests Activity

esp32/machine_pwm: Correctly stop LEDC timer.

Browse Source 
The ESP32 PWM (LEDC) timer wasn't correctly stopped.  `ledc_timer_rst()` is
for resetting the timer counter to zero, not for stopping the timer.

The correct way to stop a pwm timer is to pause it, then configure it with
`deconfigure = true`.

Signed-off-by: garywill <garywill@disroot.org>
This commit is contained in:
garywill
2024-12-06 13:20:34 +08:00
committed by Damien George
parent 464121f301
commit bfd974d658
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ports/esp32/machine_pwm.c
View File

@@ -156,7 +156,13 @@ static void pwm_deinit(int channel_idx) {
int timer_idx = chans[channel_idx].timer_idx; int timer_idx = chans[channel_idx].timer_idx;
if (timer_idx != -1) { if (timer_idx != -1) {
if (!is_timer_in_use(channel_idx, timer_idx)) { if (!is_timer_in_use(channel_idx, timer_idx)) {
check_esp_err(ledc_timer_rst(TIMER_IDX_TO_MODE(timer_idx), TIMER_IDX_TO_TIMER(timer_idx))); check_esp_err(ledc_timer_pause(TIMER_IDX_TO_MODE(timer_idx), TIMER_IDX_TO_TIMER(timer_idx)));
ledc_timer_config_t timer_config = {
.deconfigure = true,
.speed_mode = TIMER_IDX_TO_MODE(timer_idx),
.timer_num = TIMER_IDX_TO_TIMER(timer_idx),
};
check_esp_err(ledc_timer_config(&timer_config));
// Flag it unused // Flag it unused
timers[chans[channel_idx].timer_idx].freq_hz = -1; timers[chans[channel_idx].timer_idx].freq_hz = -1;
} }
@@ -635,7 +641,13 @@ static void mp_machine_pwm_freq_set(machine_pwm_obj_t *self, mp_int_t freq) {
if (!current_in_use) { if (!current_in_use) {
// Free the old timer // Free the old timer
check_esp_err(ledc_timer_rst(self->mode, self->timer)); check_esp_err(ledc_timer_pause(self->mode, self->timer));
ledc_timer_config_t timer_config = {
.deconfigure = true,
.speed_mode = self->mode,
.timer_num = self->timer,
};
check_esp_err(ledc_timer_config(&timer_config));
// Flag it unused // Flag it unused
timers[current_timer_idx].freq_hz = -1; timers[current_timer_idx].freq_hz = -1;
} }