[Bugfix] Add missing config for non-esp devices and adjust values.

Author: h2zero

src/nimble/porting/npl/freertos/src/nimble_port_freertos.c

@@ -98,14 +98,11 @@ nimble_port_freertos_deinit(void)
 #else // ESP_PLATFORM
 
 #if NIMBLE_CFG_CONTROLLER
-# ifdef MYNEWT_VAL_NIMBLE_CONTROLLER_TASK_STACK_SIZE
-#  define NIMBLE_LL_STACK_SIZE   (MYNEWT_VAL(NIMBLE_CONTROLLER_TASK_STACK_SIZE) / 4)
+
+# if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+#  define NIMBLE_LL_STACK_SIZE   (MYNEWT_VAL(NIMBLE_CONTROLLER_TASK_STACK_SIZE) / 4) + 30
 # else
-#  if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
-#   define NIMBLE_LL_STACK_SIZE   (130)
-#  else
-#   define NIMBLE_LL_STACK_SIZE   (100)
-#  endif
+#  define NIMBLE_LL_STACK_SIZE   (MYNEWT_VAL(NIMBLE_CONTROLLER_TASK_STACK_SIZE) / 4)
 # endif
 
 // configMAX_PRIORITIES - 1 is Tmr builtin task

src/syscfg/syscfg.h

@@ -142,11 +142,15 @@
 #endif
 
 #ifndef MYNEWT_VAL_OS_CPUTIME_FREQ
-#define MYNEWT_VAL_OS_CPUTIME_FREQ (1000000)
+#define MYNEWT_VAL_OS_CPUTIME_FREQ (32768)
+#endif
+
+#ifndef MYNEWT_VAL_TIMER_5
+#define MYNEWT_VAL_TIMER_5 (1)
 #endif
 
 #ifndef MYNEWT_VAL_OS_CPUTIME_TIMER_NUM
-#define MYNEWT_VAL_OS_CPUTIME_TIMER_NUM (0)
+#define MYNEWT_VAL_OS_CPUTIME_TIMER_NUM (5)
 #endif
 
 /* Overridden by @apache-mynewt-core/hw/bsp/native (defined by @apache-mynewt-core/kernel/os) */
@@ -488,7 +492,7 @@
 
 /*** @apache-mynewt-nimble/nimble/host */
 #ifndef MYNEWT_VAL_BLE_ATT_PREFERRED_MTU
-#define MYNEWT_VAL_BLE_ATT_PREFERRED_MTU (256)
+#define MYNEWT_VAL_BLE_ATT_PREFERRED_MTU (517)
 #endif
 
 #ifndef MYNEWT_VAL_BLE_ATT_SVR_FIND_INFO
@@ -680,7 +684,7 @@
 #endif
 
 #ifndef MYNEWT_VAL_BLE_HS_DEBUG
-#define MYNEWT_VAL_BLE_HS_DEBUG (1)
+#define MYNEWT_VAL_BLE_HS_DEBUG (0)
 #endif
 
 #ifndef MYNEWT_VAL_BLE_HS_FLOW_CTRL
@@ -772,7 +776,7 @@
 #endif
 
 #ifndef MYNEWT_VAL_BLE_SM_BONDING
-#define MYNEWT_VAL_BLE_SM_BONDING (0)
+#define MYNEWT_VAL_BLE_SM_BONDING (1)
 #endif
 
 #ifndef MYNEWT_VAL_BLE_SM_IO_CAP
@@ -823,10 +827,6 @@
 #define MYNEWT_VAL_BLE_SM_THEIR_KEY_DIST (0)
 #endif
 
-#ifndef MYNEWT_VAL_BLE_STORE_CONFIG_PERSIST
-#define MYNEWT_VAL_BLE_STORE_CONFIG_PERSIST (1)
-#endif
-
 #ifndef MYNEWT_VAL_BLE_STORE_MAX_BONDS
 #define MYNEWT_VAL_BLE_STORE_MAX_BONDS (3)
 #endif
@@ -839,6 +839,13 @@
 #define MYNEWT_VAL_BLE_STORE_MAX_EADS (0)
 #endif
 
