Merge branch 'release/v1.1.1'

.travis.yml

@@ -1,6 +1,7 @@
 language: python
 python:
   - "2.7"
+  - "3.6"
 
 env:
   - PLATFORMIO_PROJECT_DIR=examples/IMU

builder/main.py

@@ -212,13 +212,13 @@ def _jlink_cmd_script(env, source):
         UPLOADERFLAGS=["-s", platform.get_package_dir("tool-openocd") or ""] +
         debug_tools.get(upload_protocol).get("server").get("arguments", []) +
         ["-c",
-            "program {{$SOURCE}} verify reset; shutdown;"],
+            "program {$SOURCE} verify reset; shutdown;"],
         UPLOADCMD="$UPLOADER $UPLOADERFLAGS")
     upload_source = target_elf
     upload_actions = [env.VerboseAction("$UPLOADCMD", "Uploading $SOURCE")]
 
 # custom upload tool
-elif "UPLOADCMD" in env:
+elif upload_protocol == "custom":
     upload_actions = [env.VerboseAction("$UPLOADCMD", "Uploading $SOURCE")]
 
 else:

platform.json

@@ -7,13 +7,13 @@
   "docs": "https://github.com/aceinna/platform-aceinna_imu",
   "license": "Apache-2.0",
   "engines": {
-    "platformio": "^3.0.0"
+    "platformio": "<5"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/aceinna/platform-aceinna_imu.git"
   },
-  "version": "1.1.0",
+  "version": "1.1.1",
   "packageRepositories": [
     "https://dl.bintray.com/platformio/dl-packages/manifest.json",
     "http://dl.platformio.org/packages/manifest.json"
@@ -26,7 +26,7 @@
     "tool-openocd": {
       "type": "uploader",
       "optional": true,
-      "version": "~1.1000.0"
+      "version": "~2.1000.0"
     },
     "tool-jlink": {
       "type": "uploader",