Skip to content

Commit

Permalink
Merge branch 'release/v10.4.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
valeros committed Feb 27, 2024
2 parents a96bf18 + 815a863 commit 70be284
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 6 deletions.
2 changes: 1 addition & 1 deletion boards/bbcmicrobit_v2.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
},
"core": "nRF5",
"cpu": "cortex-m4",
"extra_flags": "-DARDUINO_BBC_MICROBIT_V2 -DNRF52833_XXAA",
"extra_flags": "-DARDUINO_BBC_MICROBIT_V2 -DNRF52833_XXAA -DUSE_LFSYNT",
"f_cpu": "64000000L",
"mcu": "nrf52833",
"variant": "BBCmicrobitV2",
Expand Down
45 changes: 45 additions & 0 deletions boards/calliopemini_v3.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"build": {
"arduino": {
"ldscript": "nrf52833_xxaa.ld"
},
"core": "nRF5",
"cpu": "cortex-m4",
"extra_flags": "-DNRF52833_XXAA -DARDUINO_CALLIOPE_MINI_V3 -DUSE_LFSYNT",
"f_cpu": "64000000",
"hwids": [
[
"0x0D28",
"0x0204"
]
],
"mcu": "nrf52833",
"usb_product": "CalliopeMiniV3",
"variant": "CalliopeminiV3"
},
"debug": {
"svd_path": "nrf52.svd",
"openocd_extra_args": [
"-c",
"transport select swd;"
],
"jlink_device": "nRF52833_xxAA"
},
"frameworks": [
"arduino"
],
"name": "Calliope Mini v3",
"upload": {
"maximum_ram_size": 131072,
"maximum_size": 524288,
"protocol": "cmsis-dap",
"protocols": [
"blackmagic",
"cmsis-dap",
"jlink",
"stlink"
]
},
"url": "https://calliope.cc",
"vendor": "Calliope"
}
4 changes: 2 additions & 2 deletions examples/arduino-blink/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ platform = nordicnrf52
framework = arduino
board = bbcmicrobit_v2

[env:dwm1001_dev]
[env:calliopemini_v3]
platform = nordicnrf52
framework = arduino
board = dwm1001_dev
board = calliopemini_v3

[env:nrf52_dk]
platform = nordicnrf52
Expand Down
6 changes: 3 additions & 3 deletions platform.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"type": "git",
"url": "https://github.com/platformio/platform-nordicnrf52.git"
},
"version": "10.3.0",
"version": "10.4.0",
"frameworks": {
"arduino": {
"package": "framework-arduinonordicnrf5",
Expand Down Expand Up @@ -60,13 +60,13 @@
"type": "framework",
"optional": true,
"owner": "platformio",
"version": "~1.700.0"
"version": "~1.800.0"
},
"framework-arduino-mbed": {
"type": "framework",
"optional": true,
"owner": "platformio",
"version": "~4.0.10"
"version": "~4.1.1"
},
"framework-cmsis": {
"type": "framework",
Expand Down

0 comments on commit 70be284

Please sign in to comment.