+#ifndef MYNEWT_VAL_BLE_STORE_CONFIG_PERSIST
+#if MYNEWT_VAL_BLE_STORE_MAX_BONDS
+#define MYNEWT_VAL_BLE_STORE_CONFIG_PERSIST (1)
+#else
+#define MYNEWT_VAL_BLE_STORE_CONFIG_PERSIST (0)
+#endif
+
 /*** @apache-mynewt-nimble/nimble/host/services/ans */
 #ifndef MYNEWT_VAL_BLE_SVC_ANS_NEW_ALERT_CAT
 #define MYNEWT_VAL_BLE_SVC_ANS_NEW_ALERT_CAT (0)
@@ -1159,6 +1166,10 @@
 #define MYNEWT_VAL_BLE_MESH_TX_SEG_MSG_COUNT (4)
 #endif
 
+#ifndef MYNEWT_VAL_BLE_MESH_SEG_RETRANSMIT_ATTEMPTS
+#define MYNEWT_VAL_BLE_MESH_SEG_RETRANSMIT_ATTEMPTS (4)
+#endif
+
 #ifndef MYNEWT_VAL_BLE_SVC_BAS_SYSINIT_STAGE
 #define MYNEWT_VAL_BLE_SVC_BAS_SYSINIT_STAGE (303)
 #endif
@@ -1313,21 +1324,6 @@
 #define MYNEWT_VAL_BLE_SVC_TPS_SYSINIT_STAGE (303)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/transport */
-// #undef MYNEWT_VAL_BLE_ACL_BUF_COUNT
-
-// #undef MYNEWT_VAL_BLE_ACL_BUF_SIZE
-
-// #undef MYNEWT_VAL_BLE_HCI_BRIDGE
-
-// #undef MYNEWT_VAL_BLE_HCI_EVT_BUF_SIZE
-
-// #undef MYNEWT_VAL_BLE_HCI_EVT_HI_BUF_COUNT
-
-// #undef MYNEWT_VAL_BLE_HCI_EVT_LO_BUF_COUNT
-
-// #undef MYNEWT_VAL_BLE_HCI_TRANSPORT
-
 #ifndef MYNEWT_VAL_BLE_MONITOR_CONSOLE_BUFFER_SIZE
 #define MYNEWT_VAL_BLE_MONITOR_CONSOLE_BUFFER_SIZE (128)
 #endif
@@ -1555,26 +1551,158 @@
 #define MYNEWT_VAL_BLE_LL_WHITELIST_SIZE (12)
 #endif
 
+#ifndef MYNEWT_VAL_BLE_LL_PUBLIC_DEV_ADDR
+#define MYNEWT_VAL_BLE_LL_PUBLIC_DEV_ADDR (0x000000000000)
+#endif
+
 #ifndef MYNEWT_VAL_BLE_LL_ROLE_BROADCASTER
-#define MYNEWT_VAL_BLE_LL_ROLE_BROADCASTER MYNEWT_VAL_BLE_ROLE_BROADCASTER
+#define MYNEWT_VAL_BLE_LL_ROLE_BROADCASTER MYNEWT_VAL(BLE_ROLE_BROADCASTER)
 #endif
 
 #ifndef MYNEWT_VAL_BLE_LL_ROLE_CENTRAL
-#define MYNEWT_VAL_BLE_LL_ROLE_CENTRAL MYNEWT_VAL_BLE_ROLE_CENTRAL
+#define MYNEWT_VAL_BLE_LL_ROLE_CENTRAL MYNEWT_VAL(BLE_ROLE_CENTRAL)
 #endif
 
 #ifndef MYNEWT_VAL_BLE_LL_ROLE_OBSERVER
-#define MYNEWT_VAL_BLE_LL_ROLE_OBSERVER MYNEWT_VAL_BLE_ROLE_OBSERVER
+#define MYNEWT_VAL_BLE_LL_ROLE_OBSERVER MYNEWT_VAL(BLE_ROLE_OBSERVER)
 #endif
 
 #ifndef MYNEWT_VAL_BLE_LL_ROLE_PERIPHERAL
