Merge branch 'release/v1.2.2'

Author: ivankravets

builder/main.py

@@ -176,12 +176,10 @@
     ASFLAGS=env.get("CCFLAGS", [])[:]
 )
 
-
-if (isfile(
+if isfile(
         join(
             platform.get_package_dir("tool-teensy") or "",
-            "teensy_loader_cli")) and
-        env.BoardConfig().id_ not in ("teensy35", "teensy36")):
+            "teensy_loader_cli")):
     env.Append(
         UPLOADER="teensy_loader_cli",
         UPLOADERFLAGS=[
@@ -196,12 +194,10 @@
         REBOOTER="teensy_reboot",
         UPLOADER="teensy_post_compile",
         UPLOADERFLAGS=[
-            "-file=firmware",
-            '-path="$BUILD_DIR"',
+            "-file=firmware", '-path="$BUILD_DIR"',
             '-tools="%s"' % (platform.get_package_dir("tool-teensy") or "")
         ],
-        UPLOADHEXCMD='$UPLOADER $UPLOADERFLAGS'
-    )
+        UPLOADHEXCMD='$UPLOADER $UPLOADERFLAGS')
 
 #
 # Target: Build executable and linkable firmware
@@ -215,7 +211,7 @@
     target_firm = env.ElfToHex(join("$BUILD_DIR", "firmware"), target_elf)
 
 AlwaysBuild(env.Alias("nobuild", target_firm))
-target_buildprog = env.Alias("buildprog", target_firm)
+target_buildprog = env.Alias("buildprog", target_firm, target_firm)
 
 #
 # Target: Print binary size

platform.json

@@ -13,7 +13,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-teensy.git"
   },
-  "version": "1.2.1",
+  "version": "1.2.2",
   "packageRepositories": [
     "https://dl.bintray.com/platformio/dl-packages/manifest.json",
     "https://sourceforge.net/projects/platformio-storage/files/packages/manifest.json/download",
@@ -53,7 +53,7 @@
     "tool-teensy": {
       "type": "uploader",
       "optional": true,
-      "version": ">=1.1.0"
+      "version": "~1.3.0"
     }
   }
 }