Skip to content

Commit

Permalink
Merge branch 'bugfix/ledc_improper_fade_param_for_setting_duty' into …
Browse files Browse the repository at this point in the history 
…'master'

ledc: Fix improper fade parameters for one-time duty set

Closes IDF-6928

See merge request espressif/esp-idf!22547
  • Loading branch information
@songruo
songruo committed Mar 1, 2023
2 parents bbac0c8 + eab8abd commit 3bb34f9
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions components/driver/ledc/ledc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -698,8 +698,8 @@ esp_err_t ledc_set_duty_with_hpoint(ledc_mode_t speed_mode, ledc_channel_t chann
hpoint, //uint32_t hpoint_val,
duty, //uint32_t duty_val,
1, //uint32_t increase,
0, //uint32_t duty_num,
0, //uint32_t duty_cycle,
1, //uint32_t duty_num,
1, //uint32_t duty_cycle,
0 //uint32_t duty_scale
);
portEXIT_CRITICAL(&ledc_spinlock);
Expand All @@ -720,8 +720,8 @@ esp_err_t ledc_set_duty(ledc_mode_t speed_mode, ledc_channel_t channel, uint32_t
LEDC_VAL_NO_CHANGE,
duty, //uint32_t duty_val,
1, //uint32_t increase,
0, //uint32_t duty_num,
0, //uint32_t duty_cycle,
1, //uint32_t duty_num,
1, //uint32_t duty_cycle,
0 //uint32_t duty_scale
);
portEXIT_CRITICAL(&ledc_spinlock);
Expand Down Expand Up @@ -995,7 +995,7 @@ static esp_err_t _ledc_set_fade_with_step(ledc_mode_t speed_mode, ledc_channel_t
duty_cur, target_duty, step_num, cycle_num, scale, dir);
} else {
portENTER_CRITICAL(&ledc_spinlock);
ledc_duty_config(speed_mode, channel, LEDC_VAL_NO_CHANGE, target_duty, dir, 0, 1, 0);
ledc_duty_config(speed_mode, channel, LEDC_VAL_NO_CHANGE, target_duty, dir, 1, 1, 0);
portEXIT_CRITICAL(&ledc_spinlock);
ESP_LOGD(LEDC_TAG, "Set to target duty: %"PRIu32, target_duty);
}
Expand Down Expand Up @@ -1023,9 +1023,9 @@ static esp_err_t _ledc_set_fade_with_time(ledc_mode_t speed_mode, ledc_channel_t
if (total_cycles > duty_delta) {
scale = 1;
cycle_num = total_cycles / duty_delta;
if (cycle_num > LEDC_LL_DUTY_NUM_MAX) {
if (cycle_num > LEDC_LL_DUTY_CYCLE_MAX) {
ESP_LOGW(LEDC_TAG, LEDC_FADE_TOO_SLOW_STR);
cycle_num = LEDC_LL_DUTY_NUM_MAX;
cycle_num = LEDC_LL_DUTY_CYCLE_MAX;
}
} else {
cycle_num = 1;
Expand Down Expand Up @@ -1129,8 +1129,8 @@ esp_err_t ledc_fade_stop(ledc_mode_t speed_mode, ledc_channel_t channel)
LEDC_VAL_NO_CHANGE,
duty_cur, //uint32_t duty_val,
1, //uint32_t increase,
0, //uint32_t duty_num,
0, //uint32_t duty_cycle,
1, //uint32_t duty_num,
1, //uint32_t duty_cycle,
0 //uint32_t duty_scale
);
_ledc_update_duty(speed_mode, channel);
Expand Down

0 comments on commit 3bb34f9

Please sign in to comment.