Skip to content

Commit c79785e

Browse files
committed
Remove duplicates in configs, fix build.
1 parent c9ae793 commit c79785e

File tree

7 files changed

+4
-24
lines changed

7 files changed

+4
-24
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#endif
3939

4040
#ifndef MYNEWT_VAL_BLE_LL_PUBLIC_DEV_ADDR
41-
#define MYNEWT_VAL_BLE_LL_PUBLIC_DEV_ADDR (MYNEWT_VAL_BLE_PUBLIC_DEV_ADDR)
41+
#define MYNEWT_VAL_BLE_LL_PUBLIC_DEV_ADDR (0x000000000000)
4242
#endif
4343

4444
#ifndef MYNEWT_VAL_BLE_TRANSPORT_ACL_COUNT

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)