Merge branch 'release/v1.2.1'

Aceinna · Oct 29, 2019 · f89e93b · f89e93b
2 parents fb8a515 + db11fc6
commit f89e93b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/boards/OpenIMU330.json b/boards/OpenIMU330.json
@@ -25,7 +25,6 @@
   ],
   "name": "Aceinna OpenIMU 330",
   "upload": {
-    "offset_address": "0x08010000",
     "maximum_ram_size": 65536,
     "maximum_size": 131072,
     "protocols": [

diff --git a/builder/main.py b/builder/main.py
@@ -185,7 +185,7 @@ def _jlink_cmd_script(env, source):
             "h",
             "loadbin %s,%s" % (
                 source,
-                board.get("upload").get("offset_address", "")),
+                board.get("upload").get("offset_address", "0x8000000")),
             "r",
             "q"
         ]
@@ -214,8 +214,9 @@ def _jlink_cmd_script(env, source):
     openocd_args.extend(
         debug_tools.get(upload_protocol).get("server").get("arguments", []))
     openocd_args.extend([
-        "-c", "program {$SOURCE} %s verify reset; shutdown;" %
-        board.get("upload.offset_address", "")
+        "-c", "program %s %s verify reset; shutdown;" % (
+            env.subst(upload_source)[0].replace("\\", "/"), board.get(
+                "upload.offset_address", "0x8000000"))
     ])
     openocd_args = [
         f.replace("$PACKAGE_DIR",

diff --git a/examples/OpenIMU330BI/VG/board/OpenIMU330.json b/examples/OpenIMU330BI/VG/board/OpenIMU330.json
@@ -25,7 +25,6 @@
   ],
   "name": "Aceinna OpenIMU 330",
   "upload": {
-    "flash_start": "0x08010000",
     "maximum_ram_size": 65536,
     "maximum_size": 131072,
     "protocols": [

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.2.0",
+  "version": "1.2.1",
   "packageRepositories": [
     "https://dl.bintray.com/platformio/dl-packages/manifest.json",
     "http://dl.platformio.org/packages/manifest.json"