alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-10-14 16:23:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(touch): adjust touch channel number on P4 from 0-13 to 1-14

Browse Source
This commit is contained in:
laokaiyao
2025-05-22 12:11:11 +08:00
parent fe5927aee6
commit c8a6d41c27
13 changed files with 145 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/soc/esp32p4/include/soc/Kconfig.soc_caps.in
View File

@@ -1699,6 +1699,14 @@ config SOC_TOUCH_SENSOR_NUM
int
default 14
config SOC_TOUCH_MIN_CHAN_ID
int
default 1
config SOC_TOUCH_MAX_CHAN_ID
int
default 14
config SOC_TOUCH_SUPPORT_SLEEP_WAKEUP
bool
default y

2
components/soc/esp32p4/include/soc/soc_caps.h
View File

@@ -629,6 +629,8 @@
/*-------------------------- TOUCH SENSOR CAPS -------------------------------*/
#define SOC_TOUCH_SENSOR_VERSION (3) /*!< Hardware version of touch sensor */
#define SOC_TOUCH_SENSOR_NUM (14) /*!< Touch available channel number. Actually there are 15 Touch channels, but channel 14 is not pinned out, limit to 14 channels */
#define SOC_TOUCH_MIN_CHAN_ID (1U) /*!< Touch minimum channel number */
#define SOC_TOUCH_MAX_CHAN_ID (14) /*!< Touch maximum channel number */
/* Touch Sensor Features */
#define SOC_TOUCH_SUPPORT_SLEEP_WAKEUP (1) /*!< Touch sensor supports sleep awake */

58
components/soc/esp32p4/include/soc/touch_sensor_channel.h
View File

@@ -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
*/
@@ -10,44 +10,44 @@
/* Note: T14 is an internal channel that does not have a corresponding external GPIO. */
#define TOUCH_PAD_GPIO2_CHANNEL TOUCH_PAD_NUM0
#define TOUCH_PAD_NUM0_GPIO_NUM 2
#define TOUCH_PAD_GPIO2_CHANNEL 1
#define TOUCH_PAD_NUM1_GPIO_NUM 2
#define TOUCH_PAD_GPIO3_CHANNEL TOUCH_PAD_NUM1
#define TOUCH_PAD_NUM1_GPIO_NUM 3
#define TOUCH_PAD_GPIO3_CHANNEL 2
#define TOUCH_PAD_NUM2_GPIO_NUM 3
#define TOUCH_PAD_GPIO4_CHANNEL TOUCH_PAD_NUM2
#define TOUCH_PAD_NUM2_GPIO_NUM 4
#define TOUCH_PAD_GPIO4_CHANNEL 3
#define TOUCH_PAD_NUM3_GPIO_NUM 4
#define TOUCH_PAD_GPIO5_CHANNEL TOUCH_PAD_NUM3
#define TOUCH_PAD_NUM3_GPIO_NUM 5
#define TOUCH_PAD_GPIO5_CHANNEL 4
#define TOUCH_PAD_NUM4_GPIO_NUM 5
#define TOUCH_PAD_GPIO6_CHANNEL TOUCH_PAD_NUM4
#define TOUCH_PAD_NUM4_GPIO_NUM 6
#define TOUCH_PAD_GPIO6_CHANNEL 5
#define TOUCH_PAD_NUM5_GPIO_NUM 6
#define TOUCH_PAD_GPIO7_CHANNEL TOUCH_PAD_NUM5
#define TOUCH_PAD_NUM5_GPIO_NUM 7
#define TOUCH_PAD_GPIO7_CHANNEL 6
#define TOUCH_PAD_NUM6_GPIO_NUM 7
#define TOUCH_PAD_GPIO8_CHANNEL TOUCH_PAD_NUM6
#define TOUCH_PAD_NUM6_GPIO_NUM 8
#define TOUCH_PAD_GPIO8_CHANNEL 7
#define TOUCH_PAD_NUM7_GPIO_NUM 8
#define TOUCH_PAD_GPIO9_CHANNEL TOUCH_PAD_NUM7
#define TOUCH_PAD_NUM7_GPIO_NUM 9
#define TOUCH_PAD_GPIO9_CHANNEL 8
#define TOUCH_PAD_NUM8_GPIO_NUM 9
#define TOUCH_PAD_GPIO10_CHANNEL TOUCH_PAD_NUM8
#define TOUCH_PAD_NUM8_GPIO_NUM 10
#define TOUCH_PAD_GPIO10_CHANNEL 9
#define TOUCH_PAD_NUM9_GPIO_NUM 10
#define TOUCH_PAD_GPIO11_CHANNEL TOUCH_PAD_NUM9
#define TOUCH_PAD_NUM9_GPIO_NUM 11
#define TOUCH_PAD_GPIO11_CHANNEL 10
#define TOUCH_PAD_NUM10_GPIO_NUM 11
#define TOUCH_PAD_GPIO12_CHANNEL TOUCH_PAD_NUM10
#define TOUCH_PAD_NUM10_GPIO_NUM 12
#define TOUCH_PAD_GPIO12_CHANNEL 11
#define TOUCH_PAD_NUM11_GPIO_NUM 12
#define TOUCH_PAD_GPIO13_CHANNEL TOUCH_PAD_NUM11
#define TOUCH_PAD_NUM11_GPIO_NUM 13
#define TOUCH_PAD_GPIO13_CHANNEL 12
#define TOUCH_PAD_NUM12_GPIO_NUM 13
#define TOUCH_PAD_GPIO14_CHANNEL TOUCH_PAD_NUM12
#define TOUCH_PAD_NUM12_GPIO_NUM 14
#define TOUCH_PAD_GPIO14_CHANNEL 13
#define TOUCH_PAD_NUM13_GPIO_NUM 14
#define TOUCH_PAD_GPIO15_CHANNEL TOUCH_PAD_NUM13
#define TOUCH_PAD_NUM13_GPIO_NUM 15
#define TOUCH_PAD_GPIO15_CHANNEL 14
#define TOUCH_PAD_NUM14_GPIO_NUM 15