Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/ext_wakeup_input_enable' into 'master'

Browse source 
sleep: make sure input enable is set for EXT0/EXT1 wakeup

See merge request idf/esp-idf!2542
This commit is contained in:
Ivan Grokhotkov 2018-06-14 19:03:01 +08:00
commit 8674a34fd6
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
components/esp32/sleep_modes.c
View file

@ -465,8 +465,7 @@ static void ext0_wakeup_prepare()
if (desc->rtc_num == rtc_gpio_num) { if (desc->rtc_num == rtc_gpio_num) {
REG_SET_BIT(desc->reg, desc->mux); REG_SET_BIT(desc->reg, desc->mux);
SET_PERI_REG_BITS(desc->reg, 0x3, 0, desc->func); SET_PERI_REG_BITS(desc->reg, 0x3, 0, desc->func);
REG_SET_BIT(desc->reg, desc->slpsel); REG_SET_BIT(desc->reg, desc->ie);
REG_SET_BIT(desc->reg, desc->slpie);
break; break;
} }
} }
@ -508,16 +507,13 @@ static void ext1_wakeup_prepare()
// Route pad to RTC // Route pad to RTC
REG_SET_BIT(desc->reg, desc->mux); REG_SET_BIT(desc->reg, desc->mux);
SET_PERI_REG_BITS(desc->reg, 0x3, 0, desc->func); SET_PERI_REG_BITS(desc->reg, 0x3, 0, desc->func);
// set input enable in sleep mode
REG_SET_BIT(desc->reg, desc->ie);
// Pad configuration depends on RTC_PERIPH state in sleep mode // Pad configuration depends on RTC_PERIPH state in sleep mode
if (s_config.pd_options[ESP_PD_DOMAIN_RTC_PERIPH] == ESP_PD_OPTION_ON) { if (s_config.pd_options[ESP_PD_DOMAIN_RTC_PERIPH] != ESP_PD_OPTION_ON) {
// set input enable in sleep mode // RTC_PERIPH will be powered down, so RTC_IO_ registers will
REG_SET_BIT(desc->reg, desc->slpie); // loose their state. Lock pad configuration.
// allow sleep status signal to control IE/SLPIE mux // Pullups/pulldowns also need to be disabled.
REG_SET_BIT(desc->reg, desc->slpsel);
} else {
// RTC_PERIPH will be disabled, so need to enable input and
// lock pad configuration. Pullups/pulldowns also need to be disabled.
REG_SET_BIT(desc->reg, desc->ie);
REG_CLR_BIT(desc->reg, desc->pulldown); REG_CLR_BIT(desc->reg, desc->pulldown);
REG_CLR_BIT(desc->reg, desc->pullup); REG_CLR_BIT(desc->reg, desc->pullup);
REG_SET_BIT(RTC_CNTL_HOLD_FORCE_REG, desc->hold_force); REG_SET_BIT(RTC_CNTL_HOLD_FORCE_REG, desc->hold_force);