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

fix(bt): Add default BLE controller funcs reset enable (6.1)

See merge request espressif/esp-idf!49139
This commit is contained in:
Jiang Jiang Jian
2026-06-10 11:13:04 +08:00
12 changed files with 193 additions and 44 deletions
@@ -2,6 +2,15 @@ config BT_CTRL_MODE_EFF
int
default 1
config BT_CTRL_CHECK_CONFIG_EFF
int
default 1
help
Marker that controller Kconfig is active (always set in sdkconfig).
Must not be unset in normal IDF builds. Controller-only integrations
that do not export this symbol rely on esp_bt.h to apply compile-time
defaults for missing BLE feature CONFIG_* names.
config BT_CTRL_BLE_MAX_ACT
int "BLE Max Instances"
default 6
+5
View File
@@ -1867,6 +1867,11 @@ esp_err_t esp_bt_controller_init(esp_bt_controller_config_t *cfg)
ESP_LOGI(BT_LOG_TAG, "BT controller compile version [%s]", btdm_controller_get_compile_version());
#ifndef CONFIG_BT_CTRL_CHECK_CONFIG_EFF
ESP_LOGW(BT_LOG_TAG, "CONFIG_BT_CTRL_CHECK_CONFIG_EFF is not defined; "
"using compile-time default BLE controller feature options");
#endif
#if (CONFIG_BT_CTRL_RUN_IN_FLASH_ONLY)
ESP_LOGI(BT_LOG_TAG,"Put all controller code in flash");
#endif