Skip to content

Commit a53cb11

Browse files
h2zeroh2zero
committed
[Bugfix] Add missing config for non-esp devices and adjust values.
1 parent eedb7fa commit a53cb11

File tree

2 files changed

+164
-42
lines changed

2 files changed

+164
-42
lines changed

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

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,11 @@ nimble_port_freertos_deinit(void)
9898
#else // ESP_PLATFORM
9999

100100
#if NIMBLE_CFG_CONTROLLER
101-
# ifdef MYNEWT_VAL_NIMBLE_CONTROLLER_TASK_STACK_SIZE
102-
# define NIMBLE_LL_STACK_SIZE (MYNEWT_VAL(NIMBLE_CONTROLLER_TASK_STACK_SIZE) / 4)
101+
102+
# if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
103+
# define NIMBLE_LL_STACK_SIZE (MYNEWT_VAL(NIMBLE_CONTROLLER_TASK_STACK_SIZE) / 4) + 30
103104
# else
104-
# if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
105-
# define NIMBLE_LL_STACK_SIZE (130)
106-
# else
107-
# define NIMBLE_LL_STACK_SIZE (100)
108-
# endif
105+
# define NIMBLE_LL_STACK_SIZE (MYNEWT_VAL(NIMBLE_CONTROLLER_TASK_STACK_SIZE) / 4)
109106
# endif
110107

111108
// configMAX_PRIORITIES - 1 is Tmr builtin task

‎src/syscfg/syscfg.h‎

Lines changed: 160 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -142,11 +142,15 @@
142142
#endif
143143

144144
#ifndef MYNEWT_VAL_OS_CPUTIME_FREQ
145-
#define MYNEWT_VAL_OS_CPUTIME_FREQ (1000000)
145+
#define MYNEWT_VAL_OS_CPUTIME_FREQ (32768)
146+
#endif
147+
148+
#ifndef MYNEWT_VAL_TIMER_5
149+
#define MYNEWT_VAL_TIMER_5 (1)
146150
#endif
147151

148152
#ifndef MYNEWT_VAL_OS_CPUTIME_TIMER_NUM
149-
#define MYNEWT_VAL_OS_CPUTIME_TIMER_NUM (0)
153+
#define MYNEWT_VAL_OS_CPUTIME_TIMER_NUM (5)
150154
#endif
151155

152156
/* Overridden by @apache-mynewt-core/hw/bsp/native (defined by @apache-mynewt-core/kernel/os) */
@@ -488,7 +492,7 @@
488492

489493
/*** @apache-mynewt-nimble/nimble/host */
490494
#ifndef MYNEWT_VAL_BLE_ATT_PREFERRED_MTU
491-
#define MYNEWT_VAL_BLE_ATT_PREFERRED_MTU (256)
495+
#define MYNEWT_VAL_BLE_ATT_PREFERRED_MTU (517)
492496
#endif
493497

494498
#ifndef MYNEWT_VAL_BLE_ATT_SVR_FIND_INFO
@@ -680,7 +684,7 @@
680684
#endif
681685

682686
#ifndef MYNEWT_VAL_BLE_HS_DEBUG
683-
#define MYNEWT_VAL_BLE_HS_DEBUG (1)
687+
#define MYNEWT_VAL_BLE_HS_DEBUG (0)
684688
#endif
685689

686690
#ifndef MYNEWT_VAL_BLE_HS_FLOW_CTRL
@@ -772,7 +776,7 @@
772776
#endif
773777

774778
#ifndef MYNEWT_VAL_BLE_SM_BONDING
775-
#define MYNEWT_VAL_BLE_SM_BONDING (0)
779+
#define MYNEWT_VAL_BLE_SM_BONDING (1)
776780
#endif
777781

778782
#ifndef MYNEWT_VAL_BLE_SM_IO_CAP
@@ -823,10 +827,6 @@
823827
#define MYNEWT_VAL_BLE_SM_THEIR_KEY_DIST (0)
824828
#endif
825829

