micropython-stubber 1.23.0__py3-none-any.whl → 1.23.1.post1__py3-none-any.whl

mpflash/mpflash/bootloader/detect.py

@@ -0,0 +1,82 @@
+""" Detect if a board is in bootloader mode 
+"""
+
+import os
+
+from mpflash.common import PORT_FWTYPES
+from mpflash.flash.uf2 import waitfor_uf2
+from mpflash.logger import log
+from mpflash.mpremoteboard import MPRemoteBoard
+
+
+def in_bootloader(mcu: MPRemoteBoard) -> bool:
+    """Check if the board is in bootloader mode"""
+    if ".uf2" in PORT_FWTYPES[mcu.port]:
+        return in_uf2_bootloader(mcu.port.upper())
+    elif mcu.port in ["stm32"]:
+        return in_stm32_bootloader()
+    elif mcu.port in ["esp32", "esp8266"]:
+        log.debug("esp32/esp8266 does not have a bootloader mode, Assume OK to flash")
+        return True
+
+    log.error(f"Bootloader mode not supported on {mcu.board} on {mcu.serialport}")
+    return False
+
+
+def in_uf2_bootloader(board_id: str) -> bool:
+    """
+    Check if the board is in UF2 bootloader mode.
+
+    :param board_id: The board ID to check for (SAMD or RP2)
+    """
+    return bool(waitfor_uf2(board_id=board_id))
+
+
+def in_stm32_bootloader() -> bool:
+    """Check if the board is in STM32 bootloader mode"""
+    if os.name == "nt":
+        driver_installed, status = check_for_stm32_bootloader_device()
+        if not driver_installed:
+            log.warning("STM32  BOOTLOADER device not found.")
+            return False
+        print()
+        if status != "OK":
+            log.warning(f"STM32 BOOTLOADER device found, Device status: {status}")
+            log.error("Please use Zadig to install a WinUSB (libusb)  driver.\nhttps://github.com/pbatard/libwdi/wiki/Zadig")
+            return False
+    return check_dfu_devices()
+
+
+def check_dfu_devices():
+    """Check if there are any DFU devices connected"""
+    # JIT import
+    from mpflash.flash.stm32_dfu import dfu_init
+    from mpflash.vendor.pydfu import get_dfu_devices
+
+    # need to init on windows to get the right usb backend
+    dfu_init()
+    devices = get_dfu_devices()
+    return len(devices) > 0
+
+
+def check_for_stm32_bootloader_device():
+    import win32com.client
+
+    # Windows only
+    # Create a WMI interface object
+    wmi = win32com.client.GetObject("winmgmts:")
+
+    # Query for USB devices
+    for usb_device in wmi.InstancesOf("Win32_PnPEntity"):
+        try:
+            # Check if device name or description contains "STM32 BOOTLOADER"
+            if str(usb_device.Name).strip() in {
+                "STM32  BOOTLOADER",
+                "STM BOOTLOADER",
+            }:
+                # Just the first match is enough
+                return True, usb_device.Status
+        except Exception:
+            pass
+    # If no matching device was found
+    return False, "Not found."

mpflash/mpflash/bootloader/manual.py

@@ -12,13 +12,14 @@ from mpflash.mpremoteboard import MPRemoteBoard
 
 
 class MCUHighlighter(RegexHighlighter):
-    """Apply style to anything that looks like an email."""
+    """Apply style to things that should stand out."""
 
     base_style = "mcu."
     highlights = [
         r"(?P<bold>Method[\s\d\:]*)",
         r"(?P<bold> \d.)",  # numbered items
         r"(?P<bold> - )",  # bullets
+        # mcu things
         r"(?P<pad>GPIO[\d]*)",
         r"(?P<pad>GPI[\d]*)",
         r"(?P<pad>IO[\d]*)",
@@ -33,21 +34,19 @@ class MCUHighlighter(RegexHighlighter):
         r"(?P<button>reset)",
         # other
         r"(?P<cable>USB)",
-        # r"(?P<mcu>SAMD[\d]*)",
-        # r"(?P<mcu>ESP[\d]*)",
-        # r"(?P<mcu>rp2)",
-        # r"(?P<mcu>rp2040)",
+        r"(?P<cable>USB-C)",
+        r"(?P<cable>Serial)",
     ]
 
 
 # https://rich.readthedocs.io/en/stable/appendix/colors.html?highlight=colors#standard-colors
