micropython-stubber 1.20.2__py3-none-any.whl → 1.20.5__py3-none-any.whl

mpflash/mpflash/cli_main.py

@@ -19,12 +19,12 @@ def mpflash():
     cli.add_command(cli_flash_board)
 
     # cli(auto_envvar_prefix="MPFLASH")
-    if False and os.environ.get("COMPUTERNAME") == "JOSVERL-S4":
+    if False and os.environ.get("COMPUTERNAME").startswith("JOSVERL"):
         # intentional less error suppression on dev machine
         result = cli(standalone_mode=False)
     else:
         try:
-            result = cli(standalone_mode=False)
+            result = cli(standalone_mode=True)
             exit(result)
         except AttributeError as e:
             log.error(f"Error: {e}")
@@ -32,6 +32,9 @@ def mpflash():
         except click.exceptions.ClickException as e:
             log.error(f"Error: {e}")
             exit(-2)
+        except click.exceptions.Abort as e:
+            # Aborted - Ctrl-C
+            exit(-3)
 
 
 if __name__ == "__main__":

mpflash/mpflash/common.py

@@ -2,6 +2,7 @@ import fnmatch
 import os
 import sys
 from dataclasses import dataclass, field
+from enum import Enum
 from pathlib import Path
 from typing import List, Optional, Union
 
@@ -47,7 +48,7 @@ class FWInfo:
     firmware: str = field(default="")  # url or path to original firmware image
     variant: str = field(default="")  # MicroPython variant
     preview: bool = field(default=False)  # True if the firmware is a preview version
-    version: str = field(default="")  # MicroPython version
+    version: str = field(default="")  # MicroPython version (NO v prefix)
     url: str = field(default="")  # url to the firmware image download folder
     build: str = field(default="0")  # The build = number of commits since the last release
     ext: str = field(default="")  # the file extension of the firmware
@@ -90,14 +91,26 @@ class DownloadParams(Params):
     force: bool = False
 
 
+class BootloaderMethod(Enum):
+    MANUAL = "manual"
+    MPY = "mpy"
+    TOUCH_1200 = "touch1200"
+    NONE = "none"
+
+
+
 @dataclass
 class FlashParams(Params):
     """Parameters for flashing a board"""
 
     erase: bool = True
-    bootloader: bool = True
+    bootloader: BootloaderMethod = BootloaderMethod.NONE
     cpu: str = ""
 
+    def __post_init__(self):
+        if isinstance(self.bootloader, str):
+            self.bootloader = BootloaderMethod(self.bootloader)
+
 
 ParamType = Union[DownloadParams, FlashParams]
 

mpflash/mpflash/config.py

@@ -1,10 +1,22 @@
 """centralized configuration for mpflash"""
 
+import os
 from pathlib import Path
 from typing import List
 
+import pkg_resources
 import platformdirs
 
+from mpflash.logger import log
+
+
+def get_version():
+    name = __package__ or "mpflash"
+    try:
+        return pkg_resources.get_distribution(name).version
+    except pkg_resources.DistributionNotFound:
+        return "Package not found"
+
 
 class MPtoolConfig:
     """Centralized configuration for mpflash"""
@@ -12,10 +24,24 @@ class MPtoolConfig:
     quiet: bool = False
     verbose: bool = False
     ignore_ports: List[str] = []
-    interactive: bool = True
     firmware_folder: Path = platformdirs.user_downloads_path() / "firmware"
     # test options specified on the commandline
     tests: List[str] = []
+    _interactive: bool = True
+
+    @property
+    def interactive(self):
+        # No interactions in CI
+        if os.getenv('GITHUB_ACTIONS') == 'true':
+            log.warning("Disabling interactive mode in CI")
+            return False
+        return self._interactive
+    
+    @interactive.setter
+    def interactive(self, value:bool):
+        self._interactive = value
+
 
 
 config = MPtoolConfig()
+__version__ = get_version()

mpflash/mpflash/download.py

@@ -21,6 +21,7 @@ from rich.progress import track
 from mpflash.common import PORT_FWTYPES, FWInfo
 from mpflash.errors import MPFlashError
 from mpflash.mpboard_id import get_known_ports
+from mpflash.vendor.versions import clean_version
 
 # avoid conflict with the ujson used by MicroPython
 jsonlines.ujson = None  # type: ignore
