mirror of
https://github.com/espressif/esp-idf.git
synced 2024-09-20 00:36:01 -04:00
Merge branch 'fix/change_bt_hci_log_to_nimble_nomenclature_v5.2' into 'release/v5.2'
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:
commit
0bb6059ae0
@ -1 +1 @@
|
||||
Subproject commit b10b120363e7d5efa7fac388ab5b4f8ce743076d
|
||||
Subproject commit d87234ed14144c9dc140a2376a38bf04efb1311d
|
@ -1821,7 +1821,7 @@
|
||||
#ifdef CONFIG_BT_NIMBLE_HOST_QUEUE_CONG_CHECK
|
||||
#define MYNEWT_VAL_BLE_QUEUE_CONG_CHECK CONFIG_BT_NIMBLE_HOST_QUEUE_CONG_CHECK
|
||||
#else
|
||||
#define MYNEWT_VAL_BLE_QUEUE_CONG_CHECK FALSE
|
||||
#define MYNEWT_VAL_BLE_QUEUE_CONG_CHECK (0)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@ -1841,6 +1841,14 @@
|
||||
#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
|
||||
#ifndef MYNEWT_VAL_BLE_TRANSPORT_UART_PORT
|
||||
#define MYNEWT_VAL_BLE_TRANSPORT_UART_PORT CONFIG_BT_NIMBLE_TRANSPORT_UART_PORT
|
||||
@ -1875,4 +1883,5 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user