From 04a238f88a9e4206fbbc3b7a3aed2a621755a046 Mon Sep 17 00:00:00 2001 From: Zhang Hai Peng Date: Mon, 17 Feb 2025 11:13:49 +0800 Subject: [PATCH] fix(ble): Update bt lib for ESP32(2a2631f) - Support ESP32 BLE GPIO DEBUG (cherry picked from commit 0a7888f839fc64097b43dae37c13cd0f3e2de690) Co-authored-by: zhanghaipeng --- components/bt/controller/esp32/Kconfig.in | 10 ++++++++++ components/bt/controller/lib_esp32 | 2 +- components/bt/include/esp32/include/esp_bt.h | 12 +++++++++++- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/components/bt/controller/esp32/Kconfig.in b/components/bt/controller/esp32/Kconfig.in index b93200209a..d80bf0205c 100644 --- a/components/bt/controller/esp32/Kconfig.in +++ b/components/bt/controller/esp32/Kconfig.in @@ -490,6 +490,16 @@ config BTDM_BLE_VS_QA_SUPPORT help This enables BLE vendor HCI command and event for QA. +config BTDM_CTRL_CONTROLLER_DEBUG_MODE_1 + visible if 0 + bool "Enable Bluetooth controller debugging mode 1 (for internal use only)" + default n + depends on BT_ENABLED + help + Enables specific debugging features for the Bluetooth controller. + This option is strictly for internal debugging purposes and should not be enabled in production environments, + as it may impact performance and stability. + config BTDM_RESERVE_DRAM hex default 0xdb5c if BT_ENABLED diff --git a/components/bt/controller/lib_esp32 b/components/bt/controller/lib_esp32 index e847faba2d..6093909e01 160000 --- a/components/bt/controller/lib_esp32 +++ b/components/bt/controller/lib_esp32 @@ -1 +1 @@ -Subproject commit e847faba2d86e90b5f21d6310bb4723c4e32ba1c +Subproject commit 6093909e01930f8cda6f60510f8a412c6d1814e8 diff --git a/components/bt/include/esp32/include/esp_bt.h b/components/bt/include/esp32/include/esp_bt.h index 684866f9e2..3b67d008d8 100644 --- a/components/bt/include/esp32/include/esp_bt.h +++ b/components/bt/include/esp32/include/esp_bt.h @@ -205,6 +205,16 @@ the adv packet will be discarded until the memory is restored. */ #define BTDM_BLE_CHAN_ASS_EN (0) #endif +#if CONFIG_BTDM_CTRL_CONTROLLER_DEBUG_MODE_1 +#define BTDM_CTRL_CONTROLLER_DEBUG_MODE_1 (1 << 1) +#else +#define BTDM_CTRL_CONTROLLER_DEBUG_MODE_1 0 +#endif + +#ifndef BTDM_CTRL_CONTROLLER_DEBUG_FLAG +#define BTDM_CTRL_CONTROLLER_DEBUG_FLAG (BTDM_CTRL_CONTROLLER_DEBUG_MODE_1 | CONTROLLER_ADV_LOST_DEBUG_BIT) +#endif + #if defined(CONFIG_BTDM_BLE_PING_EN) #define BTDM_BLE_PING_EN (CONFIG_BTDM_BLE_PING_EN) #else @@ -224,7 +234,7 @@ the adv packet will be discarded until the memory is restored. */ .normal_adv_size = NORMAL_SCAN_DUPLICATE_CACHE_SIZE, \ .mesh_adv_size = MESH_DUPLICATE_SCAN_CACHE_SIZE, \ .send_adv_reserved_size = SCAN_SEND_ADV_RESERVED_SIZE, \ - .controller_debug_flag = CONTROLLER_ADV_LOST_DEBUG_BIT, \ + .controller_debug_flag = BTDM_CTRL_CONTROLLER_DEBUG_FLAG, \ .mode = BTDM_CONTROLLER_MODE_EFF, \ .ble_max_conn = CONFIG_BTDM_CTRL_BLE_MAX_CONN_EFF, \ .bt_max_acl_conn = CONFIG_BTDM_CTRL_BR_EDR_MAX_ACL_CONN_EFF, \