Merge branch 'release/v1.5.0'

platformio · Aug 31, 2021 · 0ad2290 · 0ad2290
2 parents dcbaeb1 + 4c7def4
commit 0ad2290
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/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"])
 

diff --git 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)

diff --git 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",
@@ -48,7 +48,7 @@
       "type": "framework",
       "optional": true,
       "owner": "platformio",
-      "version": "~2.1.5"
+      "version": "~2.4.0"
     },
     "tool-avrdude-megaavr": {
       "type": "uploader",