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
arduino · Jun 23, 2021 · 42cc2dc · 42cc2dc
1 parent b9b8c40
commit 42cc2dc
Show file tree

Hide file tree

Showing 15 changed files with 5 additions and 359 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Firmware/Certificates updater for WINC and NINA Wifi module
 
-Use this tool to update the firmware and/or add SSL certificates for any WINC, NINA or SARA module.
+Use this tool to update the firmware and/or add SSL certificates for any WINC, NINA module.
 
 ## Install
 

diff --git a/cli/certificates/flash.go b/cli/certificates/flash.go
@@ -170,8 +170,6 @@ func run(cmd *cobra.Command, args []string) {
 	switch moduleName {
 	case "NINA":
 		f, err = flasher.NewNinaFlasher(uploadPort)
-	case "SARA":
-		f, err = flasher.NewSaraFlasher(uploadPort)
 	case "WINC1500":
 		f, err = flasher.NewWincFlasher(uploadPort)
 	default:

diff --git a/cli/firmware/flash.go b/cli/firmware/flash.go
@@ -215,8 +215,6 @@ func updateFirmware(board *firmwareindex.IndexBoard, commandLine []string, modul
 	switch moduleName {
 	case "NINA":
 		f, err = flasher.NewNinaFlasher(uploadPort)
-	case "SARA":
-		f, err = flasher.NewSaraFlasher(uploadPort)
 	case "WINC1500":
 		f, err = flasher.NewWincFlasher(uploadPort)
 	default:

diff --git a/firmwares/SARA/5.6A2_01/5.6A2.00-to-5.6A2.01.pkg b/firmwares/SARA/5.6A2_01/5.6A2.00-to-5.6A2.01.pkg
diff --git a/firmwares/SARA/5.6A2_01/5.6A2_01_to_99.pkg b/firmwares/SARA/5.6A2_01/5.6A2_01_to_99.pkg
diff --git a/firmwares/SARA/5.6A2_01/99_to_5.6A2_01.pkg b/firmwares/SARA/5.6A2_01/99_to_5.6A2_01.pkg
diff --git a/firmwares/SARA/SerialSARAPassthrough.ino.bin b/firmwares/SARA/SerialSARAPassthrough.ino.bin
diff --git a/flasher/sara.go b/flasher/sara.go
diff --git a/generator/generator.py b/generator/generator.py
@@ -13,7 +13,6 @@
     "nano_33_iot": "arduino:samd:nano_33_iot",
     "mkrvidor4000": "arduino:samd:mkrvidor4000",
     "uno2018": "arduino:megaavr:uno2018",
-    "mkrnb1500": "arduino:samd:mkrnb1500",
     "nanorp2040connect": "arduino:mbed_nano:nanorp2040connect",
 }
 
@@ -212,7 +211,6 @@ def generate_boards_json(input_data, arduino_cli_path):
             "firmware": [],
         },
         "arduino:megaavr:uno2018": {"fqbn": "arduino:megaavr:uno2018", "firmware": []},
-        "arduino:samd:mkrnb1500": {"fqbn": "arduino:samd:mkrnb1500", "firmware": []},
         "arduino:mbed_nano:nanorp2040connect": {
             "fqbn": "arduino:mbed_nano:nanorp2040connect",
             "firmware": [],

diff --git a/generator/raw_boards.json b/generator/raw_boards.json
@@ -473,40 +473,6 @@
       }
     ]
   },
