Skip to content

Commit a39a7a9

Browse files
committed
Merge branch 'release/v3.7.0'
2 parents 65999b9 + 253c5d6 commit a39a7a9

File tree

5 files changed

+138
-3
lines changed

5 files changed

+138
-3
lines changed

boards/adafruit_cplaynrf52840.json

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
{
2+
"build": {
3+
"core": "nRF5",
4+
"cpu": "cortex-m4",
5+
"extra_flags": "-DARDUINO_NRF52840_CIRCUITPLAY -DNRF52840_XXAA -DCIRCUITPLAY_NRF52840",
6+
"f_cpu": "64000000L",
7+
"hwids": [
8+
[
9+
"0x239A",
10+
"0x8045"
11+
],
12+
[
13+
"0x239A",
14+
"0x0045"
15+
],
16+
[
17+
"0x239A",
18+
"0x0046"
19+
],
20+
[
21+
"0x239A",
22+
"0x8046"
23+
]
24+
],
25+
"usb_product": "Circuit Playground Bluefruit",
26+
"ldscript": "nrf52840_s140_v6.ld",
27+
"mcu": "nrf52840",
28+
"variant": "circuitplayground_nrf52840",
29+
"bsp": {
30+
"name": "adafruit"
31+
},
32+
"softdevice": {
33+
"sd_flags": "-DS140",
34+
"sd_name": "s140",
35+
"sd_version": "6.1.1",
36+
"sd_fwid": "0x00B6"
37+
},
38+
"bootloader": {
39+
"settings_addr": "0xFF000"
40+
}
41+
},
42+
"connectivity": [
43+
"bluetooth"
44+
],
45+
"debug": {
46+
"jlink_device": "nRF52840_xxAA",
47+
"svd_path": "nrf52.svd"
48+
},
49+
"frameworks": [
50+
"arduino"
51+
],
52+
"name": "Circuit Playground Bluefruit",
53+
"upload": {
54+
"maximum_ram_size": 248832,
55+
"maximum_size": 815104,
56+
"require_upload_port": true,
57+
"speed": 115200,
58+
"protocol": "nrfutil",
59+
"protocols": [
60+
"jlink",
61+
"nrfjprog",
62+
"nrfutil"
63+
]
64+
},
65+
"url": "https://www.adafruit.com/product/4333",
66+
"vendor": "Adafruit"
67+
}

boards/particle_xenon.json

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
{
2+
"build": {
3+
"core": "nRF5",
4+
"cpu": "cortex-m4",
5+
"extra_flags": "-DARDUINO_NRF52840_FEATHER -DNRF52840_XXAA -DNRF52840_XXAA",
6+
"f_cpu": "64000000L",
7+
"hwids": [
8+
[
9+
"0x239A",
10+
"0x8029"
11+
]
12+
],
13+
"usb_product": "Particle Xenon",
14+
"ldscript": "nrf52840_s140_v6.ld",
15+
"mcu": "nrf52840",
16+
"variant": "particle_xenon",
17+
"bsp": {
18+
"name": "adafruit"
19+
},
20+
"softdevice": {
21+
"sd_flags": "-DS140",
22+
"sd_name": "s140",
23+
"sd_version": "6.1.1",
24+
"sd_fwid": "0x00B6"
25+
},
26+
"bootloader": {
27+
"settings_addr": "0xFF000"
28+
}
29+
},
30+
"connectivity": [
31+
"bluetooth"
32+
],
33+
"debug": {
34+
"jlink_device": "nRF52840_xxAA",
35+
"svd_path": "nrf52.svd"
36+
},
37+
"frameworks": [
38+
"arduino"
39+
],
40+
"name": "Xenon",
41+
"upload": {
42+
"maximum_ram_size": 248832,
43+
"maximum_size": 815104,
44+
"require_upload_port": true,
45+
"speed": 115200,
46+
"protocol": "nrfutil",
47+
"protocols": [
48+
"jlink",
49+
"nrfjprog",
50+
"nrfutil"
51+
]
52+
},
53+
"url": "https://docs.particle.io/xenon",
54+
"vendor": "Particle"
55+
}

builder/frameworks/arduino

Submodule arduino updated 1 file

examples/arduino-bluefruit-bleuart/platformio.ini

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,16 @@ platform = nordicnrf52
3131
framework = arduino
3232
board = adafruit_metro_nrf52840
3333
monitor_speed = 115200
34+
35+
[env:adafruit_cplaynrf52840]
36+
platform = nordicnrf52
37+
framework = arduino
38+
board = adafruit_cplaynrf52840
39+
monitor_speed = 115200
40+
41+
[env:particle_xenon]
42+
platform = nordicnrf52
43+
framework = arduino
44+
board = particle_xenon
45+
monitor_speed = 115200
46+

platform.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"type": "git",
1313
"url": "https://github.com/platformio/platform-nordicnrf52.git"
1414
},
15-
"version": "3.6.0",
15+
"version": "3.7.0",
1616
"packageRepositories": [
1717
"https://dl.bintray.com/platformio/dl-packages/manifest.json",
1818
"http://dl.platformio.org/packages/manifest.json"
@@ -40,7 +40,7 @@
4040
"framework-arduinoadafruitnrf52": {
4141
"type": "framework",
4242
"optional": true,
43-
"version": "~1.1101.0"
43+
"version": "~1.1300.0"
4444
},
4545
"framework-arduinonordicnrf5": {
4646
"type": "framework",

0 commit comments

Comments
 (0)