Skip to content

Commit e163544

Browse files
committed
Fix legacy upload.network_pattern rules
1 parent 70c7125 commit e163544

File tree

1 file changed

+16
-8
lines changed

1 file changed

+16
-8
lines changed

Diff for: platform.txt

+16-8
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,10 @@ tools.avrdude.upload.pattern="{cmd}" "-C{config.path}" {upload.verbose} -p{build
156156

157157
tools.avrdude_remote.upload.pattern="openocd --version 2>&1 | grep 2016 && if opkg update; then opkg upgrade openocd; exit 1; else echo 'Please connect your board to the Internet in order to upgrade tools' >&2; exit 1; fi || /usr/bin/run-avrdude /tmp/sketch.hex"
158158

159-
# the following rule is deprecated by pluggable discovery
160-
tools.avrdude.upload.network_pattern="{tools.arduino_ota.cmd}" -address {serial.port} -port 65280 -username arduino -password "{network.password}" -sketch "{build.path}/{build.project_name}.bin" -upload /sketch -b
159+
# The following rule is deprecated by pluggable discovery.
160+
# We keep it to avoid breaking compatibility with the Arduino Java IDE.
161+
tools.avrdude.network_cmd={runtime.tools.arduinoOTA.path}/bin/arduinoOTA
162+
tools.avrdude.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
161163

162164
#
163165
# BOSSA
@@ -172,8 +174,10 @@ tools.bossac.upload.pattern="{path}/{cmd}" {upload.verbose} --port={serial.port.
172174

173175
tools.bossac_remote.upload.pattern=/usr/bin/run-bossac {upload.verbose} --port=ttyATH0 -U {upload.native_usb} -e -w -v /tmp/sketch.bin -R
174176

175-
# the following rule is deprecated by pluggable discovery
176-
tools.bossac.upload.network_pattern="{tools.arduino_ota.cmd}" -address {serial.port} -port 65280 -username arduino -password "{network.password}" -sketch "{build.path}/{build.project_name}.bin" -upload /sketch -b {arduinoota.extraflags}
177+
# The following rule is deprecated by pluggable discovery.
178+
# We keep it to avoid breaking compatibility with the Arduino Java IDE.
179+
tools.bossac.network_cmd={runtime.tools.arduinoOTA.path}/bin/arduinoOTA
180+
tools.bossac.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 {arduinoota.extraflags}
177181

178182
#
179183
# BOSSA (ignore binary size)
@@ -188,8 +192,10 @@ tools.bossacI.upload.pattern="{path}/{cmd}" {upload.verbose} --port={serial.port
188192

189193
tools.bossacI_remote.upload.pattern=/usr/bin/run-bossac {upload.verbose} --port=ttyATH0 -U {upload.native_usb} -e -w -v /tmp/sketch.bin -R
190194

191-
# the following rule is deprecated by pluggable discovery
192-
tools.bossacI.upload.network_pattern="{tools.arduino_ota.cmd}" -address {serial.port} -port 65280 -username arduino -password "{network.password}" -sketch "{build.path}/{build.project_name}.bin" -upload /sketch -b
195+
# The following rule is deprecated by pluggable discovery.
196+
# We keep it to avoid breaking compatibility with the Arduino Java IDE.
197+
tools.bossacI.network_cmd={runtime.tools.arduinoOTA.path}/bin/arduinoOTA
198+
tools.bossacI.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
193199

194200

195201
#
@@ -204,8 +210,10 @@ tools.openocd.upload.params.verbose=-d2
204210
tools.openocd.upload.params.quiet=-d0
205211
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"
206212

207-
# the following rule is deprecated by pluggable discovery
208-
tools.openocd.upload.network_pattern={tools.arduino_ota.cmd} -address {serial.port} -port 65280 -username arduino -password "{network.password}" -sketch "{build.path}/{build.project_name}.bin" -upload /sketch -b
213+
# The following rule is deprecated by pluggable discovery.
214+
# We keep it to avoid breaking compatibility with the Arduino Java IDE.
215+
tools.openocd.network_cmd={runtime.tools.arduinoOTA.path}/bin/arduinoOTA
216+
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
209217

210218
tools.openocd.program.params.verbose=-d2
211219
tools.openocd.program.params.quiet=-d0

0 commit comments

Comments
 (0)