826-
#ifndef MYNEWT_VAL_BLE_STORE_CONFIG_PERSIST
827-
#define MYNEWT_VAL_BLE_STORE_CONFIG_PERSIST (1)
828-
#endif
829-
830830
#ifndef MYNEWT_VAL_BLE_STORE_MAX_BONDS
831831
#define MYNEWT_VAL_BLE_STORE_MAX_BONDS (3)
832832
#endif
@@ -839,6 +839,14 @@
839839
#define MYNEWT_VAL_BLE_STORE_MAX_EADS (0)
840840
#endif
841841

842+
#ifndef MYNEWT_VAL_BLE_STORE_CONFIG_PERSIST
843+
#if MYNEWT_VAL_BLE_STORE_MAX_BONDS
844+
#define MYNEWT_VAL_BLE_STORE_CONFIG_PERSIST (1)
845+
#else
846+
#define MYNEWT_VAL_BLE_STORE_CONFIG_PERSIST (0)
847+
#endif
848+
#endif
849+
842850
/*** @apache-mynewt-nimble/nimble/host/services/ans */
843851
#ifndef MYNEWT_VAL_BLE_SVC_ANS_NEW_ALERT_CAT
844852
#define MYNEWT_VAL_BLE_SVC_ANS_NEW_ALERT_CAT (0)
@@ -1159,6 +1167,10 @@
11591167
#define MYNEWT_VAL_BLE_MESH_TX_SEG_MSG_COUNT (4)
11601168
#endif
11611169

1170+
#ifndef MYNEWT_VAL_BLE_MESH_SEG_RETRANSMIT_ATTEMPTS
1171+
#define MYNEWT_VAL_BLE_MESH_SEG_RETRANSMIT_ATTEMPTS (4)
1172+
#endif
1173+
11621174
#ifndef MYNEWT_VAL_BLE_SVC_BAS_SYSINIT_STAGE
11631175
#define MYNEWT_VAL_BLE_SVC_BAS_SYSINIT_STAGE (303)
11641176
#endif
@@ -1313,21 +1325,6 @@
13131325
#define MYNEWT_VAL_BLE_SVC_TPS_SYSINIT_STAGE (303)
13141326
#endif
13151327

1316-
/*** @apache-mynewt-nimble/nimble/transport */
1317-
// #undef MYNEWT_VAL_BLE_ACL_BUF_COUNT
1318-
1319-
// #undef MYNEWT_VAL_BLE_ACL_BUF_SIZE
1320-
1321-
// #undef MYNEWT_VAL_BLE_HCI_BRIDGE
1322-
1323-
// #undef MYNEWT_VAL_BLE_HCI_EVT_BUF_SIZE
1324-
1325-
// #undef MYNEWT_VAL_BLE_HCI_EVT_HI_BUF_COUNT
1326-
1327-
// #undef MYNEWT_VAL_BLE_HCI_EVT_LO_BUF_COUNT
1328-
1329-
// #undef MYNEWT_VAL_BLE_HCI_TRANSPORT
1330-
13311328
#ifndef MYNEWT_VAL_BLE_MONITOR_CONSOLE_BUFFER_SIZE
13321329
#define MYNEWT_VAL_BLE_MONITOR_CONSOLE_BUFFER_SIZE (128)
13331330
#endif
@@ -1555,26 +1552,158 @@
15551552
#define MYNEWT_VAL_BLE_LL_WHITELIST_SIZE (12)
15561553
#endif
15571554

1555+
#ifndef MYNEWT_VAL_BLE_LL_PUBLIC_DEV_ADDR
1556+
#define MYNEWT_VAL_BLE_LL_PUBLIC_DEV_ADDR (0x000000000000)
1557+
#endif
1558+
15581559
#ifndef MYNEWT_VAL_BLE_LL_ROLE_BROADCASTER
1559-
#define MYNEWT_VAL_BLE_LL_ROLE_BROADCASTER MYNEWT_VAL_BLE_ROLE_BROADCASTER
1560+
#define MYNEWT_VAL_BLE_LL_ROLE_BROADCASTER MYNEWT_VAL(BLE_ROLE_BROADCASTER)
15601561
#endif
15611562

