remove(touch_element): remove touch_element from idf

Touch Element Library is moved to managed component.
(https://components.espressif.com/components/espressif/touch_element/versions/1.0.0/readme)

Author: L-KAYA

.gitlab/CODEOWNERS

@@ -156,7 +156,6 @@
 /components/spi_flash/                @esp-idf-codeowners/peripherals
 /components/spiffs/                   @esp-idf-codeowners/storage
 /components/tcp_transport/            @esp-idf-codeowners/network
-/components/touch_element/            @esp-idf-codeowners/peripherals
 /components/ulp/                      @esp-idf-codeowners/system
 /components/unity/                    @esp-idf-codeowners/peripherals @esp-idf-codeowners/system
 /components/usb/                      @esp-idf-codeowners/peripherals/usb

components/driver/test_apps/.build-test-rules.yml

@@ -23,6 +23,19 @@ components/driver/test_apps/legacy_twai:
   depends_components:
     - esp_driver_gpio
 
+components/driver/test_apps/touch_element:
+  disable:
+    - if: IDF_TARGET not in ["esp32s2", "esp32s3"]
+      reason: only supports esp32s2 and esp32s3
+  depends_filepatterns:
+    - components/soc/**/touch_sensor_periph.h
+    - components/soc/esp32s2/**/rtc_cntl_*
+    - components/soc/esp32s3/**/rtc_cntl_*
+    - components/soc/esp32s2/**/rtc_io_struct.h
+    - components/soc/esp32s3/**/rtc_io_struct.h
+    - components/soc/esp32s2/**/sens_struct.h
+    - components/soc/esp32s3/**/sens_struct.h
+
 components/driver/test_apps/touch_sensor_v1:
   disable:
     - if: SOC_TOUCH_SENSOR_VERSION != 1

components/touch_element/test_apps/CMakeLists.txt renamed to components/driver/test_apps/touch_element/CMakeLists.txt

@@ -1,5 +1,5 @@
 idf_component_register(SRCS "test_app_main.c" "test_touch_element.c" "test_touch_button.c"
                             "test_touch_slider.c" "test_touch_matrix.c"
-                       PRIV_REQUIRES unity touch_element
+                       PRIV_REQUIRES unity touch_element esp_pm
                        WHOLE_ARCHIVE
 )

components/touch_element/test_apps/README.md renamed to components/driver/test_apps/touch_element/README.md

@@ -0,0 +1,2 @@
+dependencies:
+  espressif/touch_element: ^1.0.0

components/touch_element/test_apps/main/CMakeLists.txt renamed to components/driver/test_apps/touch_element/main/CMakeLists.txt

@@ -10,7 +10,6 @@
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 
-// Some resources are lazy allocated in gpio/dedicated_gpio/delta_sigma driver, the threshold is left for that case
 #define TEST_MEMORY_LEAK_THRESHOLD (-400)
 
 static size_t before_free_8bit;

components/driver/test_apps/touch_element/main/idf_component.yml

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Unlicense OR CC0-1.0
  */
@@ -14,7 +14,8 @@
 #include "unity.h"
 #include "esp_random.h"
 
-#include "touch_element/touch_element_private.h"
+#include "esp_private/touch_element_private.h"
+#include "esp_private/touch_sensor_legacy_ll.h"
 #include "touch_element/touch_button.h"
 
 static portMUX_TYPE test_button_spinlock = portMUX_INITIALIZER_UNLOCKED;
@@ -103,11 +104,14 @@ void test_button_event_simulator(touch_button_handle_t button_handle, touch_butt
     te_button_handle_t te_button = (te_button_handle_t) button_handle;
     touch_pad_t channel = te_button->device->channel;
     if (button_event == TOUCH_BUTTON_EVT_ON_PRESS) {
-        touch_pad_set_cnt_mode(channel, TOUCH_PAD_SLOPE_3, TOUCH_PAD_TIE_OPT_DEFAULT);
+        touch_ll_set_slope(channel, TOUCH_PAD_SLOPE_3);
+        touch_ll_set_tie_option(channel, TOUCH_PAD_TIE_OPT_DEFAULT);
     } else if (button_event == TOUCH_BUTTON_EVT_ON_RELEASE) {
-        touch_pad_set_cnt_mode(channel, TOUCH_PAD_SLOPE_7, TOUCH_PAD_TIE_OPT_DEFAULT);
+        touch_ll_set_slope(channel, TOUCH_PAD_SLOPE_7);
+        touch_ll_set_tie_option(channel, TOUCH_PAD_TIE_OPT_DEFAULT);
     } else {
-        touch_pad_set_cnt_mode(channel, TOUCH_PAD_SLOPE_3, TOUCH_PAD_TIE_OPT_DEFAULT);  //LongPress
+        touch_ll_set_slope(channel, TOUCH_PAD_SLOPE_3);
+        touch_ll_set_tie_option(channel, TOUCH_PAD_TIE_OPT_DEFAULT);
     }
 }
 
@@ -129,7 +133,8 @@ static void test_button_callback_check(touch_button_handle_t current_handle, tou
 }
 
 void test_button_event_trigger_and_check(touch_button_handle_t handle, touch_button_event_t button_event)
-{//TODO: refactor this with a constructor
+{
+    //TODO: refactor this with a constructor
     touch_elem_message_t valid_message = {
         .handle = handle,
         .element_type = TOUCH_ELEM_TYPE_BUTTON,
@@ -189,8 +194,8 @@ static void test_button_disp_event(void)
         };
         TEST_ESP_OK(touch_button_create(&button_config, &button_handle[i]));
         TEST_ESP_OK(touch_button_subscribe_event(button_handle[i],
-                    TOUCH_ELEM_EVENT_ON_PRESS | TOUCH_ELEM_EVENT_ON_RELEASE | TOUCH_ELEM_EVENT_ON_LONGPRESS,
-                    (void *) button_channel_array[i]));
+                                                 TOUCH_ELEM_EVENT_ON_PRESS | TOUCH_ELEM_EVENT_ON_RELEASE | TOUCH_ELEM_EVENT_ON_LONGPRESS,
+                                                 (void *) button_channel_array[i]));
         TEST_ESP_OK(touch_button_set_longpress(button_handle[i], 300));
         TEST_ESP_OK(touch_button_set_dispatch_method(button_handle[i], TOUCH_ELEM_DISP_EVENT));
     }
