mirror of
https://github.com/espressif/esp-idf.git
synced 2025-08-03 20:54:32 +02:00
Merge branch 'fix/change_bt_hci_log_to_nimble_nomenclature_v5.0' into 'release/v5.0'
fix(nimble): Added BT_HCI_LOG_INCLUDED macro into esp nimble configuration according to nimble nomenclature(v5.0) See merge request espressif/esp-idf!33042
This commit is contained in:
Submodule components/bt/host/nimble/nimble updated: 75b9346a57...b43b1de4df
@@ -1646,7 +1646,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
|
||||
|
||||
@@ -1666,6 +1666,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
|
||||
|
||||
#ifndef MYNEWT_VAL_BLE_HOST_ALLOW_CONNECT_WITH_SCAN
|
||||
#ifdef CONFIG_BT_NIMBLE_HOST_ALLOW_CONNECT_WITH_SCAN
|
||||
#define MYNEWT_VAL_BLE_HOST_ALLOW_CONNECT_WITH_SCAN CONFIG_BT_NIMBLE_HOST_ALLOW_CONNECT_WITH_SCAN
|
||||
|
Reference in New Issue
Block a user