-#define MYNEWT_VAL_BLE_LL_ROLE_PERIPHERAL MYNEWT_VAL_BLE_ROLE_PERIPHERAL
+#define MYNEWT_VAL_BLE_LL_ROLE_PERIPHERAL MYNEWT_VAL(BLE_ROLE_PERIPHERAL)
+#endif
+
+#ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_CONN_PARAM_REQ
+#define MYNEWT_VAL_BLE_LL_CFG_FEAT_CONN_PARAM_REQ (1)
+#endif
+
+#ifndef MYNEWT_VAL_BLE_LL_SCA
+#define MYNEWT_VAL_BLE_LL_SCA (60)
+#endif
+
+#ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_PERIPH_INIT_FEAT_XCHG
+#define MYNEWT_VAL_BLE_LL_CFG_FEAT_PERIPH_INIT_FEAT_XCHG (1)
+#endif
+
+#ifndef MYNEWT_VAL_BLE_LL_CONN_INIT_MIN_WIN_OFFSET
+#define MYNEWT_VAL_BLE_LL_CONN_INIT_MIN_WIN_OFFSET (0)
+#endif
+
+#ifndef MYNEWT_VAL_BLE_LL_CONN_INIT_SLOTS
+#define MYNEWT_VAL_BLE_LL_CONN_INIT_SLOTS (4)
+#endif
+
+#ifndef MYNEWT_VAL_BLE_LL_DTM
+#define MYNEWT_VAL_BLE_LL_DTM (0)
+#endif
+
+#ifndef MYNEWT_VAL_BLE_LL_NUM_COMP_PKT_ITVL_MS
+#define MYNEWT_VAL_BLE_LL_NUM_COMP_PKT_ITVL_MS (2000)
 #endif
 
 #ifndef MYNEWT_VAL_BLE_LL_TX_PWR_MAX_DBM
 #define MYNEWT_VAL_BLE_LL_TX_PWR_MAX_DBM (20)
 #endif
 
+#ifndef MYNEWT_VAL_BLE_HW_WHITELIST_ENABLE
+#define MYNEWT_VAL_BLE_HW_WHITELIST_ENABLE (1)
+#endif
+
+#ifndef MYNEWT_VAL_BLE_LL_CONN_STRICT_SCHED
+#define MYNEWT_VAL_BLE_LL_CONN_STRICT_SCHED (0)
+#endif
+
+#ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_DATA_LEN_EXT
+#define MYNEWT_VAL_BLE_LL_CFG_FEAT_DATA_LEN_EXT (MYNEWT_VAL(BLE_ROLE_PERIPHERAL) || MYNEWT_VAL(BLE_ROLE_CENTRAL))
+#endif
+
+#ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_ENCRYPTION
+#define MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_ENCRYPTION (MYNEWT_VAL(BLE_ROLE_PERIPHERAL) || MYNEWT_VAL(BLE_ROLE_CENTRAL))
+#endif
+
+#ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_CSA2
+#define MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_CSA2 (1)
+#endif
+
+#ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_PING
+#define MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_PING (0)
+#endif
+
+#ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LL_EXT_ADV
+#define MYNEWT_VAL_BLE_LL_CFG_FEAT_LL_EXT_ADV (MYNEWT_VAL_BLE_EXT_ADV)
+#endif
+
+#ifndef MYNEWT_VAL_BLE_LL_CONN_INIT_MAX_TX_BYTES
+#define MYNEWT_VAL_BLE_LL_CONN_INIT_MAX_TX_BYTES (27)
+#endif
+
+#ifndef MYNEWT_VAL_BLE_LL_MAX_PKT_SIZE
+#define MYNEWT_VAL_BLE_LL_MAX_PKT_SIZE (251)
+#endif
+
+#ifndef MYNEWT_VAL_BLE_LL_SUPP_MAX_RX_BYTES
+#define MYNEWT_VAL_BLE_LL_SUPP_MAX_RX_BYTES (MYNEWT_VAL(BLE_LL_MAX_PKT_SIZE))
+#endif
+
+#ifndef MYNEWT_VAL_BLE_LL_SUPP_MAX_TX_BYTES
+#define MYNEWT_VAL_BLE_LL_SUPP_MAX_TX_BYTES (MYNEWT_VAL(BLE_LL_MAX_PKT_SIZE))
+#endif
+
+#ifndef MYNEWT_VAL_BLE_LL_NUM_SCAN_DUP_ADVS
+#define MYNEWT_VAL_BLE_LL_NUM_SCAN_DUP_ADVS (32)
+#endif
+
+#ifndef MYNEWT_VAL_BLE_LL_NUM_SCAN_RSP_ADVS
+#define MYNEWT_VAL_BLE_LL_NUM_SCAN_RSP_ADVS (32)
+#endif
+
+#ifndef MYNEWT_VAL_BLE_LL_MANUFACTURER_ID
+#define MYNEWT_VAL_BLE_LL_MANUFACTURER_ID (0x0b65)
+#endif
+
+#ifndef MYNEWT_VAL_BLE_LL_RESOLV_LIST_SIZE
+#if MYNEWT_VAL(BLE_STORE_MAX_BONDS)
+#define MYNEWT_VAL_BLE_LL_RESOLV_LIST_SIZE (4)
+#else
+#define MYNEWT_VAL_BLE_LL_RESOLV_LIST_SIZE (0)
+#endif
+#endif
+
+#ifndef MYNEWT_VAL_BLE_LL_RNG_BUFSIZE
+#define MYNEWT_VAL_BLE_LL_RNG_BUFSIZE (32)
+#endif
+
+#ifndef MYNEWT_VAL_BLE_LL_TX_PWR_DBM
+#define MYNEWT_VAL_BLE_LL_TX_PWR_DBM (0)
+#endif
+
+#ifndef MYNEWT_VAL_BLE_LL_SYSVIEW
+#define MYNEWT_VAL_BLE_LL_SYSVIEW (0)
+#endif
+
+#ifndef MYNEWT_VAL_BLE_LL_HCI_VS_EVENT_ON_ASSERT
+#define MYNEWT_VAL_BLE_LL_HCI_VS_EVENT_ON_ASSERT (0)
+#endif
+
+#ifndef MYNEWT_VAL_BLE_LL_SCHED_AUX_MAFS_DELAY
+#define MYNEWT_VAL_BLE_LL_SCHED_AUX_MAFS_DELAY (0)
+#endif
+
+#ifndef MYNEWT_VAL_BLE_LL_SCHED_AUX_CHAIN_MAFS_DELAY
+#define MYNEWT_VAL_BLE_LL_SCHED_AUX_CHAIN_MAFS_DELAY (0)
+#endif
+
+#ifndef MYNEWT_VAL_BLE_LL_SCHED_SCAN_AUX_PDU_LEN
+#define MYNEWT_VAL_BLE_LL_SCHED_SCAN_AUX_PDU_LEN (41)
+#endif
+
+#ifndef MYNEWT_VAL_BLE_LL_SCHED_SCAN_SYNC_PDU_LEN
+#define MYNEWT_VAL_BLE_LL_SCHED_SCAN_SYNC_PDU_LEN (32)
+#endif
+
+#ifndef MYNEWT_VAL_BLE_LL_RFMGMT_ENABLE_TIME
+#define MYNEWT_VAL_BLE_LL_RFMGMT_ENABLE_TIME (1500)
+#endif
+
 #ifndef MYNEWT_VAL_BLE_MESH_NET_BUF_USER_DATA_SIZE
 #define MYNEWT_VAL_BLE_MESH_NET_BUF_USER_DATA_SIZE (4)
 #endif
