Skip to content

Commit a418f48

Browse files
facchinmfacchinm
committed
Add arduinoOTA upload tool
1 parent 10bd41f commit a418f48

8 files changed

+74
-1
lines changed

‎build/build.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@
8989
<property name="LIBLISTSERIAL-VERSION" value="1.4.0" />
9090
<property name="AVRGCC-VERSION" value="4.9.2-atmel3.5.3-arduino2" />
9191
<property name="AVRDUDE-VERSION" value="6.3.0-arduino8" />
92+
<property name="arduinoOTA-VERSION" value="1.0.0" />
9293

9394
<!-- Libraries required for running arduino -->
9495
<fileset dir=".." id="runtime.jars">
@@ -496,6 +497,8 @@
496497
<param name="gcc_version" value="${AVRGCC-VERSION}"/>
497498
<param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i386-apple-darwin11.tar.bz2"/>
498499
<param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
500+
<param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-osx.tar.bz2"/>
501+
<param name="arduinoOTA_version" value="${arduinoOTA-VERSION}"/>
499502
</antcall>
500503

501504
<chmod perm="+x">
@@ -721,6 +724,8 @@
721724
<param name="gcc_version" value="${AVRGCC-VERSION}"/>
722725
<param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-armhf-pc-linux-gnu.tar.bz2"/>
723726
<param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
727+
<param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-linuxarm.tar.bz2"/>
728+
<param name="arduinoOTA_version" value="${arduinoOTA-VERSION}"/>
724729
</antcall>
725730
</target>
726731

@@ -751,6 +756,8 @@
751756
<param name="gcc_version" value="${AVRGCC-VERSION}"/>
752757
<param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i686-pc-linux-gnu.tar.bz2"/>
753758
<param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
759+
<param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-linux32.tar.bz2"/>
760+
<param name="arduinoOTA_version" value="${arduinoOTA-VERSION}"/>
754761
</antcall>
755762
</target>
756763

@@ -781,6 +788,8 @@
781788
<param name="gcc_version" value="${AVRGCC-VERSION}"/>
782789
<param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-x86_64-pc-linux-gnu.tar.bz2"/>
783790
<param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
791+
<param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-linux64.tar.bz2"/>
792+
<param name="arduinoOTA_version" value="${arduinoOTA-VERSION}"/>
784793
</antcall>
785794
</target>
786795

@@ -1067,6 +1076,8 @@
10671076
<param name="gcc_version" value="${AVRGCC-VERSION}"/>
10681077
<param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i686-w64-mingw32.zip"/>
10691078
<param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
1079+
<param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-windows.zip"/>
1080+
<param name="arduinoOTA_version" value="${arduinoOTA-VERSION}"/>
10701081
</antcall>
10711082
</target>
10721083

@@ -1152,10 +1163,21 @@
11521163
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/"/>
11531164
</antcall>
11541165

1166+
<mkdir dir="${staging_folder}/work/${staging_hardware_folder}/tmp/arduinoOTA"/>
1167+
1168+
<antcall target="${unpack_target}">
1169+
<param name="archive_file" value="${staging_folder}/${arduinoOTA_archive_file}"/>
1170+
<param name="archive_url" value="http://downloads.arduino.cc/tools/${arduinoOTA_archive_file}"/>
1171+
<param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tmp/arduinoOTA/${arduinoOTA_version}"/>
1172+
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tmp/arduinoOTA/"/>
1173+
</antcall>
1174+
11551175
<move file="${staging_folder}/work/${staging_hardware_folder}/tmp/gcc/avr" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/avr"/>
11561176
<move file="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/avr"/>
1177+
<move file="${staging_folder}/work/${staging_hardware_folder}/tmp/arduinoOTA/" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/avr"/>
11571178

11581179
<echo append="true" file="${staging_folder}/work/${staging_hardware_folder}/tools/avr/builtin_tools_versions.txt" message="arduino.avrdude=${avrdude_version}${line.separator}"/>
1180+
<echo append="true" file="${staging_folder}/work/${staging_hardware_folder}/tools/avr/builtin_tools_versions.txt" message="arduino.arduinoOTA=${arduinoOTA_version}${line.separator}"/>
11591181
<echo append="true" file="${staging_folder}/work/${staging_hardware_folder}/tools/avr/builtin_tools_versions.txt" message="arduino.avr-gcc=${gcc_version}${line.separator}"/>
11601182

11611183
<delete dir="${staging_folder}/work/${staging_hardware_folder}/tmp"/>

‎build/linux/arduinoOTA-1.0.0-linux32.tar.bz2.sha

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ea57315a2dc1ebadd219684ad720acc29914e5ea

‎build/linux/arduinoOTA-1.0.0-linux64.tar.bz2.sha

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
597dabb3a04c8036c38985c424e11be245a2a88c

‎build/linux/arduinoOTA-1.0.0-linuxarm.tar.bz2.sha

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9f0b23cc318f4cf88561884b4857a292438685e8

‎build/macosx/arduinoOTA-1.0.0-osx.tar.bz2.sha

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3d9f65a3313ca4447e502df82ce6f433552090e5

‎build/windows/arduinoOTA-1.0.0-windows.zip.sha

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
474366736c4a9a15ab8f228e2c198be44fced561

‎hardware/arduino/avr/platform.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ tools.avrdude.path={runtime.tools.avrdude.path}
9595
tools.avrdude.cmd.path={path}/bin/avrdude
9696
tools.avrdude.config.path={path}/etc/avrdude.conf
9797

98-
tools.avrdude.network_cmd={runtime.tools.arduinoota.path}/bin/arduinoota
98+
tools.avrdude.network_cmd={runtime.tools.arduinoOTA.path}/bin/arduinoOTA
9999

100100
tools.avrdude.upload.params.verbose=-v
101101
tools.avrdude.upload.params.quiet=-q -q

‎hardware/package_index_bundled.json

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,11 @@
5959
"packager": "arduino",
6060
"name": "avrdude",
6161
"version": "6.3.0-arduino8"
62+
},
63+
{
64+
"packager": "arduino",
65+
"name": "arduinoOTA",
66+
"version": "1.0.0"
6267
}
6368
]
6469
}
@@ -145,6 +150,47 @@
145150
"url": "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.3-arduino2-x86_64-pc-linux-gnu.tar.bz2"
146151
}
147152
]
153+
},
154+
{
155+
"name": "arduinoOTA",
156+
"version": "1.0.0",
157+
"systems": [
158+
{
159+
"size": "2044124",
160+
"checksum": "SHA-256:850a86876403cb45c944590a8cc7f9d8ef6d53ed853f7a9593ec395c4c1c6b2d",
161+
"host": "i686-linux-gnu",
162+
"archiveFileName": "arduinoOTA-1.0.0-linux32.tar.bz2",
163+
"url": "http://downloads.arduino.cc/tools/arduinoOTA-1.0.0-linux32.tar.bz2"
164+
},
165+
{
166+
"size": "2178772",
167+
"checksum": "SHA-256:f01f25e02787492a8a30414230635adae76ed85228045437433892d185991f9e",
168+
"host": "x86_64-linux-gnu",
169+
"archiveFileName": "arduinoOTA-1.0.0-linux64.tar.bz2",
170+
"url": "http://downloads.arduino.cc/tools/arduinoOTA-1.0.0-linux64.tar.bz2"
171+
},
172+
{
173+
"size": "1961623",
174+
"checksum": "SHA-256:0ca6c0a93bfad50be0b6e62dc51ba6c3267b809bab4ec91ef9606ab7d838e46b",
175+
"host": "arm-linux-gnueabihf",
176+
"archiveFileName": "arduinoOTA-1.0.0-linuxarm.tar.bz2",
177+
"url": "http://downloads.arduino.cc/tools/arduinoOTA-1.0.0-linuxarm.tar.bz2"
178+
},
179+
{
180+
"size": "2180617",
181+
"checksum": "SHA-256:e63c6034da2c1a7fe453eaa29c22df88627cc0aa3c5cbab7635c19367b74ee59",
182+
"host": "i386-apple-darwin11",
183+
"archiveFileName": "arduinoOTA-1.0.0-osx.tar.bz2",
184+
"url": "http://downloads.arduino.cc/tools/arduinoOTA-1.0.0-osx.tar.bz2"
185+
},
186+
{
187+
"size": "2247970",
188+
"checksum": "SHA-256:7bced1489217e07661ea1e75702a10a874b54f6146e2414ee47684c7eac014d1",
189+
"host": "i686-mingw32",
190+
"archiveFileName": "arduinoOTA-1.0.0-windows.zip",
191+
"url": "http://downloads.arduino.cc/tools/arduinoOTA-1.0.0-windows.zip"
192+
}
193+
]
148194
}
149195
]
150196
}

0 commit comments

Comments
 (0)