Skip to content

Commit 7739f1a

Browse files
committed
Merge branch 'release/v8.3.0'
2 parents 13131ec + cf48f30 commit 7739f1a

4 files changed

Lines changed: 133 additions & 3 deletions

File tree

boards/laird_bl653_dvk.json

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
{
2+
"build": {
3+
"cpu": "cortex-m4",
4+
"f_cpu": "64000000L",
5+
"mcu": "nrf52833",
6+
"zephyr": {
7+
"variant": "bl653_dvk"
8+
}
9+
},
10+
"connectivity": [
11+
"bluetooth"
12+
],
13+
"debug": {
14+
"default_tools": [
15+
"jlink"
16+
],
17+
"jlink_device": "nRF52833_xxAA",
18+
"onboard_tools": [
19+
"cmsis-dap",
20+
"jlink"
21+
],
22+
"svd_path": "nrf52833.svd"
23+
},
24+
"frameworks": [
25+
"zephyr"
26+
],
27+
"name": "BL653 Development Kit",
28+
"upload": {
29+
"maximum_ram_size": 131072,
30+
"maximum_size": 524288,
31+
"protocol": "jlink",
32+
"protocols": [
33+
"jlink",
34+
"nrfjprog",
35+
"stlink",
36+
"blackmagic",
37+
"cmsis-dap",
38+
"mbed"
39+
]
40+
},
41+
"url": "https://www.lairdconnect.com/wireless-modules/bluetooth-modules/bluetooth-5-modules/bl653-series-bluetooth-51-802154-nfc-module",
42+
"vendor": "Laird Connectivity"
43+
}

boards/nrf52833_dk.json

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
{
2+
"build": {
3+
"cpu": "cortex-m4",
4+
"f_cpu": "64000000L",
5+
"mcu": "nrf52833",
6+
"zephyr": {
7+
"variant": "nrf52833dk_nrf52833"
8+
}
9+
},
10+
"connectivity": [
11+
"bluetooth"
12+
],
13+
"debug": {
14+
"default_tools": [
15+
"jlink"
16+
],
17+
"jlink_device": "nRF52833_xxAA",
18+
"onboard_tools": [
19+
"cmsis-dap",
20+
"jlink"
21+
],
22+
"svd_path": "nrf52833.svd"
23+
},
24+
"frameworks": [
25+
"zephyr"
26+
],
27+
"name": "Nordic nRF52833-DK",
28+
"upload": {
29+
"maximum_ram_size": 131072,
30+
"maximum_size": 524288,
31+
"protocol": "jlink",
32+
"protocols": [
33+
"jlink",
34+
"nrfjprog",
35+
"stlink",
36+
"blackmagic",
37+
"cmsis-dap",
38+
"mbed"
39+
]
40+
},
41+
"url": "https://www.nordicsemi.com/Products/Development-hardware/nrf52833-dk",
42+
"vendor": "Nordic"
43+
}
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
{
2+
"build": {
3+
"cpu": "cortex-m4",
4+
"f_cpu": "64000000L",
5+
"mcu": "nrf52840",
6+
"zephyr": {
7+
"variant": "ubx_bmd345eval_nrf52840"
8+
}
9+
},
10+
"connectivity": [
11+
"bluetooth",
12+
"nfc"
13+
],
14+
"debug": {
15+
"default_tools": [
16+
"jlink"
17+
],
18+
"jlink_device": "nRF52840_xxAA",
19+
"onboard_tools": [
20+
"cmsis-dap",
21+
"jlink"
22+
],
23+
"svd_path": "nrf52840.svd"
24+
},
25+
"frameworks": [
26+
"zephyr"
27+
],
28+
"name": "u-blox BMD-345-EVAL",
29+
"upload": {
30+
"maximum_ram_size": 262144,
31+
"maximum_size": 1048576,
32+
"protocol": "jlink",
33+
"protocols": [
34+
"blackmagic",
35+
"cmsis-dap",
36+
"jlink",
37+
"nrfjprog",
38+
"mbed",
39+
"stlink"
40+
]
41+
},
42+
"url": "https://www.u-blox.com/en/product/bmd-34-series-open-cpu",
43+
"vendor": "u-blox"
44+
}

platform.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"type": "git",
1919
"url": "https://github.com/platformio/platform-nordicnrf52.git"
2020
},
21-
"version": "8.2.0",
21+
"version": "8.3.0",
2222
"frameworks": {
2323
"arduino": {
2424
"package": "framework-arduinonordicnrf5",
@@ -56,7 +56,7 @@
5656
"type": "framework",
5757
"optional": true,
5858
"owner": "platformio",
59-
"version": "~1.2400.0"
59+
"version": "~1.10000.0"
6060
},
6161
"framework-arduinonordicnrf5": {
6262
"type": "framework",
@@ -68,7 +68,7 @@
6868
"type": "framework",
6969
"optional": true,
7070
"owner": "platformio",
71-
"version": "~2.3.0"
71+
"version": "~2.4.0"
7272
},
7373
"framework-cmsis": {
7474
"type": "framework",

0 commit comments

Comments
 (0)