Merge branch 'fix/s31_touch_deep_sleep_v6.1' into 'release/v6.1'

fix(touch): enable touch deep sleep on esp32-s31 (v6.1)

See merge request espressif/esp-idf!49622
This commit is contained in:
morris
2026-06-12 18:39:07 +08:00
4 changed files with 0 additions and 17 deletions
@@ -446,12 +446,6 @@ Call :cpp:func:`touch_channel_read_data` to read the data with different types.
// Register the deep sleep wake-up
ESP_ERROR_CHECK(touch_sensor_config_sleep_wakeup(sens_handle, &deep_slp_cfg));
.. only:: esp32s31
.. note::
ESP32-S31 touch sensor wake-up from deep sleep may fail in some cases. Increasing ``meas_interval_us`` in :cpp:type:`touch_sensor_config_t` can help mitigate this issue.
.. only:: SOC_TOUCH_SUPPORT_DENOISE_CHAN
.. _touch-denoise-chan:
@@ -446,12 +446,6 @@
// 注册 Deep-sleep 唤醒功能
ESP_ERROR_CHECK(touch_sensor_config_sleep_wakeup(sens_handle, &deep_slp_cfg));
.. only:: esp32s31
.. note::
ESP32-S31 触摸传感器从 Deep-sleep 唤醒在部分场景下可能失败。增大 :cpp:type:`touch_sensor_config_t` 中的 ``meas_interval_us`` 可缓解该问题。
.. only:: SOC_TOUCH_SUPPORT_DENOISE_CHAN
.. _touch-denoise-chan:
@@ -93,7 +93,3 @@ Entering deep sleep in:
## Troubleshooting
For any technical queries, please open an [issue](https://github.com/espressif/esp-idf/issues) on GitHub. We will get back to you soon.
## Known issues
The ESP32-S31 touch sensor may fail to wake the chip from deep sleep. Increasing `meas_interval_us` in `touch_sensor_config_t` can mitigate this issue.
@@ -10,7 +10,6 @@ menu "Example Configuration"
bool "Light sleep wakeup"
config EXAMPLE_TOUCH_DEEP_SLEEP_WAKEUP
bool "Deep sleep wakeup"
depends on !IDF_TARGET_ESP32S31 # TODO: DIG-826
endchoice
config EXAMPLE_TOUCH_DEEP_SLEEP_PD