mpflash 1.25.0rc2__py3-none-any.whl → 1.25.0rc3__py3-none-any.whl

mpflash/ask_input.py

@@ -11,8 +11,7 @@ from loguru import logger as log
 
 from .common import DownloadParams, FlashParams, ParamType
 from .config import config
-from .mpboard_id import (get_known_boards_for_port, known_ports,
-                         known_stored_boards)
+from .mpboard_id import get_known_boards_for_port, known_ports, known_stored_boards
 from .mpremoteboard import MPRemoteBoard
 from .versions import micropython_versions
 
@@ -227,7 +226,7 @@ def ask_serialport(*, multi_select: bool = False, bluetooth: bool = False):
     # import only when needed to reduce load time
     import inquirer
 
-    comports = MPRemoteBoard.connected_boards(bluetooth=bluetooth, description=True)
+    comports = MPRemoteBoard.connected_boards(bluetooth=bluetooth, description=True) + ["auto"]
     return inquirer.List(
         "serial",
         message="Which serial port do you want to {action} ?",

mpflash/cli_flash.py

@@ -124,6 +124,14 @@ from mpflash.versions import clean_version
     show_default=True,
     help="""How to enter the (MicroPython) bootloader before flashing.""",
 )
+@click.option(
+    "--force",
+    "-f",
+    default=False,
+    is_flag=True,
+    show_default=True,
+    help="""Force download of firmware even if it already exists.""",
+)
 @click.option(
     "--flash_mode",
     "-fm",
@@ -150,8 +158,12 @@ def cli_flash_board(**kwargs) -> int:
     params.bootloader = BootloaderMethod(params.bootloader)
 
     # make it simple for the user to flash one board by asking for the serial port if not specified
-    if params.boards == ["?"] and params.serial == "*":
+    if params.boards == ["?"] or params.serial == "?":
         params.serial = ["?"]
+        if params.boards == ["*"]:
+            # No bard specified
+            params.boards = ["?"]
+
     if params.fw_folder: 
         config.firmware_folder = Path(params.fw_folder)
     # Detect connected boards if not specified,
@@ -214,7 +226,7 @@ def cli_flash_board(**kwargs) -> int:
             serial=params.serial[0],
             version=params.versions[0],
         )
