Merge branch 'release/v3.1.0'

valeros · valeros · commit 360ffd212bff · 2020-12-31T15:32:03.000+02:00
diff --git a/boards/AT90CAN128.json b/boards/AT90CAN128.json
@@ -15,7 +15,7 @@
   "name": "AT90CAN128",
   "upload": {
     "maximum_ram_size": 4096,
-    "maximum_size": 130048,
+    "maximum_size": 131072,
     "protocol": "arduino",
     "require_upload_port": true,
     "speed": 115200
diff --git a/boards/AT90CAN32.json b/boards/AT90CAN32.json
@@ -15,7 +15,7 @@
   "name": "AT90CAN32",
   "upload": {
     "maximum_ram_size": 2048,
-    "maximum_size": 31744,
+    "maximum_size": 32768,
     "protocol": "arduino",
     "require_upload_port": true,
     "speed": 115200
diff --git a/boards/AT90CAN64.json b/boards/AT90CAN64.json
@@ -15,7 +15,7 @@
   "name": "AT90CAN64",
   "upload": {
     "maximum_ram_size": 4096,
-    "maximum_size": 64512,
+    "maximum_size": 65536,
     "protocol": "arduino",
     "require_upload_port": true,
     "speed": 115200
diff --git a/boards/ATmega128.json b/boards/ATmega128.json
@@ -18,7 +18,7 @@
   "name": "ATmega128/A",
   "upload": {
     "maximum_ram_size": 4096,
-    "maximum_size": 130048,
+    "maximum_size": 131072,
     "protocol": "arduino",
     "require_upload_port": true,
     "speed": 115200
diff --git a/boards/ATmega1280.json b/boards/ATmega1280.json
@@ -21,7 +21,7 @@
   "name": "ATmega1280",
   "upload": {
     "maximum_ram_size": 8192,
-    "maximum_size": 130048,
+    "maximum_size": 131072,
     "protocol": "arduino",
     "require_upload_port": true,
     "speed": 115200
diff --git a/boards/ATmega1281.json b/boards/ATmega1281.json
@@ -18,7 +18,7 @@
   "name": "ATmega1281",
   "upload": {
     "maximum_ram_size": 8192,
-    "maximum_size": 130048,
+    "maximum_size": 131072,
     "protocol": "arduino",
     "require_upload_port": true,
     "speed": 115200
diff --git a/boards/ATmega1284.json b/boards/ATmega1284.json
@@ -18,7 +18,7 @@
   "name": "ATmega1284",
   "upload": {
     "maximum_ram_size": 16384,
-    "maximum_size": 130048,
+    "maximum_size": 131072,
     "protocol": "arduino",
     "require_upload_port": true,
     "speed": 115200
diff --git a/boards/ATmega1284P.json b/boards/ATmega1284P.json
@@ -18,7 +18,7 @@
   "name": "ATmega1284P",
   "upload": {
     "maximum_ram_size": 16384,
-    "maximum_size": 130048,
+    "maximum_size": 131072,
     "protocol": "arduino",
     "require_upload_port": true,
     "speed": 115200
diff --git a/boards/ATmega16.json b/boards/ATmega16.json
@@ -18,7 +18,7 @@
   "name": "ATmega16",
   "upload": {
     "maximum_ram_size": 1024,
-    "maximum_size": 15872,
+    "maximum_size": 16384,
     "protocol": "arduino",
     "require_upload_port": true,
     "speed": 115200
diff --git a/boards/ATmega162.json b/boards/ATmega162.json
@@ -15,7 +15,7 @@
   "name": "ATmega162",
   "upload": {
     "maximum_ram_size": 1024,
-    "maximum_size": 15872,
+    "maximum_size": 16384,
     "protocol": "arduino",
     "require_upload_port": true,
     "speed": 115200
diff --git a/boards/ATmega164A.json b/boards/ATmega164A.json
@@ -15,7 +15,7 @@
   "name": "ATmega164A",
   "upload": {
     "maximum_ram_size": 1024,
-    "maximum_size": 15872,
+    "maximum_size": 16384,
     "protocol": "arduino",
     "require_upload_port": true,
     "speed": 115200
diff --git a/boards/ATmega164P.json b/boards/ATmega164P.json
@@ -18,7 +18,7 @@
   "name": "ATmega164P/PA",
   "upload": {
     "maximum_ram_size": 1024,
-    "maximum_size": 15872,
+    "maximum_size": 16384,
     "protocol": "arduino",
     "require_upload_port": true,
     "speed": 115200
diff --git a/boards/ATmega168.json b/boards/ATmega168.json
@@ -18,7 +18,7 @@
   "name": "ATmega168/A",
   "upload": {
     "maximum_ram_size": 1024,
-    "maximum_size": 15872,
+    "maximum_size": 16384,
     "protocol": "arduino",
     "require_upload_port": true,
     "speed": 115200
diff --git a/boards/ATmega168P.json b/boards/ATmega168P.json
@@ -18,7 +18,7 @@
   "name": "ATmega168P/PA",
   "upload": {
     "maximum_ram_size": 1024,
-    "maximum_size": 15872,
+    "maximum_size": 16384,
     "protocol": "arduino",
     "require_upload_port": true,
     "speed": 115200
diff --git a/boards/ATmega168PB.json b/boards/ATmega168PB.json
@@ -15,7 +15,7 @@
   "name": "ATmega168PB",
   "upload": {
     "maximum_ram_size": 1024,
-    "maximum_size": 15872,
+    "maximum_size": 16384,
     "protocol": "arduino",
     "require_upload_port": true,
     "speed": 115200
diff --git a/boards/ATmega2560.json b/boards/ATmega2560.json
@@ -21,7 +21,7 @@
   "name": "ATmega2560",
   "upload": {
     "maximum_ram_size": 8192,
-    "maximum_size": 261120,
+    "maximum_size": 262144,
     "protocol": "arduino",
     "require_upload_port": true,
     "speed": 115200
diff --git a/boards/ATmega2561.json b/boards/ATmega2561.json
@@ -15,7 +15,7 @@
   "name": "ATmega2561",
   "upload": {
     "maximum_ram_size": 8192,
-    "maximum_size": 261120,
+    "maximum_size": 262144,
     "protocol": "arduino",
     "require_upload_port": true,
     "speed": 115200
diff --git a/boards/ATmega32.json b/boards/ATmega32.json
@@ -15,7 +15,7 @@
   "name": "ATmega32",
   "upload": {
     "maximum_ram_size": 2048,
-    "maximum_size": 32256,
+    "maximum_size": 32768,
     "protocol": "arduino",
     "require_upload_port": true,
     "speed": 115200
diff --git a/boards/ATmega324A.json b/boards/ATmega324A.json
@@ -18,7 +18,7 @@
   "name": "ATmega324A",
   "upload": {
     "maximum_ram_size": 2048,
-    "maximum_size": 32256,
+    "maximum_size": 32768,
     "protocol": "arduino",
     "require_upload_port": true,
     "speed": 115200
diff --git a/boards/ATmega324P.json b/boards/ATmega324P.json
@@ -18,7 +18,7 @@
   "name": "ATmega324P",
   "upload": {
     "maximum_ram_size": 2048,
-    "maximum_size": 32256,
+    "maximum_size": 32768,
     "protocol": "arduino",
     "require_upload_port": true,
     "speed": 115200
diff --git a/boards/ATmega324PA.json b/boards/ATmega324PA.json
@@ -18,7 +18,7 @@
   "name": "ATmega324PA",
   "upload": {
     "maximum_ram_size": 2048,
-    "maximum_size": 32256,
+    "maximum_size": 32768,
     "protocol": "arduino",
     "require_upload_port": true,
     "speed": 115200
diff --git a/boards/ATmega324PB.json b/boards/ATmega324PB.json
@@ -15,7 +15,7 @@
   "name": "ATmega324PB",
   "upload": {
     "maximum_ram_size": 2048,
-    "maximum_size": 32256,
+    "maximum_size": 32768,
     "protocol": "arduino",
     "require_upload_port": true,
     "speed": 115200
diff --git a/boards/ATmega328.json b/boards/ATmega328.json
@@ -21,7 +21,7 @@
   "name": "ATmega328",
   "upload": {
     "maximum_ram_size": 2048,
-    "maximum_size": 32256,
+    "maximum_size": 32768,
     "protocol": "arduino",
     "require_upload_port": true,
     "speed": 115200
diff --git a/boards/ATmega328P.json b/boards/ATmega328P.json
@@ -21,7 +21,7 @@
   "name": "ATmega328P/PA",
   "upload": {
     "maximum_ram_size": 2048,
-    "maximum_size": 32256,
+    "maximum_size": 32768,
     "protocol": "arduino",
     "require_upload_port": true,
     "speed": 115200
diff --git a/boards/ATmega328PB.json b/boards/ATmega328PB.json
@@ -15,7 +15,7 @@
   "name": "ATmega328PB",
   "upload": {
     "maximum_ram_size": 2048,
-    "maximum_size": 32256,
+    "maximum_size": 32768,
     "protocol": "arduino",
     "require_upload_port": true,
     "speed": 115200
diff --git a/boards/ATmega64.json b/boards/ATmega64.json
@@ -15,7 +15,7 @@
   "name": "ATmega64/A",
   "upload": {
     "maximum_ram_size": 4096,
-    "maximum_size": 64512,
+    "maximum_size": 65536,
     "protocol": "arduino",
     "require_upload_port": true,
     "speed": 115200
diff --git a/boards/ATmega640.json b/boards/ATmega640.json
@@ -15,7 +15,7 @@
   "name": "ATmega640",
   "upload": {
     "maximum_ram_size": 8192,
-    "maximum_size": 64512,
+    "maximum_size": 65536,
     "protocol": "arduino",
     "require_upload_port": true,
     "speed": 115200
diff --git a/boards/ATmega644A.json b/boards/ATmega644A.json
@@ -15,7 +15,7 @@
   "name": "ATmega644/A",
   "upload": {
     "maximum_ram_size": 4096,
-    "maximum_size": 64512,
+    "maximum_size": 65536,
     "protocol": "arduino",
     "require_upload_port": true,
     "speed": 115200
diff --git a/boards/ATmega644P.json b/boards/ATmega644P.json
@@ -18,7 +18,7 @@
   "name": "ATmega644P/PA",
   "upload": {
     "maximum_ram_size": 4096,
-    "maximum_size": 64512,
+    "maximum_size": 65536,
     "protocol": "arduino",
     "require_upload_port": true,
     "speed": 115200
diff --git a/boards/ATmega8.json b/boards/ATmega8.json
@@ -18,7 +18,7 @@
   "name": "ATmega8/A",
   "upload": {
     "maximum_ram_size": 1024,
-    "maximum_size": 7680,
+    "maximum_size": 8192,
     "protocol": "arduino",
     "require_upload_port": true,
     "speed": 115200
diff --git a/boards/ATmega8515.json b/boards/ATmega8515.json
@@ -15,7 +15,7 @@
   "name": "ATmega8515",
   "upload": {
     "maximum_ram_size": 512,
-    "maximum_size": 7680,
+    "maximum_size": 8192,
     "protocol": "arduino",
     "require_upload_port": true,
     "speed": 115200
diff --git a/boards/ATmega8535.json b/boards/ATmega8535.json
@@ -15,7 +15,7 @@
   "name": "ATmega8535",
   "upload": {
     "maximum_ram_size": 512,
-    "maximum_size": 7680,
+    "maximum_size": 8192,
     "protocol": "arduino",
     "require_upload_port": true,
     "speed": 115200
diff --git a/boards/ATmega88.json b/boards/ATmega88.json
@@ -18,7 +18,7 @@
   "name": "ATmega88/A",
   "upload": {
     "maximum_ram_size": 1024,
-    "maximum_size": 7680,
+    "maximum_size": 8192,
     "protocol": "arduino",
     "require_upload_port": true,
     "speed": 115200
diff --git a/boards/ATmega88P.json b/boards/ATmega88P.json
@@ -18,7 +18,7 @@
   "name": "ATmega88P/PA",
   "upload": {
     "maximum_ram_size": 1024,
-    "maximum_size": 7680,
+    "maximum_size": 8192,
     "protocol": "arduino",
     "require_upload_port": true,
     "speed": 115200
diff --git a/boards/ATmega88PB.json b/boards/ATmega88PB.json
@@ -15,7 +15,7 @@
   "name": "ATmega88PB",
   "upload": {
     "maximum_ram_size": 1024,
-    "maximum_size": 7680,
+    "maximum_size": 8192,
     "protocol": "arduino",
     "require_upload_port": true,
     "speed": 115200
diff --git a/builder/frameworks/arduino.py b/builder/frameworks/arduino.py
@@ -42,6 +42,16 @@
 
 assert isdir(FRAMEWORK_DIR)
 
+
+def get_bootloader_size():
+    max_size = board.get("upload.maximum_size")
+    if max_size > 4096 and max_size <= 32768:
+        return 512
+    elif max_size >= 65536 or board.get("build.mcu").startswith("at90can32"):
+        return 1024
+    return 0
+
+
 CPPDEFINES = [
     ("F_CPU", "$BOARD_F_CPU"),
     "ARDUINO_ARCH_AVR",
@@ -103,6 +113,18 @@
     ]
 )
 
+#
+# Take into account bootloader size
+#
+
+if (
+    build_core in ("MiniCore", "MegaCore", "MightyCore", "MajorCore")
+    and board.get("hardware.uart", "uart0") != "no_bootloader"
+):
+    upload_section = board.get("upload")
+    upload_section["maximum_size"] -= board.get(
+        "bootloader.size", get_bootloader_size()
+    )
 # copy CCFLAGS to ASFLAGS (-x assembler-with-cpp mode)
 env.Append(ASFLAGS=env.get("CCFLAGS", [])[:])
 
diff --git a/examples/arduino-blink/.gitignore b/examples/arduino-blink/.gitignore
@@ -1,2 +1,2 @@
-.pioenvs
-.piolibdeps
+.pio
+.vscode
diff --git a/examples/arduino-external-libs/.gitignore b/examples/arduino-external-libs/.gitignore
@@ -1,2 +1,2 @@
-.pioenvs
-.piolibdeps
+.pio
+.vscode
diff --git a/examples/arduino-internal-libs/.gitignore b/examples/arduino-internal-libs/.gitignore
@@ -1,2 +1,2 @@
-.pioenvs
-.piolibdeps
+.pio
+.vscode
diff --git a/examples/arduino-own-src_dir/.gitignore b/examples/arduino-own-src_dir/.gitignore
@@ -1,2 +1,2 @@
-.pioenvs
-.piolibdeps
+.pio
+.vscode
diff --git a/examples/digitstump-mouse/.gitignore b/examples/digitstump-mouse/.gitignore
@@ -1,2 +1,2 @@
-.pioenvs
-.piolibdeps
+.pio
+.vscode
diff --git a/examples/engduino-magnetometer/.gitignore b/examples/engduino-magnetometer/.gitignore
@@ -1,2 +1,2 @@
-.pioenvs
-.piolibdeps
+.pio
+.vscode
diff --git a/examples/native-blink/.gitignore b/examples/native-blink/.gitignore
@@ -1,2 +1,2 @@
-.pioenvs
-.piolibdeps
+.pio
+.vscode
diff --git a/examples/simba-blink/.gitignore b/examples/simba-blink/.gitignore
@@ -1,2 +1,2 @@
-.pioenvs
-.piolibdeps
+.pio
+.vscode
diff --git a/platform.json b/platform.json
