From 1dd2f3e07b48f94553d2d9796b28555f852b8117 Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Sun, 11 Aug 2019 15:47:30 +1000 Subject: [PATCH 1/2] driver: ledc: Fix low/high speed parameter setting Fix regression introduced in 2e8c85d8fff823232af46cc0f353ac170d0971e9 --- components/driver/ledc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/driver/ledc.c b/components/driver/ledc.c index f82efaf5e3..b0e9a3939d 100644 --- a/components/driver/ledc.c +++ b/components/driver/ledc.c @@ -314,7 +314,7 @@ esp_err_t ledc_timer_config(const ledc_timer_config_t* timer_conf) ESP_LOGE(LEDC_TAG, "invalid timer #%u", timer_num); return ESP_ERR_INVALID_ARG; } - return ledc_set_timer_div(timer_num, timer_num, timer_conf->clk_cfg, freq_hz, duty_resolution); + return ledc_set_timer_div(speed_mode, timer_num, timer_conf->clk_cfg, freq_hz, duty_resolution); } esp_err_t ledc_set_pin(int gpio_num, ledc_mode_t speed_mode, ledc_channel_t ledc_channel) From 848465da90555abc7dfdf09333b17b0e7ddde128 Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Sun, 11 Aug 2019 15:48:17 +1000 Subject: [PATCH 2/2] driver: Check ledc config result in PCNT tests --- components/driver/test/test_pcnt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/driver/test/test_pcnt.c b/components/driver/test/test_pcnt.c index af4e58fa67..90dc2c4ece 100644 --- a/components/driver/test/test_pcnt.c +++ b/components/driver/test/test_pcnt.c @@ -57,7 +57,7 @@ static void produce_pulse(void) .freq_hz = 1, .clk_cfg = LEDC_AUTO_CLK, }; - ledc_timer_config(&ledc_timer); + ESP_ERROR_CHECK(ledc_timer_config(&ledc_timer)); ledc_channel_config_t ledc_channel = { .speed_mode = LEDC_HIGH_SPEED_MODE, @@ -68,7 +68,7 @@ static void produce_pulse(void) .duty = 100, .hpoint = 0, }; - ledc_channel_config(&ledc_channel); + ESP_ERROR_CHECK(ledc_channel_config(&ledc_channel)); } static void IRAM_ATTR pcnt_intr_handler(void *arg)