+# use 3 colors to keep things simple but clear
 mcu_theme = Theme(
     {
-        "mcu.bold": "orange3",
-        "mcu.mcu": "orange3",
-        "mcu.button": "bold green",
-        "mcu.pad": "dodger_blue2",
-        "mcu.cable": "dodger_blue2",
+        "mcu.bold": "orange3",  # readers guidance
+        "mcu.button": "bold green",  # things to press
+        "mcu.pad": "dodger_blue2",  # things to connect
+        "mcu.cable": "dodger_blue2",  # things to connect
     }
 )
 
@@ -84,7 +83,7 @@ Please put your {mcu.port.upper()} device into bootloader mode by:
 """
 
     # todo: would be nice to re-use the console instance from logger
-    console = Console(highlighter=MCUHighlighter(), theme=mcu_theme)
+    console = Console(highlighter=MCUHighlighter(), theme=mcu_theme)  # type: ignore
     message += "\nIf you are unsure how to enter bootloader mode, please refer to the device documentation."
     console.print(
         Panel(

mpflash/mpflash/bootloader/micropython.py

@@ -1,10 +1,12 @@
 """Module for handling the bootloader mode for micropython boards"""
 
+from mpflash.logger import log
 from mpflash.mpremoteboard import MPRemoteBoard
 
 
 def enter_bootloader_mpy(mcu: MPRemoteBoard, timeout: int = 10):
     """Enter the bootloader mode for the board using mpremote and micropython on the board"""
+    log.info(f"Attempting bootloader on {mcu.serialport} using 'mpremote bootloader'")
     mcu.run_command("bootloader", timeout=timeout)
     # todo: check if mpremote command was successful
     return True

mpflash/mpflash/bootloader/touch1200.py

@@ -1,4 +1,8 @@
-import sys
+"""
+Enter bootloader using Touch 1200Bd for boards with bootloaders that support this.
+
+"""
+
 import time
 
 import serial
@@ -7,32 +11,19 @@ from mpflash.errors import MPFlashError
 from mpflash.logger import log
 from mpflash.mpremoteboard import MPRemoteBoard
 
-from .manual import enter_bootloader_manual
-
 
-def enter_bootloader_cdc_1200bps(mcu: MPRemoteBoard, timeout: int = 10):
-    if sys.platform == "win32":
-        log.warning("Touch 1200bps method is currently not supported on Windows, switching to manual")
-        return enter_bootloader_manual(mcu, timeout=timeout)
-
-    log.info(f"Entering bootloader on {mcu.board} on {mcu.serialport} using CDC 1200bps")
-    # if port argument is present perform soft reset
+def enter_bootloader_touch_1200bps(mcu: MPRemoteBoard, timeout: int = 10):
     if not mcu.serialport:
         raise MPFlashError("No serial port specified")
+    log.info(f"Attempting bootloader on {mcu.serialport} using 'Touch 1200Bd'")
+    # if port argument is present perform soft reset
     # try to initiate serial port connection on PORT with 1200 baudrate
     try:
-        with serial.Serial(
-            port=mcu.serialport,
-            baudrate=1200,
-            parity=serial.PARITY_NONE,
-            stopbits=serial.STOPBITS_ONE,
-            bytesize=serial.EIGHTBITS,
-            rtscts=True,
-        ) as connection:
-            print("Connection established")
-            connection.rts = True
-            connection.dtr = False
-            time.sleep(0.4)
+        com = serial.Serial(mcu.serialport, 1200, dsrdtr=True)
+        com.rts = False  # required
+        com.dtr = False  # might as well
+        time.sleep(0.2)
+        com.close()
 
     except serial.SerialException as e:
         log.exception(e)

mpflash/mpflash/cli_download.py

@@ -8,7 +8,7 @@ from loguru import logger as log
 from mpflash.connected import connected_ports_boards
 from mpflash.errors import MPFlashError
 from mpflash.mpboard_id import find_known_board
-from mpflash.vendor.versions import clean_version
+from mpflash.versions import clean_version
 
 from .ask_input import ask_missing_params
 from .cli_group import cli
@@ -58,7 +58,7 @@ from .download import download
     default=["*"],
     show_default=True,
     multiple=True,
-    help="Which serial port(s) to flash",
+    help="Which serial port(s) (or globs) to flash",
     metavar="SERIALPORT",
 )
 @click.option(

mpflash/mpflash/cli_flash.py

@@ -4,21 +4,18 @@ from typing import List
 import rich_click as click
 from loguru import logger as log
 
-from mpflash.common import BootloaderMethod
+from mpflash.ask_input import ask_missing_params
+from mpflash.cli_download import connected_ports_boards
+from mpflash.cli_group import cli
+from mpflash.cli_list import show_mcus
+from mpflash.common import BootloaderMethod, FlashParams, Params
+from mpflash.config import config
 from mpflash.errors import MPFlashError
+from mpflash.flash import flash_list
+from mpflash.flash.worklist import WorkList, full_auto_worklist, manual_worklist, single_auto_worklist
 from mpflash.mpboard_id import find_known_board
 from mpflash.mpremoteboard import MPRemoteBoard
-from mpflash.vendor.versions import clean_version
-
-from .ask_input import ask_missing_params
-from .cli_download import connected_ports_boards
-from .cli_group import cli
-from .cli_list import show_mcus
-from .common import FlashParams
-from .config import config
-from .flash import flash_list
-from .worklist import (WorkList, full_auto_worklist, manual_worklist,
-                       single_auto_worklist)
+from mpflash.versions import clean_version
 
 # #########################################################################################################
 # CLI
@@ -56,7 +53,7 @@ from .worklist import (WorkList, full_auto_worklist, manual_worklist,
     default=["*"],
     multiple=True,
     show_default=True,
-    help="Which serial port(s) to flash",
+    help="Which serial port(s) (or globs) to flash",
     metavar="SERIALPORT",
 )
 @click.option(
@@ -106,7 +103,7 @@ from .worklist import (WorkList, full_auto_worklist, manual_worklist,
     "-bl",
     "bootloader",
     type=click.Choice([e.value for e in BootloaderMethod]),
-    default="mpy",
+    default="auto",
     show_default=True,
     help="""How to enter the (MicroPython) bootloader before flashing.""",
 )
@@ -122,7 +119,7 @@ def cli_flash_board(**kwargs) -> int:
     params = FlashParams(**kwargs)
     params.versions = list(params.versions)
     params.ports = list(params.ports)
-    params.boards = list(params.boards) 
+    params.boards = list(params.boards)
     params.serial = list(params.serial)
     params.ignore = list(params.ignore)
     params.bootloader = BootloaderMethod(params.bootloader)
@@ -203,7 +200,7 @@ def cli_flash_board(**kwargs) -> int:
         return 1
 
 
-def resolve_board_ids(params):
+def resolve_board_ids(params: Params):
     """Resolve board descriptions to board_id, and remove empty strings from list of boards"""
     for board_id in params.boards:
         if board_id == "":

mpflash/mpflash/cli_group.py

@@ -27,7 +27,7 @@ def cb_verbose(ctx, param, value):
     return value
 
 
-def cb_interactive(ctx, param, value:bool):
+def cb_interactive(ctx, param, value: bool):
     log.trace(f"Setting interactive mode to {value}")
     config.interactive = value
     return value
@@ -39,6 +39,10 @@ def cb_test(ctx, param, value):
         config.tests = value
     return value
 
+def cb_usb(ctx, param, value: bool):
+    config.usb = bool(value)
+    return value
+
 
 def cb_quiet(ctx, param, value):
     log.trace(f"Setting quiet mode to {value}")
@@ -78,19 +82,28 @@ def cb_quiet(ctx, param, value):
     help="Enables verbose mode.",
     callback=cb_verbose,
 )
+@click.option(
+    "--usb",
+    "-u",
+    is_eager=True,
+    is_flag=True,
+    default=False,
+    help="Shows USB location of the connected boards.",
+    callback=cb_usb,
+    show_default=True,
+)
 @click.option(
     "--test",
     is_eager=True,
-    help="test a specific feature",
+    help="Test a specific feature.",
     callback=cb_test,
     multiple=True,
     default=[],
     envvar="MPFLASH_TEST",
-    show_default=True,
-    metavar="TEST",
+    metavar="FLAG",
 )
 def cli(**kwargs):
-    """mpflash - MicroPython Tool.
+    """mpflash - MicroPython flashing tool.
 
     A CLI to download and flash MicroPython firmware to different ports and boards.
     """

