alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-09-20 20:56:01 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'feat/revert_touch_s3_v4.4' into 'release/v4.4'

Browse Source 
touch: Added support for using touch in sleep modes back on ESP32-S3 (v4.4)

See merge request espressif/esp-idf!18691
This commit is contained in:
Jiang Jiang Jian 2022-06-30 16:55:23 +08:00
commit d5ed8f9db6
4 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/driver/esp32s3/touch_sensor.c
View File

@ -248,10 +248,6 @@ esp_err_t touch_pad_config(touch_pad_t touch_num)
esp_err_t touch_pad_init(void)
{
//TODO: IDF-4813
extern bool esp_no_sleep;
esp_no_sleep = true;
if (rtc_touch_mux == NULL) {
rtc_touch_mux = xSemaphoreCreateMutex();
}

4
components/driver/test/touch_sensor_test/test_touch_v2.c
View File

@ -1977,8 +1977,8 @@ static void test_deep_sleep_init(void)
TEST_CASE("Touch Sensor sleep pad wakeup deep sleep test", "[touch][ignore]")
{
//TODO: IDF-4813
#if TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2, ESP32S3)
//TODO: IDF-5218
#if TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2)
abort();
#endif //TEMPORARY_DISABLED_FOR_TARGETS(..)
test_deep_sleep_init();

9
components/esp_hw_support/sleep_modes.c
View File

@ -361,17 +361,8 @@ inline static void IRAM_ATTR misc_modules_wake_prepare(void)
inline static uint32_t IRAM_ATTR call_rtc_sleep_start(uint32_t reject_triggers, uint32_t lslp_mem_inf_fpu);
//TODO: IDF-4813
bool esp_no_sleep = false;
static uint32_t IRAM_ATTR esp_sleep_start(uint32_t pd_flags)
{
#if CONFIG_IDF_TARGET_ESP32S3
if (esp_no_sleep) {
ESP_EARLY_LOGE(TAG, "Sleep cannot be used with Touch/ULP for now.");
abort();
}
#endif //CONFIG_IDF_TARGET_ESP32S3
// Stop UART output so that output is not lost due to APB frequency change.
// For light sleep, suspend UART output — it will resume after wakeup.
// For deep sleep, wait for the contents of UART FIFO to be sent.

2
examples/system/deep_sleep/main/Kconfig.projbuild
View File

@ -3,7 +3,7 @@ menu "Example Configuration"
config EXAMPLE_TOUCH_WAKEUP
bool "Enable touch wake up"
default y
depends on !IDF_TARGET_ESP32C3 && !IDF_TARGET_ESP32S3
depends on IDF_TARGET_ESP32 || IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3
help
This option enables wake up from deep sleep using touch pads
TOUCH8 and TOUCH9, which correspond to GPIO33 and GPIO32.