alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'nimble-1.6.0-idf' into 'master'

Browse Source 
fix(nimble): Migrate to nimble-1.6.0

Closes BLERP-558

See merge request espressif/esp-idf!29075
This commit is contained in:
Abhinav Kudnar 2024-03-26 16:42:41 +08:00
commit 6e4eeec97c
4 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/bt/host/nimble/Kconfig.in
View File

@ -201,7 +201,7 @@ config BT_NIMBLE_LL_CFG_FEAT_LE_ENCRYPTION
help
Enable encryption connection
config BT_NIMBLE_SM_SC_LVL
config BT_NIMBLE_SM_LVL
int "Security level"
depends on BT_NIMBLE_SECURITY_ENABLE
default 0
@ -341,6 +341,13 @@ menu "Memory Settings"
low-priority event buffers, then an incoming advertising report will
get dropped
config BT_NIMBLE_L2CAP_COC_SDU_BUFF_COUNT
int "L2cap coc Service Data Unit Buffer count"
depends on BT_NIMBLE_ENABLED
default 1
help
This is the service data unit buffer count for l2cap coc.
endmenu
config BT_NIMBLE_GATT_MAX_PROCS

2
components/bt/host/nimble/nimble

@ -1 +1 @@
Subproject commit 2059a808526b08660d089e31d7929646d8bdd33e
Subproject commit 323e6c4730e1022d31323077f2b0ee230cf568ed

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

@ -507,6 +507,10 @@
/*** @apache-mynewt-nimble/nimble/host */
#ifndef MYNEWT_VAL_BLE_L2CAP_COC_SDU_BUFF_COUNT
#define MYNEWT_VAL_BLE_L2CAP_COC_SDU_BUFF_COUNT CONFIG_BT_NIMBLE_L2CAP_COC_SDU_BUFF_COUNT
#endif
#ifndef MYNEWT_VAL_BLE_DYNAMIC_SERVICE
#ifdef CONFIG_BT_NIMBLE_DYNAMIC_SERVICE
#define MYNEWT_VAL_BLE_DYNAMIC_SERVICE CONFIG_BT_NIMBLE_DYNAMIC_SERVICE
@ -872,11 +876,11 @@
#endif
#ifndef MYNEWT_VAL_BLE_SM_SC_LVL
#ifdef CONFIG_BT_NIMBLE_SM_SC_LVL
#define MYNEWT_VAL_BLE_SM_SC_LVL CONFIG_BT_NIMBLE_SM_SC_LVL
#ifndef MYNEWT_VAL_BLE_SM_LVL
#ifdef CONFIG_BT_NIMBLE_SM_LVL
#define MYNEWT_VAL_BLE_SM_LVL CONFIG_BT_NIMBLE_SM_LVL
#else
#define MYNEWT_VAL_BLE_SM_SC_LVL (0)
#define MYNEWT_VAL_BLE_SM_LVL (0)
#endif
#endif
@ -884,7 +888,6 @@
#define MYNEWT_VAL_BLE_SM_SC_ONLY (0)
#endif
#ifndef MYNEWT_VAL_BLE_SM_THEIR_KEY_DIST
#define MYNEWT_VAL_BLE_SM_THEIR_KEY_DIST (0)
#endif

1
components/bt/sdkconfig.rename
View File

@ -251,6 +251,7 @@ CONFIG_NIMBLE_SM_LEGACY CONFIG_BT_NIMBLE_SM_
CONFIG_NIMBLE_SM_SC CONFIG_BT_NIMBLE_SM_SC
CONFIG_NIMBLE_DEBUG CONFIG_BT_NIMBLE_DEBUG
CONFIG_NIMBLE_SM_SC_DEBUG_KEYS CONFIG_BT_NIMBLE_SM_SC_DEBUG_KEYS
CONFIG_BT_NIMBLE_SM_SC_LVL CONFIG_BT_NIMBLE_SM_LVL
CONFIG_NIMBLE_SVC_GAP_DEVICE_NAME CONFIG_BT_NIMBLE_SVC_GAP_DEVICE_NAME
CONFIG_NIMBLE_GAP_DEVICE_NAME_MAX_LEN CONFIG_BT_NIMBLE_GAP_DEVICE_NAME_MAX_LEN
CONFIG_NIMBLE_ATT_PREFERRED_MTU CONFIG_BT_NIMBLE_ATT_PREFERRED_MTU