mirror of
https://github.com/espressif/esp-idf.git
synced 2024-09-19 14:26:01 -04:00
Compare commits
2 Commits
7df9f16e79
...
e5f760d669
Author | SHA1 | Date | |
---|---|---|---|
|
e5f760d669 | ||
|
ad68d5b027 |
@ -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;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user