espressif/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-04-27 11:03:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feat/touch_sensor_esp32s31_support' into 'master'

Browse Source 
feat(touch_sens): support touch sensor on esp32s31

See merge request espressif/esp-idf!47329
This commit is contained in:
Hu Rui
2026-04-16 16:11:07 +08:00
parent 0c35411930 b9d3b161e4
commit da26be8864
22 changed files with 1401 additions and 1118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/doxygen/Doxyfile_esp32s31
+3
View File
@@ -3,3 +3,6 @@ INPUT += \
$(PROJECT_PATH)/components/esp_driver_jpeg/include/driver/jpeg_decode.h \
$(PROJECT_PATH)/components/esp_driver_jpeg/include/driver/jpeg_encode.h \
$(PROJECT_PATH)/components/esp_driver_jpeg/include/driver/jpeg_types.h \
$(PROJECT_PATH)/components/esp_driver_touch_sens/hw_ver3/include/driver/touch_version_types.h \
$(PROJECT_PATH)/components/esp_driver_touch_sens/include/driver/touch_sens.h \
$(PROJECT_PATH)/components/esp_driver_touch_sens/include/driver/touch_sens_types.h
docs/en/api-reference/peripherals/cap_touch_sens.rst
+2 -1
View File
@@ -3,7 +3,7 @@ Capacitive Touch Sensor
:link_to_translation:`zh_CN:[中文]`
{IDF_TARGET_TOUCH_SENSOR_VERSION:default="NOT_UPDATED", esp32="v1", esp32s2="v2", esp32s3="v2", esp32p4="v3", esp32h4="v3"}
{IDF_TARGET_TOUCH_SENSOR_VERSION:default="NOT_UPDATED", esp32="v1", esp32s2="v2", esp32s3="v2", esp32p4="v3", esp32h4="v3", esp32s31="v3"}
Introduction
---------------
@@ -31,6 +31,7 @@ Overview of Capacitive Touch Sensor Versions
+------------------+-----------+---------------------------------------------------------------------------------------+
| V3 | ESP32-P4 | Version 3, support frequency hopping |
| | ESP32-H4 | |
| | ESP32-S31 | |
+------------------+-----------+---------------------------------------------------------------------------------------+
Measurement Principle
docs/en/api-reference/peripherals/cap_touch_sens/esp32s31.inc
+61
View File
@@ -0,0 +1,61 @@
.. This file gets included from other .rst files in this folder.
.. It contains target-specific snippets.
.. Comments and '---' lines act as delimiters.
..
.. This is necessary mainly because RST doesn't support substitutions
.. (defined in RST, not in Python) inside code blocks. If that is ever implemented,
.. These code blocks can be moved back to the main .rst files, with target-specific
.. file names being replaced by substitutions.
.. touch-chan-mapping
.. list-table::
:header-rows: 1
:widths: 20 20
* - Channel
- GPIO
* - CH0
- IO6
* - CH1
- IO7
* - CH2
- IO8
* - CH3
- IO9
* - CH4
- IO10
* - CH5
- IO11
* - CH6
- IO12
* - CH7
- IO13
* - CH8
- IO14
* - CH9
- IO15
* - CH10
- IO16
* - CH11
- IO17
* - CH12
- IO18
* - CH13
- IO19
---
docs/zh_CN/api-reference/peripherals/cap_touch_sens.rst
+2 -1
View File
@@ -3,7 +3,7 @@
:link_to_translation:`en:[English]`
{IDF_TARGET_TOUCH_SENSOR_VERSION:default="NOT_UPDATED", esp32="v1", esp32s2="v2", esp32s3="v2", esp32p4="v3", esp32h4="v3"}
{IDF_TARGET_TOUCH_SENSOR_VERSION:default="NOT_UPDATED", esp32="v1", esp32s2="v2", esp32s3="v2", esp32p4="v3", esp32h4="v3", esp32s31="v3"}
概述
------
@@ -31,6 +31,7 @@
+-----------+--------------+------------------------------------------------------------------------+
| V3 | ESP32-P4 | 第三代触摸传感器，新增跳频扫描 |
| | ESP32-H4 | |
| | ESP32-S31 | |
+-----------+--------------+------------------------------------------------------------------------+
测量原理
docs/zh_CN/api-reference/peripherals/cap_touch_sens/esp32s31.inc
+61
View File
@@ -0,0 +1,61 @@
.. This file gets included from other .rst files in this folder.
.. It contains target-specific snippets.
.. Comments and '---' lines act as delimiters.
..
.. This is necessary mainly because RST doesn't support substitutions
.. (defined in RST, not in Python) inside code blocks. If that is ever implemented,
.. These code blocks can be moved back to the main .rst files, with target-specific
.. file names being replaced by substitutions.
.. touch-chan-mapping
.. list-table::
:header-rows: 1
:widths: 20 20
* - 通道
- GPIO
* - CH0
- IO6
* - CH1
- IO7
* - CH2
- IO8
* - CH3
- IO9
* - CH4
- IO10
* - CH5
- IO11
* - CH6
- IO12
* - CH7
- IO13
* - CH8
- IO14
* - CH9
- IO15
* - CH10
- IO16
* - CH11
- IO17
* - CH12
- IO18
* - CH13
- IO19
---