Merge branch 'release/v3.3.0'

platformio · Mar 29, 2021 · 245e5b1 · 245e5b1
2 parents 5dd9fe4 + 07526dd
commit 245e5b1
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 11 deletions.
diff --git a/boards/attiny1634.json b/boards/attiny1634.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "core": "tinymodern",
-    "extra_flags": "-DARDUINO_AVR_ATTINY1634",
+    "extra_flags": "-DARDUINO_AVR_ATTINY1634 -DLOWERCAL=9",
     "f_cpu": "8000000L",
     "mcu": "attiny1634"
   },

diff --git a/boards/attiny25.json b/boards/attiny25.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "core": "tiny",
-    "extra_flags": "-DARDUINO_AVR_ATTINYX5",
+    "extra_flags": "-DARDUINO_AVR_ATTINYX5 -DNEOPIXELPORT=PORTB",
     "f_cpu": "8000000L",
     "mcu": "attiny25",
     "variant": "tinyX5"

diff --git a/boards/attiny441.json b/boards/attiny441.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "core": "tinymodern",
-    "extra_flags": "-DARDUINO_AVR_ATTINYX41",
+    "extra_flags": "-DARDUINO_AVR_ATTINYX41 -DLOWERCAL -DWIRE_MASTER_ONLY -DNEW_PINOUT",
     "f_cpu": "8000000L",
     "mcu": "attiny441"
   },

diff --git a/boards/attiny45.json b/boards/attiny45.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "core": "tiny",
-    "extra_flags": "-DARDUINO_AVR_ATTINYX5",
+    "extra_flags": "-DARDUINO_AVR_ATTINYX5 -DNEOPIXELPORT=PORTB",
     "f_cpu": "8000000L",
     "mcu": "attiny45",
     "variant": "tinyX5"

diff --git a/boards/attiny828.json b/boards/attiny828.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "core": "tinymodern",
-    "extra_flags": "-DARDUINO_AVR_AVR_ATTINY828",
+    "extra_flags": "-DARDUINO_AVR_AVR_ATTINY828 -DLOWERCAL=9",
     "f_cpu": "8000000L",
     "mcu": "attiny828"
   },

diff --git a/boards/attiny841.json b/boards/attiny841.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "core": "tinymodern",
-    "extra_flags": "-DARDUINO_AVR_ATTINYX41",
+    "extra_flags": "-DARDUINO_AVR_ATTINYX41 -DLOWERCAL -DWIRE_MASTER_ONLY -DNEW_PINOUT",
     "f_cpu": "8000000L",
     "mcu": "attiny841"
   },

diff --git a/boards/attiny85.json b/boards/attiny85.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "core": "tiny",
-    "extra_flags": "-DARDUINO_AVR_ATTINYX5",
+    "extra_flags": "-DARDUINO_AVR_ATTINYX5 -DNEOPIXELPORT=PORTB",
     "f_cpu": "8000000L",
     "mcu": "attiny85",
     "variant": "tinyX5"

diff --git a/builder/frameworks/arduino.py b/builder/frameworks/arduino.py
@@ -125,6 +125,17 @@ def get_bootloader_size():
     upload_section["maximum_size"] -= board.get(
         "bootloader.size", get_bootloader_size()
     )
+elif build_core in ("tiny", "tinymodern"):
+    flatten_defines = env.Flatten(env["CPPDEFINES"])
+    extra_defines = []
+    if "CLOCK_SOURCE" not in flatten_defines:
+        extra_defines.append(("CLOCK_SOURCE", 0))
+    if "NEOPIXELPORT" not in flatten_defines:
+        extra_defines.append(("NEOPIXELPORT", "PORTA"))
+
+    if extra_defines:
+        env.AppendUnique(CPPDEFINES=extra_defines)
+
 # copy CCFLAGS to ASFLAGS (-x assembler-with-cpp mode)
 env.Append(ASFLAGS=env.get("CCFLAGS", [])[:])
 

diff --git a/builder/main.py b/builder/main.py
@@ -52,7 +52,7 @@ def BeforeUpload(target, source, env):  # pylint: disable=W0613,W0621
         return
 
     env.AutodetectUploadPort()
-    env.Append(UPLOADERFLAGS=["-P", '"$UPLOAD_PORT"'])
+    env.Append(UPLOADERFLAGS=["-P", "$UPLOAD_PORT"])
 
     if env.subst("$BOARD") in ("raspduino", "emonpi", "sleepypi"):
 
@@ -161,6 +161,7 @@ def _rpi_sysgpio(path, value):
 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-atmelavr.git"
   },
-  "version": "3.2.0",
+  "version": "3.3.0",
   "frameworks": {
     "arduino": {
       "package": "framework-arduino-avr",
@@ -45,7 +45,7 @@
       "type": "framework",
       "optional": true,
       "owner": "platformio",
-      "version": "~1.3.2"
+      "version": "~1.5.2"
     },
     "framework-arduino-avr-bean": {
       "type": "framework",

diff --git a/platform.py b/platform.py
@@ -96,7 +96,7 @@ def _add_default_debug_tools(self, board):
                     "end",
                     "target remote $DEBUG_PORT",
                     "$INIT_BREAK",
-                    "$LOAD_CMD"
+                    "$LOAD_CMDS"
                 ],
                 "port": ":1234",
                 "server": {