15621563
#ifndef MYNEWT_VAL_BLE_LL_ROLE_CENTRAL
1563-
#define MYNEWT_VAL_BLE_LL_ROLE_CENTRAL MYNEWT_VAL_BLE_ROLE_CENTRAL
1564+
#define MYNEWT_VAL_BLE_LL_ROLE_CENTRAL MYNEWT_VAL(BLE_ROLE_CENTRAL)
15641565
#endif
15651566

15661567
#ifndef MYNEWT_VAL_BLE_LL_ROLE_OBSERVER
1567-
#define MYNEWT_VAL_BLE_LL_ROLE_OBSERVER MYNEWT_VAL_BLE_ROLE_OBSERVER
1568+
#define MYNEWT_VAL_BLE_LL_ROLE_OBSERVER MYNEWT_VAL(BLE_ROLE_OBSERVER)
15681569
#endif
15691570

15701571
#ifndef MYNEWT_VAL_BLE_LL_ROLE_PERIPHERAL
1571-
#define MYNEWT_VAL_BLE_LL_ROLE_PERIPHERAL MYNEWT_VAL_BLE_ROLE_PERIPHERAL
1572+
#define MYNEWT_VAL_BLE_LL_ROLE_PERIPHERAL MYNEWT_VAL(BLE_ROLE_PERIPHERAL)
1573+
#endif
1574+
1575+
#ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_CONN_PARAM_REQ
1576+
#define MYNEWT_VAL_BLE_LL_CFG_FEAT_CONN_PARAM_REQ (1)
1577+
#endif
1578+
1579+
#ifndef MYNEWT_VAL_BLE_LL_SCA
1580+
#define MYNEWT_VAL_BLE_LL_SCA (60)
1581+
#endif
1582+
1583+
#ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_PERIPH_INIT_FEAT_XCHG
1584+
#define MYNEWT_VAL_BLE_LL_CFG_FEAT_PERIPH_INIT_FEAT_XCHG (1)
1585+
#endif
1586+
1587+
#ifndef MYNEWT_VAL_BLE_LL_CONN_INIT_MIN_WIN_OFFSET
1588+
#define MYNEWT_VAL_BLE_LL_CONN_INIT_MIN_WIN_OFFSET (0)
1589+
#endif
1590+
1591+
#ifndef MYNEWT_VAL_BLE_LL_CONN_INIT_SLOTS
1592+
#define MYNEWT_VAL_BLE_LL_CONN_INIT_SLOTS (4)
1593+
#endif
1594+
1595+
#ifndef MYNEWT_VAL_BLE_LL_DTM
1596+
#define MYNEWT_VAL_BLE_LL_DTM (0)
1597+
#endif
1598+
1599+
#ifndef MYNEWT_VAL_BLE_LL_NUM_COMP_PKT_ITVL_MS
1600+
#define MYNEWT_VAL_BLE_LL_NUM_COMP_PKT_ITVL_MS (2000)
15721601
#endif
15731602

15741603
#ifndef MYNEWT_VAL_BLE_LL_TX_PWR_MAX_DBM
15751604
#define MYNEWT_VAL_BLE_LL_TX_PWR_MAX_DBM (20)
15761605
#endif
15771606

