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

Merge branch 'bugfix/fix_touch_pad_can_not_wake_up' into 'master'

Browse Source 
bugfix(touch pad): modify deep-sleep example and add note for sleep api

See merge request idf/esp-idf!2553
This commit is contained in:
Angus Gratton
2018-06-20 11:51:46 +08:00
parent e3a31302ef 9a0d57b90b
commit c1fdd45001
6 changed files with 71 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/esp32/include/esp_sleep.h
View File

@@ -113,6 +113,9 @@ esp_err_t esp_sleep_enable_timer_wakeup(uint64_t time_in_us);
* to be powered on (ESP_PD_OPTION_ON) or when ext0 wakeup
* source is used.
*
* @note The FSM mode of the touch button should be configured
* as the timer trigger mode.
*
* @return
* - ESP_OK on success
* - ESP_ERR_INVALID_STATE if wakeup triggers conflict