From 697ae341c5e67042cd7cf88046c7a2115ce866ee Mon Sep 17 00:00:00 2001 From: Bruno Bousquet <21108660+brunob45@users.noreply.github.com> Date: Mon, 17 Jan 2022 13:02:49 -0500 Subject: [PATCH 1/4] remove duplicate MILLIS_USE_TIMER define --- boards/AVR128DA28.json | 2 +- boards/AVR128DA32.json | 2 +- boards/AVR128DA48.json | 2 +- boards/AVR128DA64.json | 2 +- boards/AVR128DB28.json | 2 +- boards/AVR128DB32.json | 2 +- boards/AVR128DB48.json | 2 +- boards/AVR128DB64.json | 2 +- boards/AVR32DA28.json | 2 +- boards/AVR32DA32.json | 2 +- boards/AVR32DA48.json | 2 +- boards/AVR32DB28.json | 2 +- boards/AVR32DB32.json | 2 +- boards/AVR32DB48.json | 2 +- boards/AVR64DA28.json | 2 +- boards/AVR64DA32.json | 2 +- boards/AVR64DA48.json | 2 +- boards/AVR64DA64.json | 2 +- boards/AVR64DB28.json | 2 +- boards/AVR64DB32.json | 2 +- boards/AVR64DB48.json | 2 +- boards/AVR64DB64.json | 2 +- boards/AVR64DD14.json | 2 +- boards/AVR64DD20.json | 2 +- boards/AVR64DD28.json | 2 +- boards/AVR64DD32.json | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/boards/AVR128DA28.json b/boards/AVR128DA28.json index afc4b8e..aa51a91 100644 --- a/boards/AVR128DA28.json +++ b/boards/AVR128DA28.json @@ -1,7 +1,7 @@ { "build": { "core": "dxcore", - "extra_flags": "-DARDUINO_AVR_AVR128DA28 -DARDUINO_avrda -DMILLIS_USE_TIMERB0", + "extra_flags": "-DARDUINO_AVR_AVR128DA28 -DARDUINO_avrda", "f_cpu": "24000000L", "mcu": "avr128da28", "variant": "28pin-standard" diff --git a/boards/AVR128DA32.json b/boards/AVR128DA32.json index 779271e..7245d32 100644 --- a/boards/AVR128DA32.json +++ b/boards/AVR128DA32.json @@ -1,7 +1,7 @@ { "build": { "core": "dxcore", - "extra_flags": "-DARDUINO_AVR_AVR128DA32 -DARDUINO_avrda -DMILLIS_USE_TIMERB0", + "extra_flags": "-DARDUINO_AVR_AVR128DA32 -DARDUINO_avrda", "f_cpu": "24000000L", "mcu": "avr128da32", "variant": "32pin-standard" diff --git a/boards/AVR128DA48.json b/boards/AVR128DA48.json index 17432eb..2434e5d 100644 --- a/boards/AVR128DA48.json +++ b/boards/AVR128DA48.json @@ -1,7 +1,7 @@ { "build": { "core": "dxcore", - "extra_flags": "-DARDUINO_AVR_AVR128DA48 -DARDUINO_avrda -DMILLIS_USE_TIMERB0", + "extra_flags": "-DARDUINO_AVR_AVR128DA48 -DARDUINO_avrda", "f_cpu": "24000000L", "mcu": "avr128da48", "variant": "48pin-standard" diff --git a/boards/AVR128DA64.json b/boards/AVR128DA64.json index 4803d52..d5a1ef6 100644 --- a/boards/AVR128DA64.json +++ b/boards/AVR128DA64.json @@ -1,7 +1,7 @@ { "build": { "core": "dxcore", - "extra_flags": "-DARDUINO_AVR_AVR128DA64 -DARDUINO_avrda -DMILLIS_USE_TIMERB0", + "extra_flags": "-DARDUINO_AVR_AVR128DA64 -DARDUINO_avrda", "f_cpu": "24000000L", "mcu": "avr128da64", "variant": "64pin-standard" diff --git a/boards/AVR128DB28.json b/boards/AVR128DB28.json index ec77311..232adc9 100644 --- a/boards/AVR128DB28.json +++ b/boards/AVR128DB28.json @@ -1,7 +1,7 @@ { "build": { "core": "dxcore", - "extra_flags": "-DARDUINO_AVR_AVR128DB28 -DARDUINO_avrdb -DMILLIS_USE_TIMERB0", + "extra_flags": "-DARDUINO_AVR_AVR128DB28 -DARDUINO_avrdb", "f_cpu": "24000000L", "mcu": "avr128db28", "variant": "28pin-standard" diff --git a/boards/AVR128DB32.json b/boards/AVR128DB32.json index 9f15417..2bc1c92 100644 --- a/boards/AVR128DB32.json +++ b/boards/AVR128DB32.json @@ -1,7 +1,7 @@ { "build": { "core": "dxcore", - "extra_flags": "-DARDUINO_AVR_AVR128DB32 -DARDUINO_avrdb -DMILLIS_USE_TIMERB0", + "extra_flags": "-DARDUINO_AVR_AVR128DB32 -DARDUINO_avrdb", "f_cpu": "24000000L", "mcu": "avr128db32", "variant": "32pin-standard" diff --git a/boards/AVR128DB48.json b/boards/AVR128DB48.json index 937eaaa..3e31d10 100644 --- a/boards/AVR128DB48.json +++ b/boards/AVR128DB48.json @@ -1,7 +1,7 @@ { "build": { "core": "dxcore", - "extra_flags": "-DARDUINO_AVR_AVR128DB48 -DARDUINO_avrdb -DMILLIS_USE_TIMERB0", + "extra_flags": "-DARDUINO_AVR_AVR128DB48 -DARDUINO_avrdb", "f_cpu": "24000000L", "mcu": "avr128db48", "variant": "48pin-standard" diff --git a/boards/AVR128DB64.json b/boards/AVR128DB64.json index 56e4f2b..3e5bf54 100644 --- a/boards/AVR128DB64.json +++ b/boards/AVR128DB64.json @@ -1,7 +1,7 @@ { "build": { "core": "dxcore", - "extra_flags": "-DARDUINO_AVR_AVR128DB64 -DARDUINO_avrdb -DMILLIS_USE_TIMERB0", + "extra_flags": "-DARDUINO_AVR_AVR128DB64 -DARDUINO_avrdb", "f_cpu": "24000000L", "mcu": "avr128db64", "variant": "64pin-standard" diff --git a/boards/AVR32DA28.json b/boards/AVR32DA28.json index aadfad3..c413d49 100644 --- a/boards/AVR32DA28.json +++ b/boards/AVR32DA28.json @@ -1,7 +1,7 @@ { "build": { "core": "dxcore", - "extra_flags": "-DARDUINO_AVR_AVR32DA28 -DARDUINO_avrda -DMILLIS_USE_TIMERB0", + "extra_flags": "-DARDUINO_AVR_AVR32DA28 -DARDUINO_avrda", "f_cpu": "24000000L", "mcu": "avr32da28", "variant": "28pin-standard" diff --git a/boards/AVR32DA32.json b/boards/AVR32DA32.json index 088c8c0..23f0786 100644 --- a/boards/AVR32DA32.json +++ b/boards/AVR32DA32.json @@ -1,7 +1,7 @@ { "build": { "core": "dxcore", - "extra_flags": "-DARDUINO_AVR_AVR32DA32 -DARDUINO_avrda -DMILLIS_USE_TIMERB0", + "extra_flags": "-DARDUINO_AVR_AVR32DA32 -DARDUINO_avrda", "f_cpu": "24000000L", "mcu": "avr32da32", "variant": "32pin-standard" diff --git a/boards/AVR32DA48.json b/boards/AVR32DA48.json index 1d3f73c..50454bc 100644 --- a/boards/AVR32DA48.json +++ b/boards/AVR32DA48.json @@ -1,7 +1,7 @@ { "build": { "core": "dxcore", - "extra_flags": "-DARDUINO_AVR_AVR32DA48 -DARDUINO_avrda -DMILLIS_USE_TIMERB0", + "extra_flags": "-DARDUINO_AVR_AVR32DA48 -DARDUINO_avrda", "f_cpu": "24000000L", "mcu": "avr32da48", "variant": "48pin-standard" diff --git a/boards/AVR32DB28.json b/boards/AVR32DB28.json index ed0765b..47bd8e6 100644 --- a/boards/AVR32DB28.json +++ b/boards/AVR32DB28.json @@ -1,7 +1,7 @@ { "build": { "core": "dxcore", - "extra_flags": "-DARDUINO_AVR_AVR32DB28 -DARDUINO_avrdb -DMILLIS_USE_TIMERB0", + "extra_flags": "-DARDUINO_AVR_AVR32DB28 -DARDUINO_avrdb", "f_cpu": "24000000L", "mcu": "avr32db28", "variant": "28pin-standard" diff --git a/boards/AVR32DB32.json b/boards/AVR32DB32.json index ec85b6d..faf4b4d 100644 --- a/boards/AVR32DB32.json +++ b/boards/AVR32DB32.json @@ -1,7 +1,7 @@ { "build": { "core": "dxcore", - "extra_flags": "-DARDUINO_AVR_AVR32DB32 -DARDUINO_avrdb -DMILLIS_USE_TIMERB0", + "extra_flags": "-DARDUINO_AVR_AVR32DB32 -DARDUINO_avrdb", "f_cpu": "24000000L", "mcu": "avr32db32", "variant": "32pin-standard" diff --git a/boards/AVR32DB48.json b/boards/AVR32DB48.json index a84b44c..e55bb5b 100644 --- a/boards/AVR32DB48.json +++ b/boards/AVR32DB48.json @@ -1,7 +1,7 @@ { "build": { "core": "dxcore", - "extra_flags": "-DARDUINO_AVR_AVR32DB48 -DARDUINO_avrdb -DMILLIS_USE_TIMERB0", + "extra_flags": "-DARDUINO_AVR_AVR32DB48 -DARDUINO_avrdb", "f_cpu": "24000000L", "mcu": "avr32db48", "variant": "48pin-standard" diff --git a/boards/AVR64DA28.json b/boards/AVR64DA28.json index f1af8ee..44a8e21 100644 --- a/boards/AVR64DA28.json +++ b/boards/AVR64DA28.json @@ -1,7 +1,7 @@ { "build": { "core": "dxcore", - "extra_flags": "-DARDUINO_AVR_AVR64DA28 -DARDUINO_avrda -DMILLIS_USE_TIMERB0", + "extra_flags": "-DARDUINO_AVR_AVR64DA28 -DARDUINO_avrda", "f_cpu": "24000000L", "mcu": "avr64da28", "variant": "28pin-standard" diff --git a/boards/AVR64DA32.json b/boards/AVR64DA32.json index 3b37710..983cebd 100644 --- a/boards/AVR64DA32.json +++ b/boards/AVR64DA32.json @@ -1,7 +1,7 @@ { "build": { "core": "dxcore", - "extra_flags": "-DARDUINO_AVR_AVR64DA32 -DARDUINO_avrda -DMILLIS_USE_TIMERB0", + "extra_flags": "-DARDUINO_AVR_AVR64DA32 -DARDUINO_avrda", "f_cpu": "24000000L", "mcu": "avr64da32", "variant": "32pin-standard" diff --git a/boards/AVR64DA48.json b/boards/AVR64DA48.json index 995721b..cd5f87e 100644 --- a/boards/AVR64DA48.json +++ b/boards/AVR64DA48.json @@ -1,7 +1,7 @@ { "build": { "core": "dxcore", - "extra_flags": "-DARDUINO_AVR_AVR64DA48 -DARDUINO_avrda -DMILLIS_USE_TIMERB0", + "extra_flags": "-DARDUINO_AVR_AVR64DA48 -DARDUINO_avrda", "f_cpu": "24000000L", "mcu": "avr64da48", "variant": "48pin-standard" diff --git a/boards/AVR64DA64.json b/boards/AVR64DA64.json index 017a8f7..3dc9d61 100644 --- a/boards/AVR64DA64.json +++ b/boards/AVR64DA64.json @@ -1,7 +1,7 @@ { "build": { "core": "dxcore", - "extra_flags": "-DARDUINO_AVR_AVR64DA64 -DARDUINO_avrda -DMILLIS_USE_TIMERB0", + "extra_flags": "-DARDUINO_AVR_AVR64DA64 -DARDUINO_avrda", "f_cpu": "24000000L", "mcu": "avr64da64", "variant": "64pin-standard" diff --git a/boards/AVR64DB28.json b/boards/AVR64DB28.json index 8d5e05d..59d3a86 100644 --- a/boards/AVR64DB28.json +++ b/boards/AVR64DB28.json @@ -1,7 +1,7 @@ { "build": { "core": "dxcore", - "extra_flags": "-DARDUINO_AVR_AVR64DB28 -DARDUINO_avrdb -DMILLIS_USE_TIMERB0", + "extra_flags": "-DARDUINO_AVR_AVR64DB28 -DARDUINO_avrdb", "f_cpu": "24000000L", "mcu": "avr64db28", "variant": "28pin-standard" diff --git a/boards/AVR64DB32.json b/boards/AVR64DB32.json index 140a3d2..e953d00 100644 --- a/boards/AVR64DB32.json +++ b/boards/AVR64DB32.json @@ -1,7 +1,7 @@ { "build": { "core": "dxcore", - "extra_flags": "-DARDUINO_AVR_AVR64DB32 -DARDUINO_avrdb -DMILLIS_USE_TIMERB0", + "extra_flags": "-DARDUINO_AVR_AVR64DB32 -DARDUINO_avrdb", "f_cpu": "24000000L", "mcu": "avr64db32", "variant": "32pin-standard" diff --git a/boards/AVR64DB48.json b/boards/AVR64DB48.json index 3c9fb3c..5bb887b 100644 --- a/boards/AVR64DB48.json +++ b/boards/AVR64DB48.json @@ -1,7 +1,7 @@ { "build": { "core": "dxcore", - "extra_flags": "-DARDUINO_AVR_AVR64DB48 -DARDUINO_avrdb -DMILLIS_USE_TIMERB0", + "extra_flags": "-DARDUINO_AVR_AVR64DB48 -DARDUINO_avrdb", "f_cpu": "24000000L", "mcu": "avr64db48", "variant": "48pin-standard" diff --git a/boards/AVR64DB64.json b/boards/AVR64DB64.json index 539de31..c658b60 100644 --- a/boards/AVR64DB64.json +++ b/boards/AVR64DB64.json @@ -1,7 +1,7 @@ { "build": { "core": "dxcore", - "extra_flags": "-DARDUINO_AVR_AVR64DB64 -DARDUINO_avrdb -DMILLIS_USE_TIMERB0", + "extra_flags": "-DARDUINO_AVR_AVR64DB64 -DARDUINO_avrdb", "f_cpu": "24000000L", "mcu": "avr64db64", "variant": "64pin-standard" diff --git a/boards/AVR64DD14.json b/boards/AVR64DD14.json index d062d90..f5ce226 100644 --- a/boards/AVR64DD14.json +++ b/boards/AVR64DD14.json @@ -1,7 +1,7 @@ { "build": { "core": "dxcore", - "extra_flags": "-DARDUINO_AVR_AVR64DD14 -DARDUINO_avrdd -DMILLIS_USE_TIMERB0", + "extra_flags": "-DARDUINO_AVR_AVR64DD14 -DARDUINO_avrdd", "f_cpu": "24000000L", "mcu": "avr64dd14", "variant": "14pin-standard" diff --git a/boards/AVR64DD20.json b/boards/AVR64DD20.json index e965dc0..930c297 100644 --- a/boards/AVR64DD20.json +++ b/boards/AVR64DD20.json @@ -1,7 +1,7 @@ { "build": { "core": "dxcore", - "extra_flags": "-DARDUINO_AVR_AVR64DD20 -DARDUINO_avrdd -DMILLIS_USE_TIMERB0", + "extra_flags": "-DARDUINO_AVR_AVR64DD20 -DARDUINO_avrdd", "f_cpu": "24000000L", "mcu": "avr64dd20", "variant": "20pin-standard" diff --git a/boards/AVR64DD28.json b/boards/AVR64DD28.json index 1165f8e..7b1d1e3 100644 --- a/boards/AVR64DD28.json +++ b/boards/AVR64DD28.json @@ -1,7 +1,7 @@ { "build": { "core": "dxcore", - "extra_flags": "-DARDUINO_AVR_AVR64DD28 -DARDUINO_avrdd -DMILLIS_USE_TIMERB0", + "extra_flags": "-DARDUINO_AVR_AVR64DD28 -DARDUINO_avrdd", "f_cpu": "24000000L", "mcu": "avr64dd28", "variant": "28pin-standard" diff --git a/boards/AVR64DD32.json b/boards/AVR64DD32.json index 2171f2c..9b4b57c 100644 --- a/boards/AVR64DD32.json +++ b/boards/AVR64DD32.json @@ -1,7 +1,7 @@ { "build": { "core": "dxcore", - "extra_flags": "-DARDUINO_AVR_AVR64DD32 -DARDUINO_avrdd -DMILLIS_USE_TIMERB0", + "extra_flags": "-DARDUINO_AVR_AVR64DD32 -DARDUINO_avrdd", "f_cpu": "24000000L", "mcu": "avr64dd32", "variant": "32pin-standard" From 00be3d27fffe5acf6e4539ead69529004638b0a1 Mon Sep 17 00:00:00 2001 From: Bruno Bousquet <21108660+brunob45@users.noreply.github.com> Date: Mon, 17 Jan 2022 13:44:21 -0500 Subject: [PATCH 2/4] add curiosity boards --- boards/curiosity_nano_da.json | 23 +++++++++++++++++++++++ boards/curiosity_nano_db.json | 23 +++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 boards/curiosity_nano_da.json create mode 100644 boards/curiosity_nano_db.json diff --git a/boards/curiosity_nano_da.json b/boards/curiosity_nano_da.json new file mode 100644 index 0000000..bc8dfda --- /dev/null +++ b/boards/curiosity_nano_da.json @@ -0,0 +1,23 @@ +{ + "build": { + "core": "dxcore", + "extra_flags": "-DARDUINO_AVR_AVR128DA48 -DARDUINO_avrda -DLED_BUILTIN=PIN_PC6", + "f_cpu": "24000000L", + "mcu": "avr128da48", + "variant": "48pin-standard" + }, + "hardware": { + "oscillator": "internal" + }, + "frameworks": [ + "arduino" + ], + "name": "Curiosity Nano AVR128DA48", + "upload": { + "maximum_ram_size": 16384, + "maximum_size": 131072, + "protocol": "curiosity_updi" + }, + "url": "https://www.microchip.com/developmenttools/ProductDetails/DM164151", + "vendor": "Microchip" +} diff --git a/boards/curiosity_nano_db.json b/boards/curiosity_nano_db.json new file mode 100644 index 0000000..5c9a836 --- /dev/null +++ b/boards/curiosity_nano_db.json @@ -0,0 +1,23 @@ +{ + "build": { + "core": "dxcore", + "extra_flags": "-DARDUINO_AVR_AVR128DB48 -DARDUINO_avrdb -DLED_BUILTIN=PIN_PB3", + "f_cpu": "24000000L", + "mcu": "avr128db48", + "variant": "48pin-standard" + }, + "hardware": { + "oscillator": "internal" + }, + "frameworks": [ + "arduino" + ], + "name": "Curiosity Nano AVR128DB48", + "upload": { + "maximum_ram_size": 16384, + "maximum_size": 131072, + "protocol": "curiosity_updi" + }, + "url": "https://www.microchip.com/developmenttools/ProductDetails/EV35L43A", + "vendor": "Microchip" +} From b21500abc108459fe6655a73868a8c5df6e77c36 Mon Sep 17 00:00:00 2001 From: Bruno Bousquet <21108660+brunob45@users.noreply.github.com> Date: Mon, 17 Jan 2022 13:58:14 -0500 Subject: [PATCH 3/4] add curiosity nano da/b to examples --- examples/arduino-blink/platformio.ini | 7 ++++++- examples/arduino-internal-libs/platformio.ini | 7 ++++++- examples/native-blink/platformio.ini | 7 ++++++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/examples/arduino-blink/platformio.ini b/examples/arduino-blink/platformio.ini index b349ae7..ed1ca29 100644 --- a/examples/arduino-blink/platformio.ini +++ b/examples/arduino-blink/platformio.ini @@ -81,7 +81,7 @@ board = AVR128DA64 [env:AVR128DA48] platform = atmelmegaavr framework = arduino -board = AVR128DA48 +board = curiosity_nano_da [env:AVR128DA32] platform = atmelmegaavr @@ -107,3 +107,8 @@ board = AVR32DB32 platform = atmelmegaavr framework = arduino board = AVR32DB48 + +[env:AVR128DB48] +platform = atmelmegaavr +framework = arduino +board = curiosity_nano_db diff --git a/examples/arduino-internal-libs/platformio.ini b/examples/arduino-internal-libs/platformio.ini index e4c8058..1dc2a68 100644 --- a/examples/arduino-internal-libs/platformio.ini +++ b/examples/arduino-internal-libs/platformio.ini @@ -25,7 +25,7 @@ board = AVR128DA64 [env:AVR128DA48] platform = atmelmegaavr framework = arduino -board = AVR128DA48 +board = curiosity_nano_da [env:AVR128DA32] platform = atmelmegaavr @@ -51,3 +51,8 @@ board = AVR32DB32 platform = atmelmegaavr framework = arduino board = AVR32DB48 + +[env:AVR128DB48] +platform = atmelmegaavr +framework = arduino +board = curiosity_nano_db diff --git a/examples/native-blink/platformio.ini b/examples/native-blink/platformio.ini index e80a765..4a89f14 100644 --- a/examples/native-blink/platformio.ini +++ b/examples/native-blink/platformio.ini @@ -23,9 +23,14 @@ board = AVR128DA64 [env:AVR128DA48] platform = atmelmegaavr framework = arduino -board = AVR128DA48 +board = curiosity_nano_da [env:AVR32DB48] platform = atmelmegaavr framework = arduino board = AVR32DB48 + +[env:AVR128DB48] +platform = atmelmegaavr +framework = arduino +board = curiosity_nano_db From 1ac6b3e6eeea297f5752e3e6f92054155b0e45de Mon Sep 17 00:00:00 2001 From: Bruno Bousquet <21108660+brunob45@users.noreply.github.com> Date: Mon, 17 Jan 2022 23:57:43 -0500 Subject: [PATCH 4/4] upload using integrated nEDBG programmer --- boards/curiosity_nano_da.json | 2 +- boards/curiosity_nano_db.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/boards/curiosity_nano_da.json b/boards/curiosity_nano_da.json index bc8dfda..fbc24bb 100644 --- a/boards/curiosity_nano_da.json +++ b/boards/curiosity_nano_da.json @@ -16,7 +16,7 @@ "upload": { "maximum_ram_size": 16384, "maximum_size": 131072, - "protocol": "curiosity_updi" + "protocol": "pkobn_updi" }, "url": "https://www.microchip.com/developmenttools/ProductDetails/DM164151", "vendor": "Microchip" diff --git a/boards/curiosity_nano_db.json b/boards/curiosity_nano_db.json index 5c9a836..2b3beeb 100644 --- a/boards/curiosity_nano_db.json +++ b/boards/curiosity_nano_db.json @@ -16,7 +16,7 @@ "upload": { "maximum_ram_size": 16384, "maximum_size": 131072, - "protocol": "curiosity_updi" + "protocol": "pkobn_updi" }, "url": "https://www.microchip.com/developmenttools/ProductDetails/EV35L43A", "vendor": "Microchip"