Merge ad68d5b027 into 59e1838270

touch_pad_filter_delete() now checks if the timer is active before stopping it.
2024-09-19 14:26:01 -04:00 · 2024-09-13 15:57:40 +05:30 · 2023-02-10 12:44:33 -05:00
1 changed files with 3 additions and 1 deletions
--- a/components/driver/touch_sensor/esp32/touch_sensor.c
+++ b/components/driver/touch_sensor/esp32/touch_sensor.c
@ -512,7 +512,9 @@ esp_err_t touch_pad_filter_delete(void)
    esp_err_t ret = ESP_OK;
    xSemaphoreTake(rtc_touch_mux, portMAX_DELAY);
    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_delete(s_touch_pad_filter->timer), err, TOUCH_TAG, "failed to delete the timer");
        s_touch_pad_filter->timer = NULL;
    }
Author	SHA1	Message	Date
Michael Rothammer	e5f760d669	Merge `ad68d5b027` into `59e1838270`	2024-09-13 15:57:40 +05:30
Huelsenfrucht	ad68d5b027	touch_pad_filter_delete() now checks if the timer is active before stopping it.	2023-02-10 12:44:33 -05:00