mpflash 0.8.1__tar.gz → 0.8.1b1__tar.gz

{mpflash-0.8.1 → mpflash-0.8.1b1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mpflash
-Version: 0.8.1
+Version: 0.8.1b1
 Summary: Flash and download tool for MicroPython firmwares
 Home-page: https://github.com/Josverl/micropython-stubber/blob/main/src/mpflash/README.md
 License: MIT

{mpflash-0.8.1 → mpflash-0.8.1b1}/mpflash/download.py

@@ -32,18 +32,8 @@ 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 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'
+# regex to extract the version from the firmware filename
+RE_VERSION_PREVIEW = r"(\d+\.\d+(\.\d+)?(-\w+.\d+)?)"
 
 
 # use functools.lru_cache to avoid needing to download pages multiple times
@@ -108,7 +98,6 @@ 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.
 
@@ -157,15 +146,13 @@ 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.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]
+                    fw_info.version = ver_match[1]
                 # else:
-                #     fw_info.build = "0"
+                #     board.$1= ""
+                if "preview." in fw_info.version:
+                    fw_info.build = fw_info.version.split("preview.")[-1]
+                else:
+                    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 ""
@@ -204,11 +191,6 @@ 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)
 
@@ -256,15 +238,12 @@ 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.version in versions and board.build == "0" and board.board in boards and not board.preview
+        if board.board in boards and (board.version in versions or board.preview and preview)
+        # and b["port"] in ["esp32", "rp2"]
     ]
-
-    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] = []

{mpflash-0.8.1 → mpflash-0.8.1b1}/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-0.8.1b1/mpflash/flash_uf2_macos.py

@@ -0,0 +1,37 @@
+""" Flashing UF2 based MCU on macos"""
+
+# 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
+
+
+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 : {n} seconds left")
+        vol_mounts = Path("/Volumes").iterdir()
+        for vol in vol_mounts:
+            try:
+                if Path(vol, "INFO_UF2.TXT").exists():
+                    destination = Path(vol)
+                    break
+            except OSError:
+                pass
+        if destination:
+            break
+        time.sleep(1)
+    return destination

{mpflash-0.8.1 → mpflash-0.8.1b1}/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-0.8.1 → mpflash-0.8.1b1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "mpflash"
-version = "0.8.1"
+version = "0.8.1b1"
 description = "Flash and download tool for MicroPython firmwares"
 authors = ["Jos Verlinde <jos_verlinde@hotmail.com>"]
 license = "MIT"

mpflash-0.8.1/mpflash/flash_uf2_macos.py

@@ -1,78 +0,0 @@
-""" Flashing UF2 based MCU on macos"""
-
-# sourcery skip: snake-case-functions
-from __future__ import annotations
-
-import sys
-import time
-from pathlib import Path
-
-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:
-    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)
-            try:
-                if Path(drive.mountpoint, "INFO_UF2.TXT").exists():
-                    board_id = get_board_id(Path(drive.mountpoint))  # type: ignore
-                    destination = Path(drive.mountpoint)
-                    break
-            except PermissionError:
-                log.debug(f"Permission error on {drive.mountpoint}")
-                continue
-        if destination:
-            break
-        time.sleep(1)
-        wait -= 1
-    return destination