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

Merge branch 'bugfix/ledc_clock_mode' into 'master'

Browse Source 
driver: ledc: Fix clock mode selection

See merge request espressif/esp-idf!5747
This commit is contained in:
Angus Gratton
2019-08-16 17:39:16 +08:00
parent 74c2eb3aff 848465da90
commit 76453ccfa5
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/driver/ledc.c
View File

@@ -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); ESP_LOGE(LEDC_TAG, "invalid timer #%u", timer_num);
return ESP_ERR_INVALID_ARG; 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) esp_err_t ledc_set_pin(int gpio_num, ledc_mode_t speed_mode, ledc_channel_t ledc_channel)

4
components/driver/test/test_pcnt.c
View File

@@ -57,7 +57,7 @@ static void produce_pulse(void)
.freq_hz = 1, .freq_hz = 1,
.clk_cfg = LEDC_AUTO_CLK, .clk_cfg = LEDC_AUTO_CLK,
}; };
ledc_timer_config(&ledc_timer); ESP_ERROR_CHECK(ledc_timer_config(&ledc_timer));
ledc_channel_config_t ledc_channel = { ledc_channel_config_t ledc_channel = {
.speed_mode = LEDC_HIGH_SPEED_MODE, .speed_mode = LEDC_HIGH_SPEED_MODE,
@@ -68,7 +68,7 @@ static void produce_pulse(void)
.duty = 100, .duty = 100,
.hpoint = 0, .hpoint = 0,
}; };
ledc_channel_config(&ledc_channel); ESP_ERROR_CHECK(ledc_channel_config(&ledc_channel));
} }
static void IRAM_ATTR pcnt_intr_handler(void *arg) static void IRAM_ATTR pcnt_intr_handler(void *arg)