mpflash/mpflash/cli_list.py

@@ -32,14 +32,14 @@ from .logger import make_quiet
     default=["*"],
     multiple=True,
     show_default=True,
-    help="Which serial port(s) to list. ",
+    help="Serial port(s) (or globs) to list. ",
     metavar="SERIALPORT",
 )
 @click.option(
     "--ignore",
     "-i",
     is_eager=True,
-    help="Serial port(s) to ignore. Defaults to MPFLASH_IGNORE.",
+    help="Serial port(s) (or globs) to ignore. Defaults to MPFLASH_IGNORE.",
     multiple=True,
     default=[],
     envvar="MPFLASH_IGNORE",
@@ -73,7 +73,13 @@ def cli_list_mcus(serial: List[str], ignore: List[str], bluetooth: bool, as_json
     # TODO? Ask user to select a serialport if [?] is given ?
 
     conn_mcus = list_mcus(ignore=ignore, include=serial, bluetooth=bluetooth)
+    # ignore boards that have the [micropython-stubber] ignore flag set
+    conn_mcus = [item for item in conn_mcus if not (item.toml.get("mpflash", {}).get("ignore", False))]    
     if as_json:
+        # remove the path and firmware attibutes from the json output as they are always empty
+        for mcu in conn_mcus:
+            del mcu.path
+            del mcu.firmware
         print(json.dumps([mcu.__dict__ for mcu in conn_mcus], indent=4))
         progress = False
     if progress:

mpflash/mpflash/cli_main.py

@@ -1,10 +1,8 @@
 """mpflash is a CLI to download and flash MicroPython firmware to various boards."""
 
-# import rich_click as click
-
 import os
 
-import rich_click as click
+import click.exceptions as click_exceptions
 from loguru import logger as log
 
 from .cli_download import cli_download
@@ -29,10 +27,10 @@ def mpflash():
         except AttributeError as e:
             log.error(f"Error: {e}")
             exit(-1)
-        except click.exceptions.ClickException as e:
+        except click_exceptions.ClickException as e:
             log.error(f"Error: {e}")
             exit(-2)
-        except click.exceptions.Abort as e:
+        except click_exceptions.Abort as e:
             # Aborted - Ctrl-C
             exit(-3)
 

mpflash/mpflash/common.py

@@ -92,6 +92,7 @@ class DownloadParams(Params):
 
 
 class BootloaderMethod(Enum):
+    AUTO = "auto"
     MANUAL = "manual"
     MPY = "mpy"
     TOUCH_1200 = "touch1200"
@@ -121,7 +122,8 @@ def filtered_comports(
     bluetooth: bool = False,
 ) -> List[ListPortInfo]:  # sourcery skip: assign-if-exp
     """
-    Get a list of filtered comports.
+    Get a list of filtered comports using the include and ignore lists.
+    both can be globs (e.g. COM*) or exact port names (e.g. COM1)
     """
     if not ignore:
         ignore = []

mpflash/mpflash/config.py

@@ -1,11 +1,11 @@
 """centralized configuration for mpflash"""
 
 import os
+from importlib.metadata import version
 from pathlib import Path
 from typing import List
 
 import platformdirs
-from importlib.metadata import version
 
 from mpflash.logger import log
 
@@ -20,6 +20,7 @@ class MPtoolConfig:
 
     quiet: bool = False
     verbose: bool = False
+    usb: bool = False
     ignore_ports: List[str] = []
     firmware_folder: Path = platformdirs.user_downloads_path() / "firmware"
     # test options specified on the commandline

mpflash/mpflash/connected.py

@@ -4,14 +4,11 @@ from rich import print
 from rich.progress import BarColumn, Progress, SpinnerColumn, TextColumn, TimeElapsedColumn
 from rich.table import Column
 
+from mpflash.common import filtered_comports
 from mpflash.mpremoteboard import MPRemoteBoard
 
-from .common import filtered_comports
 
-
-def connected_ports_boards(
-    *, include: List[str], ignore: List[str]
-) -> Tuple[List[str], List[str], List[MPRemoteBoard]]:
+def connected_ports_boards(*, include: List[str], ignore: List[str]) -> Tuple[List[str], List[str], List[MPRemoteBoard]]:
     """
     Returns a tuple containing lists of unique ports and boards from the connected MCUs.
     Boards that are physically connected, but give no tangible response are ignored.
@@ -34,7 +31,7 @@ rp_text = TextColumn("{task.description} {task.fields[device]}", table_column=Co
 rp_bar = BarColumn(bar_width=None, table_column=Column())
 
 
-def list_mcus(*, ignore: List[str], include: List[str], bluetooth: bool = False):
+def list_mcus(*, ignore: List[str], include: List[str], bluetooth: bool = False) -> List[MPRemoteBoard]:
     """
     Retrieves information about connected microcontroller boards.
 
@@ -50,11 +47,17 @@ def list_mcus(*, ignore: List[str], include: List[str], bluetooth: bool = False)
         include=include,
         bluetooth=bluetooth,
     )
-    conn_mcus = [MPRemoteBoard(c.device) for c in comports]
+    conn_mcus = [MPRemoteBoard(c.device, location=c.location or "?") for c in comports]
 
     # a lot of boilerplate to show a progress bar with the comport currently scanned
     # low update rate to facilitate screen readers/narration
-    with Progress(rp_spinner, rp_text, rp_bar, TimeElapsedColumn(), refresh_per_second=2) as progress:
+    with Progress(
+        rp_spinner,
+        rp_text,
+        rp_bar,
+        TimeElapsedColumn(),
+        refresh_per_second=1,
+    ) as progress:
         tsk_scan = progress.add_task("[green]Scanning", visible=False, total=None)
         progress.tasks[tsk_scan].fields["device"] = "..."
         progress.tasks[tsk_scan].visible = True

mpflash/mpflash/download.py

@@ -21,7 +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
+from mpflash.versions import clean_version
 
 # avoid conflict with the ujson used by MicroPython
 jsonlines.ujson = None  # type: ignore
@@ -134,7 +134,13 @@ def get_boards(ports: List[str], boards: List[str], clean: bool) -> List[FWInfo]
         for board in urls:
             board["port"] = port
 
-        for board in track(urls, description=f"Checking {port} download pages", transient=True, refresh_per_second=2):
+        for board in track(
+            urls,
+            description=f"Checking {port} download pages",
+            transient=True,
+            refresh_per_second=1,
+            show_speed=False,
+        ):
             # add a board to the list for each firmware found
             firmware_urls: List[str] = []
             for ext in PORT_FWTYPES[port]:
@@ -273,9 +279,7 @@ def get_firmware_list(ports: List[str], boards: List[str], versions: List[str],
     log.debug(f"Total {len(board_urls)} firmwares")
 
     relevant = [
-        board
-        for board in board_urls
-        if board.version in versions and board.build == "0" and board.board in boards and not board.preview
+        board for board in board_urls if board.version in versions and board.build == "0" and board.board in boards and not board.preview
     ]
 
     if preview:

mpflash/mpflash/downloaded.py

@@ -5,7 +5,7 @@ import jsonlines
 from loguru import logger as log
 
 from mpflash.common import PORT_FWTYPES, FWInfo
-from mpflash.vendor.versions import clean_version
+from mpflash.versions import clean_version
 
 from .config import config
 

mpflash/mpflash/{flash.py → flash/__init__.py}

@@ -5,9 +5,9 @@ from loguru import logger as log
 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
-from .flash_uf2 import flash_uf2
+from .esp import flash_esp
+from .stm32 import flash_stm32
+from .uf2 import flash_uf2
 from .worklist import WorkList
 
 # #########################################################################################################

mpflash/mpflash/{flash_esp.py → flash/esp.py}

@@ -53,7 +53,7 @@ def flash_esp(mcu: MPRemoteBoard, fw_file: Path, *, erase: bool = True) -> Optio
         log.error(f"Failed to flash {mcu.board} on {mcu.serialport} : {e}")
         return None
 
-    log.info("Done flashing, resetting the board and wait for it to restart")
+    log.info("Done flashing, resetting the board...")
     mcu.wait_for_restart()
     log.success(f"Flashed {mcu.serialport} to {mcu.board} {mcu.version}")
     return mcu

mpflash/mpflash/{flash_stm32.py → flash/stm32.py}

@@ -4,12 +4,13 @@ from pathlib import Path
 
 from loguru import logger as log
 
-# from .flash_stm32_cube import flash_stm32_cubecli
-from .flash_stm32_dfu import dfu_init, flash_stm32_dfu
 from mpflash.mpremoteboard import MPRemoteBoard
 
+# from .flash_stm32_cube import flash_stm32_cubecli
+from .stm32_dfu import dfu_init, flash_stm32_dfu
+
 
-def flash_stm32(mcu: MPRemoteBoard, fw_file: Path, *, erase: bool, stm32_dfu: bool = True):
+def flash_stm32(mcu: MPRemoteBoard, fw_file: Path, *, erase: bool):
     # sourcery skip: lift-return-into-if
     dfu_init()
     if updated := flash_stm32_dfu(mcu, fw_file=fw_file, erase=erase):

mpflash/mpflash/{flash_stm32_dfu.py → flash/stm32_dfu.py}

@@ -26,7 +26,7 @@ def init_libusb_windows() -> bool:
 
 
 try:
-    from .vendor import pydfu as pydfu
+    from ..vendor import pydfu as pydfu
 except ImportError:
     pydfu = None
 

mpflash/mpflash/{flash_uf2.py → flash/uf2/__init__.py}

@@ -4,22 +4,21 @@ Flash SAMD and RP2 via UF2
 
 import shutil
 import sys
-import time
 from pathlib import Path
 from typing import Optional
 
+import tenacity
 from loguru import logger as log
-from rich.progress import track
 
-from mpflash.mpremoteboard import MPRemoteBoard
-import tenacity
 from tenacity import stop_after_attempt, wait_fixed
 
-from .common import PORT_FWTYPES
-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
+from mpflash.mpremoteboard import MPRemoteBoard
+
+from mpflash.common import PORT_FWTYPES
+from .boardid import get_board_id
+from .linux import dismount_uf2_linux, wait_for_UF2_linux
+from .macos import wait_for_UF2_macos
+from .windows import wait_for_UF2_windows
 
 
 def flash_uf2(mcu: MPRemoteBoard, fw_file: Path, erase: bool) -> Optional[MPRemoteBoard]:
@@ -39,7 +38,9 @@ def flash_uf2(mcu: MPRemoteBoard, fw_file: Path, erase: bool) -> Optional[MPRemo
         log.error(f"UF2 not supported on {mcu.board} on {mcu.serialport}")
         return None
     if erase:
-        destination = waitfor_uf2()
+        log.warning("Erase not (yet) supported on .UF2, skipping erase.")
+
+    destination = waitfor_uf2(board_id=mcu.port.upper())
 
     if not destination or not destination.exists() or not (destination / "INFO_UF2.TXT").exists():
         log.error("Board is not in bootloader mode")
@@ -49,8 +50,8 @@ def flash_uf2(mcu: MPRemoteBoard, fw_file: Path, erase: bool) -> Optional[MPRemo
     board_id = get_board_id(destination)  # type: ignore
     log.info(f"Board ID: {board_id}")
     try:
-        cp_firmware_to_uf2(fw_file, destination)
-        log.success("Done copying, resetting the board and wait for it to restart")
+        copy_firmware_to_uf2(fw_file, destination)
+        log.success("Done copying, resetting the board.")
     except tenacity.RetryError:
         log.error("Failed to copy the firmware file to the board.")
         return None
@@ -59,31 +60,29 @@ def flash_uf2(mcu: MPRemoteBoard, fw_file: Path, erase: bool) -> Optional[MPRemo
         dismount_uf2_linux()
 
     mcu.wait_for_restart()
-    # time.sleep(1)  # 5 secs to short on linux
     return mcu
 
 
-def waitfor_uf2():
+def waitfor_uf2(board_id: str):
     """
     Wait for the UF2 drive to mount
     """
     if sys.platform == "linux":
-        return wait_for_UF2_linux()
+        return wait_for_UF2_linux(board_id=board_id)
     elif sys.platform == "win32":
-        return wait_for_UF2_windows()
+        return wait_for_UF2_windows(board_id=board_id)
     elif sys.platform == "darwin":
-        log.warning(f"OS {sys.platform} not tested/supported")
-        return wait_for_UF2_macos()
+        return wait_for_UF2_macos(board_id=board_id)
     else:
         log.warning(f"OS {sys.platform} not tested/supported")
         return None
 
 
 @tenacity.retry(stop=stop_after_attempt(3), wait=wait_fixed(1), reraise=False)
-def cp_firmware_to_uf2(fw_file, destination):
+def copy_firmware_to_uf2(fw_file: Path, destination: Path):
     """
     Copy the firmware file to the destination,
     Retry 3 times with 1s delay
     """
     log.info(f"Copying {fw_file} to {destination}.")
-    shutil.copy(fw_file, destination)
+    return shutil.copy(fw_file, destination)