Merge branch 'release/v3.4.0'

platformio · Aug 31, 2021 · da85d5c · da85d5c
2 parents 245e5b1 + 28cd4eb
commit da85d5c
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 10 deletions.
diff --git a/boards/attiny167.json b/boards/attiny167.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "core": "tiny",
-    "extra_flags": "-DARDUINO_AVR_ATTINYX7",
+    "extra_flags": "-DARDUINO_AVR_ATTINYX7 -DCLOCK_SOURCE=17",
     "f_cpu": "8000000L",
     "mcu": "attiny167",
     "variant": "tinyX7_New"

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

diff --git a/boards/attiny88.json b/boards/attiny88.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "core": "tiny",
-    "extra_flags": "-DARDUINO_AVR_ATTINYX8",
+    "extra_flags": "-DARDUINO_AVR_ATTINYX8 -DCLOCK_SOURCE=18",
     "f_cpu": "8000000L",
     "mcu": "attiny88",
     "variant": "tinyX8"

diff --git a/boards/sparkfun_satmega128rfa1.json b/boards/sparkfun_satmega128rfa1.json
@@ -14,8 +14,8 @@
   ],
   "name": "SparkFun ATmega128RFA1 Dev Board",
   "upload": {
-    "maximum_ram_size": 126976,
-    "maximum_size": 16384,
+    "maximum_ram_size": 16384,
+    "maximum_size": 126976,
     "protocol": "arduino",
     "require_upload_port": true,
     "speed": 57600

diff --git a/builder/frameworks/arduino.py b/builder/frameworks/arduino.py
@@ -88,8 +88,7 @@ def get_bootloader_size():
     CXXFLAGS=[
         "-fno-exceptions",
         "-fno-threadsafe-statics",
-        "-fpermissive",
-        "-std=gnu++11"
+        "-fpermissive"
     ],
 
     LINKFLAGS=[
@@ -113,6 +112,19 @@ def get_bootloader_size():
     ]
 )
 
+if build_core in ("MiniCore", "MegaCore", "MightyCore", "MajorCore"):
+    env.Append(
+        CXXFLAGS=[
+            "-std=gnu++17"
+        ],
+    )
+else:
+    env.Append(
+        CXXFLAGS=[
+            "-std=gnu++11"
+        ],
+    )
+
 #
 # Take into account bootloader size
 #

diff --git a/platform.json b/platform.json
@@ -18,7 +18,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-atmelavr.git"
   },
-  "version": "3.3.0",
+  "version": "3.4.0",
   "frameworks": {
     "arduino": {
       "package": "framework-arduino-avr",
@@ -99,7 +99,7 @@
       "type": "framework",
       "optional": true,
       "owner": "platformio",
-      "version": "~2.0.3"
+      "version": "~2.1.0"
     },
     "framework-arduino-avr-nicai": {
       "type": "framework",
@@ -141,7 +141,7 @@
       "type": "debugger",
       "optional": true,
       "owner": "platformio",
-      "version": "~1.10600.200511"
+      "version": "~1.10700.0"
     }
   }
 }