Skip to content

Commit 7144e87

Browse files
glennrubdpgeorge
authored andcommitted
nrf/bluetooth: Add support for s132/s140 v6, remove s132 v2/3/5
Support added for s132/s140 v6 in linker scripts and boards. Support removed for s132 v2/3/5. Download script updated to fetch new stacks and removed the non-supported ones. ble_drv.c updated to only handle s110 v8, and s132/s140 v6. ubluepy updated to continue scanning after each individual scan report reported to the module to keep old behaviour of the Scanner class.
1 parent db67a50 commit 7144e87

File tree

16 files changed

+204
-182
lines changed

16 files changed

+204
-182
lines changed

ports/nrf/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ wt51822_s4at | s110 | Peripheral | Manual
9999
pca10040 | s132 | Peripheral and Central | [Segger](#segger-targets)
100100
feather52 | s132 | Peripheral and Central | Manual, SWDIO and SWCLK solder points on the bottom side of the board
101101
arduino_primo | s132 | Peripheral and Central | [PyOCD](#pyocdopenocd-targets)
102-
pca10056 | | | [Segger](#segger-targets)
102+
pca10056 | s140 | Peripheral and Central | [Segger](#segger-targets)
103103

104104
## Segger Targets
105105

ports/nrf/bluetooth_conf.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,15 @@
2020
#define MICROPY_PY_UBLUEPY_PERIPHERAL (1)
2121
#define MICROPY_PY_UBLUEPY_CENTRAL (1)
2222

23+
#elif (BLUETOOTH_SD == 140)
24+
25+
#define MICROPY_PY_BLE (1)
26+
#define MICROPY_PY_BLE_NUS (0)
27+
#define BLUETOOTH_WEBBLUETOOTH_REPL (0)
28+
#define MICROPY_PY_UBLUEPY (1)
29+
#define MICROPY_PY_UBLUEPY_PERIPHERAL (1)
30+
#define MICROPY_PY_UBLUEPY_CENTRAL (1)
31+
2332
#else
2433
#error "SD not supported"
2534
#endif

ports/nrf/boards/arduino_primo/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
MCU_SERIES = m4
22
MCU_VARIANT = nrf52
33
MCU_SUB_VARIANT = nrf52832
4-
SOFTDEV_VERSION = 3.0.0
4+
SOFTDEV_VERSION = 6.0.0
55
LD_FILES += boards/nrf52832_512k_64k.ld
66
FLASHER = pyocd
77

ports/nrf/boards/dvk_bl652/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
MCU_SERIES = m4
22
MCU_VARIANT = nrf52
33
MCU_SUB_VARIANT = nrf52832
4-
SOFTDEV_VERSION = 3.0.0
4+
SOFTDEV_VERSION = 6.0.0
55
LD_FILES += boards/nrf52832_512k_64k.ld
66

77
NRF_DEFINES += -DNRF52832_XXAA

ports/nrf/boards/feather52/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
MCU_SERIES = m4
22
MCU_VARIANT = nrf52
33
MCU_SUB_VARIANT = nrf52832
4-
SOFTDEV_VERSION = 3.0.0
4+
SOFTDEV_VERSION = 6.0.0
55
LD_FILES += boards/nrf52832_512k_64k.ld
66

77
NRF_DEFINES += -DNRF52832_XXAA
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
MCU_SERIES = m4
22
MCU_VARIANT = nrf52
33
MCU_SUB_VARIANT = nrf52832
4-
SOFTDEV_VERSION = 3.0.0
4+
SOFTDEV_VERSION = 6.0.0
55
LD_FILES += boards/nrf52832_512k_64k.ld
66

77
NRF_DEFINES += -DNRF52832_XXAA
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
MCU_SERIES = m4
22
MCU_VARIANT = nrf52
33
MCU_SUB_VARIANT = nrf52840
4+
SOFTDEV_VERSION = 6.0.0
45
LD_FILES += boards/nrf52840_1M_256k.ld
56

67
NRF_DEFINES += -DNRF52840_XXAA

ports/nrf/boards/s132_3.0.0.ld

Lines changed: 0 additions & 4 deletions
This file was deleted.

ports/nrf/boards/s132_5.0.0.ld

Lines changed: 0 additions & 4 deletions
This file was deleted.

ports/nrf/boards/s132_6.0.0.ld

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
/* GNU linker script for s132 SoftDevice version 6.0.0 */
2+
3+
_sd_size = 0x00026000;
4+
_sd_ram = 0x000039c0;

0 commit comments

Comments
 (0)