@@ -1729,10 +1857,6 @@
 #define MYNEWT_VAL_BLE_LL_CFG_FEAT_LL_PRIVACY (1)
 #endif
 
-#ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LL_EXT_ADV
-#define MYNEWT_VAL_BLE_LL_CFG_FEAT_LL_EXT_ADV (MYNEWT_VAL_BLE_EXT_ADV)
-#endif
-
 #ifndef MYNEWT_VAL_BLE_MESH_PROVISIONER
 #define MYNEWT_VAL_BLE_MESH_PROVISIONER (0)
 #endif
@@ -1746,7 +1870,7 @@
 #endif
 
 #ifndef MYNEWT_VAL_BLE_USE_ESP_TIMER
-#define MYNEWT_VAL_BLE_USE_ESP_TIMER (1)
+#define MYNEWT_VAL_BLE_USE_ESP_TIMER (0)
 #endif
 
 #ifndef MYNEWT_VAL_OPTIMIZE_MULTI_CONN
@@ -1823,11 +1947,11 @@
 #endif
 #endif
 
-#define BLE_50_FEATURE_SUPPORT (1)
+#define BLE_50_FEATURE_SUPPORT (MYNEWT_VAL_BLE_LL_CFG_FEAT_DATA_LEN_EXT)
 
 /* NimBLE-Arduino added configurations */
 #ifndef MYNEWT_VAL_NIMBLE_CONTROLLER_TASK_STACK_SIZE
-#define MYNEWT_VAL_NIMBLE_CONTROLLER_TASK_STACK_SIZE (4096)
+#define MYNEWT_VAL_NIMBLE_CONTROLLER_TASK_STACK_SIZE (440)
 #endif
 
 #ifndef MYNEWT_VAL_NIMBLE_CPP_FREERTOS_TASK_BLOCK_BIT