Skip to content

Commit 1a4df4d

Browse files
committed
Merge branch 'release/v3.8.0'
2 parents a39a7a9 + a473396 commit 1a4df4d

8 files changed

+77
-14
lines changed

appveyor.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ install:
1818
- cmd: SET PATH=%PATH%;C:\Python36\Scripts
1919
- cmd: pip3 install -U https://github.com/platformio/platformio/archive/develop.zip
2020
- cmd: platformio platform install file://.
21+
- cmd: SET PLATFORMIO_PACKAGES_DIR=C:\PIOTMP
2122

2223
test_script:
2324
- cmd: platformio run -d %PLATFORMIO_PROJECT_DIR%

boards/adafruit_cplaynrf52840.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"build": {
33
"core": "nRF5",
44
"cpu": "cortex-m4",
5-
"extra_flags": "-DARDUINO_NRF52840_CIRCUITPLAY -DNRF52840_XXAA -DCIRCUITPLAY_NRF52840",
5+
"extra_flags": "-DARDUINO_NRF52840_CIRCUITPLAY -DNRF52840_XXAA -DNRF52840_CIRCUITPLAY",
66
"f_cpu": "64000000L",
77
"hwids": [
88
[

boards/adafruit_feather_nrf52832.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@
4141
],
4242
"debug": {
4343
"jlink_device": "nRF52832_xxAA",
44-
"onboard_tools": [
45-
"jlink"
46-
],
4744
"svd_path": "nrf52.svd"
4845
},
4946
"frameworks": [

boards/adafruit_feather_nrf52840.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,6 @@
4444
],
4545
"debug": {
4646
"jlink_device": "nRF52840_xxAA",
47-
"onboard_tools": [
48-
"jlink"
49-
],
5047
"svd_path": "nrf52.svd"
5148
},
5249
"frameworks": [
Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
{
2+
"build": {
3+
"core": "nRF5",
4+
"cpu": "cortex-m4",
5+
"extra_flags": "-DARDUINO_NRF52840_ITSYBITSY -DNRF52840_XXAA -DARDUINO_NRF52_ITSYBITSY",
6+
"f_cpu": "64000000L",
7+
"hwids": [
8+
[
9+
"0x239A",
10+
"0x8051"
11+
],
12+
[
13+
"0x239A",
14+
"0x0051"
15+
],
16+
[
17+
"0x239A",
18+
"0x0052"
19+
],
20+
[
21+
"0x239A",
22+
"0x8052"
23+
]
24+
],
25+
"usb_product": "ItsyBitsy nRF52840 Express",
26+
"ldscript": "nrf52840_s140_v6.ld",
27+
"mcu": "nrf52840",
28+
"variant": "itsybitsy_nrf52840_express",
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+
"onboard_tools": [
48+
"jlink"
49+
],
50+
"svd_path": "nrf52.svd"
51+
},
52+
"frameworks": [
53+
"arduino"
54+
],
55+
"name": "ItsyBitsy nRF52840 Express",
56+
"upload": {
57+
"maximum_ram_size": 248832,
58+
"maximum_size": 815104,
59+
"require_upload_port": true,
60+
"use_1200bps_touch": true,
61+
"speed": 115200,
62+
"protocol": "nrfutil",
63+
"protocols": [
64+
"jlink",
65+
"nrfjprog",
66+
"nrfutil"
67+
]
68+
},
69+
"url": "https://www.adafruit.com/product/4062",
70+
"vendor": "Adafruit"
71+
}

boards/adafruit_metro_nrf52840.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,6 @@
4444
],
4545
"debug": {
4646
"jlink_device": "nRF52840_xxAA",
47-
"onboard_tools": [
48-
"jlink"
49-
],
5047
"svd_path": "nrf52.svd"
5148
},
5249
"frameworks": [

builder/frameworks/arduino

Submodule arduino updated 1 file

platform.json

Lines changed: 3 additions & 3 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.7.0",
15+
"version": "3.8.0",
1616
"packageRepositories": [
1717
"https://dl.bintray.com/platformio/dl-packages/manifest.json",
1818
"http://dl.platformio.org/packages/manifest.json"
@@ -35,12 +35,12 @@
3535
"framework-mbed": {
3636
"type": "framework",
3737
"optional": true,
38-
"version": "~5.51304.190826"
38+
"version": "~5.51401.0"
3939
},
4040
"framework-arduinoadafruitnrf52": {
4141
"type": "framework",
4242
"optional": true,
43-
"version": "~1.1300.0"
43+
"version": "~1.1405.0"
4444
},
4545
"framework-arduinonordicnrf5": {
4646
"type": "framework",

0 commit comments

Comments
 (0)