espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-03 20:54:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(ledc): duty_start bit should wait for its self-clear before next set on esp32

Browse Source
This commit is contained in:
Song Ruo Jing
2025-06-17 20:11:17 +08:00
parent 92b84443f3
commit d87de032df
14 changed files with 38 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/esp_driver_ledc/src/ledc.c
View File

@@ -975,7 +975,7 @@ esp_err_t ledc_channel_config(const ledc_channel_config_t *ledc_conf)
static void _ledc_update_duty(ledc_mode_t speed_mode, ledc_channel_t channel) static void _ledc_update_duty(ledc_mode_t speed_mode, ledc_channel_t channel)
{ {
ledc_hal_set_sig_out_en(&(p_ledc_obj[speed_mode]->ledc_hal), channel, true); ledc_hal_set_sig_out_en(&(p_ledc_obj[speed_mode]->ledc_hal), channel, true);
ledc_hal_set_duty_start(&(p_ledc_obj[speed_mode]->ledc_hal), channel, true); ledc_hal_set_duty_start(&(p_ledc_obj[speed_mode]->ledc_hal), channel);
ledc_ls_channel_update(speed_mode, channel); ledc_ls_channel_update(speed_mode, channel);
} }
@@ -998,7 +998,6 @@ esp_err_t ledc_stop(ledc_mode_t speed_mode, ledc_channel_t channel, uint32_t idl
portENTER_CRITICAL_SAFE(&ledc_spinlock); portENTER_CRITICAL_SAFE(&ledc_spinlock);
ledc_hal_set_idle_level(&(p_ledc_obj[speed_mode]->ledc_hal), channel, idle_level); ledc_hal_set_idle_level(&(p_ledc_obj[speed_mode]->ledc_hal), channel, idle_level);
ledc_hal_set_sig_out_en(&(p_ledc_obj[speed_mode]->ledc_hal), channel, false); ledc_hal_set_sig_out_en(&(p_ledc_obj[speed_mode]->ledc_hal), channel, false);
ledc_hal_set_duty_start(&(p_ledc_obj[speed_mode]->ledc_hal), channel, false);
ledc_ls_channel_update(speed_mode, channel); ledc_ls_channel_update(speed_mode, channel);
portEXIT_CRITICAL_SAFE(&ledc_spinlock); portEXIT_CRITICAL_SAFE(&ledc_spinlock);
return ESP_OK; return ESP_OK;
@@ -1261,7 +1260,7 @@ static void IRAM_ATTR ledc_fade_isr(void *arg)
cycle, cycle,
scale); scale);
s_ledc_fade_rec[speed_mode][channel]->fsm = LEDC_FSM_HW_FADE; s_ledc_fade_rec[speed_mode][channel]->fsm = LEDC_FSM_HW_FADE;
ledc_hal_set_duty_start(&(p_ledc_obj[speed_mode]->ledc_hal), channel, true); ledc_hal_set_duty_start(&(p_ledc_obj[speed_mode]->ledc_hal), channel);
ledc_ls_channel_update(speed_mode, channel); ledc_ls_channel_update(speed_mode, channel);
} }
portEXIT_CRITICAL_ISR(&ledc_spinlock); portEXIT_CRITICAL_ISR(&ledc_spinlock);

6
components/esp_driver_ledc/test_apps/ledc/main/test_ledc.c
View File

@@ -150,6 +150,12 @@ TEST_CASE("LEDC output idle level test", "[ledc]")
TEST_ESP_OK(ledc_stop(test_speed_mode, LEDC_CHANNEL_0, !current_level)); TEST_ESP_OK(ledc_stop(test_speed_mode, LEDC_CHANNEL_0, !current_level));
vTaskDelay(1000 / portTICK_PERIOD_MS); vTaskDelay(1000 / portTICK_PERIOD_MS);
TEST_ASSERT_EQUAL_INT32(!current_level, LEDC.channel_group[test_speed_mode].channel[LEDC_CHANNEL_0].conf0.idle_lv); TEST_ASSERT_EQUAL_INT32(!current_level, LEDC.channel_group[test_speed_mode].channel[LEDC_CHANNEL_0].conf0.idle_lv);
// check real output level over some period
gpio_input_enable(PULSE_IO);
for (int i = 0; i < 40; i++) {
TEST_ASSERT_EQUAL_INT32(!current_level, gpio_get_level(PULSE_IO));
esp_rom_delay_us(50);
}
} }
TEST_CASE("LEDC iterate over all channel and timer configs", "[ledc]") TEST_CASE("LEDC iterate over all channel and timer configs", "[ledc]")

8
components/hal/esp32/include/hal/ledc_ll.h
View File

