Skip to content

Commit eb62911

Browse files
committed
Fix commands for openocd 0.10.0
Fix bug introduced by 5704a06 Double/triple {} surrounding filenames are not needed on unix but are on Win. openocd 0.10.0 tcl interpreter (jimtcl) doesn't resolve curly braces recursively, while old did. By surrounding with just one curly brace 0.10.0 is happy Fixes #426 and #422
1 parent 3ee886b commit eb62911

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

platform.txt

+5-5
Original file line numberDiff line numberDiff line change
@@ -176,23 +176,23 @@ tools.openocd.cmd.windows=bin/openocd.exe
176176

177177
tools.openocd.upload.params.verbose=-d2
178178
tools.openocd.upload.params.quiet=-d0
179-
tools.openocd.upload.pattern="{path}/{cmd}" {upload.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "telnet_port disabled; program {build.path}/{build.project_name}.bin verify reset 0x2000; shutdown"
179+
tools.openocd.upload.pattern="{path}/{cmd}" {upload.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "telnet_port disabled; program {{build.path}/{build.project_name}.bin} verify reset 0x2000; shutdown"
180180

181181
tools.openocd.network_cmd={runtime.tools.arduinoOTA.path}/bin/arduinoOTA
182182
tools.openocd.upload.network_pattern={network_cmd} -address {serial.port} -port 65280 -username arduino -password "{network.password}" -sketch "{build.path}/{build.project_name}.bin" -upload /sketch -b
183183

184184
# Program flashes the binary at 0x0000, so use the linker script without_bootloader
185185
tools.openocd.program.params.verbose=-d2
186186
tools.openocd.program.params.quiet=-d0
187-
tools.openocd.program.pattern="{path}/{cmd}" {program.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "telnet_port disabled; program {build.path}/{build.project_name}.elf verify reset; shutdown"
187+
tools.openocd.program.pattern="{path}/{cmd}" {program.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "telnet_port disabled; program {{build.path}/{build.project_name}.elf} verify reset; shutdown"
188188

189189
tools.openocd.erase.params.verbose=-d3
190190
tools.openocd.erase.params.quiet=-d0
191191
tools.openocd.erase.pattern=
192192

193193
tools.openocd.bootloader.params.verbose=-d2
194194
tools.openocd.bootloader.params.quiet=-d0
195-
tools.openocd.bootloader.pattern="{path}/{cmd}" {bootloader.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "telnet_port disabled; init; halt; at91samd bootloader 0; program {runtime.platform.path}/bootloaders/{bootloader.file} verify reset; shutdown"
195+
tools.openocd.bootloader.pattern="{path}/{cmd}" {bootloader.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "telnet_port disabled; init; halt; at91samd bootloader 0; program {{runtime.platform.path}/bootloaders/{bootloader.file}} verify reset; shutdown"
196196

197197
#
198198
# OpenOCD sketch upload - version with configurable bootloader size
@@ -210,12 +210,12 @@ tools.openocd-withbootsize.upload.pattern="{path}/{cmd}" {upload.verbose} -s "{p
210210
# Program flashes the binary at 0x0000, so use the linker script without_bootloader
211211
tools.openocd-withbootsize.program.params.verbose=-d2
212212
tools.openocd-withbootsize.program.params.quiet=-d0
213-
tools.openocd-withbootsize.program.pattern="{path}/{cmd}" {program.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "telnet_port disabled; program {build.path}/{build.project_name}.elf verify reset; shutdown"
213+
tools.openocd-withbootsize.program.pattern="{path}/{cmd}" {program.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "telnet_port disabled; program {{build.path}/{build.project_name}.elf} verify reset; shutdown"
214214

215215
tools.openocd-withbootsize.erase.params.verbose=-d3
216216
tools.openocd-withbootsize.erase.params.quiet=-d0
217217
tools.openocd-withbootsize.erase.pattern=
218218

219219
tools.openocd-withbootsize.bootloader.params.verbose=-d2
220220
tools.openocd-withbootsize.bootloader.params.quiet=-d0
221-
tools.openocd-withbootsize.bootloader.pattern="{path}/{cmd}" {bootloader.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "telnet_port disabled; init; halt; at91samd bootloader 0; program {runtime.platform.path}/bootloaders/{bootloader.file} verify reset; shutdown"
221+
tools.openocd-withbootsize.bootloader.pattern="{path}/{cmd}" {bootloader.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "telnet_port disabled; init; halt; at91samd bootloader 0; program {{runtime.platform.path}/bootloaders/{bootloader.file}} verify reset; shutdown"

0 commit comments

Comments
 (0)