Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nRF82840DK variant.h and .cpp broken #64

Merged
merged 15 commits into from
Mar 12, 2020
Merged

nRF82840DK variant.h and .cpp broken #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1ce9be2
Merge tag 'v4.0.0' into develop
ivankravets Dec 30, 2019
cb10da9
Add SVD for the nrf52840 chip
henrygab Jan 2, 2020
4bfdc4f
Update board definitions to point to nrf52840.
henrygab Jan 2, 2020
396d13a
Merge pull request #70 from henrygab/update_svd
ivankravets Jan 2, 2020
08a539b
Refactor ldscript files processing
valeros Jan 24, 2020
cacb574
Update Arduino build scripts
valeros Jan 24, 2020
cd7dd14
Update Arduino build script for nano33ble board
valeros Jan 31, 2020
4c005f5
Update support for Arduino framework (adafruit core v0.18.0)
valeros Feb 12, 2020
8d0562e
Fix bleuart example for particle_xenon board
valeros Feb 12, 2020
3dffef4
Fix default debug tools configuration
valeros Feb 18, 2020
daae88e
Update support for Arduino framework (adafruit core v0.18.5)
valeros Mar 9, 2020
630c7d7
Add new board Adafruit Feather nrf52840 Sense // Resolve #72
valeros Mar 10, 2020
10093ef
Update default targets for upload protocols
valeros Mar 11, 2020
dd8f06e
Update build sctipt for Adafruit core
valeros Mar 11, 2020
ee2b2c1
nrfutil upload method is only compatible with Adafruit core
valeros Mar 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions boards/adafruit_cplaynrf52840.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"build": {
"arduino":{
"ldscript": "nrf52840_s140_v6.ld"
},
"core": "nRF5",
"cpu": "cortex-m4",
"extra_flags": "-DARDUINO_NRF52840_CIRCUITPLAY -DNRF52840_XXAA -DNRF52840_CIRCUITPLAY",
Expand All @@ -23,7 +26,6 @@
]
],
"usb_product": "Circuit Playground Bluefruit",
"ldscript": "nrf52840_s140_v6.ld",
"mcu": "nrf52840",
"variant": "circuitplayground_nrf52840",
"bsp": {
Expand All @@ -44,7 +46,7 @@
],
"debug": {
"jlink_device": "nRF52840_xxAA",
"svd_path": "nrf52.svd"
"svd_path": "nrf52840.svd"
},
"frameworks": [
"arduino"
Expand Down
4 changes: 3 additions & 1 deletion boards/adafruit_feather_nrf52832.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"build": {
"arduino":{
"ldscript": "nrf52832_s132_v6.ld"
},
"core": "nRF5",
"cpu": "cortex-m4",
"extra_flags": "-DNRF52832_XXAA -DNRF52",
Expand All @@ -23,7 +26,6 @@
]
],
"usb_product": "Feather nRF52832 Express",
"ldscript": "nrf52832_s132_v6.ld",
"mcu": "nrf52832",
"variant": "feather_nrf52832",
"bsp": {
Expand Down
6 changes: 4 additions & 2 deletions boards/adafruit_feather_nrf52840.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"build": {
"arduino":{
"ldscript": "nrf52840_s140_v6.ld"
},
"core": "nRF5",
"cpu": "cortex-m4",
"extra_flags": "-DARDUINO_NRF52840_FEATHER -DNRF52840_XXAA",
Expand All @@ -23,7 +26,6 @@
]
],
"usb_product": "Feather nRF52840 Express",
"ldscript": "nrf52840_s140_v6.ld",
"mcu": "nrf52840",
"variant": "feather_nrf52840_express",
"bsp": {
Expand All @@ -44,7 +46,7 @@
],
"debug": {
"jlink_device": "nRF52840_xxAA",
"svd_path": "nrf52.svd"
"svd_path": "nrf52840.svd"
},
"frameworks": [
"arduino"
Expand Down
72 changes: 72 additions & 0 deletions boards/adafruit_feather_nrf52840_sense.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
{
"build": {
"arduino":{
"ldscript": "nrf52840_s140_v6.ld"
},
"core": "nRF5",
"cpu": "cortex-m4",
"extra_flags": "-DARDUINO_NRF52840_FEATHER_SENSE -DNRF52840_XXAA",
"f_cpu": "64000000L",
"hwids": [
[
"0x239A",
"0x8087"
],
[
"0x239A",
"0x0087"
],
[
"0x239A",
"0x0088"
],
[
"0x239A",
"0x8088"
]
],
"usb_product": "Feather Bluefruit Sense",
"mcu": "nrf52840",
"variant": "feather_nrf52840_sense",
"bsp": {
"name": "adafruit"
},
"softdevice": {
"sd_flags": "-DS140",
"sd_name": "s140",
"sd_version": "6.1.1",
"sd_fwid": "0x00B6"
},
"bootloader": {
"settings_addr": "0xFF000"
}
},
"connectivity": [
"bluetooth"
],
"debug": {
"jlink_device": "nRF52840_xxAA",
"svd_path": "nrf52840.svd"
},
"frameworks": [
"arduino"
],
"name": "Adafruit Feather Bluefruit Sense",
"upload": {
"maximum_ram_size": 248832,
"maximum_size": 815104,
"speed": 115200,
"protocol": "nrfutil",
"protocols": [
"jlink",
"nrfjprog",
"nrfutil",
"stlink"
],
"use_1200bps_touch": true,
"require_upload_port": true,
"wait_for_upload_port": true
},
"url": "https://www.adafruit.com/product/4516",
"vendor": "Adafruit"
}
6 changes: 4 additions & 2 deletions boards/adafruit_itsybitsy_nrf52840.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"build": {
"arduino":{
"ldscript": "nrf52840_s140_v6.ld"
},
"core": "nRF5",
"cpu": "cortex-m4",
"extra_flags": "-DARDUINO_NRF52840_ITSYBITSY -DNRF52840_XXAA -DARDUINO_NRF52_ITSYBITSY",
Expand All @@ -23,7 +26,6 @@
]
],
"usb_product": "ItsyBitsy nRF52840 Express",
"ldscript": "nrf52840_s140_v6.ld",
"mcu": "nrf52840",
"variant": "itsybitsy_nrf52840_express",
"bsp": {
Expand All @@ -47,7 +49,7 @@
"onboard_tools": [
"jlink"
],
"svd_path": "nrf52.svd"
"svd_path": "nrf52840.svd"
},
"frameworks": [
"arduino"
Expand Down
6 changes: 4 additions & 2 deletions boards/adafruit_metro_nrf52840.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"build": {
"arduino":{
"ldscript": "nrf52840_s140_v6.ld"
},
"core": "nRF5",
"cpu": "cortex-m4",
"extra_flags": "-DARDUINO_NRF52840_FEATHER -DARDUINO_NRF52840_METRO -DNRF52840_XXAA",
Expand All @@ -23,7 +26,6 @@
]
],
"usb_product": "Metro nRF52840 Express",
"ldscript": "nrf52840_s140_v6.ld",
"mcu": "nrf52840",
"variant": "metro_nrf52840_express",
"bsp": {
Expand All @@ -44,7 +46,7 @@
],
"debug": {
"jlink_device": "nRF52840_xxAA",
"svd_path": "nrf52.svd"
"svd_path": "nrf52840.svd"
},
"frameworks": [
"arduino"
Expand Down
4 changes: 3 additions & 1 deletion boards/bluey.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
{
"build": {
"arduino":{
"ldscript": "nrf52_xxaa.ld"
},
"core": "nRF5",
"cpu": "cortex-m4",
"extra_flags": "-DARDUINO_ELECTRONUT_BLUEY",
"f_cpu": "64000000L",
"ldscript": "nrf52_xxaa.ld",
"mcu": "nrf52832",
"variant": "bluey"
},
Expand Down
4 changes: 3 additions & 1 deletion boards/delta_dfbm_nq620.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
{
"build": {
"arduino":{
"ldscript": "nrf52_xxaa.ld"
},
"core": "nRF5",
"cpu": "cortex-m4",
"extra_flags": "-DARDUINO_GENERIC",
"f_cpu": "64000000L",
"ldscript": "nrf52_xxaa.ld",
"mcu": "nrf52832",
"variant": "Generic"
},
Expand Down
2 changes: 1 addition & 1 deletion boards/electronut_blip.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"onboard_tools": [
"blackmagic"
],
"svd_path": "nrf52.svd"
"svd_path": "nrf52840.svd"
},
"frameworks": [
"zephyr"
Expand Down
2 changes: 1 addition & 1 deletion boards/electronut_papyr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"onboard_tools": [
"blackmagic"
],
"svd_path": "nrf52.svd"
"svd_path": "nrf52840.svd"
},
"frameworks": [
"zephyr"
Expand Down
4 changes: 3 additions & 1 deletion boards/hackaBLE.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
{
"build": {
"arduino":{
"ldscript": "nrf52_xxaa.ld"
},
"core": "nRF5",
"cpu": "cortex-m4",
"extra_flags": "-DARDUINO_ELECTRONUT_HACKABLE",
"f_cpu": "64000000L",
"ldscript": "nrf52_xxaa.ld",
"mcu": "nrf52832",
"variant": "hackaBLE"
},
Expand Down
2 changes: 1 addition & 1 deletion boards/laird_bl654_dvk.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"cmsis-dap",
"jlink"
],
"svd_path": "nrf52.svd"
"svd_path": "nrf52840.svd"
},
"frameworks": [
"zephyr"
Expand Down
6 changes: 4 additions & 2 deletions boards/nano33ble.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"build": {
"arduino":{
"ldscript": "linker_script.ld"
},
"core": "arduino",
"cpu": "cortex-m4",
"extra_flags": "-DARDUINO_ARDUINO_NANO33BLE -DARDUINO_ARCH_NRF52840",
Expand All @@ -14,7 +17,6 @@
"0x805a"
]
],
"ldscript": "linker_script.ld",
"mcu": "nrf52840",
"variant": "ARDUINO_NANO33BLE"
},
Expand All @@ -24,7 +26,7 @@
"debug": {
"jlink_device": "nRF52840_xxAA",
"openocd_target": "nrf52.cfg",
"svd_path": "nrf52.svd"
"svd_path": "nrf52840.svd"
},
"frameworks": [
"arduino"
Expand Down
6 changes: 4 additions & 2 deletions boards/nrf52840_dk.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
{
"build": {
"arduino":{
"ldscript": "nrf52_xxaa.ld"
},
"core": "nRF5",
"cpu": "cortex-m4",
"extra_flags": "-DARDUINO_NRF52_DK",
"f_cpu": "64000000L",
"ldscript": "nrf52_xxaa.ld",
"mcu": "nrf52840",
"variant": "nRF52DK",
"zephyr": {
Expand All @@ -23,7 +25,7 @@
"cmsis-dap",
"jlink"
],
"svd_path": "nrf52.svd"
"svd_path": "nrf52840.svd"
},
"frameworks": [
"arduino",
Expand Down
6 changes: 4 additions & 2 deletions boards/nrf52840_dk_adafruit.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"build": {
"arduino":{
"ldscript": "nrf52840_s140_v6.ld"
},
"core": "nRF5",
"cpu": "cortex-m4",
"extra_flags": "-DARDUINO_NRF52840_PCA10056 -DNRF52840_XXAA",
Expand All @@ -11,7 +14,6 @@
]
],
"usb_product": "NRF52 DK",
"ldscript": "nrf52840_s140_v6.ld",
"mcu": "nrf52840",
"variant": "pca10056",
"bsp": {
Expand All @@ -35,7 +37,7 @@
"onboard_tools": [
"jlink"
],
"svd_path": "nrf52.svd"
"svd_path": "nrf52840.svd"
},
"frameworks": [
"arduino"
Expand Down
2 changes: 1 addition & 1 deletion boards/nrf52840_mdk.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"onboard_tools": [
"cmsis-dap"
],
"svd_path": "nrf52.svd"
"svd_path": "nrf52840.svd"
},
"frameworks": [
"zephyr"
Expand Down
4 changes: 3 additions & 1 deletion boards/nrf52_dk.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
{
"build": {
"arduino":{
"ldscript": "nrf52_xxaa.ld"
},
"core": "nRF5",
"cpu": "cortex-m4",
"extra_flags": "-DARDUINO_NRF52_DK",
"f_cpu": "64000000L",
"ldscript": "nrf52_xxaa.ld",
"mcu": "nrf52832",
"variant": "nRF52DK",
"zephyr": {
Expand Down
2 changes: 1 addition & 1 deletion boards/particle_argon.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
],
"debug": {
"jlink_device": "nRF52840_xxAA",
"svd_path": "nrf52.svd"
"svd_path": "nrf52840.svd"
},
"frameworks": [
"zephyr"
Expand Down
2 changes: 1 addition & 1 deletion boards/particle_boron.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
],
"debug": {
"jlink_device": "nRF52840_xxAA",
"svd_path": "nrf52.svd"
"svd_path": "nrf52840.svd"
},
"frameworks": [
"zephyr"
Expand Down
Loading