@@ -32,8 +33,18 @@ MICROPYTHON_ORG_URL = "https://micropython.org/"
 # Regexes to remove dates and hashes in the filename that just get in the way
 RE_DATE = r"(-\d{8}-)"
 RE_HASH = r"(.g[0-9a-f]+\.)"
-# regex to extract the version from the firmware filename
-RE_VERSION_PREVIEW = r"(\d+\.\d+(\.\d+)?(-\w+.\d+)?)"
+# regex to extract the version and the build from the firmware filename
+# group 1 is the version, group 2 is the build
+RE_VERSION_PREVIEW = r"v([\d\.]+)-?(?:preview\.)?(\d+)?\."
+# 'RPI_PICO_W-v1.23.uf2'
+# 'RPI_PICO_W-v1.23.0.uf2'
+# 'RPI_PICO_W-v1.23.0-406.uf2'
+# 'RPI_PICO_W-v1.23.0-preview.406.uf2'
+# 'RPI_PICO_W-v1.23.0-preview.4.uf2'
+# 'RPI_PICO_W-v1.23.0.uf2'
+# 'https://micropython.org/resources/firmware/RPI_PICO_W-20240531-v1.24.0-preview.10.gc1a6b95bf.uf2'
+# 'https://micropython.org/resources/firmware/RPI_PICO_W-20240531-v1.24.0-preview.10.uf2'
+# 'RPI_PICO_W-v1.24.0-preview.10.gc1a6b95bf.uf2'
 
 
 # use functools.lru_cache to avoid needing to download pages multiple times
@@ -98,6 +109,7 @@ def board_firmware_urls(board_url: str, base_url: str, ext: str) -> List[str]:
 # The first run takes ~60 seconds to run for 4 ports , all boards
 # so it makes sense to cache the results and skip boards as soon as possible
 def get_boards(ports: List[str], boards: List[str], clean: bool) -> List[FWInfo]:
+    # sourcery skip: use-getitem-for-re-match-groups
     """
     Retrieves a list of firmware information for the specified ports and boards.
 
@@ -146,13 +158,15 @@ def get_boards(ports: List[str], boards: List[str], clean: bool) -> List[FWInfo]
                 # board["firmware"] = _url
                 # board["preview"] = "preview" in _url  # type: ignore
                 if ver_match := re.search(RE_VERSION_PREVIEW, _url):
-                    fw_info.version = ver_match[1]
+                    fw_info.version = clean_version(ver_match.group(1))
+                    fw_info.build = ver_match.group(2) or "0"
+                fw_info.preview = fw_info.build != "0"
+                # # else:
+                # #     board.$1= ""
+                # if "preview." in fw_info.version:
+                #     fw_info.build = fw_info.version.split("preview.")[-1]
                 # else:
-                #     board.$1= ""
-                if "preview." in fw_info.version:
-                    fw_info.build = fw_info.version.split("preview.")[-1]
-                else:
-                    fw_info.build = "0"
+                #     fw_info.build = "0"
 
                 fw_info.ext = Path(fw_info.firmware).suffix
                 fw_info.variant = fw_info.filename.split("-v")[0] if "-v" in fw_info.filename else ""
@@ -180,9 +194,21 @@ def download_firmwares(
     force: bool = False,
     clean: bool = True,
 ) -> int:
+    """
+    Downloads firmware files based on the specified firmware folder, ports, boards, versions, force flag, and clean flag.
+
+    Args:
+        firmware_folder : The folder to save the downloaded firmware files.
+        ports : The list of ports to check for firmware.
+        boards : The list of boards to download firmware for.
+        versions : The list of versions to download firmware for.
+        force : A flag indicating whether to force the download even if the firmware file already exists.
+        clean : A flag indicating to clean the date from the firmware filename.
+    """
     skipped = downloaded = 0
-    if versions is None:
-        versions = []
+    versions = [] if versions is None else [clean_version(v) for v in versions]
+    # handle renamed boards
+    boards = add_renamed_boards(boards)
 
     unique_boards = get_firmware_list(ports, boards, versions, clean)
 
@@ -191,6 +217,11 @@ def download_firmwares(
     # relevant
 
     log.info(f"Found {len(unique_boards)} relevant unique firmwares")
+    if not unique_boards:
+        log.error("No relevant firmwares could be found on https://micropython.org/download")
+        log.info(f"{versions=} {ports=} {boards=}")
+        log.info("Please check the website for the latest firmware files or try the preview version.")
+        return 0
 
     firmware_folder.mkdir(exist_ok=True)
 
@@ -214,7 +245,9 @@ def download_firmwares(
                 continue
             writer.write(board.to_dict())
             downloaded += 1
-    log.info(f"Downloaded {downloaded} firmwares, skipped {skipped} existing files.")
+    # if downloaded > 0:
+    #     clean_downloaded_firmwares(firmware_folder)
+    log.success(f"Downloaded {downloaded} firmwares, skipped {skipped} existing files.")
     return downloaded + skipped
 
 
@@ -238,12 +271,15 @@ def get_firmware_list(ports: List[str], boards: List[str], versions: List[str],
     board_urls = sorted(get_boards(ports, boards, clean), key=key_fw_ver_pre_ext_bld)
 
     log.debug(f"Total {len(board_urls)} firmwares")
+
     relevant = [
         board
         for board in board_urls
-        if board.board in boards and (board.version in versions or board.preview and preview)
-        # and b["port"] in ["esp32", "rp2"]
+        if board.version in versions and board.build == "0" and board.board in boards and not board.preview
     ]
+
+    if preview:
+        relevant.extend([board for board in board_urls if board.board in boards and board.preview])
     log.debug(f"Matching firmwares: {len(relevant)}")
     # select the unique boards
     unique_boards: List[FWInfo] = []
@@ -272,7 +308,7 @@ def download(
         boards : The list of boards to download firmware for.
         versions : The list of versions to download firmware for.
         force : A flag indicating whether to force the download even if the firmware file already exists.
-        clean : A flag indicating whether to perform a clean download.
+        clean : A flag indicating whether to clean the date from the firmware filename.
 
     Returns:
         int: The number of downloaded firmware files.
@@ -284,11 +320,41 @@ def download(
     if not boards:
         log.critical("No boards found, please connect a board or specify boards to download firmware for.")
         raise MPFlashError("No boards found")
-    # versions = [clean_version(v, drop_v=True) for v in versions]  # remove leading v from version
+
     try:
         destination.mkdir(exist_ok=True, parents=True)
     except (PermissionError, FileNotFoundError) as e:
         log.critical(f"Could not create folder {destination}")
         raise MPFlashError(f"Could not create folder {destination}") from e
+    try:
+        result = download_firmwares(destination, ports, boards, versions, force=force, clean=clean)
+    except requests.exceptions.RequestException as e:
+        log.exception(e)
+        raise MPFlashError("Could not connect to micropython.org") from e
+
+    return result
+
+
+def add_renamed_boards(boards: List[str]) -> List[str]:
+    """
+    Adds the renamed boards to the list of boards.
 