-  "mkrnb1500": {
-    "firmwares/SARA": [
-      {
-        "version": "SARA",
-        "Path": "firmwares/SARA/SerialSARAPassthrough.ino.bin",
-        "Name": "firmwares SARA",
-        "IsLoader": true
-      }
-    ],
-    "firmwares/SARA/5.6A2.00-to-5.6A2.01": [
-      {
-        "version": "SARA/5.6A2.00-to-5.6A2.01",
-        "Path": "firmwares/SARA/5.6A2_01/5.6A2.00-to-5.6A2.01.pkg",
-        "Name": "SARA 5.6A2_01 (5.6A2.00-to-5.6A2.01.pkg)",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/SARA/5.6A2_01_to_99": [
-      {
-        "version": "SARA/5.6A2_01_to_99",
-        "Path": "firmwares/SARA/5.6A2_01/5.6A2_01_to_99.pkg",
-        "Name": "SARA 5.6A2_01 (5.6A2_01_to_99.pkg)",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/SARA/99_to_5.6A2_01": [
-      {
-        "version": "SARA/99_to_5.6A2_01",
-        "Path": "firmwares/SARA/5.6A2_01/99_to_5.6A2_01.pkg",
-        "Name": "SARA 5.6A2_01 (99_to_5.6A2_01.pkg)",
-        "IsLoader": false
-      }
-    ]
-  },
   "nanorp2040connect": {
     "firmwares/NINA": [
       {

diff --git a/indexes/download/testdata/module_firmware_index.json b/indexes/download/testdata/module_firmware_index.json
@@ -464,46 +464,6 @@
       "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\" "
     }
   },
-  {
-    "fqbn": "arduino:samd:mkrnb1500",
-    "firmware": [
-      {
-        "version": "5.6A2.00-to-5.6A2.01",
-        "url": "https://downloads.arduino.cc/arduino-fwuploader/firmwares/SARA/5.6A2.00-to-5.6A2.01/5.6A2.00-to-5.6A2.01.pkg",
-        "checksum": "SHA-256:8f04bd7fa1833cf2d3762e086d79191e76bf66c6e108e852b5fe89ca4f2b72c9",
-        "size": "529880",
-        "module": "SARA"
-      },
-      {
-        "version": "5.6A2_01_to_99",
-        "url": "https://downloads.arduino.cc/arduino-fwuploader/firmwares/SARA/5.6A2_01_to_99/5.6A2_01_to_99.pkg",
-        "checksum": "SHA-256:abb947accdeb980d7aeafed45ac7ce797eb90445eeb8d0bd57ca5b3ad204dbf6",
-        "size": "1738",
-        "module": "SARA"
-      },
-      {
-        "version": "99_to_5.6A2_01",
-        "url": "https://downloads.arduino.cc/arduino-fwuploader/firmwares/SARA/99_to_5.6A2_01/99_to_5.6A2_01.pkg",
-        "checksum": "SHA-256:81618148c677d8c36df5089c931b46476f4a78fd9d9fd231fee0a9dbb38aa970",
-        "size": "1724",
-        "module": "SARA"
-      }
-    ],
-    "loader_sketch": {
-      "url": "https://downloads.arduino.cc/arduino-fwuploader/firmwares/loader/arduino.samd.mkrnb1500/loader.bin",
-      "checksum": "SHA-256:a627ff76588626eacaaec2a2f5719e3fcf069fda2b32f8ace4f2703f1768f142",
-      "size": "11312"
-    },
-    "module": "SARA",
-    "name": "Arduino MKR NB 1500",
-    "uploader": "arduino:bossac@1.7.0-arduino3",
-    "upload.use_1200bps_touch": true,
-    "upload.wait_for_upload_port": true,
-    "uploader.command": {
-      "linux": "\"{tool_dir}/bossac\" -i -d --port={serial.port.file} -U true -i -e -w -v \"{loader.sketch}.bin\" -R",
-      "windows": "\"{tool_dir}\\bossac.exe\" -i -d --port={serial.port.file} -U true -i -e -w -v \"{loader.sketch}.bin\" -R"
-    }
-  },
   {
     "fqbn": "arduino:mbed_nano:nanorp2040connect",
     "firmware": [
@@ -517,8 +477,8 @@
     ],
     "loader_sketch": {
       "url": "https://downloads.arduino.cc/arduino-fwuploader/firmwares/loader/arduino.mbed_nano.nanorp2040connect/loader.elf",
-      "checksum": "SHA-256:263fe2389f9a4ee3ba5938f2115faad3bbb9c775821a598a66f0f1708e64fc01",
-      "size": "1649504"
+      "checksum": "SHA-256:4b67381122df67a210c29d01f01153f34cdeea77593f7e5e12259e3c85b472f0",
+      "size": "1639020"
     },
     "module": "NINA",
     "name": "Arduino Nano RP2040 Connect",

diff --git a/indexes/download/testdata/module_firmware_index.json.sig b/indexes/download/testdata/module_firmware_index.json.sig
diff --git a/indexes/firmwareindex/firmwareindex.go b/indexes/firmwareindex/firmwareindex.go
@@ -120,10 +120,6 @@ func LoadIndexNoSign(jsonIndexFile *paths.Path) (*Index, error) {
 
 	// Determine latest firmware for each board
 	for _, board := range index.Boards {
-		if board.Module == "SARA" {
-			// TODO implement?? by default you have to specify the version
-			continue
-		}
 		for _, firmware := range board.Firmwares {
 			if board.LatestFirmware == nil || firmware.Version.GreaterThan(board.LatestFirmware.Version) {
 				board.LatestFirmware = firmware