espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-31 19:24:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

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

See merge request espressif/esp-idf!32955
This commit is contained in:
Rahul Tank
2024-08-26 11:49:15 +08:00
parent 33539d19a1 5ac254bbee
commit 0bb6059ae0
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/bt/host/nimble/nimble

Submodule components/bt/host/nimble/nimble updated: b10b120363...d87234ed14

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

@@ -1821,7 +1821,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
@@ -1841,6 +1841,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
@@ -1875,4 +1883,5 @@
#endif #endif
#endif #endif
#endif #endif