mirror of
https://github.com/espressif/esp-idf.git
synced 2024-10-05 20:47:46 -04:00
Merge branch 'feature/ble_5_1_direction_finding_support_host' into 'master'
feature : Bluetooth LE 5.1 direction finding host support See merge request espressif/esp-idf!32704
This commit is contained in:
commit
f90d23565b
@ -634,6 +634,7 @@ if(CONFIG_BT_ENABLED)
|
|||||||
host/nimble/nimble/nimble/host/services/tps/include
|
host/nimble/nimble/nimble/host/services/tps/include
|
||||||
host/nimble/nimble/nimble/host/services/hid/include
|
host/nimble/nimble/nimble/host/services/hid/include
|
||||||
host/nimble/nimble/nimble/host/services/sps/include
|
host/nimble/nimble/nimble/host/services/sps/include
|
||||||
|
host/nimble/nimble/nimble/host/services/cte/include
|
||||||
host/nimble/nimble/nimble/host/util/include
|
host/nimble/nimble/nimble/host/util/include
|
||||||
host/nimble/nimble/nimble/host/store/ram/include
|
host/nimble/nimble/nimble/host/store/ram/include
|
||||||
host/nimble/nimble/nimble/host/store/config/include
|
host/nimble/nimble/nimble/host/store/config/include
|
||||||
@ -656,6 +657,7 @@ if(CONFIG_BT_ENABLED)
|
|||||||
"host/nimble/nimble/nimble/host/services/cts/src/ble_svc_cts.c"
|
"host/nimble/nimble/nimble/host/services/cts/src/ble_svc_cts.c"
|
||||||
"host/nimble/nimble/nimble/host/services/hid/src/ble_svc_hid.c"
|
"host/nimble/nimble/nimble/host/services/hid/src/ble_svc_hid.c"
|
||||||
"host/nimble/nimble/nimble/host/services/sps/src/ble_svc_sps.c"
|
"host/nimble/nimble/nimble/host/services/sps/src/ble_svc_sps.c"
|
||||||
|
"host/nimble/nimble/nimble/host/services/cte/src/ble_svc_cte.c"
|
||||||
"host/nimble/nimble/nimble/host/src/ble_hs_conn.c"
|
"host/nimble/nimble/nimble/host/src/ble_hs_conn.c"
|
||||||
"host/nimble/nimble/nimble/host/src/ble_store_util.c"
|
"host/nimble/nimble/nimble/host/src/ble_store_util.c"
|
||||||
"host/nimble/nimble/nimble/host/src/ble_sm.c"
|
"host/nimble/nimble/nimble/host/src/ble_sm.c"
|
||||||
|
@ -646,6 +646,13 @@ config BT_NIMBLE_PERIODIC_ADV_ENH
|
|||||||
help
|
help
|
||||||
Enable the periodic advertising enhancements
|
Enable the periodic advertising enhancements
|
||||||
|
|
||||||
|
config BT_NIMBLE_AOA_AOD
|
||||||
|
bool "Direction Finding"
|
||||||
|
depends on BT_NIMBLE_50_FEATURE_SUPPORT && SOC_BLE_CTE_SUPPORTED
|
||||||
|
default n
|
||||||
|
help
|
||||||
|
Enable support for Connectionless and Connection Oriented Direction Finding
|
||||||
|
|
||||||
menuconfig BT_NIMBLE_GATT_CACHING
|
menuconfig BT_NIMBLE_GATT_CACHING
|
||||||
bool "Enable GATT caching"
|
bool "Enable GATT caching"
|
||||||
depends on BT_NIMBLE_ENABLED && BT_NIMBLE_50_FEATURE_SUPPORT
|
depends on BT_NIMBLE_ENABLED && BT_NIMBLE_50_FEATURE_SUPPORT
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit 8373c4afb34630ca54448cf6cd5d349aa2f9bfab
|
Subproject commit d47cb44f245919fcf776c5ee094ec60f28b43fce
|
@ -1836,6 +1836,14 @@
|
|||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef MYNEWT_VAL_BLE_AOA_AOD
|
||||||
|
#ifdef CONFIG_BT_NIMBLE_AOA_AOD
|
||||||
|
#define MYNEWT_VAL_BLE_AOA_AOD CONFIG_BT_NIMBLE_AOA_AOD
|
||||||
|
#else
|
||||||
|
#define MYNEWT_VAL_BLE_AOA_AOD (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
|
||||||
@ -1869,5 +1877,4 @@
|
|||||||
#define MYNEWT_VAL_BLE_TRANSPORT_UART_STOP_BITS (1)
|
#define MYNEWT_VAL_BLE_TRANSPORT_UART_STOP_BITS (1)
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user