feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

fix(touch): checks if the timer is active before stopping it

Browse Source 
Merges https://github.com/espressif/esp-idf/pull/10745
This commit is contained in:
Huelsenfrucht
2023-02-10 12:44:33 -05:00
committed by Kevin (Lao Kaiyao)
parent 2ec93b3394
commit e6fb6612c9
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/driver/touch_sensor/esp32/touch_sensor.c
View File

@@ -512,7 +512,9 @@ esp_err_t touch_pad_filter_delete(void)
esp_err_t ret = ESP_OK; esp_err_t ret = ESP_OK;
xSemaphoreTake(rtc_touch_mux, portMAX_DELAY); xSemaphoreTake(rtc_touch_mux, portMAX_DELAY);
if (s_touch_pad_filter->timer) { if (s_touch_pad_filter->timer) {
if (esp_timer_is_active(s_touch_pad_filter->timer)) {
ESP_GOTO_ON_ERROR(esp_timer_stop(s_touch_pad_filter->timer), err, TOUCH_TAG, "failed to stop the timer"); ESP_GOTO_ON_ERROR(esp_timer_stop(s_touch_pad_filter->timer), err, TOUCH_TAG, "failed to stop the timer");
}
ESP_GOTO_ON_ERROR(esp_timer_delete(s_touch_pad_filter->timer), err, TOUCH_TAG, "failed to delete the timer"); ESP_GOTO_ON_ERROR(esp_timer_delete(s_touch_pad_filter->timer), err, TOUCH_TAG, "failed to delete the timer");
s_touch_pad_filter->timer = NULL; s_touch_pad_filter->timer = NULL;
} }