From 6eaf8815db82deac06570029ca9ee268efd7614d Mon Sep 17 00:00:00 2001 From: linruihao Date: Fri, 3 Jan 2025 14:49:11 +0800 Subject: [PATCH 1/4] feat(bt): add coexist scheme status support for bt page --- components/bt/controller/lib_esp32 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/controller/lib_esp32 b/components/bt/controller/lib_esp32 index 35fb599d37..b0b9cff14b 160000 --- a/components/bt/controller/lib_esp32 +++ b/components/bt/controller/lib_esp32 @@ -1 +1 @@ -Subproject commit 35fb599d3733f50254c056171edebcaa3c57d06b +Subproject commit b0b9cff14b4f72482300975368b3b258f30120ac From 4f8f92aa2d9eb644d1fc790cf6228527208b7029 Mon Sep 17 00:00:00 2001 From: gongyantao Date: Mon, 20 Jan 2025 20:21:51 +0800 Subject: [PATCH 2/4] feat(bt): add vendor hci command and event to support test - add afh related vendor hci command and event - add vendor event mask command --- components/bt/controller/lib_esp32 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/controller/lib_esp32 b/components/bt/controller/lib_esp32 index b0b9cff14b..89ac32e33b 160000 --- a/components/bt/controller/lib_esp32 +++ b/components/bt/controller/lib_esp32 @@ -1 +1 @@ -Subproject commit b0b9cff14b4f72482300975368b3b258f30120ac +Subproject commit 89ac32e33b1d1d8a6d7d9e65d48e7897fd7ba3ad From 0fcca4ec3ce99866110a91140baa3a39d35091ce Mon Sep 17 00:00:00 2001 From: zhanghaipeng Date: Tue, 21 Jan 2025 17:31:29 +0800 Subject: [PATCH 3/4] fix(ble): Update bt lib for ESP32(194dd63) - Fix the issue where disconnection events were not reported as a slave. - Enhance Access Address validation in compatibility mode. --- components/bt/controller/lib_esp32 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/controller/lib_esp32 b/components/bt/controller/lib_esp32 index 89ac32e33b..e847faba2d 160000 --- a/components/bt/controller/lib_esp32 +++ b/components/bt/controller/lib_esp32 @@ -1 +1 @@ -Subproject commit 89ac32e33b1d1d8a6d7d9e65d48e7897fd7ba3ad +Subproject commit e847faba2d86e90b5f21d6310bb4723c4e32ba1c From 0efea66c6d5474864f9db90deced6c59c9ac262d Mon Sep 17 00:00:00 2001 From: zhanghaipeng Date: Fri, 24 Jan 2025 20:12:08 +0800 Subject: [PATCH 4/4] fix(ble): Update bt lib for ESP32(2a2631f) - Support ESP32 BLE GPIO DEBUG --- components/bt/controller/esp32/Kconfig.in | 9 +++++++++ components/bt/controller/lib_esp32 | 2 +- components/bt/include/esp32/include/esp_bt.h | 12 +++++++++++- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/components/bt/controller/esp32/Kconfig.in b/components/bt/controller/esp32/Kconfig.in index b93200209a..f8033b2f6a 100644 --- a/components/bt/controller/esp32/Kconfig.in +++ b/components/bt/controller/esp32/Kconfig.in @@ -490,6 +490,15 @@ config BTDM_BLE_VS_QA_SUPPORT help This enables BLE vendor HCI command and event for QA. +config BTDM_CTRL_CONTROLLER_DEBUG_MODE_1 + bool "Enable Bluetooth controller debugging mode 1 (for internal use only)" if n + 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 deee679a6b..6b3e2428a1 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, \