Skip to content

Commit 1522efa

Browse files
committed
Merge branch 'doc/touch_element_support_esp32s3' into 'master'
docs(touch): build the touch element doc for esp32s3 Closes IDFGH-15073 See merge request espressif/esp-idf!38366
2 parents 64e23f3 + 2b21d5a commit 1522efa

File tree

10 files changed

+5
-12
lines changed

10 files changed

+5
-12
lines changed

docs/conf_common.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,6 @@
242242
'api-guides/romconsole.rst',
243243
'api-reference/system/ipc.rst',
244244
'security/secure-boot-v1.rst',
245-
'api-reference/peripherals/dac.rst',
246245
'api-reference/peripherals/sd_pullup_requirements.rst',
247246
'hw-reference/esp32/**',
248247
'api-guides/RF_calibration.rst',
@@ -257,8 +256,6 @@
257256
'hw-reference/esp32s2/**',
258257
'api-guides/usb-console.rst',
259258
'api-reference/peripherals/ds.rst',
260-
'api-reference/peripherals/temp_sensor.rst',
261-
'api-reference/system/async_memcpy.rst',
262259
'api-reference/peripherals/touch_element.rst',
263260
'api-guides/RF_calibration.rst',
264261
'api-guides/phy.rst',
@@ -274,6 +271,7 @@
274271
'api-reference/system/ipc.rst',
275272
'api-guides/flash_psram_config.rst',
276273
'api-reference/peripherals/sd_pullup_requirements.rst',
274+
'api-reference/peripherals/touch_element.rst',
277275
'api-guides/RF_calibration.rst',
278276
'api-guides/phy.rst',
279277
]

docs/docs_not_updated/esp32c5.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ api-reference/storage/fatfsgen.rst
2323
api-reference/storage/index.rst
2424
api-reference/storage/nvs_partition_parse.rst
2525
api-reference/peripherals/twai.rst
26-
api-reference/peripherals/touch_element.rst
2726
api-reference/peripherals/spi_features.rst
2827
api-reference/peripherals/touch_pad.rst
2928
api-reference/peripherals/sd_pullup_requirements.rst

docs/docs_not_updated/esp32c61.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ api-reference/peripherals/usb_host/usb_host_notes_usbh.rst
3737
api-reference/peripherals/usb_host/usb_host_notes_design.rst
3838
api-reference/peripherals/usb_device.rst
3939
api-reference/peripherals/dac.rst
40-
api-reference/peripherals/touch_element.rst
4140
api-reference/peripherals/ppa.rst
4241
api-reference/peripherals/camera_driver.rst
4342
api-reference/peripherals/spi_features.rst

docs/docs_not_updated/esp32h21.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ api-reference/peripherals/mcpwm.rst
149149
api-reference/peripherals/usb_host.rst
150150
api-reference/peripherals/clk_tree.rst
151151
api-reference/peripherals/camera_driver.rst
152-
api-reference/peripherals/touch_element.rst
153152
api-reference/peripherals/adc_oneshot.rst
154153
api-reference/peripherals/twai.rst
155154
api-reference/peripherals/etm.rst

docs/docs_not_updated/esp32h4.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ api-reference/peripherals/mcpwm.rst
151151
api-reference/peripherals/usb_host.rst
152152
api-reference/peripherals/clk_tree.rst
153153
api-reference/peripherals/camera_driver.rst
154-
api-reference/peripherals/touch_element.rst
155154
api-reference/peripherals/spi_master.rst
156155
api-reference/peripherals/adc_oneshot.rst
157156
api-reference/peripherals/twai.rst

docs/docs_not_updated/esp32p4.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
api-guides/partition-tables.rst
22
api-guides/usb-otg-console.rst
3-
api-reference/peripherals/parlio.rst
43
api-reference/peripherals/sd_pullup_requirements.rst

docs/en/api-reference/peripherals/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Peripherals API
4646
:SOC_LP_VAD_SUPPORTED: vad
4747
:SOC_TEMP_SENSOR_SUPPORTED: temp_sensor
4848
:SOC_TOUCH_SENSOR_SUPPORTED: cap_touch_sens
49-
:esp32s2: touch_element
49+
:esp32s2 or esp32s3: touch_element
5050
:SOC_TWAI_SUPPORTED: twai
5151
uart
5252
:SOC_USB_OTG_SUPPORTED: usb_device

docs/en/api-reference/peripherals/touch_element.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ The features in relation to the Touch Element library in {IDF_TARGET_NAME} are g
3838
:align: center
3939

4040
* - Features
41-
- ESP32S2
41+
- {IDF_TARGET_NAME}
4242
* - Touch Element waterproof
4343
- ✔
4444
* - Touch Element button

docs/zh_CN/api-reference/peripherals/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
:SOC_JPEG_CODEC_SUPPORTED: jpeg
4747
:SOC_TEMP_SENSOR_SUPPORTED: temp_sensor
4848
:SOC_TOUCH_SENSOR_SUPPORTED: cap_touch_sens
49-
:esp32s2: touch_element
49+
:esp32s2 or esp32s3: touch_element
5050
:SOC_TWAI_SUPPORTED: twai
5151
uart
5252
:SOC_USB_OTG_SUPPORTED: usb_device

docs/zh_CN/api-reference/peripherals/touch_element.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
:align: center
3939

4040
* - 功能
41-
- ESP32S2
41+
- {IDF_TARGET_NAME}
4242
* - 防水
4343
- ✔
4444
* - 按键

0 commit comments

Comments
 (0)