Skip to content

Commit 70be284

Browse files
committed
Merge branch 'release/v10.4.0'
2 parents a96bf18 + 815a863 commit 70be284

File tree

4 files changed

+51
-6
lines changed

4 files changed

+51
-6
lines changed

boards/bbcmicrobit_v2.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
},
66
"core": "nRF5",
77
"cpu": "cortex-m4",
8-
"extra_flags": "-DARDUINO_BBC_MICROBIT_V2 -DNRF52833_XXAA",
8+
"extra_flags": "-DARDUINO_BBC_MICROBIT_V2 -DNRF52833_XXAA -DUSE_LFSYNT",
99
"f_cpu": "64000000L",
1010
"mcu": "nrf52833",
1111
"variant": "BBCmicrobitV2",

boards/calliopemini_v3.json

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
{
2+
"build": {
3+
"arduino": {
4+
"ldscript": "nrf52833_xxaa.ld"
5+
},
6+
"core": "nRF5",
7+
"cpu": "cortex-m4",
8+
"extra_flags": "-DNRF52833_XXAA -DARDUINO_CALLIOPE_MINI_V3 -DUSE_LFSYNT",
9+
"f_cpu": "64000000",
10+
"hwids": [
11+
[
12+
"0x0D28",
13+
"0x0204"
14+
]
15+
],
16+
"mcu": "nrf52833",
17+
"usb_product": "CalliopeMiniV3",
18+
"variant": "CalliopeminiV3"
19+
},
20+
"debug": {
21+
"svd_path": "nrf52.svd",
22+
"openocd_extra_args": [
23+
"-c",
24+
"transport select swd;"
25+
],
26+
"jlink_device": "nRF52833_xxAA"
27+
},
28+
"frameworks": [
29+
"arduino"
30+
],
31+
"name": "Calliope Mini v3",
32+
"upload": {
33+
"maximum_ram_size": 131072,
34+
"maximum_size": 524288,
35+
"protocol": "cmsis-dap",
36+
"protocols": [
37+
"blackmagic",
38+
"cmsis-dap",
39+
"jlink",
40+
"stlink"
41+
]
42+
},
43+
"url": "https://calliope.cc",
44+
"vendor": "Calliope"
45+
}

examples/arduino-blink/platformio.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ platform = nordicnrf52
1212
framework = arduino
1313
board = bbcmicrobit_v2
1414

15-
[env:dwm1001_dev]
15+
[env:calliopemini_v3]
1616
platform = nordicnrf52
1717
framework = arduino
18-
board = dwm1001_dev
18+
board = calliopemini_v3
1919

2020
[env:nrf52_dk]
2121
platform = nordicnrf52

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": "10.3.0",
21+
"version": "10.4.0",
2222
"frameworks": {
2323
"arduino": {
2424
"package": "framework-arduinonordicnrf5",
@@ -60,13 +60,13 @@
6060
"type": "framework",
6161
"optional": true,
6262
"owner": "platformio",
63-
"version": "~1.700.0"
63+
"version": "~1.800.0"
6464
},
6565
"framework-arduino-mbed": {
6666
"type": "framework",
6767
"optional": true,
6868
"owner": "platformio",
69-
"version": "~4.0.10"
69+
"version": "~4.1.1"
7070
},
7171
"framework-cmsis": {
7272
"type": "framework",

0 commit comments

Comments
 (0)