-    jid.ensure_firmware_downloaded(worklist, version=params.versions[0])
+    jid.ensure_firmware_downloaded(worklist, version=params.versions[0], force=params.force)
     if flashed := flash_list(
         worklist,
         params.erase,

mpflash/common.py

@@ -10,7 +10,6 @@ from typing import List, Optional, Union
 from serial.tools import list_ports
 from serial.tools.list_ports_common import ListPortInfo
 
-
 # from mpflash.flash.esp import FlashMode
 from .logger import log
 
@@ -41,6 +40,7 @@ class Params:
     serial: List[str] = field(default_factory=list)
     ignore: List[str] = field(default_factory=list)
     bluetooth: bool = False
+    force: bool = False
 
 
 @dataclass
@@ -48,7 +48,6 @@ class DownloadParams(Params):
     """Parameters for downloading firmware"""
 
     clean: bool = False
-    force: bool = False
 
 
 class BootloaderMethod(Enum):

mpflash/download/jid.py

@@ -9,7 +9,7 @@ from mpflash.flash.worklist import WorkList
 from mpflash.mpboard_id.alternate import alternate_board_names
 
 
-def ensure_firmware_downloaded(worklist: WorkList, version: str) -> None:
+def ensure_firmware_downloaded(worklist: WorkList, version: str, force: bool) -> None:
     """
     Ensure all firmware in the worklist is downloaded for the given version.
 
@@ -21,16 +21,19 @@ def ensure_firmware_downloaded(worklist: WorkList, version: str) -> None:
     # iterate over the worklist ann update missing firmware
     newlist: WorkList = []
     for mcu, firmware in worklist:
-        if firmware:
-            # firmware is already downloaded
-            newlist.append((mcu, firmware))
-            continue
-        # check if the firmware is already downloaded
-        board_firmwares = find_downloaded_firmware(
-            board_id=f"{mcu.board}-{mcu.variant}" if mcu.variant else mcu.board,
-            version=version,
-            port=mcu.port,
-        )
+        if force:
+            board_firmwares = []
+        else:
+            if firmware:
+                # firmware is already downloaded
+                newlist.append((mcu, firmware))
+                continue
+            # check if the firmware is already downloaded
+            board_firmwares = find_downloaded_firmware(
+                board_id=f"{mcu.board}-{mcu.variant}" if mcu.variant else mcu.board,
+                version=version,
+                port=mcu.port,
+            )
         if not board_firmwares:
             # download the firmware
             log.info(f"Downloading {version} firmware for {mcu.board} on {mcu.serialport}.")

mpflash/downloaded.py

@@ -51,7 +51,7 @@ def clean_downloaded_firmwares() -> None:
 
         # Warn about files on disk not in DB
         for fw_file in firmware_files_on_disk - db_firmware_files:
-            log.warning(f"Found file in firmware folder but not in DB: {fw_file}")
+            log.debug(f"Found file in firmware folder but not in DB: {fw_file}")
 
 
 def find_downloaded_firmware(

mpflash/flash/stm32.py

@@ -15,5 +15,5 @@ def flash_stm32(mcu: MPRemoteBoard, fw_file: Path, *, erase: bool):
     dfu_init()
     if updated := flash_stm32_dfu(mcu, fw_file=fw_file, erase=erase):
         mcu.wait_for_restart()
-        log.success(f"Flashed {mcu.version} to {mcu.board}")
+        log.success(f"Flashed {mcu.board_id} {mcu.version} to {mcu.serialport}.")
     return updated

mpflash/logger.py

@@ -1,4 +1,11 @@
-"""Logging."""
+"""
+Logger setup for CLI tools with Unicode-safe output.
+
+Ensures log messages are compatible with the current console encoding.
+Removes or replaces Unicode icons if the encoding is not UTF-8.
+"""
+
+import sys
 
 from loguru import logger as log
 from rich.console import Console
@@ -7,9 +14,20 @@ from .config import config
 
 console = Console()
 
+# Detect if the output encoding supports Unicode (UTF-8)
+def _is_utf8_encoding() -> bool:
+    encoding = getattr(sys.stdout, "encoding", None)
+    if encoding is None:
+        return False
+    return encoding.lower().replace("-", "") == "utf8"
+
 
 def _log_formatter(record: dict) -> str:
-    """Log message formatter to combine loguru and rich formatting."""
+    """
+    Log message formatter for loguru and rich.
+
+    Removes Unicode icons if console encoding is not UTF-8.
+    """
     color_map = {
         "TRACE": "cyan",
         "DEBUG": "orange",
@@ -20,11 +38,21 @@ def _log_formatter(record: dict) -> str:
         "CRITICAL": "bold white on red",
     }
     lvl_color = color_map.get(record["level"].name, "cyan")
-    return "[not bold green]{time:HH:mm:ss}[/not bold green] | {level.icon} " + f"[{lvl_color}]{{message}}[/{lvl_color}]"
+    # Remove icon if not UTF-8
+    if _is_utf8_encoding():
+        icon = record["level"].icon
+    else:
+        icon = record["level"].name  # fallback to text
+    # Insert color directly using f-string
+    return f"[not bold green]{{time:HH:mm:ss}}[/not bold green] | {icon} [{lvl_color}]{record['message']}[/{lvl_color}]"
+
 
+def set_loglevel(loglevel: str) -> None:
+    """
+    Set the log level for the logger.
 
-def set_loglevel(loglevel: str):
-    """Set the log level for the logger"""
+    Ensures Unicode safety for log output.
+    """
     try:
         log.remove()
     except ValueError:
@@ -32,8 +60,10 @@ def set_loglevel(loglevel: str):
     log.add(console.print, level=loglevel.upper(), colorize=False, format=_log_formatter)  # type: ignore
 
 
-def make_quiet():
-    """Make the logger quiet"""
+def make_quiet() -> None:
+    """
+    Make the logger quiet.
+    """
     config.quiet = True
     console.quiet = True
     set_loglevel("CRITICAL")

mpflash/mpboard_id/known.py

@@ -59,7 +59,7 @@ def known_stored_boards(port: str, versions: List[str] = []) -> List[Tuple[str,
     """
     mp_boards = get_known_boards_for_port(port, versions)
 
-    boards = set({(f"{board.version} {board.description}", board.board_id) for board in mp_boards})
+    boards = set({(f"{board.version} {board.board_id:<30} {board.description}", board.board_id) for board in mp_boards})
     return sorted(list(boards))
 
 

mpflash/vendor/pydfu.py

@@ -406,6 +406,20 @@ def read_dfu_file(filename):
     return elements
 
 
+def read_bin_file(filename, address):
+    """Reads binary file(.bin) and stores it as single
+    element in element array just like read_dfu_file() would.
+    """
+    element = {}
+    print("File: {}".format(filename))
+    with open(filename, "rb") as fin:
+        element["data"] = fin.read()
+    element["size"] = len(element["data"])
+    element["num"] = 0
+    element["addr"] = address
+    return [element]
+
+
 class FilterDFU(object):
     """Class for filtering USB devices to identify devices which are in DFU
     mode.
@@ -541,6 +555,13 @@ def main():
     parser.add_argument("--pid", help="USB Product ID", type=lambda x: int(x, 0), default=None)
     parser.add_argument("-m", "--mass-erase", help="mass erase device", action="store_true", default=False)
     parser.add_argument("-u", "--upload", help="read file from DFU device", dest="path", default=False)
+    parser.add_argument(
+        "-a",
+        "--address",
+        help="specify target memory address(hex or dec) when uploading .bin files",
+        type=lambda x: int(x, 0),
+        default=None,
+    )
     parser.add_argument("-x", "--exit", help="Exit DFU", action="store_true", default=False)
     parser.add_argument("-v", "--verbose", help="increase output verbosity", action="store_true", default=False)
     args = parser.parse_args()
@@ -567,7 +588,14 @@ def main():
         command_run = True
 
     if args.path:
-        elements = read_dfu_file(args.path)
+        if str(args.path).endswith(".bin"):
+            if args.address is None:
+                raise ValueError("Address must be specified using -a when uploading binary")
+
+            elements = read_bin_file(args.path, args.addr)
+        else:
+            elements = read_dfu_file(args.path)
+
         if not elements:
             print("No data in dfu file")
             return

{mpflash-1.25.0rc2.dist-info → mpflash-1.25.0rc3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mpflash
-Version: 1.25.0rc2
+Version: 1.25.0rc3
 Summary: Flash and download tool for MicroPython firmwares
 License: MIT
 Keywords: MicroPython,firmware,flash,download,UF2,esptool

{mpflash-1.25.0rc2.dist-info → mpflash-1.25.0rc3.dist-info}/RECORD

@@ -1,6 +1,6 @@
 mpflash/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mpflash/add_firmware.py,sha256=P1yaNUdExfzC_qnhE-P5ALZg1Uh7XT6Xf7NYccJP7Rc,4317
-mpflash/ask_input.py,sha256=eoaFZf2F85RszyqcLBmuJvKtDe4PdT_T-nwOBFaWehg,8903
+mpflash/ask_input.py,sha256=YUx65Xwj6dNPwWcbQiWG7U4wDW69zEdno2HcT1KwPBg,8886
 mpflash/basicgit.py,sha256=Aiz6rF6PVhQir-FU-T1NhbjsW803y39Js6xnWs8-yu4,9676
 mpflash/bootloader/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mpflash/bootloader/activate.py,sha256=orQOw4XTkXVZI-rMInRb0T5Wp3qA_BlzbJUA2gyBToU,2361
@@ -9,11 +9,11 @@ mpflash/bootloader/manual.py,sha256=WYC4x-dxrSwVUfgnKTlu34pCzckrWJKZnWsARDocycI,
 mpflash/bootloader/micropython.py,sha256=v_kZkvg0uWZDbMrT78gmiYHbD83QLdnrctvEClI8iRg,529
 mpflash/bootloader/touch1200.py,sha256=VND7_YniS9Vx6WEaAxjI72RZZ6WBOwmBTsKJkbuaAHk,1105
 mpflash/cli_download.py,sha256=sMMIVTE4P9O2GpWB9jcbOiKQX-XJ0nu2bBylRbWu0X8,3872
-mpflash/cli_flash.py,sha256=K2TEyQndibtKdwSkeeu_esDUsu8H0_4DB_37SF7DR9E,7657
+mpflash/cli_flash.py,sha256=QQ7fml84UBK_dUDb1G7DT5_MBDbZbXcWEhkgOq2P8gA,7962
 mpflash/cli_group.py,sha256=Uf_1ZmeeSIsaGLuuKn3KPPPVi8fJVbIacJYFZx_oPHc,2684
 mpflash/cli_list.py,sha256=ZuRalXXjDGo6FhgMTv54BQD_PNss7eeopeZQ_uE1J90,2632
 mpflash/cli_main.py,sha256=NMhEtMtSe7ApE-210Q4p-g7ZgewgO-4z1Q-vNKLQ47Y,1277
-mpflash/common.py,sha256=fEFxSy2KVAhBUlJv0GsWnUHdJtRckp2XGlYVPAhS8WE,5924
+mpflash/common.py,sha256=iKDoc6Ut8XbZ8fYLEI2XsoU7GuG_pFG0KGcRWXPl1wE,5922
 mpflash/config.py,sha256=bmwNSJzk27iHcI-r3C6hm6-TeOat2ymzbbv-Q-xuO2o,3048
 mpflash/connected.py,sha256=oxZdk1o-AfNPhJsSxr3KrMH_gdYfrjqc_IpT6J8Ng9k,3496
 mpflash/db/__init__.py,sha256=wnIlO4nOXsPGXMbn2OCqHRsR-hUmtJsko8VdqjH3ZUE,45
@@ -27,12 +27,12 @@ mpflash/db/tools.py,sha256=6SEGfshNob4yRQ4h-Cj_xcWMRY28sbA8CWauNXV_uMI,814
 mpflash/download/__init__.py,sha256=zidXvsSFCfR-BZCZ6TiB7uEucEuUqXnZhKSfTs60lzU,7930
 mpflash/download/from_web.py,sha256=PVJDaFfYLJGXlPva5fExh4Yg2H7j3idyJEcfOiVVJBs,7608
 mpflash/download/fwinfo.py,sha256=gpa92PkysT1B7mxPAFJ-b_6y03QCNgHKm-J6T_RFNMI,1852
-mpflash/download/jid.py,sha256=ToRImbHdtvJ7AtZDH3aQURxBDci-0RvRtj5uCt8tHlI,2213
-mpflash/downloaded.py,sha256=RLz52l7uSvNW5HGMicTAj8aWLxnXYTsQbfcwCbjb_oo,4042
+mpflash/download/jid.py,sha256=503HW4jIB22fsb9vYphXqqO33LTMtvPdENG81wKDgMs,2334
+mpflash/downloaded.py,sha256=508sqROPf0Ymz7UxMzReXtK6mG1EcoXA-ysGdzV-VM0,4040
 mpflash/errors.py,sha256=IAidY3qkZsXy6Pm1rdmVFmGyg81ywHhse3itaPctA2w,247
 mpflash/flash/__init__.py,sha256=jif7-ifsXMabidjNdqUQyl1CwD5_USjCAZFhU5W-Aw8,2992
 mpflash/flash/esp.py,sha256=4977E1hDqJ4-EIkLzwrUtgZuc0ZTD7NvP1PQZgZ2DoU,3227
-mpflash/flash/stm32.py,sha256=dqp9BZ4Vr-6GlQcF12TSmRf-5TXkov9qvCpMgeUJc7Y,574
+mpflash/flash/stm32.py,sha256=jNgMpJaxUwtJ-v6VU1luD1t41AQprCUeNVCVEovxQe0,595
 mpflash/flash/stm32_dfu.py,sha256=W-3JsRQyf3DduoIRXDmGZ35RogqtjQgcJnk-GOtQoLE,3090
 mpflash/flash/uf2/__init__.py,sha256=haL84hP2p1ZjKF6dXJJHAB_NTf7jT91MuZvmvg9SpIA,3617
 mpflash/flash/uf2/boardid.py,sha256=U5wGM8VA3wEpUxQCMtuXpMZZomdVH8J_Zd5_GekUMuU,423
@@ -42,13 +42,13 @@ mpflash/flash/uf2/uf2disk.py,sha256=4_P2l-kedM7VSliA2u706LQLxvu3xWSod1-lj-xjZis,
 mpflash/flash/uf2/windows.py,sha256=S---sVjVrC00ZcnpOewtJIBfSCj2cr7FGQwEm_ZEDnY,1334
 mpflash/flash/worklist.py,sha256=ZqbgYChXFGEVLVlGKeS9eJJDToxBYqjrfWE2NIa7Cck,5622
 mpflash/list.py,sha256=NNhKpRh3ARZMdq56GLJgJ67GeuUf9SxjTzFhQjDsi9A,4008
-mpflash/logger.py,sha256=nHeH_Z9M5c1b0ECunNmxz_mCfl9b7v5suaSDDqAdS2E,1078
+mpflash/logger.py,sha256=oMGBhfHv0edPJaUxiqAjkQ5Na2B687f94LqE-IR7C-U,1885
 mpflash/mpboard_id/__init__.py,sha256=Z6gDDWTCSKPp2fsuaUz80zgrklBR9XDlSLF9y_evR9A,391
 mpflash/mpboard_id/alternate.py,sha256=ZhqfdA9sLJmyOfJ6WwK9wrzzUn6JQdkAreiL0q5XEQg,1913
 mpflash/mpboard_id/board_id.py,sha256=dGbYnqaGHm6Z68P6aCq5bv95pyhi9KKhQleQXmlyO8Y,2046
 mpflash/mpboard_id/board_info.json,sha256=A3ZIt38KvAy2NMB5srHorSBd3Q3wOZIXufWiIs3XLrs,1019745
 mpflash/mpboard_id/board_info.zip,sha256=-2bnQGRsIQuJUfz-7_-GQ8pMWJ1evhCez6yfjhXocNw,23213
-mpflash/mpboard_id/known.py,sha256=IZ3LDYZpQo7TmWa67FzmbUJIqWuxoD_QiZ4JT1A6344,3304
+mpflash/mpboard_id/known.py,sha256=GrNe4FtzVIdi9L9xuJ1gzorzXTvdfrugX1iVc_Nblb8,3325
 mpflash/mpboard_id/resolve.py,sha256=5KCZ0Tcg3FYZ3HK_zux5EguwoSC2E03kCpW2fh4rN2A,779
 mpflash/mpremoteboard/__init__.py,sha256=kZ-MziZPwx6UOs_ybLYEYeUDndC1XyylMcpGTiEHpTk,12043
 mpflash/mpremoteboard/mpy_fw_info.py,sha256=ZDEPJN9XJnoG_oeWcLNiLJAD5bkVX2yI_j4K7msUxWM,5196
@@ -59,11 +59,11 @@ mpflash/vendor/click_aliases.py,sha256=adLhqLxNpJEPjSCIRSTkR-QzSgavGFKT0cwRbjxpz
 mpflash/vendor/dfu.py,sha256=6rqGCBS8mTxxaLtkdzJ8O6nc74kFk8jrkmKvxw-x-u8,5693
 mpflash/vendor/pico-universal-flash-nuke/LICENSE.txt,sha256=Zkc2iTNbib2NCMwtLjMEz0vFCPglgvaw6Mj7QiWldpQ,1484
 mpflash/vendor/pico-universal-flash-nuke/universal_flash_nuke.uf2,sha256=QuPMppqHMVOt3vDVU0bikHRLsTiDRQYNUcGQ_OLRFGI,28160
-mpflash/vendor/pydfu.py,sha256=1I8dwbacUH_-u2y6gYZYRKO_Iof8Eb3rZsVyQ1ETluI,20364
+mpflash/vendor/pydfu.py,sha256=KD1RHHuhvhWi-l1UB6GyggkxouDKtZgkG4ivRbIfwC4,21264
 mpflash/vendor/readme.md,sha256=BQ7Uxf8joeYMjTUuSLLBG49ob6a9MgFPIEwuc72-Mfw,415
 mpflash/versions.py,sha256=HuujLNdMKY_mQXyEqwXVHcU8nbuXeBiWP2TMA5JQhr4,4884
-mpflash-1.25.0rc2.dist-info/entry_points.txt,sha256=Jk_visOhYOsZIcSP2Ms9hKqfKy1iorR-6dYltSoWCpY,52
-mpflash-1.25.0rc2.dist-info/LICENSE,sha256=mWpNhsIxWzetYNnTpr4eb3HtgsxGIC8KcYWxXEcxQvE,1077
-mpflash-1.25.0rc2.dist-info/METADATA,sha256=yw6z-qe0GA3gXJJJHyVBp58Wqah9knQLX_vDUNTm1Y8,23938
-mpflash-1.25.0rc2.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-mpflash-1.25.0rc2.dist-info/RECORD,,
+mpflash-1.25.0rc3.dist-info/entry_points.txt,sha256=Jk_visOhYOsZIcSP2Ms9hKqfKy1iorR-6dYltSoWCpY,52
+mpflash-1.25.0rc3.dist-info/LICENSE,sha256=mWpNhsIxWzetYNnTpr4eb3HtgsxGIC8KcYWxXEcxQvE,1077
+mpflash-1.25.0rc3.dist-info/METADATA,sha256=mEXilzRfCv3IpCReXC9MiydCTo_XVD81flx9E6zFtnI,23938
+mpflash-1.25.0rc3.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+mpflash-1.25.0rc3.dist-info/RECORD,,