Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-01 10:40:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/fix_some_ble_sleep_issues_v6.1' into 'release/v6.1'

Browse Source 
Fix/fix some ble sleep issues (6.1)

See merge request espressif/esp-idf!51320
This commit is contained in:
Jiang Jiang Jian
2026-08-31 11:26:01 +08:00
parent fe321e73c8 54b357e089
commit 880b0b1f67
16 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/bt/controller/esp32c5/bt.c
+2 -2
View File
@@ -1137,7 +1137,7 @@ modem_deint:
esp_bt_controller_log_deinit();
#endif // CONFIG_BT_LE_CONTROLLER_LOG_ENABLED
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);
free_mem:
@@ -1162,7 +1162,7 @@ esp_err_t esp_bt_controller_deinit(void)
os_msys_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);
ble_stack_deinitEnv();
components/bt/porting_btdm/controller/btdm_common/src/btdm_lp.c
+1 -1
View File
@@ -171,7 +171,7 @@ void btdm_lp_set_lpclk_src(modem_clock_lpclk_src_t clk_src)
return;
}
if (clk_src >= MODEM_CLOCK_LPCLK_SRC_MAX || clk_src <= MODEM_CLOCK_LPCLK_SRC_INVALID) {
if (clk_src >= MODEM_CLOCK_LPCLK_SRC_MAX) {
return;
}
examples/bluetooth/nimble/power_save/sdkconfig.32m.esp32h2
+1
View File
@@ -18,5 +18,6 @@ CONFIG_ESP_MODEM_CLOCK_ENABLE_CHECKING=y
# Sleep Config
#
CONFIG_ESP_SLEEP_POWER_DOWN_FLASH=y
CONFIG_PM_SLP_IRAM_OPT=y
CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION=y
# end of Sleep Config
examples/bluetooth/nimble/power_save/sdkconfig.32m.esp32h21
+1
View File
@@ -18,5 +18,6 @@ CONFIG_ESP_MODEM_CLOCK_ENABLE_CHECKING=y
#
# Sleep Config
#
CONFIG_PM_SLP_IRAM_OPT=y
CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION=y
# end of Sleep Config
examples/bluetooth/nimble/power_save/sdkconfig.32m.esp32h4
+1
View File
@@ -18,5 +18,6 @@ CONFIG_ESP_MODEM_CLOCK_ENABLE_CHECKING=y
#
# Sleep Config
#
CONFIG_PM_SLP_IRAM_OPT=y
CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION=y
# end of Sleep Config
examples/bluetooth/nimble/power_save/sdkconfig.40m.esp32c6
+1
View File
@@ -20,5 +20,6 @@ CONFIG_ESP_MODEM_CLOCK_ENABLE_CHECKING=y
#
CONFIG_ESP_SLEEP_POWER_DOWN_FLASH=y
CONFIG_ESP_PHY_MAC_BB_PD=y
CONFIG_PM_SLP_IRAM_OPT=y
CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION=y
# end of Sleep Config
examples/bluetooth/nimble/power_save/sdkconfig.40m.esp32c61
+1
View File
@@ -18,5 +18,6 @@ CONFIG_ESP_MODEM_CLOCK_ENABLE_CHECKING=y
#
# Sleep Config
#
CONFIG_PM_SLP_IRAM_OPT=y
CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION=y
# end of Sleep Config
examples/bluetooth/nimble/power_save/sdkconfig.40m.esp32s31
+1
View File
@@ -18,5 +18,6 @@ CONFIG_ESP_MODEM_CLOCK_ENABLE_CHECKING=y
#
# Sleep Config
#
CONFIG_PM_SLP_IRAM_OPT=y
CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION=y
# end of Sleep Config
examples/bluetooth/nimble/power_save/sdkconfig.48m.esp32c5
+1
View File
@@ -18,5 +18,6 @@ CONFIG_ESP_MODEM_CLOCK_ENABLE_CHECKING=y
#
# Sleep Config
#
CONFIG_PM_SLP_IRAM_OPT=y
CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION=y
# end of Sleep Config
examples/bluetooth/nimble/power_save/sdkconfig.defaults.esp32c5
+1
View File
@@ -19,6 +19,7 @@ CONFIG_ESP_MODEM_CLOCK_ENABLE_CHECKING=y
#
# Sleep Config
#
CONFIG_PM_SLP_IRAM_OPT=y
CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION=y
# end of Sleep Config
examples/bluetooth/nimble/power_save/sdkconfig.defaults.esp32c6
+1
View File
@@ -21,6 +21,7 @@ CONFIG_ESP_MODEM_CLOCK_ENABLE_CHECKING=y
#
CONFIG_ESP_SLEEP_POWER_DOWN_FLASH=y
CONFIG_ESP_PHY_MAC_BB_PD=y
CONFIG_PM_SLP_IRAM_OPT=y
CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION=y
# end of Sleep Config
examples/bluetooth/nimble/power_save/sdkconfig.defaults.esp32c61
+1
View File
@@ -19,6 +19,7 @@ CONFIG_ESP_MODEM_CLOCK_ENABLE_CHECKING=y
#
# Sleep Config
#
CONFIG_PM_SLP_IRAM_OPT=y
CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION=y
# end of Sleep Config
examples/bluetooth/nimble/power_save/sdkconfig.defaults.esp32h2
+1
View File
@@ -19,6 +19,7 @@ CONFIG_ESP_MODEM_CLOCK_ENABLE_CHECKING=y
# Sleep Config
#
CONFIG_ESP_SLEEP_POWER_DOWN_FLASH=y
CONFIG_PM_SLP_IRAM_OPT=y
CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION=y
# end of Sleep Config
examples/bluetooth/nimble/power_save/sdkconfig.defaults.esp32h21
+1
View File
@@ -18,6 +18,7 @@ CONFIG_ESP_MODEM_CLOCK_ENABLE_CHECKING=y
#
# Sleep Config
#
CONFIG_PM_SLP_IRAM_OPT=y
CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION=y
# end of Sleep Config
examples/bluetooth/nimble/power_save/sdkconfig.defaults.esp32h4
+1
View File
@@ -18,6 +18,7 @@ CONFIG_ESP_MODEM_CLOCK_ENABLE_CHECKING=y
#
# Sleep Config
#
CONFIG_PM_SLP_IRAM_OPT=y
CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION=y
# end of Sleep Config
examples/bluetooth/nimble/power_save/sdkconfig.defaults.esp32s31
+1
View File
@@ -19,6 +19,7 @@ CONFIG_ESP_MODEM_CLOCK_ENABLE_CHECKING=y
#
# Sleep Config
#
CONFIG_PM_SLP_IRAM_OPT=y
CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION=y
# end of Sleep Config