Merge branch 'release/v4.2.0'

Author: valeros

boards/attiny13.json

@@ -4,7 +4,7 @@
     "extra_flags": "-DARDUINO_AVR_ATTINY13",
     "f_cpu": "9600000L",
     "mcu": "attiny13",
-    "variant": "attiny13"
+    "variant": "attiny13a"
   },
   "hardware": {
     "oscillator": "internal",

boards/attiny13a.json

@@ -4,7 +4,7 @@
     "extra_flags": "-DARDUINO_AVR_ATTINY13",
     "f_cpu": "9600000L",
     "mcu": "attiny13a",
-    "variant": "attiny13"
+    "variant": "attiny13a"
   },
   "hardware": {
     "oscillator": "internal",

builder/bootloader.py

@@ -54,6 +54,41 @@ def get_suitable_optiboot_binary(framework_dir, board_config):
     return bootloader_path.replace(".hex", "_BIGBOOT.hex")
 
 
+def get_suitable_urboot_binary(framework_dir, board_config):
+    mcu = board_config.get("build.mcu", "").lower()
+    f_cpu = int(board_config.get("build.f_cpu", "16000000L").strip("UL"))
+    oscillator = board.get("hardware.oscillator", "external").lower()
+    bootloader_led = board_config.get("bootloader.led_pin", "no-led").lower()
+    bootloader_speed = board_config.get("bootloader.speed", env.subst("$UPLOAD_SPEED"))
+    bootloader_file = "urboot_%s.hex" % mcu
+
+    if core == "MicroCore":
+        f_cpu_error = float(board_config.get("hardware.f_cpu_error", "0.0"))
+        uart = board_config.get("hardware.uart", "swio_rxb1_txb0").lower()
+        if oscillator == "internal":
+            clock_speed = f_cpu + int(f_cpu_error/100 * f_cpu)
+        else:
+            clock_speed = f_cpu
+    else:
+        uart = board_config.get("hardware.uart", "uart0").lower()
+        clock_speed = f_cpu
+
+    bootloader_path = join(
+        framework_dir,
+        "bootloaders",
+        "urboot",
+        "watchdog_1_s",
+        "%s_oscillator" % oscillator,
+        "%d_hz" % clock_speed,
+        "%s_baud" % bootloader_speed,
+        uart,
+        bootloader_led,
+        bootloader_file,
+    )
+
+    return bootloader_path
+
+
 framework_dir = ""
 if env.get("PIOFRAMEWORK", []):
     framework_dir = platform.get_package_dir(
@@ -64,6 +99,9 @@ def get_suitable_optiboot_binary(framework_dir, board_config):
 if core in ("MiniCore", "MegaCore", "MightyCore", "MajorCore"):
     if not isfile(bootloader_path):
         bootloader_path = get_suitable_optiboot_binary(framework_dir, board)
+elif core == "MicroCore":
+    if not isfile(bootloader_path):
+        bootloader_path = get_suitable_urboot_binary(framework_dir, board)
 else:
     if not isfile(bootloader_path):
         bootloader_path = join(framework_dir, "bootloaders", bootloader_path)
@@ -76,10 +114,16 @@ def get_suitable_optiboot_binary(framework_dir, board_config):
     sys.stderr.write("Error: Couldn't find bootloader image %s\n" % bootloader_path)
     env.Exit(1)
 
+print("Using bootloader image:\n%s" % bootloader_path)
+
 fuses_action = env.SConscript("fuses.py", exports="env")
 
-lock_bits = board.get("bootloader.lock_bits", "0x0F")
-unlock_bits = board.get("bootloader.unlock_bits", "0x3F")
+if core == "MicroCore":
+    lock_bits = board.get("bootloader.lock_bits", "0xFF")
+    unlock_bits = board.get("bootloader.unlock_bits", "0xFF")
+else:
+    lock_bits = board.get("bootloader.lock_bits", "0x0F")
+    unlock_bits = board.get("bootloader.unlock_bits", "0x3F")
 
 env.Replace(
     BOOTUPLOADER="avrdude",

builder/fuses.py

@@ -205,6 +205,8 @@ def get_hfuse(target, uart, oscillator, bod, eesave, jtagen):
     ckopt_offset = ckopt_bit << 4
     jtagen_bit = 1 if jtagen == "yes" else 0
     jtagen_offset = jtagen_bit << 6
+    selfprogen_bit = 1 if uart != "no_bootloader" else 0
+    selfprogen_offset = selfprogen_bit << 4
 
     if target in targets_1:
         if uart == "no_bootloader":
@@ -248,13 +250,13 @@ def get_hfuse(target, uart, oscillator, bod, eesave, jtagen):
 
     elif target in targets_7:
         if bod == "4.3v":
-            return 0x9
+            return 0xF9 & ~selfprogen_offset
         elif bod == "2.7v":
-            return 0xFB
+            return 0xFB & ~selfprogen_offset
         elif bod == "1.8v":
-            return 0xFD
+            return 0xFD & ~selfprogen_offset
         else:
-            return 0xFF
+            return 0xFF & ~selfprogen_offset
 
     else:
         sys.stderr.write("Error: Couldn't calculate hfuse for %s\n" % target)
@@ -411,15 +413,13 @@ def is_target_without_bootloader(target):
         "attiny26",
         "attiny25",
         "attiny24",
-        "attiny13",
-        "attiny13a",
     )
 
     return target in targets_without_bootloader
 
 
 def get_lock_bits(target):
-    if is_target_without_bootloader(target):
+    if is_target_without_bootloader(target) or core == "MicroCore":
         return "0xff"
     else:
         return "0x0f"
@@ -464,7 +464,7 @@ def get_lock_bits(target):
     f_cpu = board.get("build.f_cpu", "16000000L").upper()
     oscillator = board.get("hardware.oscillator", "external").lower()
     bod = board.get("hardware.bod", "2.7v").lower()
-    uart = board.get("hardware.uart", "uart0").lower()
+    uart = board.get("hardware.uart", "no_bootloader" if core == "MicroCore" else "uart0").lower()
     eesave = board.get("hardware.eesave", "yes").lower()
     jtagen = board.get("hardware.jtagen", "no").lower()
     ckout = board.get("hardware.ckout", "no").lower()
@@ -477,9 +477,7 @@ def get_lock_bits(target):
     print("Oscillator = %s" % oscillator)
     print("BOD level = %s" % bod)
     print("Save EEPROM = %s" % eesave)
-
-    if target not in ("attiny13", "attiny13a"):
-        print("UART port = %s" % uart)
+    print("UART port = %s" % uart)
 
     if target not in (
         "atmega8535",

platform.json

@@ -18,7 +18,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-atmelavr.git"
   },
-  "version": "4.1.0",
+  "version": "4.2.0",
   "frameworks": {
     "arduino": {
       "package": "framework-arduino-avr",
@@ -71,31 +71,31 @@
       "type": "framework",
       "optional": true,
       "owner": "platformio",
-      "version": "~2.2.2"
+      "version": "~2.2.3"
     },
     "framework-arduino-avr-mightycore": {
       "type": "framework",
       "optional": true,
       "owner": "platformio",
-      "version": "~2.2.1"
+      "version": "~2.2.2"
     },
     "framework-arduino-avr-minicore": {
       "type": "framework",
       "optional": true,
       "owner": "platformio",
-      "version": "~2.2.1"
+      "version": "~2.2.2"
     },
     "framework-arduino-avr-majorcore": {
       "type": "framework",
       "optional": true,
       "owner": "platformio",
-      "version": "~2.2.1"
+      "version": "~2.2.2"
     },
     "framework-arduino-avr-microcore": {
       "type": "framework",
       "optional": true,
       "owner": "platformio",
-      "version": "~2.2.1"
+      "version": "~2.3.0"
     },
     "framework-arduino-avr-nicai": {
       "type": "framework",

platform.py

@@ -57,11 +57,11 @@ def configure_default_packages(self, variables, targets):
         if upload_protocol == "micronucleus":
             disabled_tool = "tool-avrdude"
 
-        if "fuses" in targets:
+        if "fuses" in targets or "bootloader" in targets:
             required_tool = "tool-avrdude"
 
         if required_tool in self.packages:
-            self.packages[required_tool]['optional'] = False
+            self.packages[required_tool]["optional"] = False
 
         if disabled_tool in self.packages and disabled_tool != required_tool:
             del self.packages[disabled_tool]