From d9e32041156f9ee5a8cb6eda0d53f19028576ddc Mon Sep 17 00:00:00 2001 From: Li Shuai Date: Tue, 9 Nov 2021 14:20:41 +0800 Subject: [PATCH 1/2] light sleep: replace new kconfig option of mac bb power down & phy reduce tx power --- components/esp_phy/sdkconfig.rename | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/esp_phy/sdkconfig.rename b/components/esp_phy/sdkconfig.rename index 17cee6d513..1952f7afcf 100644 --- a/components/esp_phy/sdkconfig.rename +++ b/components/esp_phy/sdkconfig.rename @@ -1,8 +1,8 @@ # sdkconfig replacement configurations for deprecated options formatted as # CONFIG_DEPRECATED_OPTION CONFIG_NEW_OPTION -CONFIG_MAC_BB_PD CONFIG_ESP32_PHY_MAC_BB_PD -CONFIG_REDUCE_PHY_TX_POWER CONFIG_ESP32_REDUCE_PHY_TX_POWER +CONFIG_MAC_BB_PD CONFIG_ESP_PHY_MAC_BB_PD +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_REDUCE_PHY_TX_POWER CONFIG_ESP_PHY_REDUCE_TX_POWER CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE From c99cb930c339c1e07f8daa9931fef8ddbb352211 Mon Sep 17 00:00:00 2001 From: Li Shuai Date: Tue, 9 Nov 2021 14:26:06 +0800 Subject: [PATCH 2/2] sleep: deep sleep does not need cpu and wifi/bt mac retention --- components/esp_hw_support/sleep_modes.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/components/esp_hw_support/sleep_modes.c b/components/esp_hw_support/sleep_modes.c index 632b1a19ed..60b9819979 100644 --- a/components/esp_hw_support/sleep_modes.c +++ b/components/esp_hw_support/sleep_modes.c @@ -391,7 +391,9 @@ static uint32_t IRAM_ATTR esp_sleep_start(uint32_t pd_flags) } #endif - misc_modules_sleep_prepare(); + if (!deep_sleep) { + misc_modules_sleep_prepare(); + } #if CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 if (deep_sleep) { @@ -484,10 +486,9 @@ static uint32_t IRAM_ATTR esp_sleep_start(uint32_t pd_flags) if (!deep_sleep) { s_config.ccount_ticks_record = cpu_ll_get_cycle_count(); + misc_modules_wake_prepare(); } - misc_modules_wake_prepare(); - // re-enable UART output resume_uarts();