Add support for pluggable discovery #426
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
silvanocerza
requested review from
cmaglie,
aentinger,
facchinm,
giulcioffi and
a team
|
Memory usage change @ d2832a6
Click for full report table
Click for full report CSV |
per1234
requested changes
Sep 7, 2021
silvanocerza
force-pushed
the
scerza/pluggable-discovery-support
branch
from
d2832a6 to
9e80e07
Compare
|
Memory usage change @ 3054e8e
Click for full report table
Click for full report CSV |
per1234
approved these changes
Sep 10, 2021
There was a problem hiding this comment.
It looks good to me.
I tried it out on a Mega with Ethernet Shield by using the ArduinoOTA library in combination with the supplemental my_boards:avr platform, to which I made the equivalent modifications:
diff --git a/avr/boards.txt b/avr/boards.txt
index cfbd79a..21bfde8 100644
--- a/avr/boards.txt
+++ b/avr/boards.txt
@@ -19,2 +19,4 @@ mega.pid.5=0x0242
mega.upload.tool=arduino:avrdude
+mega.upload.tool.serial=arduino:avrdude
+mega.upload.tool.network=arduino:arduino_ota
mega.upload.protocol=arduino
@@ -43,2 +45,4 @@ badio.name=Badio 1284p (Optiboot)
badio.upload.tool=arduino:avrdude
+badio.upload.tool.serial=arduino:avrdude
+badio.upload.tool.network=arduino:arduino_ota
badio.upload.protocol=arduino
@@ -67,2 +71,4 @@ badio_sd.name=Badio 1284p (SD boot)
badio_sd.upload.tool=arduino:avrdude
+badio_sd.upload.tool.serial=arduino:avrdude
+badio_sd.upload.tool.network=arduino:arduino_ota
badio_sd.upload.protocol=stk500
@@ -92,2 +98,4 @@ uno_bob.name=Uno/Nano/Mini (Big Optiboot)
uno_bob.upload.tool=arduino:avrdude
+uno_bob.upload.tool.serial=arduino:avrdude
+uno_bob.upload.tool.network=arduino:arduino_ota
uno_bob.upload.protocol=arduino
diff --git a/avr/platform.txt b/avr/platform.txt
index 597527c..4255f30 100644
--- a/avr/platform.txt
+++ b/avr/platform.txt
@@ -4,3 +4,5 @@ recipe.objcopy.bin.pattern="{compiler.path}{compiler.elf2hex.cmd}" -O binary {co
-tools.avrdude.upload.network_pattern="{network_cmd}" -address {serial.port} -port 65280 -username arduino -password password -sketch "{build.path}/{build.project_name}.bin" -upload /sketch -b
+tools.avrdude.upload.network_pattern="{tools.arduino_ota.cmd}" -address {serial.port} -port 65280 -username arduino -password password -sketch "{build.path}/{build.project_name}.bin" -upload /sketch -b
+
+tools.arduino_ota.upload.pattern="{cmd}" -address {upload.port.address} -port 65280 -username arduino -password password -sketch "{build.path}/{build.project_name}.bin" -upload /sketch -bbut that test didn't actually use much of anything from this PR, since arduino:avr doesn't work with the ArduinoOTA library out of the box. It would be best to try it out with the Uno WiFi (NOT Rev2), since that was the whole reason the network upload capability was added to arduino:avr in the first place. Unfortunately, I don't have that board. If someone else has one, please give it a try with Arduino CLI.
cmaglie
force-pushed
the
scerza/pluggable-discovery-support
branch
from
3054e8e to
5d74fcc
Compare
cmaglie
force-pushed
the
scerza/pluggable-discovery-support
branch
from
5d74fcc to
c34151f
Compare
3 tasks
3 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR adds supports for the new upload syntax following the pluggable discovery specification.