mpflash 0.6.0__py3-none-any.whl → 0.7.0__py3-none-any.whl

mpflash/cli_flash.py

@@ -13,7 +13,7 @@ from .cli_group import cli
 from .cli_list import show_mcus
 from .config import config
 from .flash import flash_list
-from .worklist import WorkList, full_auto_worklist, manual_worklist, single_auto_worklist
+from .worklist import MPRemoteBoard, WorkList, full_auto_worklist, manual_worklist, single_auto_worklist
 
 # #########################################################################################################
 # CLI
@@ -104,6 +104,11 @@ def cli_flash_board(**kwargs):
     if not params.boards or params.boards == []:
         # nothing specified - detect connected boards
         params.ports, params.boards = connected_ports_boards()
+        if params.boards == []:
+            # No MicroPython boards detected, but it could be unflashed or not in bootloader mode
+            # Ask for serial port and board_id to flash
+            params.serial = "?"
+            params.boards = ["?"]
     else:
         for board_id in params.boards:
             if board_id == "":
@@ -130,9 +135,9 @@ def cli_flash_board(**kwargs):
     if len(params.versions) > 1:
         log.error(f"Only one version can be flashed at a time, not {params.versions}")
         raise MPFlashError("Only one version can be flashed at a time")
-    if len(params.boards) > 1:
-        log.error(f"Only one board can be flashed at a time, not {params.boards}")
-        raise MPFlashError("Only one board can be flashed at a time")
+    # if len(params.boards) > 1:
+    #     log.error(f"Only one board can be flashed at a time, not {params.boards}")
+    #     raise MPFlashError("Only one board can be flashed at a time")
 
     params.versions = [clean_version(v) for v in params.versions]
     worklist: WorkList = []

mpflash/cli_group.py

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

mpflash/flash_uf2.py

