Skip to content

Commit f3e2d72

Browse files
committed
Merge branch 'release/v4.2.0'
2 parents 081c33e + 065039d commit f3e2d72

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

builder/main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ def _jlink_cmd_script(env, source):
183183
UPLOADERFLAGS=["-s", platform.get_package_dir("tool-openocd") or ""] +
184184
debug_tools.get(upload_protocol).get("server").get("arguments", []) + [
185185
"-c",
186-
"program {{$SOURCE}} verify reset %s; shutdown;" %
186+
"program {$SOURCE} verify reset %s; shutdown;" %
187187
env.BoardConfig().get("upload.offset_address", "")
188188
],
189189
UPLOADCMD="$UPLOADER $UPLOADERFLAGS"

platform.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"type": "git",
1313
"url": "https://github.com/platformio/platform-nxplpc.git"
1414
},
15-
"version": "4.1.0",
15+
"version": "4.2.0",
1616
"packageRepositories": [
1717
"https://dl.bintray.com/platformio/dl-packages/manifest.json",
1818
"http://dl.platformio.org/packages/manifest.json"
@@ -26,17 +26,17 @@
2626
"packages": {
2727
"toolchain-gccarmnoneeabi": {
2828
"type": "toolchain",
29-
"version": ">=1.60301.0"
29+
"version": ">=1.60301.0,<1.80000.0"
3030
},
3131
"framework-mbed": {
3232
"type": "framework",
3333
"optional": true,
34-
"version": "~5.51104.190214"
34+
"version": "~5.51105.190304"
3535
},
3636
"tool-openocd": {
3737
"type": "debugger",
3838
"optional": true,
39-
"version": "~1.1000.0"
39+
"version": "~2.1000.0"
4040
},
4141
"tool-pyocd": {
4242
"type": "debugger",

0 commit comments

Comments
 (0)