Merge branch 'bugfix/fix_modem_reject_deepsleep_v5.1' into 'release/v5.1'

fix(sleep): fix modem reject the deepsleep request (backport v5.1)

See merge request espressif/esp-idf!26102
This commit is contained in:
Jiang Jiang Jian 2023-09-27 05:23:00 +08:00
commit 5d0bdce91d

View File

@ -646,10 +646,14 @@ static esp_err_t IRAM_ATTR esp_sleep_start(uint32_t pd_flags, esp_sleep_mode_t m
}
#endif
/* Enable sleep reject for faster return from this function,
* in case the wakeup is already triggerred.
*/
uint32_t reject_triggers = (s_config.wakeup_triggers & RTC_SLEEP_REJECT_MASK) | sleep_modem_reject_triggers();
uint32_t reject_triggers = s_config.wakeup_triggers & RTC_SLEEP_REJECT_MASK;
if (!deep_sleep) {
/* Enable sleep reject for faster return from this function,
* in case the wakeup is already triggerred.
*/
reject_triggers |= sleep_modem_reject_triggers();
}
//Append some flags in addition to power domains
uint32_t sleep_flags = pd_flags;