@@ -481,13 +481,15 @@ static inline void ledc_ll_set_sig_out_en(ledc_dev_t *hw, ledc_mode_t speed_mode
* @param hw Beginning address of the peripheral registers * @param hw Beginning address of the peripheral registers
* @param speed_mode LEDC speed_mode, high-speed mode or low-speed mode * @param speed_mode LEDC speed_mode, high-speed mode or low-speed mode
* @param channel_num LEDC channel index (0-7), select from ledc_channel_t * @param channel_num LEDC channel index (0-7), select from ledc_channel_t
* @param duty_start The duty start
* *
* @return None * @return None
*/ */
static inline void ledc_ll_set_duty_start(ledc_dev_t *hw, ledc_mode_t speed_mode, ledc_channel_t channel_num, bool duty_start) static inline void ledc_ll_set_duty_start(ledc_dev_t *hw, ledc_mode_t speed_mode, ledc_channel_t channel_num)
{ {
hw->channel_group[speed_mode].channel[channel_num].conf1.duty_start = duty_start; // wait until the last duty change took effect (duty_start bit will be self-cleared when duty update or fade is done)
// this is necessary on ESP32 only, otherwise, internal logic might mess up (later targets with SOC_LEDC_SUPPORT_FADE_STOP allow to re-configure parameters while last update is still in progress)
while (hw->channel_group[speed_mode].channel[channel_num].conf1.duty_start);
hw->channel_group[speed_mode].channel[channel_num].conf1.duty_start = 1;
} }
/** /**

5
components/hal/esp32c2/include/hal/ledc_ll.h
View File

@@ -458,13 +458,12 @@ static inline void ledc_ll_set_sig_out_en(ledc_dev_t *hw, ledc_mode_t speed_mode
* @param hw Beginning address of the peripheral registers * @param hw Beginning address of the peripheral registers
* @param speed_mode LEDC speed_mode, high-speed mode or low-speed mode * @param speed_mode LEDC speed_mode, high-speed mode or low-speed mode
* @param channel_num LEDC channel index (0-7), select from ledc_channel_t * @param channel_num LEDC channel index (0-7), select from ledc_channel_t
* @param duty_start The duty start
* *
* @return None * @return None
*/ */
static inline void ledc_ll_set_duty_start(ledc_dev_t *hw, ledc_mode_t speed_mode, ledc_channel_t channel_num, bool duty_start) static inline void ledc_ll_set_duty_start(ledc_dev_t *hw, ledc_mode_t speed_mode, ledc_channel_t channel_num)
{ {
hw->channel_group[speed_mode].channel[channel_num].conf1.duty_start = duty_start; hw->channel_group[speed_mode].channel[channel_num].conf1.duty_start = 1;
} }
/** /**

5
components/hal/esp32c3/include/hal/ledc_ll.h
View File

@@ -459,13 +459,12 @@ static inline void ledc_ll_set_sig_out_en(ledc_dev_t *hw, ledc_mode_t speed_mode
* @param hw Beginning address of the peripheral registers * @param hw Beginning address of the peripheral registers
* @param speed_mode LEDC speed_mode, high-speed mode or low-speed mode * @param speed_mode LEDC speed_mode, high-speed mode or low-speed mode
* @param channel_num LEDC channel index (0-7), select from ledc_channel_t * @param channel_num LEDC channel index (0-7), select from ledc_channel_t
* @param duty_start The duty start
* *
* @return None * @return None
*/ */
static inline void ledc_ll_set_duty_start(ledc_dev_t *hw, ledc_mode_t speed_mode, ledc_channel_t channel_num, bool duty_start) static inline void ledc_ll_set_duty_start(ledc_dev_t *hw, ledc_mode_t speed_mode, ledc_channel_t channel_num)
{ {
hw->channel_group[speed_mode].channel[channel_num].conf1.duty_start = duty_start; hw->channel_group[speed_mode].channel[channel_num].conf1.duty_start = 1;
} }
/** /**

7
components/hal/esp32c5/include/hal/ledc_ll.h
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -458,13 +458,12 @@ static inline void ledc_ll_set_sig_out_en(ledc_dev_t *hw, ledc_mode_t speed_mode
* @param hw Beginning address of the peripheral registers * @param hw Beginning address of the peripheral registers
* @param speed_mode LEDC speed_mode, low-speed mode only * @param speed_mode LEDC speed_mode, low-speed mode only
* @param channel_num LEDC channel index (0-5), select from ledc_channel_t * @param channel_num LEDC channel index (0-5), select from ledc_channel_t
* @param duty_start The duty start
* *
* @return None * @return None
*/ */
static inline void ledc_ll_set_duty_start(ledc_dev_t *hw, ledc_mode_t speed_mode, ledc_channel_t channel_num, bool duty_start) static inline void ledc_ll_set_duty_start(ledc_dev_t *hw, ledc_mode_t speed_mode, ledc_channel_t channel_num)
{ {
hw->channel_group[speed_mode].channel[channel_num].conf1.duty_start = duty_start; hw->channel_group[speed_mode].channel[channel_num].conf1.duty_start = 1;
} }
/** /**

7
components/hal/esp32c6/include/hal/ledc_ll.h
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -579,13 +579,12 @@ static inline void ledc_ll_set_sig_out_en(ledc_dev_t *hw, ledc_mode_t speed_mode
* @param hw Beginning address of the peripheral registers * @param hw Beginning address of the peripheral registers
* @param speed_mode LEDC speed_mode, low-speed mode only * @param speed_mode LEDC speed_mode, low-speed mode only
* @param channel_num LEDC channel index (0-5), select from ledc_channel_t * @param channel_num LEDC channel index (0-5), select from ledc_channel_t
* @param duty_start The duty start
* *
* @return None * @return None
*/ */
static inline void ledc_ll_set_duty_start(ledc_dev_t *hw, ledc_mode_t speed_mode, ledc_channel_t channel_num, bool duty_start) static inline void ledc_ll_set_duty_start(ledc_dev_t *hw, ledc_mode_t speed_mode, ledc_channel_t channel_num)
{ {
hw->channel_group[speed_mode].channel[channel_num].conf1.duty_start = duty_start; hw->channel_group[speed_mode].channel[channel_num].conf1.duty_start = 1;
} }
/** /**

7
components/hal/esp32c61/include/hal/ledc_ll.h
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -458,13 +458,12 @@ static inline void ledc_ll_set_sig_out_en(ledc_dev_t *hw, ledc_mode_t speed_mode
* @param hw Beginning address of the peripheral registers * @param hw Beginning address of the peripheral registers
* @param speed_mode LEDC speed_mode, low-speed mode only * @param speed_mode LEDC speed_mode, low-speed mode only
* @param channel_num LEDC channel index (0-5), select from ledc_channel_t * @param channel_num LEDC channel index (0-5), select from ledc_channel_t
* @param duty_start The duty start
* *
* @return None * @return None
*/ */
static inline void ledc_ll_set_duty_start(ledc_dev_t *hw, ledc_mode_t speed_mode, ledc_channel_t channel_num, bool duty_start) static inline void ledc_ll_set_duty_start(ledc_dev_t *hw, ledc_mode_t speed_mode, ledc_channel_t channel_num)
{ {
hw->channel_group[speed_mode].channel[channel_num].conf1.duty_start = duty_start; hw->channel_group[speed_mode].channel[channel_num].conf1.duty_start = 1;
} }
/** /**

7
components/hal/esp32h2/include/hal/ledc_ll.h
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -577,13 +577,12 @@ static inline void ledc_ll_set_sig_out_en(ledc_dev_t *hw, ledc_mode_t speed_mode
* @param hw Beginning address of the peripheral registers * @param hw Beginning address of the peripheral registers
* @param speed_mode LEDC speed_mode, low-speed mode only * @param speed_mode LEDC speed_mode, low-speed mode only
* @param channel_num LEDC channel index (0-5), select from ledc_channel_t * @param channel_num LEDC channel index (0-5), select from ledc_channel_t
* @param duty_start The duty start
* *
* @return None * @return None
*/ */
static inline void ledc_ll_set_duty_start(ledc_dev_t *hw, ledc_mode_t speed_mode, ledc_channel_t channel_num, bool duty_start) static inline void ledc_ll_set_duty_start(ledc_dev_t *hw, ledc_mode_t speed_mode, ledc_channel_t channel_num)
{ {
hw->channel_group[speed_mode].channel[channel_num].conf1.duty_start = duty_start; hw->channel_group[speed_mode].channel[channel_num].conf1.duty_start = 1;
} }
/** /**

5
components/hal/esp32p4/include/hal/ledc_ll.h
View File

@@ -484,13 +484,12 @@ static inline void ledc_ll_set_sig_out_en(ledc_dev_t *hw, ledc_mode_t speed_mode
* @param hw Beginning address of the peripheral registers * @param hw Beginning address of the peripheral registers
* @param speed_mode LEDC speed_mode, low-speed mode only * @param speed_mode LEDC speed_mode, low-speed mode only
* @param channel_num LEDC channel index (0-5), select from ledc_channel_t * @param channel_num LEDC channel index (0-5), select from ledc_channel_t
* @param duty_start The duty start
* *
* @return None * @return None
*/ */
static inline void ledc_ll_set_duty_start(ledc_dev_t *hw, ledc_mode_t speed_mode, ledc_channel_t channel_num, bool duty_start) static inline void ledc_ll_set_duty_start(ledc_dev_t *hw, ledc_mode_t speed_mode, ledc_channel_t channel_num)
{ {
hw->channel_group[speed_mode].channel[channel_num].conf1.duty_start = duty_start; hw->channel_group[speed_mode].channel[channel_num].conf1.duty_start = 1;
} }
/** /**

5
components/hal/esp32s2/include/hal/ledc_ll.h
View File

@@ -498,13 +498,12 @@ static inline void ledc_ll_set_sig_out_en(ledc_dev_t *hw, ledc_mode_t speed_mode
* @param hw Beginning address of the peripheral registers * @param hw Beginning address of the peripheral registers
* @param speed_mode LEDC speed_mode, high-speed mode or low-speed mode * @param speed_mode LEDC speed_mode, high-speed mode or low-speed mode
* @param channel_num LEDC channel index (0-7), select from ledc_channel_t * @param channel_num LEDC channel index (0-7), select from ledc_channel_t
* @param duty_start The duty start
* *
* @return None * @return None
*/ */
static inline void ledc_ll_set_duty_start(ledc_dev_t *hw, ledc_mode_t speed_mode, ledc_channel_t channel_num, bool duty_start) static inline void ledc_ll_set_duty_start(ledc_dev_t *hw, ledc_mode_t speed_mode, ledc_channel_t channel_num)
{ {
hw->channel_group[speed_mode].channel[channel_num].conf1.duty_start = duty_start; hw->channel_group[speed_mode].channel[channel_num].conf1.duty_start = 1;
} }
/** /**

5
components/hal/esp32s3/include/hal/ledc_ll.h
View File

@@ -459,13 +459,12 @@ static inline void ledc_ll_set_sig_out_en(ledc_dev_t *hw, ledc_mode_t speed_mode
* @param hw Beginning address of the peripheral registers * @param hw Beginning address of the peripheral registers
* @param speed_mode LEDC speed_mode, high-speed mode or low-speed mode * @param speed_mode LEDC speed_mode, high-speed mode or low-speed mode
* @param channel_num LEDC channel index (0-7), select from ledc_channel_t * @param channel_num LEDC channel index (0-7), select from ledc_channel_t
* @param duty_start The duty start
* *
* @return None * @return None
*/ */
static inline void ledc_ll_set_duty_start(ledc_dev_t *hw, ledc_mode_t speed_mode, ledc_channel_t channel_num, bool duty_start) static inline void ledc_ll_set_duty_start(ledc_dev_t *hw, ledc_mode_t speed_mode, ledc_channel_t channel_num)
{ {
hw->channel_group[speed_mode].channel[channel_num].conf1.duty_start = duty_start; hw->channel_group[speed_mode].channel[channel_num].conf1.duty_start = 1;
} }
/** /**

3
components/hal/include/hal/ledc_hal.h
View File

@@ -263,11 +263,10 @@ void ledc_hal_ls_channel_update(ledc_hal_context_t *hal, ledc_channel_t channel_
* *
* @param hal Context of the HAL layer * @param hal Context of the HAL layer
* @param channel_num LEDC channel index (0-7), select from ledc_channel_t * @param channel_num LEDC channel index (0-7), select from ledc_channel_t
* @param duty_start The duty start
* *
* @return None * @return None
*/ */
void ledc_hal_set_duty_start(ledc_hal_context_t *hal, ledc_channel_t channel_num, bool duty_start); void ledc_hal_set_duty_start(ledc_hal_context_t *hal, ledc_channel_t channel_num);
/** /**
* @brief Set LEDC the integer part of duty value * @brief Set LEDC the integer part of duty value

4
components/hal/ledc_hal_iram.c
View File

@@ -16,9 +16,9 @@ void ledc_hal_ls_channel_update(ledc_hal_context_t *hal, ledc_channel_t channel_
ledc_ll_ls_channel_update(hal->dev, hal->speed_mode, channel_num); ledc_ll_ls_channel_update(hal->dev, hal->speed_mode, channel_num);
} }
void ledc_hal_set_duty_start(ledc_hal_context_t *hal, ledc_channel_t channel_num, bool duty_start) void ledc_hal_set_duty_start(ledc_hal_context_t *hal, ledc_channel_t channel_num)
{ {
ledc_ll_set_duty_start(hal->dev, hal->speed_mode, channel_num, duty_start); ledc_ll_set_duty_start(hal->dev, hal->speed_mode, channel_num);
} }
void ledc_hal_set_duty_int_part(ledc_hal_context_t *hal, ledc_channel_t channel_num, uint32_t duty_val) void ledc_hal_set_duty_int_part(ledc_hal_context_t *hal, ledc_channel_t channel_num, uint32_t duty_val)