From a3dd4191f627667956b61085bf467c0bc99d8431 Mon Sep 17 00:00:00 2001 From: Maximilian Gerhardt Date: Thu, 7 Jul 2022 20:44:50 +0200 Subject: [PATCH 1/5] Use ArduinoCore-mbed for edge-control --- platform.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform.py b/platform.py index 6763fb1..8a10595 100644 --- a/platform.py +++ b/platform.py @@ -59,7 +59,7 @@ def configure_default_packages(self, variables, targets): if not IS_WINDOWS: self.packages["tool-gperf"]["optional"] = False - if board in ("nano33ble", "nicla_sense_me"): + if board in ("nano33ble", "nicla_sense_me", "edge_control"): self.packages["toolchain-gccarmnoneeabi"]["version"] = "~1.80201.0" self.frameworks["arduino"]["package"] = "framework-arduino-mbed" self.frameworks["arduino"][ From 06289ac21718b395a3e15f45b65d596bb0482d9a Mon Sep 17 00:00:00 2001 From: Maximilian Gerhardt Date: Thu, 7 Jul 2022 20:46:08 +0200 Subject: [PATCH 2/5] Create edge_control.json --- boards/edge_control.json | 53 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 boards/edge_control.json diff --git a/boards/edge_control.json b/boards/edge_control.json new file mode 100644 index 0000000..41f587d --- /dev/null +++ b/boards/edge_control.json @@ -0,0 +1,53 @@ +{ + "build": { + "arduino": { + "ldscript": "linker_script.ld" + }, + "core": "arduino", + "cpu": "cortex-m4", + "extra_flags": "-DARDUINO_EDGE_CONTROL -DARDUINO_ARCH_NRF52840", + "f_cpu": "64000000L", + "hwids": [ + [ + "0x2341", + "0x005d" + ], + [ + "0x2341", + "0x805d" + ] + ], + "mcu": "nrf52840", + "variant": "EDGE_CONTROL" + }, + "connectivity": [ + "bluetooth" + ], + "debug": { + "jlink_device": "nRF52840_xxAA", + "openocd_target": "nrf52.cfg", + "svd_path": "nrf52840.svd" + }, + "frameworks": [ + "arduino" + ], + "name": "Arduino Edge Control", + "upload": { + "maximum_ram_size": 262144, + "maximum_size": 983040, + "protocol": "sam-ba", + "protocols": [ + "jlink", + "nrfjprog", + "nrfutil", + "cmsis-dap", + "sam-ba", + "blackmagic" + ], + "use_1200bps_touch": true, + "require_upload_port": true, + "wait_for_upload_port": true + }, + "url": "https://docs.arduino.cc/hardware/edge-control", + "vendor": "Arduino" + } From ddf89d2028aadf9fef472d38330ed5ef28074a4e Mon Sep 17 00:00:00 2001 From: Maximilian Gerhardt Date: Thu, 7 Jul 2022 20:51:00 +0200 Subject: [PATCH 3/5] Add board to CI --- examples/arduino-blink/platformio.ini | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/examples/arduino-blink/platformio.ini b/examples/arduino-blink/platformio.ini index aeceba4..1bd6374 100644 --- a/examples/arduino-blink/platformio.ini +++ b/examples/arduino-blink/platformio.ini @@ -32,6 +32,11 @@ platform = nordicnrf52 framework = arduino board = redbear_blenano2 +[env:edge_control] +platform = nordicnrf52 +framework = arduino +board = edge_control + [env:redbear_blend2] platform = nordicnrf52 framework = arduino From 1304a914de47b784c6e582f2519c81bfbf74df6b Mon Sep 17 00:00:00 2001 From: Maximilian Gerhardt Date: Thu, 7 Jul 2022 21:03:44 +0200 Subject: [PATCH 4/5] Fix CI --- examples/arduino-bluefruit-bleuart/platformio.ini | 3 +++ 1 file changed, 3 insertions(+) diff --git a/examples/arduino-bluefruit-bleuart/platformio.ini b/examples/arduino-bluefruit-bleuart/platformio.ini index 955918b..187ceca 100644 --- a/examples/arduino-bluefruit-bleuart/platformio.ini +++ b/examples/arduino-bluefruit-bleuart/platformio.ini @@ -13,6 +13,8 @@ platform = nordicnrf52 framework = arduino board = adafruit_feather_nrf52832 monitor_speed = 115200 +; nRF crypto only supported on nRF52840 +lib_ignore = Adafruit nRFCrypto [env:adafruit_feather_nrf52840] platform = nordicnrf52 @@ -25,6 +27,7 @@ platform = nordicnrf52 framework = arduino board = nrf52840_dk_adafruit monitor_speed = 115200 + [env:adafruit_metro_nrf52840] platform = nordicnrf52 framework = arduino From 9641af18215ac1efb95c232e7410479a31dd8042 Mon Sep 17 00:00:00 2001 From: Maximilian Gerhardt Date: Thu, 7 Jul 2022 22:11:08 +0200 Subject: [PATCH 5/5] Fix compilation for boards without builtin LED --- examples/arduino-blink/src/Blink.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/examples/arduino-blink/src/Blink.cpp b/examples/arduino-blink/src/Blink.cpp index d2c77fe..b347c9d 100644 --- a/examples/arduino-blink/src/Blink.cpp +++ b/examples/arduino-blink/src/Blink.cpp @@ -6,6 +6,10 @@ #include +#ifndef LED_BUILTIN +#define LED_BUILTIN 13 +#endif + void setup() { // initialize LED digital pin as an output.