fix(touch): release ISR semaphore when delete

esp-arduino-libs · Nov 8, 2024 · f341c7b · f341c7b
1 parent 6cb9866
commit f341c7b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 0 deletions.
diff --git a/src/touch/ESP_PanelTouch.cpp b/src/touch/ESP_PanelTouch.cpp
@@ -78,6 +78,12 @@ ESP_PanelTouch::ESP_PanelTouch(ESP_PanelBus *bus, const esp_lcd_touch_config_t &
     }
 }
 
+void ESP_PanelTouch::configLevels(int reset_level, int interrupt_level)
+{
+    config.levels.reset = reset_level;
+    config.levels.interrupt = interrupt_level;
+}
+
 bool ESP_PanelTouch::attachInterruptCallback(std::function<bool (void *)> callback, void *user_data)
 {
     ESP_PANEL_CHECK_FALSE_RET((config.interrupt_callback == onTouchInterrupt), false, "Interruption is not enabled");
@@ -109,6 +115,11 @@ bool ESP_PanelTouch::del(void)
     ESP_PANEL_CHECK_NULL_RET(handle, false, "Invalid handle");
     ESP_PANEL_CHECK_ERR_RET(esp_lcd_touch_del(handle), false, "Delete touch panel failed");
 
+    if (_isr_sem != NULL) {
+        vSemaphoreDelete(_isr_sem);
+        _isr_sem = NULL;
+    }
+
     ESP_LOGD(TAG, "Touch panel @%p deleted", handle);
     handle = NULL;
 

diff --git a/src/touch/ESP_PanelTouch.h b/src/touch/ESP_PanelTouch.h
@@ -84,6 +84,14 @@ class ESP_PanelTouch {
      */
     virtual ~ESP_PanelTouch() = default;
 
+    /**
+     * @brief Configure the levels of the reset and interrupt signals
+     *
+     * @param reset_level     The level of the reset signal
+     * @param interrupt_level The level of the interrupt signal
+     */
+    void configLevels(int reset_level, int interrupt_level);
+
     /**
      * @brief Attach a callback function, which will be called when the refreshing is finished
      *

diff --git a/test_apps/touch/i2c/main/test_i2c_touch.cpp b/test_apps/touch/i2c/main/test_i2c_touch.cpp
@@ -117,6 +117,7 @@ static void run_test(shared_ptr<ESP_PanelTouch> touch_device)
 CREATE_TEST_CASE(CST816S)
 CREATE_TEST_CASE(FT5x06)
 CREATE_TEST_CASE(GT1151)
+CREATE_TEST_CASE(GT911)
 CREATE_TEST_CASE(TT21100)
 CREATE_TEST_CASE(ST1633)
 CREATE_TEST_CASE(ST7123)