@@ -56,6 +56,6 @@ def flash_uf2(mcu: MPRemoteBoard, fw_file: Path, erase: bool) -> Optional[MPRemo
     log.success("Done copying, resetting the board and wait for it to restart")
     if sys.platform in ["linux", "darwin"]:
         dismount_uf2()
-    for _ in track(range(5 + 2)):
+    for _ in track(range(5 + 2), description="Waiting for the board to restart", transient=True):
         time.sleep(1)  # 5 secs to short on linux
     return mcu

mpflash/list.py

@@ -1,14 +1,18 @@
 from typing import List
 
 from rich import print
-from rich.progress import track
-from rich.table import Table
+from rich.progress import BarColumn, Progress, SpinnerColumn, TextColumn, TimeElapsedColumn, track
+from rich.table import Column, Table
 
 from mpflash.mpremoteboard import MPRemoteBoard
 
 from .config import config
 from .logger import console
 
+rp_spinner = SpinnerColumn(finished_text="✅")
+rp_text = TextColumn("{task.description} {task.fields[device]}", table_column=Column())
+rp_bar = BarColumn(bar_width=None, table_column=Column())
+
 
 def list_mcus(bluetooth: bool = False):
     """
@@ -21,12 +25,24 @@ def list_mcus(bluetooth: bool = False):
     """
     conn_mcus = [MPRemoteBoard(sp) for sp in MPRemoteBoard.connected_boards(bluetooth) if sp not in config.ignore_ports]
 
-    for mcu in track(conn_mcus, description="Getting board info", transient=True, update_period=0.1):
+    # a lot of boilerplate to show a progress bar with the comport currenlty scanned
+    with Progress(rp_spinner, rp_text, rp_bar, TimeElapsedColumn()) 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
+        progress.start_task(tsk_scan)
         try:
-            mcu.get_mcu_info()
-        except ConnectionError as e:
-            print(f"Error: {e}")
-            continue
+            for mcu in conn_mcus:
+                progress.update(tsk_scan, device=mcu.serialport.replace("/dev/", ""))
+                try:
+                    mcu.get_mcu_info()
+                except ConnectionError as e:
+                    print(f"Error: {e}")
+                    continue
+        finally:
+            # transient
+            progress.stop_task(tsk_scan)
+            progress.tasks[tsk_scan].visible = False
     return conn_mcus
 
 
@@ -38,11 +54,10 @@ def show_mcus(
     """Show the list of connected boards in a nice table"""
     table = Table(
         title=title,
-        title_style="bold",
-        header_style="bold blue",
+        title_style="magenta",
+        header_style="bold magenta",
         collapse_padding=True,
         width=110,
-        row_styles=["blue", "yellow"],
     )
     table.add_column("Serial", overflow="fold")
     table.add_column("Family")
@@ -59,11 +74,12 @@ def show_mcus(
                 mcu.get_mcu_info()
             except ConnectionError:
                 continue
+        description = f"[italic bright_cyan]{mcu.description}" if mcu.description else ""
         table.add_row(
             mcu.serialport.replace("/dev/", ""),
             mcu.family,
             mcu.port,
-            f"{mcu.board}\n{mcu.description}".strip(),
+            f"{mcu.board}\n{description}".strip(),
             # mcu.variant,
             mcu.cpu,
             mcu.version,

mpflash/mpremoteboard/__init__.py

@@ -65,8 +65,9 @@ class MPRemoteBoard:
 
     @staticmethod
     def connected_boards(bluetooth: bool = False) -> List[str]:
+        # TODO: rename to connected_comports
         """
-        Get a list of connected boards.
+        Get a list of connected comports.
 
         Parameters:
         - bluetooth (bool): Whether to include Bluetooth ports. Default is False.
@@ -74,14 +75,14 @@ class MPRemoteBoard:
         Returns:
         - List[str]: A list of connected board ports.
         """
-        ports = serial.tools.list_ports.comports()
+        comports = serial.tools.list_ports.comports()
 
         if not bluetooth:
             # filter out bluetooth ports
-            ports = [p for p in ports if "bluetooth" not in p.description.lower()]
-            ports = [p for p in ports if "BTHENUM" not in p.hwid]
+            comports = [p for p in comports if "bluetooth" not in p.description.lower()]
+            comports = [p for p in comports if "BTHENUM" not in p.hwid]
 
-        return sorted([p.device for p in ports])
+        return sorted([p.device for p in comports])
 
     @retry(stop=stop_after_attempt(RETRIES), wait=wait_fixed(1), reraise=True)  # type: ignore ## retry_error_cls=ConnectionError,
     def get_mcu_info(self, timeout: int = 2):

mpflash/worklist.py

@@ -24,7 +24,7 @@ def auto_update(
     *,
     selector: Optional[Dict[str, str]] = None,
 ) -> WorkList:
-    """Builds a list of boards to update based on the connected boards and the firmware available
+    """Builds a list of boards to update based on the connected boards and the firmwares available locally in the firmware folder.
 
     Args:
         conn_boards (List[MPRemoteBoard]): List of connected boards

{mpflash-0.6.0.dist-info → mpflash-0.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mpflash
-Version: 0.6.0
+Version: 0.7.0
 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.6.0.dist-info → mpflash-0.7.0.dist-info}/RECORD

@@ -1,8 +1,8 @@
 mpflash/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mpflash/ask_input.py,sha256=NGjCcOx49gW8xuDZK1BQXNOMPy7fUQ5pQamasez1wHI,7793
 mpflash/cli_download.py,sha256=9Rxwo-j7h9_rwMeAgITmfkdiNVi-Wunr1vpx2VjjUNM,3090
-mpflash/cli_flash.py,sha256=bp2AXHYqusVQbIOt12gqkbC4OoVMVV2gsY1fI-Js63M,5482
-mpflash/cli_group.py,sha256=hdyFrxkA_ye5r5bAsOnPr99KV2pfzgDoNXGPjTvEpW0,1946
+mpflash/cli_flash.py,sha256=Hld8SGNTJWKB0CTjfG8wGZh8RaC7CtVxhw4--LKTkig,5760
+mpflash/cli_group.py,sha256=nL3H06PHm_XUDlMuRyjgmTYeLnkrLa9mKDdahYw-KRo,1967
 mpflash/cli_list.py,sha256=uxTRPdjFWv5ev4E_pz1JYv8DSFLOtZvTKmVmCiRpEC4,1005
 mpflash/cli_main.py,sha256=VxIpmvk3-2Sr1uB1AMT5bRa0TlrbY28ZaYd6NGZnEe0,632
 mpflash/common.py,sha256=lucFGMLl03qz-5Ic2XVv4g5XVt6hloUU6N5v0tSaUYE,1049
@@ -15,26 +15,26 @@ mpflash/flash_esp.py,sha256=TjBOk2y1eLrcE8T3iYGypsiskPX7BFNfxYmCuUo_3v4,2316
 mpflash/flash_stm32.py,sha256=d4BoQl3a9Tchnvn2ZTuq2MpYBB4MTaRukwtEncI95k0,823
 mpflash/flash_stm32_cube.py,sha256=w7aGWjReeWUKl0Q3ZjXH8BRqNO1Tk9AO7gtRNUg1c9Y,3970
 mpflash/flash_stm32_dfu.py,sha256=G70EZodWb-aRi507Jxbys-VEwbBGU1oZacow3_nq-d4,2972
-mpflash/flash_uf2.py,sha256=nTbp8MbSZeNVPWPPsQxN1ppTtBGESXMfwZ_qL4Bwkv0,2029
+mpflash/flash_uf2.py,sha256=KvNPk1zDwQexJfPI5MlIoR7zTD0u-pQQwSHuFQjuMXg,2093
 mpflash/flash_uf2_boardid.py,sha256=WZKucGu_hJ8ymb236uuZbiR6pD6AA_l4LA-7LwtQhq8,414
 mpflash/flash_uf2_linux.py,sha256=LAGkzTImVq-wKo7LGUNlwkUHv1L4rGO7igR5dwxY07o,4298
 mpflash/flash_uf2_windows.py,sha256=dcmA-koavH7duOuNwI0n2aDDbhF1_5ZZ-mXFAXgj8z4,1072
-mpflash/list.py,sha256=7-yW_J-TDGMvRrRfz7clJseiMy4uEgcwyhOaiw5fj1w,2248
+mpflash/list.py,sha256=G35Pjc8Aw3qqY4dCi-0QtRRZEiJF5EPwyuU7Jx5S63Q,3186
 mpflash/logger.py,sha256=dI_H_a7EOdQJyvoeRHQuYeZuTKYVUS3DUPTLhE9rkdM,1098
 mpflash/mpboard_id/__init__.py,sha256=JYGe7VwpBV4ig2M9a6vJUQrMtgdNjZKHt_Z5N13Ycrs,3509
 mpflash/mpboard_id/board_id.py,sha256=NjKkIUv3sw6X60qy--mieQWrle3WNKw5NwAepMenTHI,2230
 mpflash/mpboard_id/board_info.csv,sha256=KPWDo-zHWfrPGQn9oInsDH-5IdCzhBCs6K_YAmqqSpQ,96983
 mpflash/mpboard_id/board_info.json,sha256=JtVyOMIO1O7vLKzJ0hyXQ4JSxXiQBJyay2hjdNLnZM0,674442
-mpflash/mpremoteboard/__init__.py,sha256=NSp71Qynz3hYqLLy0foVqdkURbNxfjUjiQBmaxKFF64,6951
+mpflash/mpremoteboard/__init__.py,sha256=DxlO_7LiyWDz5hNRI77fzp3sI3fZQ9Sd23dnGLx4Zl0,7017
 mpflash/mpremoteboard/mpy_fw_info.py,sha256=6AQbN3jtQgllqWQYl4e-63KeEtV08EXk8_JnM6XBkvo,4554
 mpflash/mpremoteboard/runner.py,sha256=H3W_xGJvjz7TLtlkDQrCLibgegRWGfsaBOABNbAfP_U,4783
 mpflash/vendor/dfu.py,sha256=oK_MRSOyDJrUuS6D24IMIsfL7oLcrvUq0yp_h4WIY2U,5739
 mpflash/vendor/pydfu.py,sha256=_MdBRo1EeNeKDqFPSTB5tNL1jGSBJgsVeVjE5e7Pb8s,20542
 mpflash/vendor/readme.md,sha256=iIIZxuLUIGHQ0KODzYVtMezsztvyxCXcNJp_AzwTIPk,86
 mpflash/vendor/versions.py,sha256=ooRZjeeYepQHwp12hMu2m0p8nZXQ5s942w5mGkKmgeI,3629
-mpflash/worklist.py,sha256=TGVFugEyWn83WKr0wahBBimcfsHMWGo8_QTu4g3ao-0,5266
-mpflash-0.6.0.dist-info/entry_points.txt,sha256=Jk_visOhYOsZIcSP2Ms9hKqfKy1iorR-6dYltSoWCpY,52
-mpflash-0.6.0.dist-info/LICENSE,sha256=mWpNhsIxWzetYNnTpr4eb3HtgsxGIC8KcYWxXEcxQvE,1077
-mpflash-0.6.0.dist-info/METADATA,sha256=wlr-kNnhL5NmvIbM9LIquNRymrf_sPsLcv7MQYx0-Ic,13778
-mpflash-0.6.0.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
-mpflash-0.6.0.dist-info/RECORD,,
+mpflash/worklist.py,sha256=qZsqF3Lf5Bl7QQ31ZLVHewP6WC8fmwQPMbyNgbG7LB4,5299
+mpflash-0.7.0.dist-info/entry_points.txt,sha256=Jk_visOhYOsZIcSP2Ms9hKqfKy1iorR-6dYltSoWCpY,52
+mpflash-0.7.0.dist-info/LICENSE,sha256=mWpNhsIxWzetYNnTpr4eb3HtgsxGIC8KcYWxXEcxQvE,1077
+mpflash-0.7.0.dist-info/METADATA,sha256=7U3zE54LqRhVIqVljefb5h-WjgjnTvLtm-EY6mTizTY,13778
+mpflash-0.7.0.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
+mpflash-0.7.0.dist-info/RECORD,,