1607+
#ifndef MYNEWT_VAL_BLE_HW_WHITELIST_ENABLE
1608+
#define MYNEWT_VAL_BLE_HW_WHITELIST_ENABLE (1)
1609+
#endif
1610+
1611+
#ifndef MYNEWT_VAL_BLE_LL_CONN_STRICT_SCHED
1612+
#define MYNEWT_VAL_BLE_LL_CONN_STRICT_SCHED (0)
1613+
#endif
1614+
1615+
#ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_DATA_LEN_EXT
1616+
#define MYNEWT_VAL_BLE_LL_CFG_FEAT_DATA_LEN_EXT (MYNEWT_VAL(BLE_ROLE_PERIPHERAL) || MYNEWT_VAL(BLE_ROLE_CENTRAL))
1617+
#endif
1618+
1619+
#ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_ENCRYPTION
1620+
#define MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_ENCRYPTION (MYNEWT_VAL(BLE_ROLE_PERIPHERAL) || MYNEWT_VAL(BLE_ROLE_CENTRAL))
1621+
#endif
1622+
1623+
#ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_CSA2
1624+
#define MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_CSA2 (1)
1625+
#endif
1626+
1627+
#ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_PING
1628+
#define MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_PING (0)
1629+
#endif
1630+
1631+
#ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LL_EXT_ADV
1632+
#define MYNEWT_VAL_BLE_LL_CFG_FEAT_LL_EXT_ADV (MYNEWT_VAL_BLE_EXT_ADV)
1633+
#endif
1634+
1635+
#ifndef MYNEWT_VAL_BLE_LL_CONN_INIT_MAX_TX_BYTES
1636+
#define MYNEWT_VAL_BLE_LL_CONN_INIT_MAX_TX_BYTES (27)
1637+
#endif
1638+
1639+
#ifndef MYNEWT_VAL_BLE_LL_MAX_PKT_SIZE
1640+
#define MYNEWT_VAL_BLE_LL_MAX_PKT_SIZE (251)
1641+
#endif
1642+
1643+
#ifndef MYNEWT_VAL_BLE_LL_SUPP_MAX_RX_BYTES
1644+
#define MYNEWT_VAL_BLE_LL_SUPP_MAX_RX_BYTES (MYNEWT_VAL(BLE_LL_MAX_PKT_SIZE))
1645+
#endif
1646+
1647+
#ifndef MYNEWT_VAL_BLE_LL_SUPP_MAX_TX_BYTES
1648+
#define MYNEWT_VAL_BLE_LL_SUPP_MAX_TX_BYTES (MYNEWT_VAL(BLE_LL_MAX_PKT_SIZE))
1649+
#endif
1650+
1651+
#ifndef MYNEWT_VAL_BLE_LL_NUM_SCAN_DUP_ADVS
1652+
#define MYNEWT_VAL_BLE_LL_NUM_SCAN_DUP_ADVS (32)
1653+
#endif
1654+
1655+
#ifndef MYNEWT_VAL_BLE_LL_NUM_SCAN_RSP_ADVS
1656+
#define MYNEWT_VAL_BLE_LL_NUM_SCAN_RSP_ADVS (32)
1657+
#endif
1658+
1659+
#ifndef MYNEWT_VAL_BLE_LL_MANUFACTURER_ID
1660+
#define MYNEWT_VAL_BLE_LL_MANUFACTURER_ID (0x0b65)
1661+
#endif
1662+
1663+
#ifndef MYNEWT_VAL_BLE_LL_RESOLV_LIST_SIZE
1664+
#if MYNEWT_VAL(BLE_STORE_MAX_BONDS)
1665+
#define MYNEWT_VAL_BLE_LL_RESOLV_LIST_SIZE (4)
1666+
#else
1667+
#define MYNEWT_VAL_BLE_LL_RESOLV_LIST_SIZE (0)
1668+
#endif
1669+
#endif
1670+
1671+
#ifndef MYNEWT_VAL_BLE_LL_RNG_BUFSIZE
1672+
#define MYNEWT_VAL_BLE_LL_RNG_BUFSIZE (32)
1673+
#endif
1674+
1675+
#ifndef MYNEWT_VAL_BLE_LL_TX_PWR_DBM
1676+
#define MYNEWT_VAL_BLE_LL_TX_PWR_DBM (0)
1677+
#endif
1678+
1679+
#ifndef MYNEWT_VAL_BLE_LL_SYSVIEW
1680+
#define MYNEWT_VAL_BLE_LL_SYSVIEW (0)
1681+
#endif
1682+
1683+
#ifndef MYNEWT_VAL_BLE_LL_HCI_VS_EVENT_ON_ASSERT
1684+
#define MYNEWT_VAL_BLE_LL_HCI_VS_EVENT_ON_ASSERT (0)
1685+
#endif
1686+
1687+
#ifndef MYNEWT_VAL_BLE_LL_SCHED_AUX_MAFS_DELAY
1688+
#define MYNEWT_VAL_BLE_LL_SCHED_AUX_MAFS_DELAY (0)
1689+
#endif
1690+
1691+
#ifndef MYNEWT_VAL_BLE_LL_SCHED_AUX_CHAIN_MAFS_DELAY
1692+
#define MYNEWT_VAL_BLE_LL_SCHED_AUX_CHAIN_MAFS_DELAY (0)
1693+
#endif
1694+
1695+
#ifndef MYNEWT_VAL_BLE_LL_SCHED_SCAN_AUX_PDU_LEN
1696+
#define MYNEWT_VAL_BLE_LL_SCHED_SCAN_AUX_PDU_LEN (41)
1697+
#endif
1698+
1699+
#ifndef MYNEWT_VAL_BLE_LL_SCHED_SCAN_SYNC_PDU_LEN
1700+
#define MYNEWT_VAL_BLE_LL_SCHED_SCAN_SYNC_PDU_LEN (32)
1701+
#endif
1702+
1703+
#ifndef MYNEWT_VAL_BLE_LL_RFMGMT_ENABLE_TIME
1704+
#define MYNEWT_VAL_BLE_LL_RFMGMT_ENABLE_TIME (1500)
1705+
#endif
1706+
15781707
#ifndef MYNEWT_VAL_BLE_MESH_NET_BUF_USER_DATA_SIZE
15791708
#define MYNEWT_VAL_BLE_MESH_NET_BUF_USER_DATA_SIZE (4)
15801709
#endif
@@ -1729,10 +1858,6 @@
17291858
#define MYNEWT_VAL_BLE_LL_CFG_FEAT_LL_PRIVACY (1)
17301859
#endif
17311860

