Merge branch 'NimBLE/update_to_nimble-1.2.0_release' into 'master'
NimBLE: Update NimBLE submodule to latest `nimble-1.2.0-idf` release See merge request espressif/esp-idf!6350
This commit is contained in:
commit
d2e62a1602
4 changed files with 14 additions and 1 deletions
|
@ -387,6 +387,7 @@ if(CONFIG_BT_ENABLED)
|
||||||
host/nimble/nimble/nimble/host/services/gap/include
|
host/nimble/nimble/nimble/host/services/gap/include
|
||||||
host/nimble/nimble/nimble/host/services/gatt/include
|
host/nimble/nimble/nimble/host/services/gatt/include
|
||||||
host/nimble/nimble/nimble/host/services/ias/include
|
host/nimble/nimble/nimble/host/services/ias/include
|
||||||
|
host/nimble/nimble/nimble/host/services/ipss/include
|
||||||
host/nimble/nimble/nimble/host/services/lls/include
|
host/nimble/nimble/nimble/host/services/lls/include
|
||||||
host/nimble/nimble/nimble/host/services/tps/include
|
host/nimble/nimble/nimble/host/services/tps/include
|
||||||
host/nimble/nimble/nimble/host/util/include
|
host/nimble/nimble/nimble/host/util/include
|
||||||
|
@ -421,6 +422,7 @@ if(CONFIG_BT_ENABLED)
|
||||||
"host/nimble/nimble/nimble/host/services/gatt/src/ble_svc_gatt.c"
|
"host/nimble/nimble/nimble/host/services/gatt/src/ble_svc_gatt.c"
|
||||||
"host/nimble/nimble/nimble/host/services/tps/src/ble_svc_tps.c"
|
"host/nimble/nimble/nimble/host/services/tps/src/ble_svc_tps.c"
|
||||||
"host/nimble/nimble/nimble/host/services/ias/src/ble_svc_ias.c"
|
"host/nimble/nimble/nimble/host/services/ias/src/ble_svc_ias.c"
|
||||||
|
"host/nimble/nimble/nimble/host/services/ipss/src/ble_svc_ipss.c"
|
||||||
"host/nimble/nimble/nimble/host/services/ans/src/ble_svc_ans.c"
|
"host/nimble/nimble/nimble/host/services/ans/src/ble_svc_ans.c"
|
||||||
"host/nimble/nimble/nimble/host/services/gap/src/ble_svc_gap.c"
|
"host/nimble/nimble/nimble/host/services/gap/src/ble_svc_gap.c"
|
||||||
"host/nimble/nimble/nimble/host/services/bas/src/ble_svc_bas.c"
|
"host/nimble/nimble/nimble/host/services/bas/src/ble_svc_bas.c"
|
||||||
|
@ -442,6 +444,7 @@ if(CONFIG_BT_ENABLED)
|
||||||
"host/nimble/nimble/nimble/host/src/ble_hs_hci_evt.c"
|
"host/nimble/nimble/nimble/host/src/ble_hs_hci_evt.c"
|
||||||
"host/nimble/nimble/nimble/host/src/ble_hs_dbg.c"
|
"host/nimble/nimble/nimble/host/src/ble_hs_dbg.c"
|
||||||
"host/nimble/nimble/nimble/host/src/ble_hs_mqueue.c"
|
"host/nimble/nimble/nimble/host/src/ble_hs_mqueue.c"
|
||||||
|
"host/nimble/nimble/nimble/host/src/ble_hs_periodic_sync.c"
|
||||||
"host/nimble/nimble/nimble/host/src/ble_att.c"
|
"host/nimble/nimble/nimble/host/src/ble_att.c"
|
||||||
"host/nimble/nimble/nimble/host/src/ble_gattc.c"
|
"host/nimble/nimble/nimble/host/src/ble_gattc.c"
|
||||||
"host/nimble/nimble/nimble/host/src/ble_store.c"
|
"host/nimble/nimble/nimble/host/src/ble_store.c"
|
||||||
|
|
|
@ -171,6 +171,7 @@ COMPONENT_ADD_INCLUDEDIRS += host/nimble/nimble/nimble/include
|
||||||
host/nimble/nimble/nimble/host/services/gap/include \
|
host/nimble/nimble/nimble/host/services/gap/include \
|
||||||
host/nimble/nimble/nimble/host/services/gatt/include \
|
host/nimble/nimble/nimble/host/services/gatt/include \
|
||||||
host/nimble/nimble/nimble/host/services/ias/include \
|
host/nimble/nimble/nimble/host/services/ias/include \
|
||||||
|
host/nimble/nimble/nimble/host/services/ipss/include \
|
||||||
host/nimble/nimble/nimble/host/services/lls/include \
|
host/nimble/nimble/nimble/host/services/lls/include \
|
||||||
host/nimble/nimble/nimble/host/services/tps/include \
|
host/nimble/nimble/nimble/host/services/tps/include \
|
||||||
host/nimble/nimble/nimble/host/util/include \
|
host/nimble/nimble/nimble/host/util/include \
|
||||||
|
@ -191,6 +192,7 @@ COMPONENT_SRCDIRS += host/nimble/nimble/nimble/host/src
|
||||||
host/nimble/nimble/nimble/host/services/gap/src \
|
host/nimble/nimble/nimble/host/services/gap/src \
|
||||||
host/nimble/nimble/nimble/host/services/gatt/src \
|
host/nimble/nimble/nimble/host/services/gatt/src \
|
||||||
host/nimble/nimble/nimble/host/services/ias/src \
|
host/nimble/nimble/nimble/host/services/ias/src \
|
||||||
|
host/nimble/nimble/nimble/host/services/ipss/src \
|
||||||
host/nimble/nimble/nimble/host/services/lls/src \
|
host/nimble/nimble/nimble/host/services/lls/src \
|
||||||
host/nimble/nimble/nimble/host/services/tps/src \
|
host/nimble/nimble/nimble/host/services/tps/src \
|
||||||
host/nimble/nimble/nimble/host/util/src \
|
host/nimble/nimble/nimble/host/util/src \
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit b2ae70c37e544f93adc1f22c4954c93be7525bed
|
Subproject commit 4a4be394951942cb86b8ed3f779d0c6e733f6e6b
|
|
@ -58,6 +58,10 @@
|
||||||
#define MYNEWT_VAL_BLE_MULTI_ADV_INSTANCES (0)
|
#define MYNEWT_VAL_BLE_MULTI_ADV_INSTANCES (0)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef MYNEWT_VAL_BLE_MAX_PERIODIC_SYNCS
|
||||||
|
#define MYNEWT_VAL_BLE_MAX_PERIODIC_SYNCS (0)
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef MYNEWT_VAL_BLE_ROLE_BROADCASTER
|
#ifndef MYNEWT_VAL_BLE_ROLE_BROADCASTER
|
||||||
#ifdef CONFIG_BT_NIMBLE_ROLE_BROADCASTER
|
#ifdef CONFIG_BT_NIMBLE_ROLE_BROADCASTER
|
||||||
#define MYNEWT_VAL_BLE_ROLE_BROADCASTER (1)
|
#define MYNEWT_VAL_BLE_ROLE_BROADCASTER (1)
|
||||||
|
@ -263,6 +267,10 @@
|
||||||
#define MYNEWT_VAL_BLE_ATT_PREFERRED_MTU CONFIG_BT_NIMBLE_ATT_PREFERRED_MTU
|
#define MYNEWT_VAL_BLE_ATT_PREFERRED_MTU CONFIG_BT_NIMBLE_ATT_PREFERRED_MTU
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef MYNEWT_VAL_BLE_PERIODIC_ADV
|
||||||
|
#define MYNEWT_VAL_BLE_PERIODIC_ADV (0)
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef MYNEWT_VAL_BLE_ATT_SVR_FIND_INFO
|
#ifndef MYNEWT_VAL_BLE_ATT_SVR_FIND_INFO
|
||||||
#define MYNEWT_VAL_BLE_ATT_SVR_FIND_INFO (1)
|
#define MYNEWT_VAL_BLE_ATT_SVR_FIND_INFO (1)
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue