mpflash 1.25.0rc3__tar.gz → 1.26.0__tar.gz

{mpflash-1.25.0rc3 → mpflash-1.26.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mpflash
-Version: 1.25.0rc3
+Version: 1.26.0
 Summary: Flash and download tool for MicroPython firmwares
 License: MIT
 Keywords: MicroPython,firmware,flash,download,UF2,esptool
@@ -29,7 +29,7 @@ Requires-Dist: loguru (>=0.7.2,<0.8.0)
 Requires-Dist: mpremote (>=1.22.0,<2.0.0)
 Requires-Dist: packaging (>=24.2,<25.0)
 Requires-Dist: platformdirs (>=4.2.0,<5.0.0)
-Requires-Dist: psutil (>=5.9.8,<8.0.0)
+Requires-Dist: psutil (>=7.0.0,<8.0.0)
 Requires-Dist: pygithub (>=2.1.1,<3.0.0)
 Requires-Dist: pyusb (>=1.2.1,<2.0.0)
 Requires-Dist: pywin32 (>=310,<311) ; sys_platform == "win32"
@@ -37,6 +37,7 @@ Requires-Dist: requests (>=2.31.0,<3.0.0)
 Requires-Dist: rich-click (>=1.8.1,<2.0.0)
 Requires-Dist: sqlalchemy (>=2.0.41,<3.0.0)
 Requires-Dist: tenacity (==9.0.0)
+Requires-Dist: tomli-w (>=1.2.0,<2.0.0)
 Project-URL: Homepage, https://github.com/Josverl/mpflash/blob/main/README.md
 Project-URL: Repository, https://github.com/Josverl/mpflash
 Description-Content-Type: text/markdown
@@ -58,9 +59,22 @@ This tool was initially created to be used in a CI/CD pipeline to automate the p
     - `samd`, using ` .uf2`, using filecopy 
     - `esp32`, using `.bin`, using esptool,
     - `esp8266`, using `.bin`, using esptool
-    - `stm32`, using ` .dfu`, using pydfu
+    - `stm32`, using ` .dfu`, using pydfu (also in Windows) 
 
 Not yet implemented: `nrf`, `cc3200`, `mimxrt`, `renesas`
+
+## Release v1.25.0(.post2)
+
+This release includes several new features and improvements:
+- **New features:**
+  - Added support for `--variant` option to specify a specific variant of the board when flashing.
+  - mpflash now uses a slqlite database to store information on all possible micropython firmwares, and the management of the downloaded firmware files.
+  - This allows for a better identification of boards, and matches to the correct firmware.
+  - Use the MicroPython v1.25.0 `sys.implementation._build` to as board_id when avaialable
+  - Automatically try to download firmware if not yet available locally. No lonmger need to specify the `--download` option.
+  - Restructured mpboard_id to use a SQLite db to be able to ID more boards and variants
+  - vendored and adapted `board_database.py` from mpflash, kudos @mattytrentini
+
  
 ## Features
  1. List the connected boards including their firmware details, in a tabular or json format
@@ -79,15 +93,54 @@ You can use mpflash to perform various operations on your MicroPython boards. He
 | Command | Description |
 |---------|-------------|
 | `mpflash list` | List the connected board(s) including their firmware details |
+| `mpflash flash` | Flash the latest stable firmware to the connected board(s), downloading the firmware if needed |
 | `mpflash download` | Download the MicroPython firmware(s) for the connected board(s) |
-| `mpflash flash` | Flash the latest stable firmware to the connected board(s) |
 
-## selecting or ignoring specific serial ports
+**Listing connected boards:**  
+`mpflash list` will list all connected boards in a table , including their serial port, family, board name, CPU, version and build number.
+Options are available to list the boards in a json format, or to filter the list by serial port or board type.
+
+
+**Flashing boards with new firmware:**  
+`mpflash flash` will flash the latest stable firmware to all connected boards, downloading the firmware if needed.
+It will try to determine the current micropython borad and variant, download the firmware if needed, and flash the correct firmware to each board.
+
+Common options are:
+
+ - `--version` to specify the version of the firmware to flash, defaults to the latest stable version.
+ - `--serial` to specify the serial port(s) to flash, defaults to all connected boards.
+ - `--board` to specify which firmware to flash to a single board
+ - `--variant` to specify a specific variant of the board
+
+**Downloading firmware:**
+`mpflash download` will download the latest stable firmware for all connected boards, or a specific board if specified. It will download the firmware from the official MicroPython website and save it in your `Downloads/firmware` directory.  
+When a board is specified for which multiple variants are available, all variants will be downloaded.
+
+Common options are:
+
+ - `--version` to specify the version of the firmware to download, defaults to the latest stable version. (e.g. `stable`, `preview`, `x.y.z`)
+ - `--serial` to specify the serial port(s) to flash, defaults to all connected boards.
+ - `--board` to specify which firmware to flash to a single board
 
-You can use the `--serial` option to select a specific serial port to flash, or the `--ignore` option to ignore a specific serial port.
-both options can be specified multiple times 
-Both can be globs (e.g. COM*) or exact port names (e.g. COM1)
-in addition there is a --bluetooth option to simplify ignoring bluetooth ports
+## Setting the Firmware Files and Database Location
+
+You can override the default location for firmware files and the MPFlash database by setting the `MPFLASH_FIRMWARE` environment variable. For example, in a Bash shell:
+
+```bash
+export MPFLASH_FIRMWARE="/path/to/custom/firmware"
+```
+
+When this variable is set, `mpflash` will use that location to store firmware files and estabish it's database.
+
+## Selecting or ignoring specific serial ports
+
+You can use the `--serial` option to select a specific serial port(s) to flash,  
+Or you can use the `--ignore` option to ignore a specific serial port(s).  
+
+Either option can be specified multiple times, can be globs (e.g. COM*) or exact port names (e.g. /dev/ttyUSB0).
+To permenently ignore a port, you can set the `MPFLASH_IGNORE` environment variable to a space-separated list of serial ports or globs.
+
+In addition there is a --bluetooth option to simplify ignoring bluetooth ports, where the default is to ignore bluetooth ports.
 
 ```
 --serial,--serial-port      -s      SERIALPORT  Serial port(s) (or globs) to list. [default: *]                                                                                                                                                                           > > --ignore                    -i      SERIALPORT  Serial port(s) (or globs) to ignore. Defaults to MPFLASH_IGNORE.                                                                                                                                                          │
@@ -102,9 +155,9 @@ This file can contain a description of the board, which will be shown in the lis
 description = "Blue Norwegian actuator"
 ```
 
-If you want the board to be ignored by mpflash, you can add the following to the board_info.toml file:
+If you want the board to be ignored by mpflash, no matter which serial port it is connected to, you can add the following to the `board_info.toml` file:
 ```toml
-description = "Blue Norwegian feeder"
+description = "Blue Norwegian actuator"
 [mpflash]
 ignore = true
 ```

{mpflash-1.25.0rc3 → mpflash-1.26.0}/README.md

@@ -15,9 +15,22 @@ This tool was initially created to be used in a CI/CD pipeline to automate the p
     - `samd`, using ` .uf2`, using filecopy 
     - `esp32`, using `.bin`, using esptool,
     - `esp8266`, using `.bin`, using esptool
-    - `stm32`, using ` .dfu`, using pydfu
+    - `stm32`, using ` .dfu`, using pydfu (also in Windows) 
 
 Not yet implemented: `nrf`, `cc3200`, `mimxrt`, `renesas`
+
+## Release v1.25.0(.post2)
+
+This release includes several new features and improvements:
+- **New features:**
+  - Added support for `--variant` option to specify a specific variant of the board when flashing.
+  - mpflash now uses a slqlite database to store information on all possible micropython firmwares, and the management of the downloaded firmware files.
+  - This allows for a better identification of boards, and matches to the correct firmware.
+  - Use the MicroPython v1.25.0 `sys.implementation._build` to as board_id when avaialable
+  - Automatically try to download firmware if not yet available locally. No lonmger need to specify the `--download` option.
+  - Restructured mpboard_id to use a SQLite db to be able to ID more boards and variants
+  - vendored and adapted `board_database.py` from mpflash, kudos @mattytrentini
+
  
 ## Features
  1. List the connected boards including their firmware details, in a tabular or json format
@@ -36,15 +49,54 @@ You can use mpflash to perform various operations on your MicroPython boards. He
 | Command | Description |
 |---------|-------------|
 | `mpflash list` | List the connected board(s) including their firmware details |
+| `mpflash flash` | Flash the latest stable firmware to the connected board(s), downloading the firmware if needed |
 | `mpflash download` | Download the MicroPython firmware(s) for the connected board(s) |
-| `mpflash flash` | Flash the latest stable firmware to the connected board(s) |
 
-## selecting or ignoring specific serial ports
+**Listing connected boards:**  
+`mpflash list` will list all connected boards in a table , including their serial port, family, board name, CPU, version and build number.
+Options are available to list the boards in a json format, or to filter the list by serial port or board type.
+
+
+**Flashing boards with new firmware:**  
+`mpflash flash` will flash the latest stable firmware to all connected boards, downloading the firmware if needed.
+It will try to determine the current micropython borad and variant, download the firmware if needed, and flash the correct firmware to each board.
+
+Common options are:
+
+ - `--version` to specify the version of the firmware to flash, defaults to the latest stable version.
+ - `--serial` to specify the serial port(s) to flash, defaults to all connected boards.
+ - `--board` to specify which firmware to flash to a single board
+ - `--variant` to specify a specific variant of the board
+
+**Downloading firmware:**
+`mpflash download` will download the latest stable firmware for all connected boards, or a specific board if specified. It will download the firmware from the official MicroPython website and save it in your `Downloads/firmware` directory.  
+When a board is specified for which multiple variants are available, all variants will be downloaded.
+
+Common options are:
+
+ - `--version` to specify the version of the firmware to download, defaults to the latest stable version. (e.g. `stable`, `preview`, `x.y.z`)
+ - `--serial` to specify the serial port(s) to flash, defaults to all connected boards.
+ - `--board` to specify which firmware to flash to a single board
 
-You can use the `--serial` option to select a specific serial port to flash, or the `--ignore` option to ignore a specific serial port.
-both options can be specified multiple times 
-Both can be globs (e.g. COM*) or exact port names (e.g. COM1)
-in addition there is a --bluetooth option to simplify ignoring bluetooth ports
+## Setting the Firmware Files and Database Location
+
+You can override the default location for firmware files and the MPFlash database by setting the `MPFLASH_FIRMWARE` environment variable. For example, in a Bash shell:
+
+```bash
+export MPFLASH_FIRMWARE="/path/to/custom/firmware"
+```
+
+When this variable is set, `mpflash` will use that location to store firmware files and estabish it's database.
+
+## Selecting or ignoring specific serial ports
+
+You can use the `--serial` option to select a specific serial port(s) to flash,  
+Or you can use the `--ignore` option to ignore a specific serial port(s).  
+
+Either option can be specified multiple times, can be globs (e.g. COM*) or exact port names (e.g. /dev/ttyUSB0).
+To permenently ignore a port, you can set the `MPFLASH_IGNORE` environment variable to a space-separated list of serial ports or globs.
+
+In addition there is a --bluetooth option to simplify ignoring bluetooth ports, where the default is to ignore bluetooth ports.
 
 ```
 --serial,--serial-port      -s      SERIALPORT  Serial port(s) (or globs) to list. [default: *]                                                                                                                                                                           > > --ignore                    -i      SERIALPORT  Serial port(s) (or globs) to ignore. Defaults to MPFLASH_IGNORE.                                                                                                                                                          │
@@ -59,9 +111,9 @@ This file can contain a description of the board, which will be shown in the lis
 description = "Blue Norwegian actuator"
 ```
 
-If you want the board to be ignored by mpflash, you can add the following to the board_info.toml file:
+If you want the board to be ignored by mpflash, no matter which serial port it is connected to, you can add the following to the `board_info.toml` file:
 ```toml
-description = "Blue Norwegian feeder"
+description = "Blue Norwegian actuator"
 [mpflash]
 ignore = true
 ```

{mpflash-1.25.0rc3 → mpflash-1.26.0}/mpflash/basicgit.py

@@ -135,6 +135,25 @@ def get_local_tags(repo: Optional[Path] = None, minver: Optional[str] = None) ->
     return sorted(tags)
 
 
+def get_current_branch(repo: Optional[Union[Path, str]] = None) -> Optional[str]:
+    """
+    Get the current branch name of a local repository.
+
+    Args:
+        repo: Path to the repository directory
+
+    Returns:
+        Current branch name or None if error
+    """
+    cmd = ["git", "branch", "--show-current"]
+    result = _run_local_git(cmd, repo=repo, expect_stderr=True)
+    if not result:
+        return None
+
+    branch = result.stdout.strip()
+    return branch if branch else None
+
+
 @cachetools.func.ttl_cache(maxsize=16, ttl=60)  # 60 seconds
 def get_tags(repo: str, minver: Optional[str] = None) -> List[str]:
     """
@@ -242,7 +261,7 @@ def fetch(repo: Union[Path, str]) -> bool:
     return result.returncode == 0 if result else False
 
 
-def pull(repo: Union[Path, str], branch: str = "main") -> bool:
+def pull(repo: Union[Path, str], branch: str = "main", force: bool = True) -> bool:
     """
     pull a repo origin into main
     repo should be in the form of : path/.git
@@ -253,7 +272,9 @@ def pull(repo: Union[Path, str], branch: str = "main") -> bool:
         raise NotADirectoryError
     repo = Path(repo)
     # first checkout HEAD
-    cmd = ["git", "checkout", branch, "--quiet", "--force"]
+    cmd = ["git", "checkout", branch, "--quiet"]
+    if force:
+        cmd.append("--force")
     result = _run_local_git(cmd, repo=repo, expect_stderr=True)
     if not result:
         log.error("error during git checkout main", result)

mpflash-1.26.0/mpflash/cli_add.py

@@ -0,0 +1,131 @@
+"""CLI to add a custom MicroPython firmware."""
+
+from pathlib import Path
+from typing import Union
+
+import rich_click as click
+from loguru import logger as log
+
+from mpflash.connected import connected_ports_boards_variants
+from mpflash.custom import Firmware, add_firmware, custom_fw_from_path
+from mpflash.downloaded import clean_downloaded_firmwares
+from mpflash.errors import MPFlashError
+from mpflash.mpboard_id import find_known_board
+from mpflash.mpboard_id.alternate import add_renamed_boards
+from mpflash.versions import clean_version
+
+from .ask_input import ask_missing_params
+from .cli_group import cli
+from .config import config
+from .download import download
+
+
+@cli.command(
+    "add",
+    help="Add a custom MicroPython firmware.",
+)
+# @click.option(
+#     "--version",
+#     "-v",
+#     "versions",
+#     default=["stable"],
+#     multiple=False,
+#     show_default=True,
+#     help="The version of MicroPython to to download.",
+#     metavar="SEMVER, 'stable', 'preview' or '?'",
+# )
+@click.option(
+    "--path",
+    "-p",
+    "fw_path",
+    multiple=False,
+    default="",
+    show_default=False,
+    help="a local path to the firmware file to add.",
+    metavar="FIRMWARE_PATH",
+)
+@click.option(
+    "--description",
+    "-d",
+    "description",
+    default="",
+    help="An Optional description for the firmware.",
+    metavar="TXT",
+)
+# @click.option(
+#     "--board",
+#     "-b",
+#     "boards",
+#     multiple=True,
+#     default=[],
+#     show_default=True,
+#     help="The board(s) to download the firmware for.",
+#     metavar="BOARD_ID or ?",
+# )
+# @click.option(
+#     "--serial",
+#     "--serial-port",
+#     "-s",
+#     "serial",
+#     default=["*"],
+#     show_default=True,
+#     multiple=True,
+#     help="Which serial port(s) (or globs) to flash",
+#     metavar="SERIALPORT",
+# )
+# @click.option(
+#     "--ignore",
+#     "-i",
+#     is_eager=True,
+#     help="Serial port(s) to ignore. Defaults to MPFLASH_IGNORE.",
+#     multiple=True,
+#     default=[],
+#     envvar="MPFLASH_IGNORE",
+#     show_default=True,
+#     metavar="SERIALPORT",
+# )
+# @click.option(
+#     "--clean/--no-clean",
+#     default=True,
+#     show_default=True,
+#     help="""Remove dates and hashes from the downloaded firmware filenames.""",
+# )
+@click.option(
+    "--force",
+    "-f",
+    default=False,
+    is_flag=True,
+    show_default=True,
+    help="""Overwrite existing firmware.""",
+)
+def cli_add_custom(
+    fw_path: Union[Path, str],
+    force: bool = False,
+    description: str = "",
+) -> int:
+    """Add a custom MicroPython firmware from a local file."""
+    if not fw_path:
+        log.error("No firmware path provided. Use --path to specify a firmware file.")
+        return 1
+    fw_path = Path(fw_path).expanduser().resolve()
+    if not fw_path.exists():
+        log.error(f"Firmware file does not exist: {fw_path}")
+        return 1
+
+    try:
+        fw_dict = custom_fw_from_path(fw_path)
+        if description:
+            fw_dict["description"] = description
+        if add_firmware(
+            source=fw_path,
+            fw_info=fw_dict,
+            custom=True,
+            force=force,
+        ):
+            log.success(f"Added custom firmware: {fw_dict['custom_id']} for {fw_dict['firmware_file']}")
+            return 0
+        else:
+            return 1
+    except MPFlashError as e:
+        log.error(f"{e}")
+        return 1

{mpflash-1.25.0rc3 → mpflash-1.26.0}/mpflash/cli_download.py

@@ -2,10 +2,11 @@
 
 from pathlib import Path
 
+from pytest import param
 import rich_click as click
 from loguru import logger as log
 
-from mpflash.connected import connected_ports_boards
+from mpflash.connected import connected_ports_boards_variants
 from mpflash.downloaded import clean_downloaded_firmwares
 from mpflash.errors import MPFlashError
 from mpflash.mpboard_id import find_known_board
@@ -23,15 +24,6 @@ from .download import download
     "download",
     help="Download MicroPython firmware for specific ports, boards and versions.",
 )
-@click.option(
-    "--destination",
-    "-d",
-    "fw_folder",
-    type=click.Path(file_okay=False, dir_okay=True, path_type=Path),
-    default=None,
-    show_default=False,
-    help="The folder to download the firmware to.",
-)
 @click.option(
     "--version",
     "-v",
@@ -94,9 +86,6 @@ def cli_download(**kwargs) -> int:
     params.boards = list(params.boards)
     params.serial = list(params.serial)
     params.ignore = list(params.ignore)
-    if params.fw_folder: 
-        config.firmware_folder = Path(params.fw_folder)
-    # all_boards: List[MPRemoteBoard] = []
     if params.boards:
         if not params.ports:
             # no ports specified - resolve ports from specified boards by resolving board IDs
@@ -109,7 +98,7 @@ def cli_download(**kwargs) -> int:
                         log.error(f"{e}")
     else:
         # no boards specified - detect connected ports and boards
-        params.ports, params.boards, _ = connected_ports_boards(include=params.serial, ignore=params.ignore)
+        params.ports, params.boards, _, _ = connected_ports_boards_variants(include=params.serial, ignore=params.ignore)
 
     params = ask_missing_params(params)
     if not params:  # Cancelled by user

{mpflash-1.25.0rc3 → mpflash-1.26.0}/mpflash/cli_flash.py

@@ -1,4 +1,3 @@
-from pathlib import Path
 from typing import List
 
 import rich_click as click
@@ -7,11 +6,10 @@ from loguru import logger as log
 import mpflash.download.jid as jid
 import mpflash.mpboard_id as mpboard_id
 from mpflash.ask_input import ask_missing_params
-from mpflash.cli_download import connected_ports_boards
+from mpflash.cli_download import connected_ports_boards_variants
 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.common import BootloaderMethod, FlashParams, filtered_comports
 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
@@ -27,15 +25,6 @@ from mpflash.versions import clean_version
     "flash",
     short_help="Flash one or all connected MicroPython boards with a specific firmware and version.",
 )
-@click.option(
-    "--firmware",
-    "-f",
-    "fw_folder",
-    type=click.Path(file_okay=False, dir_okay=True, path_type=Path),
-    default=None,
-    show_default=False,
-    help="The folder to retrieve the firmware from.",
-)
 @click.option(
     "--version",
     "-v",
@@ -95,7 +84,7 @@ from mpflash.versions import clean_version
 )
 @click.option(
     "--variant",
-    "-var",
+    "--var",
     "variant",  # single board
     multiple=False,
     help="The board VARIANT to flash or '-'. If not specified will try to read the variant from the connected MCU.",
@@ -104,7 +93,6 @@ from mpflash.versions import clean_version
 @click.option(
     "--cpu",
     "--chip",
-    "-c",
     "cpu",
     help="The CPU type to flash. If not specified will try to read the CPU from the connected MCU.",
     metavar="CPU",
@@ -134,12 +122,20 @@ from mpflash.versions import clean_version
 )
 @click.option(
     "--flash_mode",
-    "-fm",
+    "--fm",
     type=click.Choice(["keep", "qio", "qout", "dio", "dout"]),
     default="keep",
     show_default=True,
     help="""Flash mode for ESP boards. (default: keep)""",
 )
+@click.option(
+    "--custom",
+    "-c",
+    default=False,
+    is_flag=True,
+    show_default=True,
+    help="""Flash a custom firmware""",
+)
 def cli_flash_board(**kwargs) -> int:
     # version to versions, board to boards
     kwargs["versions"] = [kwargs.pop("version")] if kwargs["version"] is not None else []
@@ -164,16 +160,18 @@ def cli_flash_board(**kwargs) -> int:
             # No bard specified
             params.boards = ["?"]
 
-    if params.fw_folder: 
-        config.firmware_folder = Path(params.fw_folder)
     # Detect connected boards if not specified,
     # and ask for input if boards cannot be detected
     all_boards: List[MPRemoteBoard] = []
     if not params.boards:
         # nothing specified - detect connected boards
-        params.ports, params.boards, all_boards = connected_ports_boards(
-            include=params.ports, ignore=params.ignore, bluetooth=params.bluetooth
+        params.ports, params.boards, variants, all_boards = connected_ports_boards_variants(
+            include=params.ports,
+            ignore=params.ignore,
+            bluetooth=params.bluetooth,
         )
+        if variants and len(variants) >= 1:
+            params.variant = variants[0]
         if params.boards == []:
             # No MicroPython boards detected, but it could be unflashed or in bootloader mode
             # Ask for serial port and board_id to flash
@@ -197,11 +195,27 @@ def cli_flash_board(**kwargs) -> int:
     params.versions = [clean_version(v) for v in params.versions]
     worklist: WorkList = []
 
+    if len(params.versions) == 1 and len(params.boards) == 1 and params.serial == ["*"]:
+        # A one or more serial port including the board / variant
+        comports = filtered_comports(
+            ignore=params.ignore,
+            include=params.serial,
+            bluetooth=params.bluetooth,
+        )
+        board_id = f"{params.boards[0]}-{params.variant}" if params.variant else params.boards[0]
+        log.info(f"Flashing {board_id} {params.versions[0]} to {len(comports)} serial ports")
+        log.info(f"Target ports: {', '.join(comports)}")
+        worklist = manual_worklist(
+            comports,
+            board_id=board_id,
+            version=params.versions[0],
+            custom=params.custom,
+        )
     # if serial port == auto and there are one or more specified/detected boards
-    if params.serial == ["*"] and params.boards:
+    elif params.serial == ["*"] and params.boards:
         if not all_boards:
             log.trace("No boards detected yet, scanning for connected boards")
-            _, _, all_boards = connected_ports_boards(include=params.ports, ignore=params.ignore)
+            _, _, _, all_boards = connected_ports_boards_variants(include=params.ports, ignore=params.ignore)
         # if variant id provided on the cmdline, treat is as an override
         if params.variant:
             for b in all_boards:
@@ -215,8 +229,13 @@ def cli_flash_board(**kwargs) -> int:
         )
     elif params.versions[0] and params.boards[0] and params.serial:
         # A one or more serial port including the board / variant
+        comports = filtered_comports(
+            ignore=params.ignore,
+            include=params.ports,
+            bluetooth=params.bluetooth,
+        )
         worklist = manual_worklist(
-            params.serial[0],
+            comports,
             board_id=params.boards[0],
             version=params.versions[0],
         )
@@ -226,7 +245,8 @@ def cli_flash_board(**kwargs) -> int:
             serial=params.serial[0],
             version=params.versions[0],
         )
-    jid.ensure_firmware_downloaded(worklist, version=params.versions[0], force=params.force)
+    if not params.custom:
+        jid.ensure_firmware_downloaded(worklist, version=params.versions[0], force=params.force)
     if flashed := flash_list(
         worklist,
         params.erase,
@@ -239,5 +259,3 @@ def cli_flash_board(**kwargs) -> int:
     else:
         log.error("No boards were flashed")
         return 1
-
-

{mpflash-1.25.0rc3 → mpflash-1.26.0}/mpflash/cli_group.py

@@ -14,6 +14,7 @@ from .logger import log, make_quiet, set_loglevel
 set_loglevel("INFO")
 config.verbose = False
 
+
 def cb_verbose(ctx, param, value):
     """Callback to set the log level to DEBUG if verbose is set"""
     if value and not config.quiet:

{mpflash-1.25.0rc3 → mpflash-1.26.0}/mpflash/cli_list.py

@@ -86,6 +86,8 @@ def cli_list_mcus(serial: List[str], ignore: List[str], bluetooth: bool, as_json
         if mcu.family == "circuitpython":
             # CircuitPython boards need a special reset command
             mcu.run_command(["exec", "--no-follow", "import microcontroller,time;time.sleep(0.01);microcontroller.reset()"], resume=False)
+        elif mcu.family == "unknown":
+            continue
         else:
             mcu.run_command("reset")
     return 0 if conn_mcus else 1

{mpflash-1.25.0rc3 → mpflash-1.26.0}/mpflash/cli_main.py

@@ -5,6 +5,9 @@ import os
 import click.exceptions as click_exceptions
 from loguru import logger as log
 
+from mpflash.errors import MPFlashError
+
+from .cli_add import cli_add_custom
 from .cli_download import cli_download
 from .cli_flash import cli_flash_board
 from .cli_group import cli
@@ -19,6 +22,7 @@ def mpflash():
     cli.add_command(cli_list_mcus)
     cli.add_command(cli_download)
     cli.add_command(cli_flash_board)
+    cli.add_command(cli_add_custom)
 
     # cli(auto_envvar_prefix="MPFLASH")
     if False and os.environ.get("COMPUTERNAME").upper().startswith("JOSVERL"):
@@ -37,6 +41,9 @@ def mpflash():
         except click_exceptions.Abort:
             # Aborted - Ctrl-C
             exit(-3)
+        except MPFlashError as e:
+            log.error(f"MPFlashError: {e}")
+            exit(-4)
 
 
 if __name__ == "__main__":