From d491a7130f283e4839c5362350e258c58dcde35e Mon Sep 17 00:00:00 2001 From: MCUdude Date: Wed, 28 Apr 2021 21:47:46 +0200 Subject: [PATCH 1/6] Fix ARDUINO_AVR macros --- boards/ATmega1608.json | 2 +- boards/ATmega1609.json | 2 +- boards/ATmega3208.json | 2 +- boards/ATmega3209.json | 2 +- boards/ATmega4808.json | 2 +- boards/ATmega4809.json | 2 +- boards/ATmega808.json | 2 +- boards/ATmega809.json | 2 +- boards/avr_iot_wg.json | 2 +- boards/curiosity_nano_4809.json | 2 +- boards/xplained_pro_4809.json | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/boards/ATmega1608.json b/boards/ATmega1608.json index ae5a3e7..aa802bc 100644 --- a/boards/ATmega1608.json +++ b/boards/ATmega1608.json @@ -1,7 +1,7 @@ { "build": { "core": "MegaCoreX", - "extra_flags": "-DARDUINO_AVR_ATMEGA1608", + "extra_flags": "-DARDUINO_AVR_ATmega1608", "f_cpu": "16000000L", "mcu": "atmega1608", "variant": "32pin-standard" diff --git a/boards/ATmega1609.json b/boards/ATmega1609.json index 83edca7..a76f7826 100644 --- a/boards/ATmega1609.json +++ b/boards/ATmega1609.json @@ -1,7 +1,7 @@ { "build": { "core": "MegaCoreX", - "extra_flags": "-DARDUINO_AVR_ATMEGA1609", + "extra_flags": "-DARDUINO_AVR_ATmega1609", "f_cpu": "16000000L", "mcu": "atmega1609", "variant": "48pin-standard" diff --git a/boards/ATmega3208.json b/boards/ATmega3208.json index 9744be8..e413142 100644 --- a/boards/ATmega3208.json +++ b/boards/ATmega3208.json @@ -1,7 +1,7 @@ { "build": { "core": "MegaCoreX", - "extra_flags": "-DARDUINO_AVR_ATMEGA3208", + "extra_flags": "-DARDUINO_AVR_ATmega3208", "f_cpu": "16000000L", "mcu": "atmega3208", "variant": "32pin-standard" diff --git a/boards/ATmega3209.json b/boards/ATmega3209.json index 6c7d3f3..a9c239b 100644 --- a/boards/ATmega3209.json +++ b/boards/ATmega3209.json @@ -1,7 +1,7 @@ { "build": { "core": "MegaCoreX", - "extra_flags": "-DARDUINO_AVR_ATMEGA3209", + "extra_flags": "-DARDUINO_AVR_ATmega3209", "f_cpu": "16000000L", "mcu": "atmega3209", "variant": "48pin-standard" diff --git a/boards/ATmega4808.json b/boards/ATmega4808.json index a0bd34c..b6d305d 100644 --- a/boards/ATmega4808.json +++ b/boards/ATmega4808.json @@ -1,7 +1,7 @@ { "build": { "core": "MegaCoreX", - "extra_flags": "-DARDUINO_AVR_ATMEGA4808", + "extra_flags": "-DARDUINO_AVR_ATmega4808", "f_cpu": "16000000L", "mcu": "atmega4808", "variant": "32pin-standard" diff --git a/boards/ATmega4809.json b/boards/ATmega4809.json index 8b56d51..bbe4464 100644 --- a/boards/ATmega4809.json +++ b/boards/ATmega4809.json @@ -1,7 +1,7 @@ { "build": { "core": "MegaCoreX", - "extra_flags": "-DARDUINO_AVR_ATMEGA4809", + "extra_flags": "-DARDUINO_AVR_ATmega4809", "f_cpu": "16000000L", "mcu": "atmega4809", "variant": "48pin-standard" diff --git a/boards/ATmega808.json b/boards/ATmega808.json index 5e08df6..9f7b7a3 100644 --- a/boards/ATmega808.json +++ b/boards/ATmega808.json @@ -1,7 +1,7 @@ { "build": { "core": "MegaCoreX", - "extra_flags": "-DARDUINO_AVR_ATMEGA808", + "extra_flags": "-DARDUINO_AVR_ATmega808", "f_cpu": "16000000L", "mcu": "atmega808", "variant": "32pin-standard" diff --git a/boards/ATmega809.json b/boards/ATmega809.json index bbcbc04..8d4a2ae 100644 --- a/boards/ATmega809.json +++ b/boards/ATmega809.json @@ -1,7 +1,7 @@ { "build": { "core": "MegaCoreX", - "extra_flags": "-DARDUINO_AVR_ATMEGA809", + "extra_flags": "-DARDUINO_AVR_ATmega809", "f_cpu": "16000000L", "mcu": "atmega809", "variant": "48pin-standard" diff --git a/boards/avr_iot_wg.json b/boards/avr_iot_wg.json index 3fad172..04cb5aa 100644 --- a/boards/avr_iot_wg.json +++ b/boards/avr_iot_wg.json @@ -1,7 +1,7 @@ { "build": { "core": "MegaCoreX", - "extra_flags": "-DARDUINO_AVR_ATMEGA4808", + "extra_flags": "-DARDUINO_AVR_ATmega4808", "f_cpu": "16000000L", "mcu": "atmega4808", "variant": "32pin-standard" diff --git a/boards/curiosity_nano_4809.json b/boards/curiosity_nano_4809.json index 3f27fb2..501b2f5 100644 --- a/boards/curiosity_nano_4809.json +++ b/boards/curiosity_nano_4809.json @@ -1,7 +1,7 @@ { "build": { "core": "MegaCoreX", - "extra_flags": "-DARDUINO_AVR_ATMEGA4809", + "extra_flags": "-DARDUINO_AVR_ATmega4809", "f_cpu": "16000000L", "mcu": "atmega4809", "variant": "48pin-standard" diff --git a/boards/xplained_pro_4809.json b/boards/xplained_pro_4809.json index ce5c8da..1343267 100644 --- a/boards/xplained_pro_4809.json +++ b/boards/xplained_pro_4809.json @@ -1,7 +1,7 @@ { "build": { "core": "MegaCoreX", - "extra_flags": "-DARDUINO_AVR_ATMEGA4809", + "extra_flags": "-DARDUINO_AVR_ATmega4809", "f_cpu": "16000000L", "mcu": "atmega4809", "variant": "48pin-standard" From b0d2752afc09351b0921b89f645a4a9bd7aceb33 Mon Sep 17 00:00:00 2001 From: 5e3 Date: Tue, 29 Jun 2021 21:34:04 +0200 Subject: [PATCH 2/6] fix: CLOCK_SOURCE instead of CLOCKSOURCE --- builder/frameworks/arduino.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/frameworks/arduino.py b/builder/frameworks/arduino.py index 9b0ff82..441545a 100644 --- a/builder/frameworks/arduino.py +++ b/builder/frameworks/arduino.py @@ -74,7 +74,7 @@ oscillator_type = board.get("hardware", {}).get("oscillator", "internal") if build_core == "megatinycore": - env.Append(CPPDEFINES=[("CLOCKSOURCE", 2 if oscillator_type == "external" else 0)]) + env.Append(CPPDEFINES=[("CLOCK_SOURCE", 2 if oscillator_type == "external" else 0)]) elif oscillator_type == "external" and build_core == "MegaCoreX": env.Append(CPPDEFINES=["USE_EXTERNAL_OSCILLATOR"]) From f576d972bdfbf05b89de1cb8aac32b1c932884aa Mon Sep 17 00:00:00 2001 From: valeros Date: Wed, 18 Aug 2021 14:15:43 +0300 Subject: [PATCH 3/6] Add an explicit dependency on checkprogsize target for the final binary --- builder/main.py | 1 + 1 file changed, 1 insertion(+) diff --git a/builder/main.py b/builder/main.py index f8120af..01c725a 100644 --- a/builder/main.py +++ b/builder/main.py @@ -148,6 +148,7 @@ def BeforeUpload(target, source, env): # pylint: disable=W0613,W0621 else: target_elf = env.BuildProgram() target_firm = env.ElfToHex(join("$BUILD_DIR", "${PROGNAME}"), target_elf) + env.Depends(target_firm, "checkprogsize") AlwaysBuild(env.Alias("nobuild", target_firm)) target_buildprog = env.Alias("buildprog", target_firm, target_firm) From 71f862050d408fbd911b925d91835fb28cbe119b Mon Sep 17 00:00:00 2001 From: valeros Date: Wed, 18 Aug 2021 14:22:37 +0300 Subject: [PATCH 4/6] Update MegaTinyCore to the latest v2.3.2 --- platform.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform.json b/platform.json index 89ce0ff..2c3d4bf 100644 --- a/platform.json +++ b/platform.json @@ -48,7 +48,7 @@ "type": "framework", "optional": true, "owner": "platformio", - "version": "~2.1.5" + "version": "~2.3.0" }, "tool-avrdude-megaavr": { "type": "uploader", From f48dfa50936ce06d1e1ebdd2f106777fe84a244b Mon Sep 17 00:00:00 2001 From: valeros Date: Wed, 25 Aug 2021 14:16:38 +0300 Subject: [PATCH 5/6] Update MegaTinyCore to the latest v2.4.0 --- platform.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform.json b/platform.json index 2c3d4bf..1a729e6 100644 --- a/platform.json +++ b/platform.json @@ -48,7 +48,7 @@ "type": "framework", "optional": true, "owner": "platformio", - "version": "~2.3.0" + "version": "~2.4.0" }, "tool-avrdude-megaavr": { "type": "uploader", From 4c7def4caf75121d234d00938d0e34eca52b3924 Mon Sep 17 00:00:00 2001 From: valeros Date: Tue, 31 Aug 2021 16:04:44 +0300 Subject: [PATCH 6/6] Bump version to 1.5.0 --- platform.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform.json b/platform.json index 1a729e6..0115e51 100644 --- a/platform.json +++ b/platform.json @@ -18,7 +18,7 @@ "type": "git", "url": "https://github.com/platformio/platform-atmelmegaavr.git" }, - "version": "1.4.0", + "version": "1.5.0", "frameworks": { "arduino": { "package": "framework-arduino-megaavr",