tools/flash: Pass hub kind instead of metadata.

Each tool only uses the metadata to get the hub kind, so pass it directly. In the BLE tool it was duplicated before, so we need just one.

Author: laurensvalk

tools/flash/__main__.py

@@ -60,9 +60,9 @@ def main():
     hub_kind = HubKind(metadata["device-id"])
 
     if hub_kind in (HubKind.TECHNIC_SMALL, HubKind.TECHNIC_LARGE):
-        flash_dfu(firmware, metadata)
+        flash_dfu(firmware, hub_kind)
     elif hub_kind in [HubKind.BOOST, HubKind.CITY, HubKind.TECHNIC]:
-        asyncio.run(flash_ble(hub_kind, firmware, metadata))
+        asyncio.run(flash_ble(firmware, hub_kind))
     elif hub_kind == HubKind.NXT:
         flash_nxt(firmware)
     elif hub_kind == HubKind.EV3:

tools/flash/dfu.py

@@ -23,7 +23,6 @@
 from tqdm.contrib.logging import logging_redirect_tqdm
 
 from lwp3.bytecodes import HubKind
-from firmware import AnyFirmwareMetadata
 from constants import (
     LEGO_USB_VID,
     MINDSTORMS_INVENTOR_DFU_USB_PID,
@@ -242,7 +241,7 @@ def write_firmware(
     print("Done.")
 
 
-def flash_dfu(firmware_bin: bytes, metadata: AnyFirmwareMetadata) -> None:
+def flash_dfu(firmware_bin: bytes, hub_kind: HubKind) -> None:
     """Flashes a firmware image to a connected hub over USB DFU."""
     try:
         devices = get_dfu_devices(idVendor=LEGO_USB_VID)
@@ -269,7 +268,7 @@ def flash_dfu(firmware_bin: bytes, metadata: AnyFirmwareMetadata) -> None:
             print(f"Unknown USB product ID: {product_id:04X}", file=sys.stderr)
             exit(1)
 
-        if ALL_PIDS[product_id] != metadata["device-id"]:
+        if ALL_PIDS[product_id] != hub_kind:
             print("Incorrect firmware type for this hub", file=sys.stderr)
             exit(1)
 

tools/flash/lwp3/flash.py

@@ -179,7 +179,7 @@ async def bootloader_request(self, request, payload=None, timeout=None):
                 reply = await self.wait_for_reply(timeout)
             return request.parse_reply(reply)
 
-    async def flash(self, firmware, metadata):
+    async def flash(self, firmware, hub_kind):
         # Firmware information
         firmware_io = io.BytesIO(firmware)
         firmware_size = len(firmware)
@@ -193,11 +193,11 @@ async def flash(self, firmware, metadata):
         hub_name, max_data_size = HUB_INFO[info.type_id]
 
         # Verify hub ID against ID in firmware package
-        if info.type_id != metadata["device-id"]:
+        if info.type_id != hub_kind:
             await self.disconnect()
             raise RuntimeError(
                 "This firmware {0}, but we are connected to {1}.".format(
-                    HUB_INFO[metadata["device-id"]][0], hub_name
+                    HUB_INFO[hub_kind][0], hub_name
                 )
             )
 
@@ -308,17 +308,16 @@ def match_hub(hub_kind: HubKind, adv: AdvertisementData) -> bool:
     return False
 
 
-async def flash_ble(hub_kind: HubKind, firmware: bytes, metadata: dict):
+async def flash_ble(firmware: bytes, hub_kind: HubKind):
     """
     Flashes firmware to the hub using Bluetooth Low Energy.
 
     The hub has to be advertising and can be running official LEGO firmware,
     Pybricks firmware or be in bootloader mode.
 
     Args:
-        hub_kind: The hub type ID. Only hubs matching this ID will be discovered.
         firmware: The raw firmware binary blob.
-        metadata: The firmware metadata from the firmware.zip file.
+        hub_kind: The hub type ID. Only hubs matching this ID will be discovered.
     """
 
     print(f"Searching for {hub_kind.name} hub...")
@@ -352,4 +351,4 @@ def map_and_match(device: BLEDevice, adv: AdvertisementData):
     updater = BootloaderConnection()
     await updater.connect(device)
     print("Erasing flash and starting update")
-    await updater.flash(firmware, metadata)
+    await updater.flash(firmware, hub_kind)