Skip to content

Commit fab0f55

Browse files
committed
Merge branch 'release/v10.10.0'
2 parents 09a68d7 + b439884 commit fab0f55

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

builder/main.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -363,11 +363,11 @@ def _jlink_cmd_script(env, source):
363363
script_path = join(build_dir, "upload.jlink")
364364
commands = ["h"]
365365
if "DFUBOOTHEX" in env:
366-
commands.append("loadbin %s,%s" % (str(source).replace("_signature", ""),
366+
commands.append('loadbin "%s",%s' % (str(source).replace("_signature", ""),
367367
env.BoardConfig().get("upload.offset_address", "0x26000")))
368-
commands.append("loadbin %s,%s" % (source, env.get("BOOT_SETTING_ADDR")))
368+
commands.append('loadbin "%s",%s' % (source, env.get("BOOT_SETTING_ADDR")))
369369
else:
370-
commands.append("loadbin %s,%s" % (source, env.BoardConfig().get(
370+
commands.append('loadbin "%s",%s' % (source, env.BoardConfig().get(
371371
"upload.offset_address", "0x0")))
372372

373373
commands.append("r")

platform.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"type": "git",
1919
"url": "https://github.com/platformio/platform-nordicnrf52.git"
2020
},
21-
"version": "10.9.0",
21+
"version": "10.10.0",
2222
"frameworks": {
2323
"arduino": {
2424
"package": "framework-arduinonordicnrf5",
@@ -54,7 +54,7 @@
5454
"type": "framework",
5555
"optional": true,
5656
"owner": "platformio",
57-
"version": "~1.10601.0"
57+
"version": "~1.10700.0"
5858
},
5959
"framework-arduinonordicnrf5": {
6060
"type": "framework",
@@ -66,7 +66,7 @@
6666
"type": "framework",
6767
"optional": true,
6868
"owner": "platformio",
69-
"version": "~4.3.1"
69+
"version": "~4.4.1"
7070
},
7171
"framework-cmsis": {
7272
"type": "framework",

0 commit comments

Comments
 (0)