Merge pull request #224 from per1234/tools.openocd.path-fix

facchinm · web-flow · commit 78078e0c083f · 2017-04-04T10:29:11.000+02:00
Correct OpenOCD version in tools.openocd.path definition
diff --git a/platform.txt b/platform.txt
@@ -148,7 +148,7 @@ tools.bossac.upload.network_pattern="{network_cmd}" -address {serial.port} -port
 # OpenOCD sketch upload
 #
 
-tools.openocd.path={runtime.tools.openocd-0.9.0-arduino5-static.path}
+tools.openocd.path={runtime.tools.openocd-0.9.0-arduino6-static.path}
 tools.openocd.cmd=bin/openocd
 tools.openocd.cmd.windows=bin/openocd.exe
 
@@ -177,7 +177,7 @@ tools.openocd.bootloader.pattern="{path}/{cmd}" {bootloader.verbose} -s "{path}/
 # FIXME: this programmer is a workaround for default options being overwritten by uploadUsingPreferences
 #
 
-tools.openocd-withbootsize.path={runtime.tools.openocd-0.9.0-arduino5-static.path}
+tools.openocd-withbootsize.path={runtime.tools.openocd-0.9.0-arduino6-static.path}
 tools.openocd-withbootsize.cmd=bin/openocd
 tools.openocd-withbootsize.cmd.windows=bin/openocd.exe
 

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ tools.bossac.upload.network_pattern="{network_cmd}" -address {serial.port} -port`
`148`	`148`	`# OpenOCD sketch upload`
`149`	`149`	`#`
`150`	`150`
`151`		`-tools.openocd.path={runtime.tools.openocd-0.9.0-arduino5-static.path}`
	`151`	`+tools.openocd.path={runtime.tools.openocd-0.9.0-arduino6-static.path}`
`152`	`152`	`tools.openocd.cmd=bin/openocd`
`153`	`153`	`tools.openocd.cmd.windows=bin/openocd.exe`
`154`	`154`
`@@ -177,7 +177,7 @@ tools.openocd.bootloader.pattern="{path}/{cmd}" {bootloader.verbose} -s "{path}/`
`177`	`177`	`# FIXME: this programmer is a workaround for default options being overwritten by uploadUsingPreferences`
`178`	`178`	`#`
`179`	`179`
`180`		`-tools.openocd-withbootsize.path={runtime.tools.openocd-0.9.0-arduino5-static.path}`
	`180`	`+tools.openocd-withbootsize.path={runtime.tools.openocd-0.9.0-arduino6-static.path}`
`181`	`181`	`tools.openocd-withbootsize.cmd=bin/openocd`
`182`	`182`	`tools.openocd-withbootsize.cmd.windows=bin/openocd.exe`
`183`	`183`