diff --git a/components/hal/esp32/include/hal/touch_sensor_ll.h b/components/hal/esp32/include/hal/touch_sensor_ll.h index 8d1c945024..bfd9248689 100644 --- a/components/hal/esp32/include/hal/touch_sensor_ll.h +++ b/components/hal/esp32/include/hal/touch_sensor_ll.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -208,7 +208,12 @@ static inline void touch_ll_get_slope(touch_pad_t touch_num, touch_cnt_slope_t * static inline void touch_ll_set_tie_option(touch_pad_t touch_num, touch_tie_opt_t opt) { touch_pad_t touch_pad_wrap = touch_ll_num_wrap(touch_num); - RTCIO.touch_pad[touch_pad_wrap].tie_opt = opt; + if (opt == TOUCH_PAD_TIE_OPT_FLOAT) { + RTCIO.touch_pad[touch_pad_wrap].xpd = 0; + } else { + RTCIO.touch_pad[touch_pad_wrap].xpd = 1; + RTCIO.touch_pad[touch_pad_wrap].tie_opt = opt; + } } /** @@ -220,7 +225,11 @@ static inline void touch_ll_set_tie_option(touch_pad_t touch_num, touch_tie_opt_ static inline void touch_ll_get_tie_option(touch_pad_t touch_num, touch_tie_opt_t *opt) { touch_pad_t touch_pad_wrap = touch_ll_num_wrap(touch_num); - *opt = (touch_tie_opt_t)RTCIO.touch_pad[touch_pad_wrap].tie_opt; + if (RTCIO.touch_pad[touch_pad_wrap].xpd) { + *opt = (touch_tie_opt_t)RTCIO.touch_pad[touch_pad_wrap].tie_opt; + } else { + *opt = TOUCH_PAD_TIE_OPT_FLOAT; + } } /** diff --git a/components/hal/esp32s2/include/hal/touch_sensor_ll.h b/components/hal/esp32s2/include/hal/touch_sensor_ll.h index 0cc5069d2f..eddcb52db4 100644 --- a/components/hal/esp32s2/include/hal/touch_sensor_ll.h +++ b/components/hal/esp32s2/include/hal/touch_sensor_ll.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -194,7 +194,12 @@ static inline void touch_ll_get_slope(touch_pad_t touch_num, touch_cnt_slope_t * */ static inline void touch_ll_set_tie_option(touch_pad_t touch_num, touch_tie_opt_t opt) { - RTCIO.touch_pad[touch_num].tie_opt = opt; + if (opt == TOUCH_PAD_TIE_OPT_FLOAT) { + RTCIO.touch_pad[touch_num].xpd = 0; + } else { + RTCIO.touch_pad[touch_num].xpd = 1; + RTCIO.touch_pad[touch_num].tie_opt = opt; + } } /** @@ -205,7 +210,11 @@ static inline void touch_ll_set_tie_option(touch_pad_t touch_num, touch_tie_opt_ */ static inline void touch_ll_get_tie_option(touch_pad_t touch_num, touch_tie_opt_t *opt) { - *opt = (touch_tie_opt_t)RTCIO.touch_pad[touch_num].tie_opt; + if (RTCIO.touch_pad[touch_num].xpd) { + *opt = (touch_tie_opt_t)RTCIO.touch_pad[touch_num].tie_opt; + } else { + *opt = TOUCH_PAD_TIE_OPT_FLOAT; + } } /** diff --git a/components/hal/esp32s3/include/hal/touch_sensor_ll.h b/components/hal/esp32s3/include/hal/touch_sensor_ll.h index d3dde4edd3..3e2d2379fc 100644 --- a/components/hal/esp32s3/include/hal/touch_sensor_ll.h +++ b/components/hal/esp32s3/include/hal/touch_sensor_ll.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -209,7 +209,12 @@ static inline void touch_ll_get_slope(touch_pad_t touch_num, touch_cnt_slope_t * */ static inline void touch_ll_set_tie_option(touch_pad_t touch_num, touch_tie_opt_t opt) { - RTCIO.touch_pad[touch_num].tie_opt = opt; + if (opt == TOUCH_PAD_TIE_OPT_FLOAT) { + RTCIO.touch_pad[touch_num].xpd = 0; + } else { + RTCIO.touch_pad[touch_num].xpd = 1; + RTCIO.touch_pad[touch_num].tie_opt = opt; + } } /** @@ -220,7 +225,11 @@ static inline void touch_ll_set_tie_option(touch_pad_t touch_num, touch_tie_opt_ */ static inline void touch_ll_get_tie_option(touch_pad_t touch_num, touch_tie_opt_t *opt) { - *opt = (touch_tie_opt_t)RTCIO.touch_pad[touch_num].tie_opt; + if (RTCIO.touch_pad[touch_num].xpd) { + *opt = (touch_tie_opt_t)RTCIO.touch_pad[touch_num].tie_opt; + } else { + *opt = TOUCH_PAD_TIE_OPT_FLOAT; + } } /** diff --git a/components/hal/include/hal/touch_sensor_types.h b/components/hal/include/hal/touch_sensor_types.h index dac11762f3..2e537a4315 100644 --- a/components/hal/include/hal/touch_sensor_types.h +++ b/components/hal/include/hal/touch_sensor_types.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -86,7 +86,8 @@ typedef enum { typedef enum { TOUCH_PAD_TIE_OPT_LOW = 0, /*!