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

Merge branch 'bugfix/timergroup_regression' into 'master'

Browse Source 
timer: fix unit test regression

Closes IDFCI-889

See merge request espressif/esp-idf!15232
This commit is contained in:
morris
2021-09-17 08:22:08 +00:00
parent eccb1f85d8 56e617d747
commit b8ec4c1a16
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/driver/timer.c
View File

@@ -288,8 +288,7 @@ esp_err_t timer_init(timer_group_t group_num, timer_idx_t timer_num, const timer
timer_hal_set_divider(&(p_timer_obj[group_num][timer_num]->hal), config->divider); timer_hal_set_divider(&(p_timer_obj[group_num][timer_num]->hal), config->divider);
timer_hal_set_counter_increase(&(p_timer_obj[group_num][timer_num]->hal), config->counter_dir); timer_hal_set_counter_increase(&(p_timer_obj[group_num][timer_num]->hal), config->counter_dir);
timer_hal_set_alarm_enable(&(p_timer_obj[group_num][timer_num]->hal), config->alarm_en); timer_hal_set_alarm_enable(&(p_timer_obj[group_num][timer_num]->hal), config->alarm_en);
// Disable level interrupt by default timer_hal_set_level_int_enable(&(p_timer_obj[group_num][timer_num]->hal), config->intr_type == TIMER_INTR_LEVEL);
timer_hal_set_level_int_enable(&(p_timer_obj[group_num][timer_num]->hal), false);
if (config->intr_type != TIMER_INTR_LEVEL) { if (config->intr_type != TIMER_INTR_LEVEL) {
ESP_LOGW(TIMER_TAG, "only support Level Interrupt, switch to Level Interrupt instead"); ESP_LOGW(TIMER_TAG, "only support Level Interrupt, switch to Level Interrupt instead");
} }