alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'fix/change_bt_hci_log_to_nimble_nomenclature_v5.3' into 'release/v5.3'

Browse Source 
fix(nimble): Added BT_HCI_LOG_INCLUDED macro into esp nimble configuration according to nimble nomenclature (v5.3)

See merge request espressif/esp-idf!32952
This commit is contained in:
Rahul Tank 2024-09-05 21:14:05 +08:00
commit 64d8797756
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/bt/host/nimble/nimble

@ -1 +1 @@
Subproject commit 7f93a8d0b53bfe2cac875b0f0cdb458d8dbe7911 Subproject commit 071575038c771dedfe177e1c3e0bcf6f83d7094b

10
components/bt/host/nimble/port/include/esp_nimble_cfg.h
View File

@ -1824,7 +1824,7 @@
#ifdef CONFIG_BT_NIMBLE_HOST_QUEUE_CONG_CHECK #ifdef CONFIG_BT_NIMBLE_HOST_QUEUE_CONG_CHECK
#define MYNEWT_VAL_BLE_QUEUE_CONG_CHECK CONFIG_BT_NIMBLE_HOST_QUEUE_CONG_CHECK #define MYNEWT_VAL_BLE_QUEUE_CONG_CHECK CONFIG_BT_NIMBLE_HOST_QUEUE_CONG_CHECK
#else #else
#define MYNEWT_VAL_BLE_QUEUE_CONG_CHECK FALSE #define MYNEWT_VAL_BLE_QUEUE_CONG_CHECK (0)
#endif #endif
#endif #endif
@ -1852,6 +1852,14 @@
#endif #endif
#endif #endif
#ifndef MYNEWT_VAL_BT_HCI_LOG_INCLUDED
#ifdef CONFIG_BT_HCI_LOG_DEBUG_EN
#define MYNEWT_VAL_BT_HCI_LOG_INCLUDED CONFIG_BT_HCI_LOG_DEBUG_EN
#else
#define MYNEWT_VAL_BT_HCI_LOG_INCLUDED (0)
#endif
#endif
#if CONFIG_BT_CONTROLLER_DISABLED && CONFIG_BT_NIMBLE_TRANSPORT_UART #if CONFIG_BT_CONTROLLER_DISABLED && CONFIG_BT_NIMBLE_TRANSPORT_UART
#ifndef MYNEWT_VAL_BLE_TRANSPORT_UART_PORT #ifndef MYNEWT_VAL_BLE_TRANSPORT_UART_PORT
#define MYNEWT_VAL_BLE_TRANSPORT_UART_PORT CONFIG_BT_NIMBLE_TRANSPORT_UART_PORT #define MYNEWT_VAL_BLE_TRANSPORT_UART_PORT CONFIG_BT_NIMBLE_TRANSPORT_UART_PORT