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

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

Browse Source 
(cherry picked from commit 7c1cb4b296)

Co-authored-by: zhanghaipeng <zhanghaipeng@espressif.com>
This commit is contained in:
Zhang Hai Peng
2026-06-02 10:14:17 +08:00
parent 359a84367b
commit 71fc9347ed
3 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/bt/controller/esp32c3/Kconfig.in
View File

@@ -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
components/bt/controller/esp32c3/bt.c
View File

@@ -1866,6 +1866,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

18
components/bt/include/esp32c3/include/esp_bt.h
View File

@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2015-2026 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -268,7 +268,21 @@ typedef void (* esp_bt_hci_tl_callback_t) (void *arg, uint8_t status);
#define BT_CTRL_RUN_IN_FLASH_ONLY (0)
#endif
/*
* Only when CONFIG_BT_CTRL_CHECK_CONFIG_EFF is absent: this build does not
* run controller Kconfig, so missing CONFIG_BT_CTRL_BLE_* means "use default",
* not "disabled". When the symbol is defined (normal IDF sdkconfig), Kconfig
* is authoritative: bool=n leaves CONFIG_BT_CTRL_BLE_* undefined and must
* not be overridden here.
*/
#ifndef CONFIG_BT_CTRL_CHECK_CONFIG_EFF
#define CONFIG_BT_CTRL_BLE_ADV 1
#define CONFIG_BT_CTRL_BLE_SCAN 1
#define CONFIG_BT_CTRL_DTM_ENABLE 1
#define CONFIG_BT_CTRL_BLE_MASTER 1
#define CONFIG_BT_CTRL_BLE_SECURITY_ENABLE 1
#define CONFIG_BT_CTRL_BLE_MIN_CONN_INTERVAL_ENABLE 1
#endif /* !CONFIG_BT_CTRL_CHECK_CONFIG_EFF */
#if defined(CONFIG_BT_CTRL_DTM_ENABLE)
#define BT_CTRL_DTM_ENABLE CONFIG_BT_CTRL_DTM_ENABLE