-    return download_firmwares(destination, ports, boards, versions, force=force, clean=clean)
+    Args:
+        boards : The list of boards to add the renamed boards to.
+
+    Returns:
+        List[str]: The list of boards with the renamed boards added.
+
+    """
+    renamed = {
+        "PICO": ["RPI_PICO"],
+        "PICO_W": ["RPI_PICO_W"],
+        "GENERIC": ["ESP32_GENERIC", "ESP8266_GENERIC"],  # just add both of them
+    }
+    _boards = boards.copy()
+    for board in boards:
+        if board in renamed and renamed[board] not in boards:
+            _boards.extend(renamed[board])
+        if board != board.upper() and board.upper() not in boards:
+            _boards.append(board.upper())
+    return _boards

mpflash/mpflash/downloaded.py

@@ -24,10 +24,26 @@ def downloaded_firmwares(fw_folder: Path) -> List[FWInfo]:
     return firmwares
 
 
+def clean_downloaded_firmwares(fw_folder: Path) -> None:
+    """
+    Remove duplicate entries from the firmware.jsonl file, keeping the latest one
+    uniqueness is based on the filename
+    """
+    firmwares = downloaded_firmwares(fw_folder)
+    if not firmwares:
+        return
+    # keep the latest entry
+    unique_fw = {fw.filename: fw for fw in firmwares}
+    with jsonlines.open(fw_folder / "firmware.jsonl", "w") as writer:
+        for fw in unique_fw.values():
+            writer.write(fw.to_dict())
+    log.info(f"Removed duplicate entries from firmware.jsonl in {fw_folder}")
+
+
 def find_downloaded_firmware(
     *,
     board_id: str,
-    version: str = "",
+    version: str = "",  # v1.2.3
     port: str = "",
     variants: bool = False,
     fw_folder: Optional[Path] = None,
@@ -38,21 +54,22 @@ def find_downloaded_firmware(
         selector = {}
     fw_folder = fw_folder or config.firmware_folder
     # Use the information in firmwares.jsonl to find the firmware file
+    log.debug(f"{trie}] Looking for firmware for {board_id} {version} ")
     fw_list = downloaded_firmwares(fw_folder)
     if not fw_list:
         log.error("No firmware files found. Please download the firmware first.")
         return []
     # filter by version
-    version = clean_version(version, drop_v=True)
+    version = clean_version(version)
     fw_list = filter_downloaded_fwlist(fw_list, board_id, version, port, variants, selector)
 
     if not fw_list and trie < 3:
         log.info(f"Try ({trie+1}) to find a firmware for the board {board_id}")
         if trie == 1:
-            # ESP board naming conventions have changed by adding a PORT refix
+            # ESP board naming conventions have changed by adding a PORT prefix
             if port.startswith("esp") and not board_id.startswith(port.upper()):
                 board_id = f"{port.upper()}_{board_id}"
-            # RP2 board naming conventions have changed by adding a _RPIprefix
+            # RP2 board naming conventions have changed by adding a _RPI prefix
             if port == "rp2" and not board_id.startswith("RPI_"):
                 board_id = f"RPI_{board_id}"
         elif trie == 2:
@@ -75,7 +92,7 @@ def find_downloaded_firmware(
 def filter_downloaded_fwlist(
     fw_list: List[FWInfo],
     board_id: str,
-    version: str,
+    version: str,  # v1.2.3
     port: str,
     # preview: bool,
     variants: bool,
@@ -86,11 +103,14 @@ def filter_downloaded_fwlist(
         # never get a preview for an older version
         fw_list = [fw for fw in fw_list if fw.preview]
     else:
-        fw_list = [fw for fw in fw_list if fw.version == version]
-
+        # older FWInfo version has no v1.2.3 prefix
+        either = [clean_version(version, drop_v=False), clean_version(version, drop_v=True)]
+        fw_list = [fw for fw in fw_list if fw.version in either]
+    log.trace(f"Filtering firmware for {version} : {len(fw_list)} found.")
     # filter by port
     if port:
         fw_list = [fw for fw in fw_list if fw.port == port]
+        log.trace(f"Filtering firmware for {port} : {len(fw_list)} found.")
 
     if board_id:
         if variants:
@@ -99,6 +119,7 @@ def filter_downloaded_fwlist(
         else:
             # the firmware variant should match exactly the board_id
             fw_list = [fw for fw in fw_list if fw.variant == board_id]
+        log.trace(f"Filtering firmware for {board_id} : {len(fw_list)} found.")
     if selector and port in selector:
         fw_list = [fw for fw in fw_list if fw.filename.endswith(selector[port])]
     return fw_list

mpflash/mpflash/errors.py

@@ -2,4 +2,8 @@
 
 
 class MPFlashError(Exception):
-    pass
+    """Base class for exceptions in this module."""
+
+    def __init__(self, message: str):
+        self.message = message
+        super().__init__(message)

mpflash/mpflash/flash.py

@@ -1,10 +1,9 @@
-import time
 from pathlib import Path
 
 from loguru import logger as log
 
-from mpflash.common import PORT_FWTYPES
-from mpflash.mpremoteboard import MPRemoteBoard
+from mpflash.bootloader import enter_bootloader
+from mpflash.common import PORT_FWTYPES, BootloaderMethod
 
 from .flash_esp import flash_esp
 from .flash_stm32 import flash_stm32
@@ -14,13 +13,15 @@ from .worklist import WorkList
 # #########################################################################################################
 
 
+
 def flash_list(
     todo: WorkList,
     fw_folder: Path,
     erase: bool,
-    bootloader: bool,
+    bootloader: BootloaderMethod,
 ):
     """Flash a list of boards with the specified firmware."""
+    UF2_PORTS = [port for port, exts in PORT_FWTYPES.items() if ".uf2" in exts]
     flashed = []
     for mcu, fw_info in todo:
         fw_file = fw_folder / fw_info.filename
@@ -30,14 +31,13 @@ def flash_list(
         log.info(f"Updating {mcu.board} on {mcu.serialport} to {fw_info.version}")
         updated = None
         # try:
-        if mcu.port in [port for port, exts in PORT_FWTYPES.items() if ".uf2" in exts] and fw_file.suffix == ".uf2":
-            # any .uf2 port ["samd", "rp2", "nrf"]:
-            if bootloader:
-                enter_bootloader(mcu)
+        if mcu.port in UF2_PORTS and fw_file.suffix == ".uf2":
+            if not enter_bootloader(mcu, bootloader):
+                continue
             updated = flash_uf2(mcu, fw_file=fw_file, erase=erase)
         elif mcu.port in ["stm32"]:
-            if bootloader:
-                enter_bootloader(mcu)
+            if not enter_bootloader(mcu, bootloader):
+                continue
             updated = flash_stm32(mcu, fw_file, erase=erase)
         elif mcu.port in ["esp32", "esp8266"]:
             #  bootloader is handled by esptool for esp32/esp8266
@@ -50,20 +50,3 @@ def flash_list(
         else:
             log.error(f"Failed to flash {mcu.board} on {mcu.serialport}")
     return flashed
-
-
-def enter_bootloader(mcu: MPRemoteBoard, timeout: int = 10, wait_after: int = 2):
-    """Enter the bootloader mode for the board"""
-    log.info(f"Entering bootloader on {mcu.board} on {mcu.serialport}")
-    mcu.run_command("bootloader", timeout=timeout)
-    time.sleep(wait_after)
-
-
-# TODO:
-# flash from some sort of queue to allow different images to be flashed to the same board
-#  - flash variant 1
-#  - stub variant 1
-#  - flash variant 2
-#  - stub variant 2
-#
-# JIT download / download any missing firmwares based on the detected boards

mpflash/mpflash/flash_uf2.py

@@ -14,7 +14,7 @@ from rich.progress import track
 from mpflash.mpremoteboard import MPRemoteBoard
 
 from .common import PORT_FWTYPES
-from .config import config
+from .flash_uf2_boardid import get_board_id
 from .flash_uf2_linux import dismount_uf2_linux, wait_for_UF2_linux
 from .flash_uf2_macos import wait_for_UF2_macos
 from .flash_uf2_windows import wait_for_UF2_windows
@@ -45,11 +45,7 @@ def flash_uf2(mcu: MPRemoteBoard, fw_file: Path, erase: bool) -> Optional[MPRemo
         destination = wait_for_UF2_windows()
     elif sys.platform == "darwin":
         log.warning(f"OS {sys.platform} not tested/supported")
-        # TODO: test which of the options is best
-        if "macos_uf2" in config.tests:
-            destination = wait_for_UF2_macos()
-        else:
-            destination = wait_for_UF2_linux()
+        destination = wait_for_UF2_macos()
     else:
         log.warning(f"OS {sys.platform} not tested/supported")
         return None
@@ -59,6 +55,8 @@ def flash_uf2(mcu: MPRemoteBoard, fw_file: Path, erase: bool) -> Optional[MPRemo
         return None
 
     log.info("Board is in bootloader mode")
+    board_id = get_board_id(destination)  # type: ignore
+    log.info(f"Board ID: {board_id}")
     log.info(f"Copying {fw_file} to {destination}.")
     shutil.copy(fw_file, destination)
     log.success("Done copying, resetting the board and wait for it to restart")

mpflash/mpflash/flash_uf2_boardid.py

@@ -1,4 +1,5 @@
 from pathlib import Path
+
 from loguru import logger as log
 
 
@@ -10,5 +11,5 @@ def get_board_id(path: Path):
     for line in data:
         if line.startswith("Board-ID"):
             board_id = line[9:].strip()
-    log.trace(f"Found Board-ID={board_id}")
+    log.debug(f"INFO_UF2.TXT Board-ID={board_id}")
     return board_id

mpflash/mpflash/flash_uf2_macos.py

@@ -3,76 +3,32 @@
 # sourcery skip: snake-case-functions
 from __future__ import annotations
 
-import sys
 import time
 from pathlib import Path
+from typing import Optional
 
-from loguru import logger as log
 from rich.progress import track
 
-from .flash_uf2_boardid import get_board_id
-from .uf2disk import UF2Disk
 
 
-def get_uf2_drives():
-    """
-    Get a list of all the (un)mounted UF2 drives
-    """
-    if sys.platform != "linux":
-        log.error("pumount only works on Linux")
-        return
-    # import blkinfo only on linux
-    from blkinfo import BlkDiskInfo
-
-    myblkd = BlkDiskInfo()
-    filters = {
-        "tran": "usb",
-    }
-    usb_disks = myblkd.get_disks(filters)
-    for disk in usb_disks:
-        if disk["fstype"] == "vfat":
-            uf2_part = disk
-            # unpartioned usb disk or partition (e.g. /dev/sdb )
-            # SEEED WIO Terminal is unpartioned
-            # print( json.dumps(uf2_part, indent=4))
-            uf2 = UF2Disk()
-            uf2.device_path = "/dev/" + uf2_part["name"]
-            uf2.label = uf2_part["label"]
-            uf2.mountpoint = uf2_part["mountpoint"]
-            yield uf2
-        elif disk["type"] == "disk" and disk.get("children") and len(disk.get("children")) > 0:
-            if disk.get("children")[0]["type"] == "part" and disk.get("children")[0]["fstype"] == "vfat":
-                uf2_part = disk.get("children")[0]
-                # print( json.dumps(uf2_part, indent=4))
-                uf2 = UF2Disk()
-                uf2.device_path = "/dev/" + uf2_part["name"]
-                uf2.label = uf2_part["label"]
-                uf2.mountpoint = uf2_part["mountpoint"]
-                yield uf2
-
-
-def wait_for_UF2_macos(s_max: int = 10):
-    destination = ""
-    wait = 10
-    uf2_drives = []
-    # while not destination and wait > 0:
+def wait_for_UF2_macos(s_max: int = 10) -> Optional[Path]:
+    """Wait for the MCU to mount as a drive"""
+    if s_max < 1:
+        s_max = 10
+    destination = None
     for _ in track(
         range(s_max), description="Waiting for mcu to mount as a drive", transient=True, refresh_per_second=2
     ):
-        # log.info(f"Waiting for mcu to mount as a drive : {wait} seconds left")
-        uf2_drives += list(get_uf2_drives())
-        for drive in get_uf2_drives():
-            time.sleep(1)
+        # log.info(f"Waiting for mcu to mount as a drive : {n} seconds left")
+        vol_mounts = Path("/Volumes").iterdir()
+        for vol in vol_mounts:
             try:
-                if Path(drive.mountpoint, "INFO_UF2.TXT").exists():
-                    board_id = get_board_id(Path(drive.mountpoint))  # type: ignore
-                    destination = Path(drive.mountpoint)
+                if Path(vol, "INFO_UF2.TXT").exists():
+                    destination = Path(vol)
                     break
-            except PermissionError:
-                log.debug(f"Permission error on {drive.mountpoint}")
-                continue
+            except OSError:
+                pass
         if destination:
             break
         time.sleep(1)
-        wait -= 1
     return destination

mpflash/mpflash/flash_uf2_windows.py

@@ -5,25 +5,25 @@ from __future__ import annotations
 
 import time
 from pathlib import Path
+from typing import Optional
 
 import psutil
 from rich.progress import track
 
-from .flash_uf2_boardid import get_board_id
 
 
-def wait_for_UF2_windows(s_max: int = 10):
+
+def wait_for_UF2_windows(s_max: int = 10) -> Optional[Path]:
     """Wait for the MCU to mount as a drive"""
     if s_max < 1:
         s_max = 10
-    destination = ""
+    destination = None
     for _ in track(range(s_max), description="Waiting for mcu to mount as a drive", transient=True,refresh_per_second=2):
         # log.info(f"Waiting for mcu to mount as a drive : {n} seconds left")
         drives = [drive.device for drive in psutil.disk_partitions()]
         for drive in drives:
             try:
                 if Path(drive, "INFO_UF2.TXT").exists():
-                    board_id = get_board_id(Path(drive))  # type: ignore
                     destination = Path(drive)
                     break
             except OSError:

mpflash/mpflash/mpboard_id/__init__.py

@@ -77,10 +77,14 @@ def known_stored_boards(port: str, versions: Optional[List[str]] = None) -> List
 @lru_cache(maxsize=20)
 def find_known_board(board_id: str) -> Board:
     """Find the board for the given BOARD_ID or 'board description' and return the board info as a Board object"""
+    # FIXME : functional overlap with:
+    # mpboard_id\board_id.py _find_board_id_by_description
     info = read_known_boardinfo()
     for board_info in info:
         if board_id in (board_info.board_id, board_info.description):
             if not board_info.cpu:
+                # safeguard for older board_info.json files
+                print(f"Board {board_id} has no CPU info, using port as CPU")
                 if " with " in board_info.description:
                     board_info.cpu = board_info.description.split(" with ")[-1]
                 else: