Skip to content

Commit 42cc2dc

Browse files
umbynosumbynos
authored
Remove support for SARA module (#65)
* remove old sara fw and loader sketch * remove sara related code in `arduino-fwuploader` binary * remove sara from the generator * remove sara also in test indexes and regenerate signatures
1 parent b9b8c40 commit 42cc2dc

15 files changed

+5
-359
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Firmware/Certificates updater for WINC and NINA Wifi module
22

3-
Use this tool to update the firmware and/or add SSL certificates for any WINC, NINA or SARA module.
3+
Use this tool to update the firmware and/or add SSL certificates for any WINC, NINA module.
44

55
## Install
66

‎cli/certificates/flash.go

-2
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,6 @@ func run(cmd *cobra.Command, args []string) {
170170
switch moduleName {
171171
case "NINA":
172172
f, err = flasher.NewNinaFlasher(uploadPort)
173-
case "SARA":
174-
f, err = flasher.NewSaraFlasher(uploadPort)
175173
case "WINC1500":
176174
f, err = flasher.NewWincFlasher(uploadPort)
177175
default:

‎cli/firmware/flash.go

-2
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,6 @@ func updateFirmware(board *firmwareindex.IndexBoard, commandLine []string, modul
215215
switch moduleName {
216216
case "NINA":
217217
f, err = flasher.NewNinaFlasher(uploadPort)
218-
case "SARA":
219-
f, err = flasher.NewSaraFlasher(uploadPort)
220218
case "WINC1500":
221219
f, err = flasher.NewWincFlasher(uploadPort)
222220
default:

‎firmwares/SARA/5.6A2_01/5.6A2.00-to-5.6A2.01.pkg

-517 KB
Binary file not shown.

‎firmwares/SARA/5.6A2_01/5.6A2_01_to_99.pkg

-1.7 KB
Binary file not shown.

‎firmwares/SARA/5.6A2_01/99_to_5.6A2_01.pkg

-1.68 KB
Binary file not shown.

‎firmwares/SARA/SerialSARAPassthrough.ino.bin

-11 KB
Binary file not shown.

‎flasher/sara.go

-230
This file was deleted.

‎generator/generator.py

-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
"nano_33_iot": "arduino:samd:nano_33_iot",
1414
"mkrvidor4000": "arduino:samd:mkrvidor4000",
1515
"uno2018": "arduino:megaavr:uno2018",
16-
"mkrnb1500": "arduino:samd:mkrnb1500",
1716
"nanorp2040connect": "arduino:mbed_nano:nanorp2040connect",
1817
}
1918

@@ -212,7 +211,6 @@ def generate_boards_json(input_data, arduino_cli_path):
212211
"firmware": [],
213212
},
214213
"arduino:megaavr:uno2018": {"fqbn": "arduino:megaavr:uno2018", "firmware": []},
215-
"arduino:samd:mkrnb1500": {"fqbn": "arduino:samd:mkrnb1500", "firmware": []},
216214
"arduino:mbed_nano:nanorp2040connect": {
217215
"fqbn": "arduino:mbed_nano:nanorp2040connect",
218216
"firmware": [],

‎generator/raw_boards.json

-34
Original file line numberDiff line numberDiff line change
@@ -473,40 +473,6 @@
473473
}
474474
]
475475
},
476-
"mkrnb1500": {
477-
"firmwares/SARA": [
478-
{
479-
"version": "SARA",
480-
"Path": "firmwares/SARA/SerialSARAPassthrough.ino.bin",
481-
"Name": "firmwares SARA",
482-
"IsLoader": true
483-
}
484-
],
485-
"firmwares/SARA/5.6A2.00-to-5.6A2.01": [
486-
{
487-
"version": "SARA/5.6A2.00-to-5.6A2.01",
488-
"Path": "firmwares/SARA/5.6A2_01/5.6A2.00-to-5.6A2.01.pkg",
489-
"Name": "SARA 5.6A2_01 (5.6A2.00-to-5.6A2.01.pkg)",
490-
"IsLoader": false
491-
}
492-
],
493-
"firmwares/SARA/5.6A2_01_to_99": [
494-
{
495-
"version": "SARA/5.6A2_01_to_99",
496-
"Path": "firmwares/SARA/5.6A2_01/5.6A2_01_to_99.pkg",
497-
"Name": "SARA 5.6A2_01 (5.6A2_01_to_99.pkg)",
498-
"IsLoader": false
499-
}
500-
],
501-
"firmwares/SARA/99_to_5.6A2_01": [
502-
{
503-
"version": "SARA/99_to_5.6A2_01",
504-
"Path": "firmwares/SARA/5.6A2_01/99_to_5.6A2_01.pkg",
505-
"Name": "SARA 5.6A2_01 (99_to_5.6A2_01.pkg)",
506-
"IsLoader": false
507-
}
508-
]
509-
},
510476
"nanorp2040connect": {
511477
"firmwares/NINA": [
512478
{

‎indexes/download/testdata/module_firmware_index.json

+2-42
Original file line numberDiff line numberDiff line change
@@ -464,46 +464,6 @@
464464
"linux": "\"{tool_dir}/bin/avrdude\" \"-C{tool_dir}/etc/avrdude.conf\" -v -patmega4809 -cxplainedmini_updi -Pusb -b115200 -e -D \"-Uflash:w:{loader.sketch}.hex:i\" \"-Ufuse2:w:0x01:m\" \"-Ufuse5:w:0xC9:m\" \"-Ufuse8:w:0x02:m\" "
465465
}
466466
},
467-
{
468-
"fqbn": "arduino:samd:mkrnb1500",
469-
"firmware": [
470-
{
471-
"version": "5.6A2.00-to-5.6A2.01",
472-
"url": "https://downloads.arduino.cc/arduino-fwuploader/firmwares/SARA/5.6A2.00-to-5.6A2.01/5.6A2.00-to-5.6A2.01.pkg",
473-
"checksum": "SHA-256:8f04bd7fa1833cf2d3762e086d79191e76bf66c6e108e852b5fe89ca4f2b72c9",
474-
"size": "529880",
475-
"module": "SARA"
476-
},
477-
{
478-
"version": "5.6A2_01_to_99",
479-
"url": "https://downloads.arduino.cc/arduino-fwuploader/firmwares/SARA/5.6A2_01_to_99/5.6A2_01_to_99.pkg",
480-
"checksum": "SHA-256:abb947accdeb980d7aeafed45ac7ce797eb90445eeb8d0bd57ca5b3ad204dbf6",
481-
"size": "1738",
482-
"module": "SARA"
483-
},
484-
{
485-
"version": "99_to_5.6A2_01",
486-
"url": "https://downloads.arduino.cc/arduino-fwuploader/firmwares/SARA/99_to_5.6A2_01/99_to_5.6A2_01.pkg",
487-
"checksum": "SHA-256:81618148c677d8c36df5089c931b46476f4a78fd9d9fd231fee0a9dbb38aa970",
488-
"size": "1724",
489-
"module": "SARA"
490-
}
491-
],
492-
"loader_sketch": {
493-
"url": "https://downloads.arduino.cc/arduino-fwuploader/firmwares/loader/arduino.samd.mkrnb1500/loader.bin",
494-
"checksum": "SHA-256:a627ff76588626eacaaec2a2f5719e3fcf069fda2b32f8ace4f2703f1768f142",
495-
"size": "11312"
496-
},
497-
"module": "SARA",
498-
"name": "Arduino MKR NB 1500",
499-
"uploader": "arduino:[email protected]",
500-
"upload.use_1200bps_touch": true,
501-
"upload.wait_for_upload_port": true,
502-
"uploader.command": {
503-
"linux": "\"{tool_dir}/bossac\" -i -d --port={serial.port.file} -U true -i -e -w -v \"{loader.sketch}.bin\" -R",
504-
"windows": "\"{tool_dir}\\bossac.exe\" -i -d --port={serial.port.file} -U true -i -e -w -v \"{loader.sketch}.bin\" -R"
505-
}
506-
},
507467
{
508468
"fqbn": "arduino:mbed_nano:nanorp2040connect",
509469
"firmware": [
@@ -517,8 +477,8 @@
517477
],
518478
"loader_sketch": {
519479
"url": "https://downloads.arduino.cc/arduino-fwuploader/firmwares/loader/arduino.mbed_nano.nanorp2040connect/loader.elf",
520-
"checksum": "SHA-256:263fe2389f9a4ee3ba5938f2115faad3bbb9c775821a598a66f0f1708e64fc01",
521-
"size": "1649504"
480+
"checksum": "SHA-256:4b67381122df67a210c29d01f01153f34cdeea77593f7e5e12259e3c85b472f0",
481+
"size": "1639020"
522482
},
523483
"module": "NINA",
524484
"name": "Arduino Nano RP2040 Connect",

‎indexes/download/testdata/module_firmware_index.json.sig

0 Bytes
Binary file not shown.

‎indexes/firmwareindex/firmwareindex.go

-4
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,6 @@ func LoadIndexNoSign(jsonIndexFile *paths.Path) (*Index, error) {
120120

121121
// Determine latest firmware for each board
122122
for _, board := range index.Boards {
123-
if board.Module == "SARA" {
124-
// TODO implement?? by default you have to specify the version
125-
continue
126-
}
127123
for _, firmware := range board.Firmwares {
128124
if board.LatestFirmware == nil || firmware.Version.GreaterThan(board.LatestFirmware.Version) {
129125
board.LatestFirmware = firmware

0 commit comments

Comments
 (0)