Merge branch 'release/v1.1.4'

Aceinna · Aug 1, 2019 · 8cf2212 · 8cf2212
2 parents 257738d + 26b1eee
commit 8cf2212
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/builder/main.py b/builder/main.py
@@ -226,7 +226,6 @@ def _jlink_cmd_script(env, source):
         UPLOADER="openocd",
         UPLOADERFLAGS=openocd_args,
         UPLOADCMD="$UPLOADER $UPLOADERFLAGS")
-    upload_source = target_elf
     upload_actions = [env.VerboseAction("$UPLOADCMD", "Uploading $SOURCE")]
 
 # custom upload tool

diff --git a/platform.json b/platform.json
@@ -13,7 +13,7 @@
     "type": "git",
     "url": "https://github.com/aceinna/platform-aceinna_imu.git"
   },
-  "version": "1.1.3",
+  "version": "1.1.4",
   "packageRepositories": [
     "https://dl.bintray.com/platformio/dl-packages/manifest.json",
     "http://dl.platformio.org/packages/manifest.json"