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

Merge branch 'feat/support_bluedroid_key_log' into 'master'

Browse Source 
Feat/support bluedroid key log

Closes BLERP-2782

See merge request espressif/esp-idf!48437
This commit is contained in:
Island
2026-05-14 14:04:07 +08:00
parent 4f766e1f02 0af57d731c
commit d8031954f6
6 changed files with 59 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/bt/Kconfig
View File

@@ -54,6 +54,10 @@ menu "Bluetooth"
endchoice
menu "Common Options"
source "$IDF_PATH/components/bt/common/Kconfig.in"
endmenu
menu "Bluedroid Options"
depends on BT_BLUEDROID_ENABLED
source "$IDF_PATH/components/bt/host/bluedroid/Kconfig.in"
@@ -80,10 +84,6 @@ menu "Bluetooth"
We cannot split the memory into 3 different regions (IRAM, BLE-IRAM, DRAM).
So this option will disable the memory protection scheme (ESP_SYSTEM_MEMPROT)
menu "Common Options"
source "$IDF_PATH/components/bt/common/Kconfig.in"
endmenu
config BT_HCI_LOG_DEBUG_EN
depends on BT_BLUEDROID_ENABLED || BT_NIMBLE_ENABLED
bool "Enable Bluetooth HCI debug mode"

6
components/bt/common/Kconfig.in
View File

@@ -162,7 +162,6 @@ menu "BT Logs"
default n
depends on !BT_STACK_NO_LOG
select BLE_LOG_ENABLED
select BLE_COMPRESSED_LOG_ENABLE
help
Enable bandwidth-optimized logging for the BLE Log Async Output
system. When enabled, only high-severity logs are captured and
@@ -175,9 +174,9 @@ menu "BT Logs"
if BT_LOG_CRITICAL_ONLY
config BT_LOG_CRITICAL_ONLY_CTRL
bool "Controller: bandwidth-optimized logging"
depends on SOC_ESP_NIMBLE_CONTROLLER || BT_CTRL_RUN_IN_FLASH_ONLY
depends on SOC_ESP_NIMBLE_CONTROLLER || BLE_LOG_IS_ESP_LEGACY_CONTROLLER
select BT_LE_CONTROLLER_LOG_ENABLED if SOC_ESP_NIMBLE_CONTROLLER
select BT_CTRL_LE_LOG_EN if !SOC_ESP_NIMBLE_CONTROLLER
select BT_CTRL_LE_LOG_EN if BLE_LOG_IS_ESP_LEGACY_CONTROLLER
default y
help
Enable controller log output via the async transport with
@@ -186,7 +185,6 @@ menu "BT Logs"
config BT_LOG_CRITICAL_ONLY_HOST
bool "Host: bandwidth-optimized logging"
select BLE_HOST_COMPRESSED_LOG_ENABLE if BT_BLUEDROID_ENABLED
default y
help
Enable host stack log encoding via the async transport.

26
components/bt/common/ble_log/Kconfig.in
View File

@@ -1,5 +1,7 @@
config BLE_LOG_ENABLED
bool "Enable BT Log Async Output (Dev Only)"
select BLE_COMPRESSED_LOG_ENABLE
select BLE_HOST_COMPRESSED_LOG_ENABLE if BT_BLUEDROID_ENABLED
default n
help
Enable BT Log Async Output
@@ -63,16 +65,14 @@ if BLE_LOG_ENABLED
bool "Current BLE Controller is ESP BLE Legacy Controller"
depends on BT_CONTROLLER_ENABLED
depends on !SOC_ESP_NIMBLE_CONTROLLER
depends on BT_CTRL_RUN_IN_FLASH_ONLY
default y
select BT_CTRL_LE_LOG_EN
select BLE_LOG_LL_ENABLED
help
Current BLE Controller is ESP BLE Legacy Controller
config BLE_LOG_LL_ENABLED
bool "Enable BLE Log for Link Layer"
depends on BT_CONTROLLER_ENABLED
default y if BLE_LOG_IS_ESP_LEGACY_CONTROLLER
default n
help
Enable BLE Log for Link Layer
@@ -112,11 +112,25 @@ if BLE_LOG_ENABLED
it will be truncated.
endif
config BLE_LOG_HOST_SIDE_HCI_LOG_ENABLED
bool "Enable BLE Host side HCI Logging"
config BLE_LOG_HOST_LOG
bool "Enable BLE Log for Host"
depends on BT_BLUEDROID_ENABLED
default y
help
Enable BLE Host side HCI Logging
Enable BLE Log for the Host stack (Bluedroid or NimBLE).
When enabled, host-side log statements are routed through the
BLE Log async output transport instead of (or in addition to)
the standard UART logging path. Disable this option to keep
BLE Log enabled for the controller/link layer only.
config BLE_LOG_HOST_SIDE_HCI_LOG_ENABLED
bool "Enable BLE Host side HCI Logging"
default y if BLE_LOG_IS_ESP_LEGACY_CONTROLLER
help
Enable HCI packet logging captured on the Host side
(Bluedroid / NimBLE HCI HAL). Useful for correlating
host events with controller-side HCI traces.
config BLE_LOG_TS_ENABLED
bool "Enable BLE Log Timestamp Synchronization (TS)"

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

