feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'bugfix/wifi_bt_mac_bb_pd_light_sleep_v4.4' into 'release/v4.4'

Browse Source 
backport v4.4: fixes some sleep related issues

See merge request espressif/esp-idf!15932
This commit is contained in:
Jiang Jiang Jian
2021-11-15 07:18:56 +00:00
parent df0929009a e75762b02f
commit 3a7024990e
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/esp_hw_support/sleep_modes.c
View File

@@ -382,7 +382,9 @@ static uint32_t IRAM_ATTR esp_sleep_start(uint32_t pd_flags)
} }
#endif #endif
misc_modules_sleep_prepare(); if (!deep_sleep) {
misc_modules_sleep_prepare();
}
#if CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 #if CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
if (deep_sleep) { if (deep_sleep) {
@@ -472,10 +474,9 @@ static uint32_t IRAM_ATTR esp_sleep_start(uint32_t pd_flags)
if (!deep_sleep) { if (!deep_sleep) {
s_config.ccount_ticks_record = cpu_ll_get_cycle_count(); s_config.ccount_ticks_record = cpu_ll_get_cycle_count();
misc_modules_wake_prepare();
} }
misc_modules_wake_prepare();
// re-enable UART output // re-enable UART output
resume_uarts(); resume_uarts();

4
components/esp_phy/sdkconfig.rename
View File

@@ -1,8 +1,8 @@
# sdkconfig replacement configurations for deprecated options formatted as # sdkconfig replacement configurations for deprecated options formatted as
# CONFIG_DEPRECATED_OPTION CONFIG_NEW_OPTION # CONFIG_DEPRECATED_OPTION CONFIG_NEW_OPTION
CONFIG_MAC_BB_PD CONFIG_ESP32_PHY_MAC_BB_PD CONFIG_MAC_BB_PD CONFIG_ESP_PHY_MAC_BB_PD
CONFIG_REDUCE_PHY_TX_POWER CONFIG_ESP32_REDUCE_PHY_TX_POWER CONFIG_REDUCE_PHY_TX_POWER CONFIG_ESP_PHY_REDUCE_TX_POWER
CONFIG_ESP32_PHY_MAC_BB_PD CONFIG_ESP_PHY_MAC_BB_PD CONFIG_ESP32_PHY_MAC_BB_PD CONFIG_ESP_PHY_MAC_BB_PD
CONFIG_ESP32_REDUCE_PHY_TX_POWER CONFIG_ESP_PHY_REDUCE_TX_POWER CONFIG_ESP32_REDUCE_PHY_TX_POWER CONFIG_ESP_PHY_REDUCE_TX_POWER
CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE