Skip to content

Commit 8b18082

Browse files
h2zeroh2zero
committed
Add new/updated config options added in NimBLE 1.5.0
1 parent e31ba39 commit 8b18082

File tree

7 files changed

+52
-23
lines changed

7 files changed

+52
-23
lines changed

‎.github/workflows/build.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ jobs:
5151
fail-fast: false
5252
matrix:
5353
example:
54-
- "libraries/n-able/examples/FreeRTOS"
55-
- "libraries/n-able/examples/BLE_Advertiser"
56-
- "libraries/n-able/examples/BLE_Scan"
54+
- "example/framework/libraries/n-able/examples/FreeRTOS"
55+
- "example/framework/libraries/n-able/examples/BLE_Advertiser"
56+
- "example/framework/libraries/n-able/examples/BLE_Scan"
5757
- "example/lib/examples/Bluetooth_5/NimBLE_extended_server/"
5858
variant:
5959
- generic_nrf52832

‎cores/nRF5/nimble_config/ext_nimble_config.h‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,55 @@
1212
#error No supported mcu config specified
1313
#endif
1414

15+
/* NimBLE 1.5 Updated config */
16+
#ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_PERIPH_INIT_FEAT_XCHG
17+
#define MYNEWT_VAL_BLE_LL_CFG_FEAT_PERIPH_INIT_FEAT_XCHG (MYNEWT_VAL_BLE_LL_CFG_FEAT_SLAVE_INIT_FEAT_XCHG)
18+
#endif
19+
20+
#ifndef MYNEWT_VAL_BLE_LL_DTM
21+
#define MYNEWT_VAL_BLE_LL_DTM (MYNEWT_VAL_BLE_LL_DTM)
22+
#endif
23+
24+
#ifndef MYNEWT_VAL_BLE_LL_SCAN_AUX_SEGMENT_CNT
25+
#define MYNEWT_VAL_BLE_LL_SCAN_AUX_SEGMENT_CNT (MYNEWT_VAL_BLE_LL_EXT_ADV_AUX_PTR_CNT)
26+
#endif
27+
28+
#ifndef MYNEWT_VAL_BLE_LL_MANUFACTURER_ID
29+
#define MYNEWT_VAL_BLE_LL_MANUFACTURER_ID (MYNEWT_VAL_BLE_LL_MFRG_ID)
30+
#endif
31+
32+
#ifndef MYNEWT_VAL_BLE_LL_CONN_STRICT_SCHED
33+
#define MYNEWT_VAL_BLE_LL_CONN_STRICT_SCHED (MYNEWT_VAL_BLE_LL_STRICT_CONN_SCHEDULING)
34+
#endif
35+
36+
#ifndef MYNEWT_VAL_BLE_LL_HCI_VS_EVENT_ON_ASSERT
37+
#define MYNEWT_VAL_BLE_LL_HCI_VS_EVENT_ON_ASSERT (MYNEWT_VAL_BLE_LL_VND_EVENT_ON_ASSERT)
38+
#endif
39+
40+
#ifndef MYNEWT_VAL_BLE_LL_PUBLIC_DEV_ADDR
41+
#define MYNEWT_VAL_BLE_LL_PUBLIC_DEV_ADDR (0x000000000000)
42+
#endif
43+
44+
#ifndef MYNEWT_VAL_BLE_TRANSPORT_ACL_COUNT
45+
#define MYNEWT_VAL_BLE_TRANSPORT_ACL_COUNT (MYNEWT_VAL_BLE_ACL_BUF_COUNT)
46+
#endif
47+
48+
#ifndef MYNEWT_VAL_BLE_TRANSPORT_ACL_SIZE
49+
#define MYNEWT_VAL_BLE_TRANSPORT_ACL_SIZE (MYNEWT_VAL_BLE_ACL_BUF_SIZE)
50+
#endif
51+
52+
#ifndef MYNEWT_VAL_BLE_TRANSPORT_EVT_COUNT
53+
#define MYNEWT_VAL_BLE_TRANSPORT_EVT_COUNT (MYNEWT_VAL_BLE_HCI_ACL_OUT_COUNT)
54+
#endif
55+
56+
#ifndef MYNEWT_VAL_BLE_TRANSPORT_EVT_DISCARDABLE_COUNT
57+
#define MYNEWT_VAL_BLE_TRANSPORT_EVT_DISCARDABLE_COUNT (MYNEWT_VAL_BLE_HCI_EVT_LO_BUF_COUNT)
58+
#endif
59+
60+
#ifndef MYNEWT_VAL_BLE_TRANSPORT_EVT_SIZE
61+
#define MYNEWT_VAL_BLE_TRANSPORT_EVT_SIZE (MYNEWT_VAL_BLE_HCI_EVT_BUF_SIZE)
62+
#endif
63+
1564
#ifndef min
1665
#define min(a, b) ((a)<(b)?(a):(b))
1766
#endif

‎cores/nRF5/nimble_config/nrf51_nimconfig.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1270,10 +1270,6 @@
12701270
#define MYNEWT_VAL_BLE_HCI_VS (1)
12711271
#endif
12721272

1273-
#ifndef MYNEWT_VAL_BLE_PUBLIC_DEV_ADDR
1274-
#define MYNEWT_VAL_BLE_PUBLIC_DEV_ADDR ((uint8_t[6]){0x00, 0x00, 0x00, 0x00, 0x00, 0x00})
1275-
#endif
1276-
12771273
#if defined(ARDUINO_ARCH_NRF5) && defined(NRF52_SERIES)
12781274
#ifndef MYNEWT_VAL_BLE_PHY_DBG_TIME_ADDRESS_END_PIN
12791275
#define MYNEWT_VAL_BLE_PHY_DBG_TIME_ADDRESS_END_PIN (-1)

‎cores/nRF5/nimble_config/nrf52810_nimconfig.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -422,10 +422,6 @@
422422
#define MYNEWT_VAL_BLE_NUM_COMP_PKT_RATE ((2 * OS_TICKS_PER_SEC))
423423
#endif
424424

425-
#ifndef MYNEWT_VAL_BLE_PUBLIC_DEV_ADDR
426-
#define MYNEWT_VAL_BLE_PUBLIC_DEV_ADDR ((uint8_t[6]){0x00, 0x00, 0x00, 0x00, 0x00, 0x00})
427-
#endif
428-
429425
#ifndef MYNEWT_VAL_BLE_LL_RFMGMT_ENABLE_TIME
430426
#define MYNEWT_VAL_BLE_LL_RFMGMT_ENABLE_TIME (1500)
431427
#endif

‎cores/nRF5/nimble_config/nrf52832_nimconfig.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -422,10 +422,6 @@
422422
#define MYNEWT_VAL_BLE_NUM_COMP_PKT_RATE ((2 * OS_TICKS_PER_SEC))
423423
#endif
424424

425-
#ifndef MYNEWT_VAL_BLE_PUBLIC_DEV_ADDR
426-
#define MYNEWT_VAL_BLE_PUBLIC_DEV_ADDR ((uint8_t[6]){0x00, 0x00, 0x00, 0x00, 0x00, 0x00})
427-
#endif
428-
429425
#ifndef MYNEWT_VAL_BLE_LL_RFMGMT_ENABLE_TIME
430426
#define MYNEWT_VAL_BLE_LL_RFMGMT_ENABLE_TIME (1500)
431427
#endif

‎cores/nRF5/nimble_config/nrf52833_nimconfig.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -422,10 +422,6 @@
422422
#define MYNEWT_VAL_BLE_NUM_COMP_PKT_RATE ((2 * OS_TICKS_PER_SEC))
423423
#endif
424424

425-
#ifndef MYNEWT_VAL_BLE_PUBLIC_DEV_ADDR
426-
#define MYNEWT_VAL_BLE_PUBLIC_DEV_ADDR ((uint8_t[6]){0x00, 0x00, 0x00, 0x00, 0x00, 0x00})
427-
#endif
428-
429425
#ifndef MYNEWT_VAL_BLE_LL_RFMGMT_ENABLE_TIME
430426
#define MYNEWT_VAL_BLE_LL_RFMGMT_ENABLE_TIME (1500)
431427
#endif

‎cores/nRF5/nimble_config/nrf52840_nimconfig.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -422,10 +422,6 @@
422422
#define MYNEWT_VAL_BLE_NUM_COMP_PKT_RATE ((2 * OS_TICKS_PER_SEC))
423423
#endif
424424

425-
#ifndef MYNEWT_VAL_BLE_PUBLIC_DEV_ADDR
426-
#define MYNEWT_VAL_BLE_PUBLIC_DEV_ADDR ((uint8_t[6]){0x00, 0x00, 0x00, 0x00, 0x00, 0x00})
427-
#endif
428-
429425
#ifndef MYNEWT_VAL_BLE_LL_RFMGMT_ENABLE_TIME
430426
#define MYNEWT_VAL_BLE_LL_RFMGMT_ENABLE_TIME (1500)
431427
#endif

0 commit comments

Comments
 (0)