@@ -233,8 +238,8 @@ static void test_button_disp_callback(void)
         };
         TEST_ESP_OK(touch_button_create(&button_config, &button_handle[i]));
         TEST_ESP_OK(touch_button_subscribe_event(button_handle[i],
-                    TOUCH_ELEM_EVENT_ON_PRESS | TOUCH_ELEM_EVENT_ON_RELEASE | TOUCH_ELEM_EVENT_ON_LONGPRESS,
-                    (void *) &monitor));
+                                                 TOUCH_ELEM_EVENT_ON_PRESS | TOUCH_ELEM_EVENT_ON_RELEASE | TOUCH_ELEM_EVENT_ON_LONGPRESS,
+                                                 (void *) &monitor));
         TEST_ESP_OK(touch_button_set_dispatch_method(button_handle[i], TOUCH_ELEM_DISP_CALLBACK));
         TEST_ESP_OK(touch_button_set_callback(button_handle[i], &test_button_handler));
         TEST_ESP_OK(touch_button_set_longpress(button_handle[i], 300));
@@ -295,7 +300,7 @@ static void test_button_event_change_lp(void)
     printf("Touch button event change longtime test start\n");
     for (int i = 0; i < 10; i++) {
         printf("Touch button event change longtime test... (%d/10)\n", i + 1);
-        esp_err_t ret;
+        esp_err_t ret = ESP_OK;
         uint8_t channel_index = random() % BUTTON_CHANNEL_NUM;
         touch_elem_message_t valid_message = {
             .handle = button_handle[channel_index],
@@ -412,7 +417,7 @@ static void test_button_event_concurrent(void)
     printf("Touch button event concurrent test start\n");
     for (int i = 0; i < 10; i++) {
         printf("Touch button event concurrent test... (%d/10)\n", i + 1);
-        esp_err_t ret;
+        esp_err_t ret = ESP_OK;
         uint32_t message_count = 0;
         touch_elem_message_t current_message;
 
@@ -488,7 +493,6 @@ static void test_button_random_trigger_concurrent(void)
         TEST_ASSERT(os_ret == pdPASS);
     }
 
-
     uint32_t run_count = 0;
     while (1) {
         if (run_count++ % 1000 == 0) {

components/touch_element/test_apps/main/test_app_main.c renamed to components/driver/test_apps/touch_element/main/test_app_main.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Unlicense OR CC0-1.0
  */
@@ -34,6 +34,7 @@
 #include "touch_element/touch_button.h"
 #include "touch_element/touch_slider.h"
 #include "touch_element/touch_matrix.h"
+#include "esp_private/touch_sensor_legacy_ll.h"
 
 typedef struct {
     QueueHandle_t valid_msg_handle;
@@ -110,7 +111,8 @@ static void test_system_waterproof_guard(void)
     printf("Touch Element waterproof guard sensor test start\n");
 
     srandom((unsigned int)time(NULL));
-    {//No use waterproof guard sensor
+    {
+        //No use waterproof guard sensor
         touch_elem_waterproof_config_t waterproof_config = {
             .guard_channel = TOUCH_WATERPROOF_GUARD_NOUSE,
             .guard_sensitivity = 0.0F
@@ -128,7 +130,8 @@ static void test_system_waterproof_guard(void)
         touch_element_waterproof_uninstall();
     }
 
-    {//Use waterproof guard sensor(Add all handles)
+    {
+        //Use waterproof guard sensor(Add all handles)
         touch_elem_waterproof_config_t waterproof_config = {
             .guard_channel = TOUCH_PAD_NUM13,
             .guard_sensitivity = 0.1F
@@ -158,7 +161,8 @@ static void test_system_waterproof_guard(void)
         touch_element_waterproof_uninstall();
     }
 
-    {//Put half button handles into guard ring
+    {
+        //Put half button handles into guard ring
         const uint8_t protect_handle_threshold = BUTTON_CHANNEL_NUM / 2;
         touch_elem_waterproof_config_t waterproof_config = {
             .guard_channel = TOUCH_PAD_NUM13,
@@ -196,9 +200,11 @@ static void test_system_waterproof_guard(void)
 static void test_waterproof_event_simulator(touch_pad_t guard_channel, touch_button_event_t guard_state)
 {
     if (guard_state == TOUCH_BUTTON_EVT_ON_PRESS) {
-        touch_pad_set_cnt_mode(guard_channel, TOUCH_PAD_SLOPE_3, TOUCH_PAD_TIE_OPT_DEFAULT);
+        touch_ll_set_slope(guard_channel, TOUCH_PAD_SLOPE_3);
+        touch_ll_set_tie_option(guard_channel, TOUCH_PAD_TIE_OPT_DEFAULT);
     } else if (guard_state == TOUCH_BUTTON_EVT_ON_RELEASE) {
-        touch_pad_set_cnt_mode(guard_channel, TOUCH_PAD_SLOPE_7, TOUCH_PAD_TIE_OPT_DEFAULT);
+        touch_ll_set_slope(guard_channel, TOUCH_PAD_SLOPE_7);
+        touch_ll_set_tie_option(guard_channel, TOUCH_PAD_TIE_OPT_DEFAULT);
     } else {
         printf("guard sensor simulator doesn't support this operation\n");
     }

components/touch_element/test_apps/main/test_touch_button.c renamed to components/driver/test_apps/touch_element/main/test_touch_button.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Unlicense OR CC0-1.0
  */
@@ -13,7 +13,8 @@
 #include "freertos/semphr.h"
 #include "unity.h"
 
-#include "touch_element/touch_element_private.h"
+#include "esp_private/touch_element_private.h"
+#include "esp_private/touch_sensor_legacy_ll.h"
 #include "touch_element/touch_matrix.h"
 
 static const touch_pad_t x_axis_channel[3] = {
@@ -95,23 +96,31 @@ void test_matrix_event_simulator(touch_matrix_handle_t matrix_handle, touch_matr
     touch_pad_t x_channel = te_matrix->device[pos_index / te_matrix->y_channel_num]->channel;
     touch_pad_t y_channel = te_matrix->device[te_matrix->x_channel_num + (pos_index % te_matrix->y_channel_num)]->channel;
     if (matrix_event == TOUCH_MATRIX_EVT_ON_PRESS) {
-        touch_pad_set_cnt_mode(x_channel, TOUCH_PAD_SLOPE_3, TOUCH_PAD_TIE_OPT_DEFAULT);
-        touch_pad_set_cnt_mode(y_channel, TOUCH_PAD_SLOPE_3, TOUCH_PAD_TIE_OPT_DEFAULT);
+        touch_ll_set_slope(x_channel, TOUCH_PAD_SLOPE_3);
+        touch_ll_set_tie_option(x_channel, TOUCH_PAD_TIE_OPT_DEFAULT);
+        touch_ll_set_slope(y_channel, TOUCH_PAD_SLOPE_3);
+        touch_ll_set_tie_option(y_channel, TOUCH_PAD_TIE_OPT_DEFAULT);
     } else if (matrix_event == TOUCH_MATRIX_EVT_ON_RELEASE) {
-        touch_pad_set_cnt_mode(x_channel, TOUCH_PAD_SLOPE_7, TOUCH_PAD_TIE_OPT_DEFAULT);
-        touch_pad_set_cnt_mode(y_channel, TOUCH_PAD_SLOPE_7, TOUCH_PAD_TIE_OPT_DEFAULT);
+        touch_ll_set_slope(x_channel, TOUCH_PAD_SLOPE_7);
+        touch_ll_set_tie_option(x_channel, TOUCH_PAD_TIE_OPT_DEFAULT);
+        touch_ll_set_slope(y_channel, TOUCH_PAD_SLOPE_7);
+        touch_ll_set_tie_option(y_channel, TOUCH_PAD_TIE_OPT_DEFAULT);
     } else {
-        touch_pad_set_cnt_mode(x_channel, TOUCH_PAD_SLOPE_3, TOUCH_PAD_TIE_OPT_DEFAULT); // LongPress
-        touch_pad_set_cnt_mode(y_channel, TOUCH_PAD_SLOPE_3, TOUCH_PAD_TIE_OPT_DEFAULT);
+        touch_ll_set_slope(x_channel, TOUCH_PAD_SLOPE_3);
+        touch_ll_set_tie_option(x_channel, TOUCH_PAD_TIE_OPT_DEFAULT);
+        touch_ll_set_slope(y_channel, TOUCH_PAD_SLOPE_3);
+        touch_ll_set_tie_option(y_channel, TOUCH_PAD_TIE_OPT_DEFAULT);
     }
 }
 
 static void test_matrix_channel_simulator(touch_pad_t channel, touch_matrix_event_t matrix_event)
 {
     if (matrix_event == TOUCH_MATRIX_EVT_ON_PRESS) {
-        touch_pad_set_cnt_mode(channel, TOUCH_PAD_SLOPE_3, TOUCH_PAD_TIE_OPT_DEFAULT);
+        touch_ll_set_slope(channel, TOUCH_PAD_SLOPE_3);
+        touch_ll_set_tie_option(channel, TOUCH_PAD_TIE_OPT_DEFAULT);
     } else if (matrix_event == TOUCH_MATRIX_EVT_ON_RELEASE) {
-        touch_pad_set_cnt_mode(channel, TOUCH_PAD_SLOPE_7, TOUCH_PAD_TIE_OPT_DEFAULT);
+        touch_ll_set_slope(channel, TOUCH_PAD_SLOPE_7);
+        touch_ll_set_tie_option(channel, TOUCH_PAD_TIE_OPT_DEFAULT);
     }
 }
 
@@ -218,7 +227,7 @@ static void test_matrix_disp_event(void)
     printf("Touch matrix event test start\n");
     for (int i = 0; i < 10; i++) {
         printf("Touch matrix event test... (%d/10)\n", i + 1);
-        uint32_t button_num = random() % ( MATRIX_CHANNEL_NUM_X * MATRIX_CHANNEL_NUM_Y );
+        uint32_t button_num = random() % (MATRIX_CHANNEL_NUM_X * MATRIX_CHANNEL_NUM_Y);
         test_matrix_event_trigger_and_check(matrix_handle, TOUCH_MATRIX_EVT_ON_PRESS, button_num);
         test_matrix_event_trigger_and_check(matrix_handle, TOUCH_MATRIX_EVT_ON_LONGPRESS, button_num);
         test_matrix_event_trigger_and_check(matrix_handle, TOUCH_MATRIX_EVT_ON_RELEASE, button_num);
@@ -377,7 +386,7 @@ static void test_matrix_event_change_lp(void)
     printf("Touch matrix event change longtime test start\n");
     for (int i = 0; i < 10; i++) {
         printf("Touch matrix event change longtime test... (%d/10)\n", i + 1);
-        uint32_t button_num = random() % ( MATRIX_CHANNEL_NUM_X * MATRIX_CHANNEL_NUM_Y );
+        uint32_t button_num = random() % (MATRIX_CHANNEL_NUM_X * MATRIX_CHANNEL_NUM_Y);
         TEST_ESP_OK(touch_matrix_set_longpress(matrix_handle, 200 + (i + 1) * 50));
         test_matrix_event_trigger_and_check(matrix_handle, TOUCH_MATRIX_EVT_ON_LONGPRESS, button_num);
         test_matrix_event_simulator(matrix_handle, TOUCH_MATRIX_EVT_ON_RELEASE, button_num); //Reset hardware