mirror of
https://github.com/espressif/esp-idf.git
synced 2026-10-02 11:10:54 +03:00
Merge branch 'fix/fix_some_ble_sleep_issues_v5.5' into 'release/v5.5'
Fix/fix some ble sleep issues (5.5) See merge request espressif/esp-idf!51318
This commit is contained in:
@@ -1112,7 +1112,7 @@ modem_deint:
|
|||||||
esp_bt_controller_log_deinit();
|
esp_bt_controller_log_deinit();
|
||||||
#endif // CONFIG_BT_LE_CONTROLLER_LOG_ENABLED
|
#endif // CONFIG_BT_LE_CONTROLLER_LOG_ENABLED
|
||||||
esp_phy_modem_deinit();
|
esp_phy_modem_deinit();
|
||||||
// modem_clock_deselect_lp_clock_source(PERIPH_BT_MODULE);
|
modem_clock_deselect_lp_clock_source(PERIPH_BT_MODULE);
|
||||||
modem_clock_module_disable(PERIPH_BT_MODULE);
|
modem_clock_module_disable(PERIPH_BT_MODULE);
|
||||||
|
|
||||||
free_mem:
|
free_mem:
|
||||||
@@ -1137,7 +1137,7 @@ esp_err_t esp_bt_controller_deinit(void)
|
|||||||
os_msys_deinit();
|
os_msys_deinit();
|
||||||
|
|
||||||
esp_phy_modem_deinit();
|
esp_phy_modem_deinit();
|
||||||
// modem_clock_deselect_lp_clock_source(PERIPH_BT_MODULE);
|
modem_clock_deselect_lp_clock_source(PERIPH_BT_MODULE);
|
||||||
modem_clock_module_disable(PERIPH_BT_MODULE);
|
modem_clock_module_disable(PERIPH_BT_MODULE);
|
||||||
|
|
||||||
ble_stack_deinitEnv();
|
ble_stack_deinitEnv();
|
||||||
|
|||||||
@@ -16,5 +16,6 @@ CONFIG_PM_POWER_DOWN_CPU_IN_LIGHT_SLEEP=y
|
|||||||
# Sleep Config
|
# Sleep Config
|
||||||
#
|
#
|
||||||
CONFIG_ESP_SLEEP_POWER_DOWN_FLASH=y
|
CONFIG_ESP_SLEEP_POWER_DOWN_FLASH=y
|
||||||
|
CONFIG_PM_SLP_IRAM_OPT=y
|
||||||
CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION=y
|
CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION=y
|
||||||
# end of Sleep Config
|
# end of Sleep Config
|
||||||
|
|||||||
@@ -19,5 +19,6 @@ CONFIG_FREERTOS_USE_TICKLESS_IDLE=y
|
|||||||
#
|
#
|
||||||
CONFIG_ESP_SLEEP_POWER_DOWN_FLASH=y
|
CONFIG_ESP_SLEEP_POWER_DOWN_FLASH=y
|
||||||
CONFIG_ESP_PHY_MAC_BB_PD=y
|
CONFIG_ESP_PHY_MAC_BB_PD=y
|
||||||
|
CONFIG_PM_SLP_IRAM_OPT=y
|
||||||
CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION=y
|
CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION=y
|
||||||
# end of Sleep Config
|
# end of Sleep Config
|
||||||
|
|||||||
@@ -17,5 +17,6 @@ CONFIG_FREERTOS_USE_TICKLESS_IDLE=y
|
|||||||
#
|
#
|
||||||
# Sleep Config
|
# Sleep Config
|
||||||
#
|
#
|
||||||
|
CONFIG_PM_SLP_IRAM_OPT=y
|
||||||
CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION=y
|
CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION=y
|
||||||
# end of Sleep Config
|
# end of Sleep Config
|
||||||
|
|||||||
@@ -17,5 +17,6 @@ CONFIG_FREERTOS_USE_TICKLESS_IDLE=y
|
|||||||
#
|
#
|
||||||
# Sleep Config
|
# Sleep Config
|
||||||
#
|
#
|
||||||
|
CONFIG_PM_SLP_IRAM_OPT=y
|
||||||
CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION=y
|
CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION=y
|
||||||
# end of Sleep Config
|
# end of Sleep Config
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ CONFIG_FREERTOS_USE_TICKLESS_IDLE=y
|
|||||||
#
|
#
|
||||||
# Sleep Config
|
# Sleep Config
|
||||||
#
|
#
|
||||||
|
CONFIG_PM_SLP_IRAM_OPT=y
|
||||||
CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION=y
|
CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION=y
|
||||||
# end of Sleep Config
|
# end of Sleep Config
|
||||||
|
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ CONFIG_FREERTOS_USE_TICKLESS_IDLE=y
|
|||||||
#
|
#
|
||||||
CONFIG_ESP_SLEEP_POWER_DOWN_FLASH=y
|
CONFIG_ESP_SLEEP_POWER_DOWN_FLASH=y
|
||||||
CONFIG_ESP_PHY_MAC_BB_PD=y
|
CONFIG_ESP_PHY_MAC_BB_PD=y
|
||||||
|
CONFIG_PM_SLP_IRAM_OPT=y
|
||||||
CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION=y
|
CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION=y
|
||||||
# end of Sleep Config
|
# end of Sleep Config
|
||||||
|
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ CONFIG_FREERTOS_USE_TICKLESS_IDLE=y
|
|||||||
#
|
#
|
||||||
# Sleep Config
|
# Sleep Config
|
||||||
#
|
#
|
||||||
|
CONFIG_PM_SLP_IRAM_OPT=y
|
||||||
CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION=y
|
CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION=y
|
||||||
# end of Sleep Config
|
# end of Sleep Config
|
||||||
|
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ CONFIG_PM_POWER_DOWN_PERIPHERAL_IN_LIGHT_SLEEP=y
|
|||||||
# Sleep Config
|
# Sleep Config
|
||||||
#
|
#
|
||||||
CONFIG_ESP_SLEEP_POWER_DOWN_FLASH=y
|
CONFIG_ESP_SLEEP_POWER_DOWN_FLASH=y
|
||||||
|
CONFIG_PM_SLP_IRAM_OPT=y
|
||||||
CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION=y
|
CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION=y
|
||||||
# end of Sleep Config
|
# end of Sleep Config
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user