@@ -590,8 +590,9 @@ config BT_CTRL_BLE_MIN_CONN_INTERVAL_ENABLE
menu "Controller debug log Options (Experimental)"
config BT_CTRL_LE_LOG_EN
depends on BT_CTRL_RUN_IN_FLASH_ONLY
bool "Enable BLE debug log"
select BT_CTRL_RUN_IN_FLASH_ONLY
default y if BLE_LOG_LL_ENABLED
default n
config BT_CTRL_LE_LOG_MODE_BLE_LOG_V2

40
components/bt/host/bluedroid/Kconfig.in
View File

@@ -563,7 +563,9 @@ menu "BT DEBUG LOG LEVEL"
choice BT_LOG_HCI_TRACE_LEVEL
prompt "HCI layer"
default BT_LOG_HCI_TRACE_LEVEL_WARNING
default BT_LOG_HCI_TRACE_LEVEL_EVENT if BT_LOG_CRITICAL_ONLY_HOST
default BT_LOG_HCI_TRACE_LEVEL_VERBOSE if BLE_LOG_HOST_LOG && !BT_LOG_CRITICAL_ONLY_HOST
default BT_LOG_HCI_TRACE_LEVEL_WARNING if !BLE_LOG_ENABLED
depends on BT_BLUEDROID_ENABLED && !BT_STACK_NO_LOG
help
Define BT trace level for HCI layer
@@ -598,7 +600,9 @@ menu "BT DEBUG LOG LEVEL"
choice BT_LOG_BTM_TRACE_LEVEL
prompt "BTM layer"
default BT_LOG_BTM_TRACE_LEVEL_WARNING
default BT_LOG_BTM_TRACE_LEVEL_EVENT if BT_LOG_CRITICAL_ONLY_HOST
default BT_LOG_BTM_TRACE_LEVEL_VERBOSE if BLE_LOG_HOST_LOG && !BT_LOG_CRITICAL_ONLY_HOST
default BT_LOG_BTM_TRACE_LEVEL_WARNING if !BLE_LOG_ENABLED
depends on BT_BLUEDROID_ENABLED && !BT_STACK_NO_LOG
help
Define BT trace level for BTM layer
@@ -633,7 +637,9 @@ menu "BT DEBUG LOG LEVEL"
choice BT_LOG_L2CAP_TRACE_LEVEL
prompt "L2CAP layer"
default BT_LOG_L2CAP_TRACE_LEVEL_WARNING
default BT_LOG_L2CAP_TRACE_LEVEL_EVENT if BT_LOG_CRITICAL_ONLY_HOST
default BT_LOG_L2CAP_TRACE_LEVEL_VERBOSE if BLE_LOG_HOST_LOG && !BT_LOG_CRITICAL_ONLY_HOST
default BT_LOG_L2CAP_TRACE_LEVEL_WARNING if !BLE_LOG_ENABLED
depends on BT_BLUEDROID_ENABLED && !BT_STACK_NO_LOG
help
Define BT trace level for L2CAP layer
@@ -738,7 +744,9 @@ menu "BT DEBUG LOG LEVEL"
choice BT_LOG_GAP_TRACE_LEVEL
prompt "GAP layer"
default BT_LOG_GAP_TRACE_LEVEL_WARNING
default BT_LOG_GAP_TRACE_LEVEL_EVENT if BT_LOG_CRITICAL_ONLY_HOST
default BT_LOG_GAP_TRACE_LEVEL_VERBOSE if BLE_LOG_HOST_LOG && !BT_LOG_CRITICAL_ONLY_HOST
default BT_LOG_GAP_TRACE_LEVEL_WARNING if !BLE_LOG_ENABLED
depends on BT_BLUEDROID_ENABLED && !BT_STACK_NO_LOG
help
Define BT trace level for GAP layer
@@ -1053,7 +1061,9 @@ menu "BT DEBUG LOG LEVEL"
choice BT_LOG_APPL_TRACE_LEVEL
prompt "APPL layer"
default BT_LOG_APPL_TRACE_LEVEL_WARNING
default BT_LOG_APPL_TRACE_LEVEL_EVENT if BT_LOG_CRITICAL_ONLY_HOST
default BT_LOG_APPL_TRACE_LEVEL_VERBOSE if BLE_LOG_HOST_LOG && !BT_LOG_CRITICAL_ONLY_HOST
default BT_LOG_APPL_TRACE_LEVEL_WARNING if !BLE_LOG_ENABLED
depends on BT_BLUEDROID_ENABLED && !BT_STACK_NO_LOG
help
Define BT trace level for APPL layer
@@ -1088,7 +1098,9 @@ menu "BT DEBUG LOG LEVEL"
choice BT_LOG_GATT_TRACE_LEVEL
prompt "GATT layer"
default BT_LOG_GATT_TRACE_LEVEL_WARNING
default BT_LOG_GATT_TRACE_LEVEL_EVENT if BT_LOG_CRITICAL_ONLY_HOST
default BT_LOG_GATT_TRACE_LEVEL_VERBOSE if BLE_LOG_HOST_LOG && !BT_LOG_CRITICAL_ONLY_HOST
default BT_LOG_GATT_TRACE_LEVEL_WARNING if !BLE_LOG_ENABLED
depends on BT_BLUEDROID_ENABLED && !BT_STACK_NO_LOG
help
Define BT trace level for GATT layer
@@ -1123,7 +1135,9 @@ menu "BT DEBUG LOG LEVEL"
choice BT_LOG_SMP_TRACE_LEVEL
prompt "SMP layer"
default BT_LOG_SMP_TRACE_LEVEL_WARNING
default BT_LOG_SMP_TRACE_LEVEL_EVENT if BT_LOG_CRITICAL_ONLY_HOST
default BT_LOG_SMP_TRACE_LEVEL_VERBOSE if BLE_LOG_HOST_LOG && !BT_LOG_CRITICAL_ONLY_HOST
default BT_LOG_SMP_TRACE_LEVEL_WARNING if !BLE_LOG_ENABLED
depends on BT_BLUEDROID_ENABLED && !BT_STACK_NO_LOG
help
Define BT trace level for SMP layer
@@ -1158,7 +1172,9 @@ menu "BT DEBUG LOG LEVEL"
choice BT_LOG_BTIF_TRACE_LEVEL
prompt "BTIF layer"
default BT_LOG_BTIF_TRACE_LEVEL_WARNING
default BT_LOG_BTIF_TRACE_LEVEL_EVENT if BT_LOG_CRITICAL_ONLY_HOST
default BT_LOG_BTIF_TRACE_LEVEL_VERBOSE if BLE_LOG_HOST_LOG && !BT_LOG_CRITICAL_ONLY_HOST
default BT_LOG_BTIF_TRACE_LEVEL_WARNING if !BLE_LOG_ENABLED
depends on BT_BLUEDROID_ENABLED && !BT_STACK_NO_LOG
help
Define BT trace level for BTIF layer
@@ -1193,7 +1209,9 @@ menu "BT DEBUG LOG LEVEL"
choice BT_LOG_BTC_TRACE_LEVEL
prompt "BTC layer"
default BT_LOG_BTC_TRACE_LEVEL_WARNING
default BT_LOG_BTC_TRACE_LEVEL_EVENT if BT_LOG_CRITICAL_ONLY_HOST
default BT_LOG_BTC_TRACE_LEVEL_VERBOSE if BLE_LOG_HOST_LOG && !BT_LOG_CRITICAL_ONLY_HOST
default BT_LOG_BTC_TRACE_LEVEL_WARNING if !BLE_LOG_ENABLED
depends on BT_BLUEDROID_ENABLED && !BT_STACK_NO_LOG
help
Define BT trace level for BTC layer
@@ -1228,7 +1246,9 @@ menu "BT DEBUG LOG LEVEL"
choice BT_LOG_OSI_TRACE_LEVEL
prompt "OSI layer"
default BT_LOG_OSI_TRACE_LEVEL_WARNING
default BT_LOG_OSI_TRACE_LEVEL_EVENT if BT_LOG_CRITICAL_ONLY_HOST
default BT_LOG_OSI_TRACE_LEVEL_VERBOSE if BLE_LOG_HOST_LOG && !BT_LOG_CRITICAL_ONLY_HOST
default BT_LOG_OSI_TRACE_LEVEL_WARNING if !BLE_LOG_ENABLED
depends on BT_BLUEDROID_ENABLED && !BT_STACK_NO_LOG
help
Define BT trace level for OSI layer

2
components/bt/host/bluedroid/stack/hcic/hciblecmds.c
View File

@@ -2476,7 +2476,7 @@ UINT8 btsnd_hcic_ble_iso_create_cis(uint8_t cis_count, struct ble_hci_cis_hdls *
BT_HDR *p;
UINT8 *pp;
HCI_TRACE_DEBUG("hci create cis: cig_id ", cis_count);
HCI_TRACE_DEBUG("hci create cis: cis_count %d", cis_count);
// for (uint8_t i = 0; i < cis_count; i++)
// {
// HCI_TRACE_ERROR("i %d cis_hdl %d acl_hdl %d", i, cis_hdls[i].cis_hdl, cis_hdls[i].acl_hdl);