Skip to content

Commit f38c9fc

Browse files
valerosvaleros
committed
Merge branch 'release/v4.1.0'
2 parents 2bd968e + 34aa694 commit f38c9fc

31 files changed

Lines changed: 54965 additions & 57 deletions

‎boards/adafruit_cplaynrf52840.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
{
22
"build": {
3+
"arduino":{
4+
"ldscript": "nrf52840_s140_v6.ld"
5+
},
36
"core": "nRF5",
47
"cpu": "cortex-m4",
58
"extra_flags": "-DARDUINO_NRF52840_CIRCUITPLAY -DNRF52840_XXAA -DNRF52840_CIRCUITPLAY",
@@ -23,7 +26,6 @@
2326
]
2427
],
2528
"usb_product": "Circuit Playground Bluefruit",
26-
"ldscript": "nrf52840_s140_v6.ld",
2729
"mcu": "nrf52840",
2830
"variant": "circuitplayground_nrf52840",
2931
"bsp": {
@@ -44,7 +46,7 @@
4446
],
4547
"debug": {
4648
"jlink_device": "nRF52840_xxAA",
47-
"svd_path": "nrf52.svd"
49+
"svd_path": "nrf52840.svd"
4850
},
4951
"frameworks": [
5052
"arduino"

‎boards/adafruit_feather_nrf52832.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
{
22
"build": {
3+
"arduino":{
4+
"ldscript": "nrf52832_s132_v6.ld"
5+
},
36
"core": "nRF5",
47
"cpu": "cortex-m4",
58
"extra_flags": "-DNRF52832_XXAA -DNRF52",
@@ -23,7 +26,6 @@
2326
]
2427
],
2528
"usb_product": "Feather nRF52832 Express",
26-
"ldscript": "nrf52832_s132_v6.ld",
2729
"mcu": "nrf52832",
2830
"variant": "feather_nrf52832",
2931
"bsp": {

‎boards/adafruit_feather_nrf52840.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
{
22
"build": {
3+
"arduino":{
4+
"ldscript": "nrf52840_s140_v6.ld"
5+
},
36
"core": "nRF5",
47
"cpu": "cortex-m4",
58
"extra_flags": "-DARDUINO_NRF52840_FEATHER -DNRF52840_XXAA",
@@ -23,7 +26,6 @@
2326
]
2427
],
2528
"usb_product": "Feather nRF52840 Express",
26-
"ldscript": "nrf52840_s140_v6.ld",
2729
"mcu": "nrf52840",
2830
"variant": "feather_nrf52840_express",
2931
"bsp": {
@@ -44,7 +46,7 @@
4446
],
4547
"debug": {
4648
"jlink_device": "nRF52840_xxAA",
47-
"svd_path": "nrf52.svd"
49+
"svd_path": "nrf52840.svd"
4850
},
4951
"frameworks": [
5052
"arduino"

‎boards/adafruit_feather_nrf52840_sense.json‎

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

‎boards/adafruit_itsybitsy_nrf52840.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
{
22
"build": {
3+
"arduino":{
4+
"ldscript": "nrf52840_s140_v6.ld"
5+
},
36
"core": "nRF5",
47
"cpu": "cortex-m4",
58
"extra_flags": "-DARDUINO_NRF52840_ITSYBITSY -DNRF52840_XXAA -DARDUINO_NRF52_ITSYBITSY",
@@ -23,7 +26,6 @@
2326
]
2427
],
2528
"usb_product": "ItsyBitsy nRF52840 Express",
26-
"ldscript": "nrf52840_s140_v6.ld",
2729
"mcu": "nrf52840",
2830
"variant": "itsybitsy_nrf52840_express",
2931
"bsp": {
@@ -47,7 +49,7 @@
4749
"onboard_tools": [
4850
"jlink"
4951
],
50-
"svd_path": "nrf52.svd"
52+
"svd_path": "nrf52840.svd"
5153
},
5254
"frameworks": [
5355
"arduino"

‎boards/adafruit_metro_nrf52840.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
{
22
"build": {
3+
"arduino":{
4+
"ldscript": "nrf52840_s140_v6.ld"
5+
},
36
"core": "nRF5",
47
"cpu": "cortex-m4",
58
"extra_flags": "-DARDUINO_NRF52840_FEATHER -DARDUINO_NRF52840_METRO -DNRF52840_XXAA",
@@ -23,7 +26,6 @@
2326
]
2427
],
2528
"usb_product": "Metro nRF52840 Express",
26-
"ldscript": "nrf52840_s140_v6.ld",
2729
"mcu": "nrf52840",
2830
"variant": "metro_nrf52840_express",
2931
"bsp": {
@@ -44,7 +46,7 @@
4446
],
4547
"debug": {
4648
"jlink_device": "nRF52840_xxAA",
47-
"svd_path": "nrf52.svd"
49+
"svd_path": "nrf52840.svd"
4850
},
4951
"frameworks": [
5052
"arduino"

‎boards/bluey.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
{
22
"build": {
3+
"arduino":{
4+
"ldscript": "nrf52_xxaa.ld"
5+
},
36
"core": "nRF5",
47
"cpu": "cortex-m4",
58
"extra_flags": "-DARDUINO_ELECTRONUT_BLUEY",
69
"f_cpu": "64000000L",
7-
"ldscript": "nrf52_xxaa.ld",
810
"mcu": "nrf52832",
911
"variant": "bluey"
1012
},

‎boards/delta_dfbm_nq620.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
{
22
"build": {
3+
"arduino":{
4+
"ldscript": "nrf52_xxaa.ld"
5+
},
36
"core": "nRF5",
47
"cpu": "cortex-m4",
58
"extra_flags": "-DARDUINO_GENERIC",
69
"f_cpu": "64000000L",
7-
"ldscript": "nrf52_xxaa.ld",
810
"mcu": "nrf52832",
911
"variant": "Generic"
1012
},

‎boards/electronut_blip.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"onboard_tools": [
1919
"blackmagic"
2020
],
21-
"svd_path": "nrf52.svd"
21+
"svd_path": "nrf52840.svd"
2222
},
2323
"frameworks": [
2424
"zephyr"

‎boards/electronut_papyr.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"onboard_tools": [
1919
"blackmagic"
2020
],
21-
"svd_path": "nrf52.svd"
21+
"svd_path": "nrf52840.svd"
2222
},
2323
"frameworks": [
2424
"zephyr"

0 commit comments

Comments
 (0)