1732-
#ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LL_EXT_ADV
1733-
#define MYNEWT_VAL_BLE_LL_CFG_FEAT_LL_EXT_ADV (MYNEWT_VAL_BLE_EXT_ADV)
1734-
#endif
1735-
17361861
#ifndef MYNEWT_VAL_BLE_MESH_PROVISIONER
17371862
#define MYNEWT_VAL_BLE_MESH_PROVISIONER (0)
17381863
#endif
@@ -1746,7 +1871,7 @@
17461871
#endif
17471872

17481873
#ifndef MYNEWT_VAL_BLE_USE_ESP_TIMER
1749-
#define MYNEWT_VAL_BLE_USE_ESP_TIMER (1)
1874+
#define MYNEWT_VAL_BLE_USE_ESP_TIMER (0)
17501875
#endif
17511876

17521877
#ifndef MYNEWT_VAL_OPTIMIZE_MULTI_CONN
@@ -1823,11 +1948,11 @@
18231948
#endif
18241949
#endif
18251950

1826-
#define BLE_50_FEATURE_SUPPORT (1)
1951+
#define BLE_50_FEATURE_SUPPORT (MYNEWT_VAL_BLE_LL_CFG_FEAT_DATA_LEN_EXT)
18271952

18281953
/* NimBLE-Arduino added configurations */
18291954
#ifndef MYNEWT_VAL_NIMBLE_CONTROLLER_TASK_STACK_SIZE
1830-
#define MYNEWT_VAL_NIMBLE_CONTROLLER_TASK_STACK_SIZE (4096)
1955+
#define MYNEWT_VAL_NIMBLE_CONTROLLER_TASK_STACK_SIZE (440)
18311956
#endif
18321957

18331958
#ifndef MYNEWT_VAL_NIMBLE_CPP_FREERTOS_TASK_BLOCK_BIT

0 commit comments

Comments
 (0)