micropython-stubber 1.17.4__py3-none-any.whl → 1.17.6__py3-none-any.whl

{micropython_stubber-1.17.4.dist-info → micropython_stubber-1.17.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: micropython-stubber
-Version: 1.17.4
+Version: 1.17.6
 Summary: Tooling to create and maintain stubs for MicroPython
 Home-page: https://github.com/Josverl/micropython-stubber#readme
 License: MIT

{micropython_stubber-1.17.4.dist-info → micropython_stubber-1.17.6.dist-info}/RECORD

@@ -1,37 +1,37 @@
-mptool/mptool/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mptool/mptool/cli_group.py,sha256=nxgH-gZ7sdxdppOHz6fnzB7I9Lu9ubz6r3QfFkrhSsc,1223
-mptool/mptool/cli_main.py,sha256=Sr7cdTOwqfi-nrr77NRF6zzIOS_qSDNbECF8_6_Vq64,495
-mptool/mptool/common.py,sha256=bW1_JY5904cm6luUlMQmzgYXk7ukrDyMaxwovOyfHes,3875
-mptool/mptool/config.py,sha256=n3v-w6VKvcUqpRQAfMAdrk_3-_XRw8fRIFaD379dN9w,159
-mptool/mptool/downloader.py,sha256=OsOTNjv-91RQc2quD8ptUzI1-pJhHekE8jARdg-1rhk,9961
-mptool/mptool/flash_esp.py,sha256=XffVg1BKzaQo4pzSJdUoHmHa7h4s4gBlNQR50ahGJ1E,2301
-mptool/mptool/flash_stm32.py,sha256=Pn1y9rKw48D0khucT8yU3NjFkHQ9YYTvwco9ir4MmpQ,3742
-mptool/mptool/flash_uf2.py,sha256=I795z12x8_KkiCg0WUirXabkc1vj7zNFcPvxWO8nEdo,2072
-mptool/mptool/flash_uf2_linux.py,sha256=NlnFN67qmUHw4GKOSay87I4H30ipOlrdHkFTF7MLwPc,3841
-mptool/mptool/flash_uf2_windows.py,sha256=AiFg5jrSyEMX2QxC2sgfn8GekKBw-fPkIi8emlU7Z7o,711
-mptool/mptool/flasher.py,sha256=_N-CYZZZ401kxZ45CDgl1XDj3lqdMPHjhpbn82ow2Kc,9575
-mptool/mptool/list.py,sha256=shFNDyEnmqqDjiJ4WSpJLTkDO_6H3fvYBeJKzfGFJMw,2004
-mptool/mptool/logger.py,sha256=FvGQSR2l4O9nmJV0rKbyoeJDd7fbY2vKQTmPEED0h6s,1048
-mptool/mptool/uf2_boardid.py,sha256=WZKucGu_hJ8ymb236uuZbiR6pD6AA_l4LA-7LwtQhq8,414
-mptool/poetry.lock,sha256=BGPosn3e__H3c0QlYw_9c9EFfHPeMY6OLasgNAmhm5g,137373
-mptool/pyproject.toml,sha256=GFBnLevRmBiahnqOk_RdBVElJLOoTpdk5WQsDX_lxDA,910
-mptool/README.md,sha256=y08mpllwvpZk29LDylbrPoiMBSVRifLVJetLHTFoaOw,287
-stubber/__init__.py,sha256=aYwROv-hMrVTvKEq1i44H3geRl57NBjJeAQq7GhR2lM,51
+mpflash/mpflash/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mpflash/mpflash/cli_group.py,sha256=oWgZlUoXY_Wc9-XMXxuxH3F0TevYNafsFWpRtT_WiiU,1228
+mpflash/mpflash/cli_main.py,sha256=nLFfR-ti_stLVvgwDRsNXgaQ43gQVZUOz_xvRERPuy0,494
+mpflash/mpflash/common.py,sha256=RBNfbojPKLK3_cxLFIvtHWy8UZUbBxN0ogBN0nliVR4,3896
+mpflash/mpflash/config.py,sha256=R_sYZ_UwzIc9H2vhwIU5RSDhpcV3fHIX83FEURWOd5E,160
+mpflash/mpflash/downloader.py,sha256=QVtgocj4b-c9ZunzEZnsyhEZu_Lbk8Hk-43qWBMJ0AI,9783
+mpflash/mpflash/flash_esp.py,sha256=XffVg1BKzaQo4pzSJdUoHmHa7h4s4gBlNQR50ahGJ1E,2301
+mpflash/mpflash/flash_stm32.py,sha256=Pn1y9rKw48D0khucT8yU3NjFkHQ9YYTvwco9ir4MmpQ,3742
+mpflash/mpflash/flash_uf2.py,sha256=8rZRqdi3Rtp8UsHxKgmoMfZ1yBXZbMFXcOeyVVMmX5w,2029
+mpflash/mpflash/flash_uf2_linux.py,sha256=wXtpqFan6x5k8h2bwwLqwY-LKbpyTg7n2SbD4eb6yH0,4012
+mpflash/mpflash/flash_uf2_windows.py,sha256=AiFg5jrSyEMX2QxC2sgfn8GekKBw-fPkIi8emlU7Z7o,711
+mpflash/mpflash/flasher.py,sha256=J7-bsrfQ0MPEKrnUx47q0OqAS61roLBaETu4nv4MfMU,9400
+mpflash/mpflash/list.py,sha256=7GpZEK7fh6GCzgUdRLHGp8FMEeCbLstV-2u3ohaRYsc,1970
+mpflash/mpflash/logger.py,sha256=FvGQSR2l4O9nmJV0rKbyoeJDd7fbY2vKQTmPEED0h6s,1048
+mpflash/mpflash/uf2_boardid.py,sha256=WZKucGu_hJ8ymb236uuZbiR6pD6AA_l4LA-7LwtQhq8,414
+mpflash/poetry.lock,sha256=1Gf00ycWFfkHFFmLFDnL8ov7GhZPz0qYv-k2S91s-xo,137771
+mpflash/pyproject.toml,sha256=vffY5dhFWQLUllZl_-f5YFfSsmYwvBN8DakysierFOA,1247
+mpflash/README.md,sha256=B25tOMF5eyZ3ych_6pfTWRc6cJxwNPXbw7F2QMfJt8A,11455
+stubber/__init__.py,sha256=b_G4a0TzIG3P--Gsh1qzZaXiera0wZdKQDeZvPTSECM,49
 stubber/basicgit.py,sha256=5y7eIxmZXfGHwgGrdHtFWTB-tYdgAc7A-0b299wHMYc,9543
 stubber/board/board_info.csv,sha256=K2VSmfR013fN-oJWkQUmiQ19w09dVwJHDquPy6QmMhY,8627
 stubber/board/boot.py,sha256=XjWlKErU5nI1HJSugXIP_3hlwgRQboE6sJrpcbSygnk,1120
-stubber/board/createstubs.py,sha256=xEnuXXGN1_siM94csiGhUaaJFUYS7l2LCbEvWwW3Op4,32416
-stubber/board/createstubs_db.py,sha256=JmDzwne4QUzoWRPy3Awi3AcB3O8WIJnigQ8nAQDmILw,30154
-stubber/board/createstubs_db_min.py,sha256=TxMRP4g45nkIAzVkeC7Axr2vvsXZpNkm1gkJtryiYDY,11386
-stubber/board/createstubs_db_mpy.mpy,sha256=4gYaYGiHUk3PpQ_a5w8-2dkczQVOhz25A2Wy0vFavGM,9472
+stubber/board/createstubs.py,sha256=4yD2Ixt-E2fUS2Rq3zBrcFKYNr_avNg0pBWQP4HrWgk,32546
+stubber/board/createstubs_db.py,sha256=pbfa7tNxs0GtjaknCCDPmDqNpukw5DKqqd3UlJNiW2E,30284
+stubber/board/createstubs_db_min.py,sha256=FxhpNl8iMpH8JNXy8f6i0Ijk_e6rlGiHRv5gVK5HuYM,11424
+stubber/board/createstubs_db_mpy.mpy,sha256=tedfLsrbARO2mqJrZ-8565wMg4VMq88yB-S_f4xjt0I,9509
 stubber/board/createstubs_lvgl.py,sha256=CTe7eq1ACRK_JJxavaqDD8znn29nSWJiHHTZ_ps6EhM,27217
 stubber/board/createstubs_lvgl_min.py,sha256=jLkWYmeboI2A8feMC7pT7cYWttLejQTuX7WAEZCylhw,27207
 stubber/board/createstubs_lvgl_mpy.mpy,sha256=ex-nlq2V5e8anQBJvRWEEc-FzU7nlwg5NSrZ8vOadIA,9267
-stubber/board/createstubs_mem.py,sha256=HUh8IWVcjpBqlJUgSZy7SWZY3t1zmpvzlpo_8qz-VqA,28488
-stubber/board/createstubs_mem_min.py,sha256=4HPWe7hLLMKGNYl970499NTTD4nClF0_koEkY_mtypI,10932
-stubber/board/createstubs_mem_mpy.mpy,sha256=G7WqJnAKjmwnUp-ASoV-TxHqIBid2LJE4ZHoINg3FME,9054
-stubber/board/createstubs_min.py,sha256=dxGgdbLpwnA4gJ576x3OkbznREZXcMf6b2w7fuTTNuo,13471
-stubber/board/createstubs_mpy.mpy,sha256=SVsdlZw0YSYF-RuBQ9OSTD0I3PXVSpQPY8PowDFuv_E,12156
+stubber/board/createstubs_mem.py,sha256=H8RV8p_tI8u2wsxbv4lPUQ-6e5xm0G2fL48s09rk1OY,28618
+stubber/board/createstubs_mem_min.py,sha256=aJGZFnYhz3nF7R8OZDydOBs1y1RorLDpV6UYpo3ykSg,10970
+stubber/board/createstubs_mem_mpy.mpy,sha256=SJow8erMqxCCDTkrmy5_O1S-iQy5uXyTosYGEkSpTY8,9091
+stubber/board/createstubs_min.py,sha256=9s0KTIXVwzD386ECOvVd1MW04bztv1XZd1WbsDtPErs,13509
+stubber/board/createstubs_mpy.mpy,sha256=YBDgMGamFVTq6HvTsQkAWBi7TxvC0oBEsqVL7IWbB2o,12193
 stubber/board/fw_info.py,sha256=6AQbN3jtQgllqWQYl4e-63KeEtV08EXk8_JnM6XBkvo,4554
 stubber/board/info.py,sha256=b7SOPZHVsVhaayKCwVkFZlYu0BW-UFI7LuG1Eop9480,5629
 stubber/board/main.py,sha256=f6V3tdt6sPZVLuwemT-NLuK9GySfW2c2J6PJMOOWQQw,413
@@ -40,7 +40,7 @@ stubber/board/pyrightconfig.json,sha256=6oHS4aDOfwKBAFeUPsCGJzEXpUgBZsPaF0M4P-N2
 stubber/bulk/board_id.py,sha256=R37zhRpg9kj3CqDJvPacQdbLq4d9k-Du1e7VUDWrzkI,1531
 stubber/bulk/mcu_stubber.py,sha256=NvJ8Q8nw09EfUsRg58FOGLldvb3lVIqQ1CHnpIIyeSk,16287
 stubber/bulk/mpremoteboard.py,sha256=YtaCZBCeS1ZBZrLGI7cVWuM0-0Fyc-hSpxLWofmo0qA,4843
-stubber/bulk/runner.py,sha256=r6b5V6U6LvYbrHH2L8zWwsaCqoTvgVTdU4w83CUH79Y,4070
+stubber/bulk/runner.py,sha256=AQUu8Rhj2jN5-R8F7zHi8pOCv6Z3HE0E0-KIed7QDx4,4159
 stubber/codemod/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stubber/codemod/_partials/__init__.py,sha256=4v1lkgSBzFw08gxwujh5sivpbJbYqg5lZeRzgyvN4TE,1561
 stubber/codemod/_partials/db_main.py,sha256=APeyLDuAc-FNXRQ7ECFVqVPLfOLVyAoLuE83e2Sfg1E,4183
@@ -125,8 +125,8 @@ stubber/utils/stubmaker.py,sha256=qld_Wfm9f4EuzedXlX1Ky0i0BJdR75oOOTha13_ekz0,52
 stubber/utils/typed_config_toml.py,sha256=ikifCIZGNhS_uqsfp6IwIpxdtZqbLtywprjWG_Q0y8o,2629
 stubber/utils/versions.py,sha256=VvADhHG3ZEu5z1mm927Aj18PO1krFvxVXxxwdecRPlY,3756
 stubber/variants.py,sha256=-o4TgotbKaCcYBdXkutPaBSR1JdxWmOAiuNT1UlahYc,3784
-micropython_stubber-1.17.4.dist-info/entry_points.txt,sha256=NQi_M36fgq5k6giSuASas3LrpF6CVdkzfvJC0ja73_g,55
-micropython_stubber-1.17.4.dist-info/LICENSE,sha256=Fx9qrL45ayRXgH6QzttboqZEjKXms0w1t_b_nkOqYCU,1572
-micropython_stubber-1.17.4.dist-info/METADATA,sha256=JSa8pVPDEkS7a85F2uwzwhFRBPBrRn7riMXgzjN_zFU,19029
-micropython_stubber-1.17.4.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
-micropython_stubber-1.17.4.dist-info/RECORD,,
+micropython_stubber-1.17.6.dist-info/entry_points.txt,sha256=NQi_M36fgq5k6giSuASas3LrpF6CVdkzfvJC0ja73_g,55
+micropython_stubber-1.17.6.dist-info/LICENSE,sha256=Fx9qrL45ayRXgH6QzttboqZEjKXms0w1t_b_nkOqYCU,1572
+micropython_stubber-1.17.6.dist-info/METADATA,sha256=vXkIJk9X8j3kkA6jrJzRYWXYeGXoASOg8710O_qwL8s,19029
+micropython_stubber-1.17.6.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
+micropython_stubber-1.17.6.dist-info/RECORD,,

mpflash/README.md

@@ -0,0 +1,149 @@
+# mpflash
+mpflash is a command-line tool for working with MicroPython firmware. It provides various features to help you develop, build, and manage your MicroPython projects.
+
+This tool was created to be used in a CI/CD pipeline to automate the process of downloading and flashing MicroPython firmware to multiple boards, but it can also be used for manual flashing and development.
+
+mpflash has been tested on Windows x64, Linux X64 and ARM64, but not (yet) macOS.
+
+## Features
+ 1. List the connected boards including their firmware details, in a tabular or json format
+ 2. Download MicroPython firmware for specific boards and versions.
+ 3. Flash one or all connected MicroPython boards with a specific firmware or version.
+    Tested ports: rp2, samd, esp32, esp32s3, esp8266 and stm32 (requires cubeprogrammer)
+ 
+## Installation
+To install mpflash, you can use pip: `pip install mpflash`
+
+## How to use
+You can list the connected boards using the following command:
+```bash
+$ mpflash list
+D:\MyPython\micropython-stubber> mpflash list
+Getting board info ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 100% 0:00:02
+                                       Connected boards
+┏━━━━━━━━┳━━━━━━━━━━━━━┳━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━┳━━━━━━━┓
+┃ Serial ┃ Family      ┃ Port    ┃ Board              ┃ CPU         ┃ Version        ┃ build ┃
+┡━━━━━━━━╇━━━━━━━━━━━━━╇━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━╇━━━━━━━┩
+│ COM11  │ micropython │ rp2     │ RPI_PICO_W         │ RP2040      │ 1.20.0         │       │
+│ COM12  │ micropython │ esp8266 │ ESP8266_GENERIC    │ ESP8266     │ 1.22.2         │       │
+│ COM18  │ micropython │ rp2     │ RPI_PICO_W         │ RP2040      │ 1.23.0-preview │ 155   │
+│ COM3   │ micropython │ samd    │ SEEED_WIO_TERMINAL │ SAMD51P19A  │ 1.23.0-preview │ 155   │
+│ COM5   │ micropython │ stm32   │ PYBV11             │ STM32F405RG │ 1.23.0-preview │ 166   │
+│ COM8   │ micropython │ esp32   │ ESP32_GENERIC_S3   │ ESP32S3     │ 1.23.0-preview │ 155   │
+└────────┴─────────────┴─────────┴────────────────────┴─────────────┴────────────────┴───────┘
+```
+
+Suppose you want to download the MicroPython firmware for some boards, you can use the following command: 
+
+```bash
+# download the firmware
+$ mpflash download --board ESP8266_GENERIC --board SEEED_WIO_TERMINAL
+```	
+This will download the latest stable version of the MicroPython firmware for the boards and save it in the `firmware` directory.
+The stable version (default) is determined based on the most recent published release,
+other optionse are `--version preview` and `--version x.y.z` to download the latest preview or version x.y.z respectively.
+
+by default the firmware will be downloaded to  Downloads  in a `firmware` folder in your, but you can specify a different directory using the `--dir` option.
+
+```bash
+The directory structure will be something like this:
+```
+Downloads/firmware
+|   firmware.jsonl
++---esp8266
+|       ESP8266_GENERIC-FLASH_1M-v1.22.2.bin
+|       ESP8266_GENERIC-FLASH_512K-v1.22.2.bin
+|       ESP8266_GENERIC-OTA-v1.22.2.bin
+|       ESP8266_GENERIC-v1.22.2.bin
+\---samd
+        SEEED_WIO_TERMINAL-v1.22.2.uf2
+```
+You can then flash the firmware to the board using the following command: `mpflash flash`
+This will (try to) autodetect the connected boards, and determine the correct firmware to flash to each board.
+
+```bash
+> mpflash flash
+22:15:55 | ℹ️  - Using latest stable version: v1.22.2
+                                       Connected boards
+┏━━━━━━━━┳━━━━━━━━━━━━━┳━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━┳━━━━━━━┓
+┃ Serial ┃ Family      ┃ Port    ┃ Board              ┃ CPU         ┃ Version        ┃ build ┃
+┡━━━━━━━━╇━━━━━━━━━━━━━╇━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━╇━━━━━━━┩
+│ COM11  │ micropython │ rp2     │ RPI_PICO_W         │ RP2040      │ 1.20.0         │       │
+│ COM12  │ micropython │ esp8266 │ ESP8266_GENERIC    │ ESP8266     │ 1.22.2         │       │
+│ COM18  │ micropython │ rp2     │ RPI_PICO_W         │ RP2040      │ 1.23.0-preview │ 155   │
+│ COM3   │ micropython │ samd    │ SEEED_WIO_TERMINAL │ SAMD51P19A  │ 1.23.0-preview │ 155   │
+│ COM5   │ micropython │ stm32   │ PYBV11             │ STM32F405RG │ 1.23.0-preview │ 166   │
+│ COM8   │ micropython │ esp32   │ ESP32_GENERIC_S3   │ ESP32S3     │ 1.23.0-preview │ 155   │
+└────────┴─────────────┴─────────┴────────────────────┴─────────────┴────────────────┴───────┘
+22:15:58 | ℹ️  - Found v1.22.2 firmware rp2\RPI_PICO_W-v1.22.2.uf2 for RPI_PICO_W on COM11.
+22:15:58 | ℹ️  - Found v1.22.2 firmware esp8266\ESP8266_GENERIC-v1.22.2.bin for ESP8266_GENERIC on COM12.
+22:15:58 | ℹ️  - Found v1.22.2 firmware rp2\RPI_PICO_W-v1.22.2.uf2 for RPI_PICO_W on COM18.
+22:15:58 | ℹ️  - Found v1.22.2 firmware samd\SEEED_WIO_TERMINAL-v1.22.2.uf2 for SEEED_WIO_TERMINAL on COM3.
+22:15:58 | ⚠️  - Trying to find a firmware for the board PYBV11
+22:15:58 | ❌  - No v1.22.2 firmware found for PYBV11 on COM5.
+22:15:58 | ⚠️  - Trying to find a firmware for the board ESP32-GENERIC-S3
+22:15:58 | ❌  - No v1.22.2 firmware found for ESP32_GENERIC_S3 on COM8.
+22:15:58 | ℹ️  - Updating RPI_PICO_W on COM11 to 1.22.2
+22:15:58 | ℹ️  - Erasing not yet implemented for UF2 flashing.
+22:15:58 | ℹ️  - Entering UF2 bootloader on RPI_PICO_W on COM11
+22:15:58 | ℹ️  - Waiting for mcu to mount as a drive : 10 seconds left
+22:15:59 | ℹ️  - Waiting for mcu to mount as a drive : 9 seconds left
+22:16:00 | ℹ️  - Board is in bootloader mode
+22:16:00 | ℹ️  - Copying firmware\rp2\RPI_PICO_W-v1.22.2.uf2 to F:
+22:16:13 | ✅  - Done copying, resetting the board and wait for it to restart
+22:16:23 | ℹ️  - Updating ESP8266_GENERIC on COM12 to 1.22.2
+22:16:23 | ℹ️  - Flashing firmware\esp8266\ESP8266_GENERIC-v1.22.2.bin on ESP8266_GENERIC on COM12
+22:16:23 | ℹ️  - Running esptool --chip ESP8266 --port COM12 erase_flash 
+esptool.py v4.7.0
+Serial port COM12
+Connecting....
+...
+Chip erase completed successfully in 6.5s
+Hard resetting via RTS pin...
+22:16:31 | ℹ️  - Running esptool --chip ESP8266 --port COM12 -b 460800 write_flash --flash_size=detect 0x0 firmware\esp8266\ESP8266_GENERIC-v1.22.2.bin 
+esptool.py v4.7.0
+Serial port COM12
+Connecting....
+...
+Leaving...
+Hard resetting via RTS pin...
+22:16:43 | ℹ️  - Done flashing, resetting the board and wait for it to restart
+22:16:49 | ✅  - Flashed 1.22.2 to ESP8266_GENERIC on COM12 done
+22:16:49 | ℹ️  - Updating RPI_PICO_W on COM18 to 1.22.2
+22:16:49 | ℹ️  - Erasing not yet implemented for UF2 flashing.
+22:16:49 | ℹ️  - Entering UF2 bootloader on RPI_PICO_W on COM18
+22:16:49 | ℹ️  - Waiting for mcu to mount as a drive : 10 seconds left
+22:16:50 | ℹ️  - Waiting for mcu to mount as a drive : 9 seconds left
+22:16:51 | ℹ️  - Board is in bootloader mode
+22:16:51 | ℹ️  - Copying firmware\rp2\RPI_PICO_W-v1.22.2.uf2 to F:[/bold]
+22:17:02 | ✅  - Done copying, resetting the board and wait for it to restart
+22:17:12 | ℹ️  - Updating SEEED_WIO_TERMINAL on COM3 to 1.22.2
+22:17:12 | ℹ️  - Erasing not yet implemented for UF2 flashing.
+22:17:12 | ℹ️  - Entering UF2 bootloader on SEEED_WIO_TERMINAL on COM3
+22:17:12 | ℹ️  - Waiting for mcu to mount as a drive : 10 seconds left
+22:17:13 | ℹ️  - Waiting for mcu to mount as a drive : 9 seconds left
+22:17:14 | ℹ️  - Board is in bootloader mode
+22:17:14 | ℹ️  - Copying firmware\samd\SEEED_WIO_TERMINAL-v1.22.2.uf2 to F:[/bold]
+22:17:17 | ✅  - Done copying, resetting the board and wait for it to restart
+22:17:27 | ℹ️  - Flashed 4 boards
+                               Connected boards after flashing
+┏━━━━━━━━┳━━━━━━━━━━━━━┳━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━┳━━━━━━━┓
+┃ Serial ┃ Family      ┃ Port    ┃ Board              ┃ CPU         ┃ Version        ┃ build ┃
+┡━━━━━━━━╇━━━━━━━━━━━━━╇━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━╇━━━━━━━┩
+│ COM11  │ micropython │ rp2     │ RPI_PICO_W         │ RP2040      │ 1.22.2         │       │
+│ COM12  │ micropython │ esp8266 │ ESP8266_GENERIC    │ ESP8266     │ 1.22.2         │       │
+│ COM18  │ micropython │ rp2     │ RPI_PICO_W         │ RP2040      │ 1.22.2         │       │
+│ COM3   │ micropython │ samd    │ SEEED_WIO_TERMINAL │ SAMD51P19A  │ 1.22.2         │       │
+│ COM5   │ micropython │ stm32   │ PYBV11             │ STM32F405RG │ 1.23.0-preview │ 166   │
+│ COM8   │ micropython │ esp32   │ ESP32_GENERIC_S3   │ ESP32S3     │ 1.23.0-preview │ 155   │
+└────────┴─────────────┴─────────┴────────────────────┴─────────────┴────────────────┴───────┘
+```
+Note that if no matching firmware can be found for a board, it will be skipped.
+(For example, the PYBV11 and ESP32_GENERIC_S3 boards in the example above.)
+
+## Issues and bug reports
+mpflash is currently co-located in the [micropython-stubber](https://github.com/Josverl/micropython-stubber) repository.
+Please report any issues or bugs in the [issue tracker](https://github.com/Josverl/micropython-stubber/issues) with '[mpflash]' in the subject.
+
+## License
+mpflash is licensed under the MIT license. See the LICENSE file for more details.

{mptool/mptool → mpflash/mpflash}/cli_group.py

@@ -4,6 +4,7 @@ Additional comands are added in the submodules.
 """
 
 from typing import List
+
 import rich_click as click
 
 from .config import config
@@ -39,16 +40,16 @@ def cb_ignore(ctx, param, value):
     "--ignore",
     "-i",
     is_eager=True,
-    help="Serial port(s) to ignore. Defaults to MPTOOL_IGNORE.",
+    help="Serial port(s) to ignore. Defaults to MPFLASH_IGNORE.",
     callback=cb_ignore,
     multiple=True,
     default=[],
-    envvar="MPTOOL_IGNORE",
+    envvar="MPFLASH_IGNORE",
     show_default=True,
     metavar="SERIALPORT",
 )
 def cli(verbose: bool, ignore: List[str], **kwargs):
-    """mptool - MicroPython Tool.
+    """mpflash - MicroPython Tool.
 
     A CLI to download and flash MicroPython firmware to different ports and boards.
     """

{mptool/mptool → mpflash/mpflash}/cli_main.py

@@ -1,4 +1,4 @@
-"""mptool is a CLI to download and flash MicroPython firmware to various boards."""
+"""mpflash is a CLI to download and flash MicroPython firmware to various boards."""
 
 import rich_click as click
 
@@ -10,12 +10,12 @@ from .list import list_boards
 # from loguru import logger as log
 
 
-def mptool():
+def mpflash():
     # cli.add_command(flash_board)
     # cli.add_command(list_boards)
     # cli.add_command(download)
-    cli()  # auto_envvar_prefix='MPTOOL')
+    cli(auto_envvar_prefix="MPFLASH")
 
 
 if __name__ == "__main__":
-    mptool()
+    mpflash()

{mptool/mptool → mpflash/mpflash}/common.py

@@ -1,6 +1,7 @@
 from pathlib import Path
 from typing import Dict, Union
 
+import platformdirs
 from github import Github
 from loguru import logger as log
 from packaging.version import parse
@@ -12,11 +13,11 @@ PORT_FWTYPES = {
     "rp2": ".uf2",
     "samd": ".uf2",
     "mimxrt": ".hex",
-    "nrf": ".hex",
+    "nrf": ".uf2",
     "renesas-ra": ".hex",
 }
 
-DEFAULT_FW_PATH = Path.cwd() / "firmware"
+DEFAULT_FW_PATH = platformdirs.user_downloads_path() / "firmware"
 # DEFAULT_FW_PATH = Path.home() / "mp_firmware"
 
 FWInfo = Dict[str, Union[str, bool]]
@@ -87,9 +88,7 @@ def micropython_versions(minver: str = "v1.9.2"):
         g = Github()
         _ = 1 / 0
         repo = g.get_repo("micropython/micropython")
-        versions = [
-            tag.name for tag in repo.get_tags() if parse(tag.name) >= parse(minver)
-        ]
+        versions = [tag.name for tag in repo.get_tags() if parse(tag.name) >= parse(minver)]
     except Exception:
         versions = [
             "v9.99.9-preview",

{mptool/mptool → mpflash/mpflash}/config.py

@@ -1,4 +1,4 @@
-"""centralized configuration for mptool"""
+"""centralized configuration for mpflash"""
 
 from typing import List
 

{mptool/mptool → mpflash/mpflash}/downloader.py

@@ -18,7 +18,7 @@ from loguru import logger as log
 from rich.progress import track
 
 from .cli_group import cli
-from .common import PORT_FWTYPES, clean_version
+from .common import DEFAULT_FW_PATH, PORT_FWTYPES, clean_version
 
 MICROPYTHON_ORG_URL = "https://micropython.org/"
 
@@ -40,6 +40,7 @@ DEFAULT_BOARDS = [
     "ARDUINO_NANO_RP2040_CONNECT",
     "PIMORONI_PICOLIPO_16MB",
     "SEEED_WIO_TERMINAL",
+    "PARTICLE_XENON",
 ]
 
 
@@ -77,9 +78,7 @@ def firmware_list(board_url: str, base_url: str, ext: str) -> List[str]:
     tags = soup.findAll(
         "a",
         recursive=True,
-        attrs={
-            "href": re.compile(r"^/resources/firmware/.*\." + ext.lstrip(".") + "$")
-        },
+        attrs={"href": re.compile(r"^/resources/firmware/.*\." + ext.lstrip(".") + "$")},
     )
     if "?" in base_url:
         base_url = base_url.split("?")[0]
@@ -94,9 +93,7 @@ FirmwareInfo = Dict[str, str]
 # boards we are interested in ( this avoids getting a lot of boards we don't care about)
 # 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(
-    fw_types: Dict[str, str], board_list: List[str], clean: bool
-) -> List[FirmwareInfo]:
+def get_boards(fw_types: Dict[str, str], board_list: List[str], clean: bool) -> List[FirmwareInfo]:
     board_urls: List[FirmwareInfo] = []
     for port in fw_types:
         download_page_url = f"{MICROPYTHON_ORG_URL}download/?port={port}"
@@ -107,9 +104,7 @@ def get_boards(
         for board in _urls:
             board["port"] = port
 
-        for board in track(
-            _urls, description="Checking download pages", transient=True
-        ):
+        for board in track(_urls, description=f"Checking {port} download pages", transient=True):
             # add a board to the list for each firmware found
             firmwares = firmware_list(board["url"], MICROPYTHON_ORG_URL, fw_types[port])
             for _url in firmwares:
@@ -130,11 +125,7 @@ def get_boards(
                     # remove hash from firmware name
                     fname = re.sub(RE_HASH, ".", fname)
                 board["filename"] = fname
-                board["variant"] = (
-                    board["filename"].split("-v")[0]
-                    if "-v" in board["filename"]
-                    else ""
-                )
+                board["variant"] = board["filename"].split("-v")[0] if "-v" in board["filename"] else ""
                 board_urls.append(board.copy())
     return board_urls
 
@@ -171,9 +162,7 @@ def download_firmwares(
 
     firmware_folder.mkdir(exist_ok=True)
 
-    with open(
-        firmware_folder / "firmware.jsonl", "a", encoding="utf-8", buffering=1
-    ) as f_jsonl:
+    with open(firmware_folder / "firmware.jsonl", "a", encoding="utf-8", buffering=1) as f_jsonl:
         for board in unique_boards:
             filename = firmware_folder / board["port"] / board["filename"]
             filename.parent.mkdir(exist_ok=True)
@@ -197,21 +186,16 @@ def download_firmwares(
     log.info(f"Downloaded {downloaded} firmwares, skipped {skipped} existing files.")
 
 
-def get_firmware_list(
-    board_list: List[str], version_list: List[str], preview: bool, clean: bool
-):
+def get_firmware_list(board_list: List[str], version_list: List[str], preview: bool, clean: bool):
     log.trace("Checking MicroPython download pages")
 
-    board_urls = sorted(
-        get_boards(PORT_FWTYPES, board_list, clean), key=key_fw_variant_ver
-    )
+    board_urls = sorted(get_boards(PORT_FWTYPES, board_list, clean), key=key_fw_variant_ver)
 
     log.debug(f"Total {len(board_urls)} firmwares")
     relevant = [
         board
         for board in board_urls
-        if board["board"] in board_list
-        and (board["version"] in version_list or board["preview"] and preview)
+        if board["board"] in board_list and (board["version"] in version_list or board["preview"] and preview)
         # and b["port"] in ["esp32", "rp2"]
     ]
     log.debug(f"Matching firmwares: {len(relevant)}")
@@ -233,7 +217,7 @@ def get_firmware_list(
     "--destination",
     "-d",
     type=click.Path(file_okay=False, dir_okay=True, path_type=Path),
-    default="./firmware",
+    default=DEFAULT_FW_PATH,
     show_default=True,
     help="The folder to download the firmware to.",
 )
@@ -267,19 +251,13 @@ def get_firmware_list(
     help="""Force download of firmware even if it already exists.""",
     show_default=True,
 )
-def download(
-    destination: Path, boards: List[str], versions: List[str], force: bool, clean: bool
-):
+def download(destination: Path, boards: List[str], versions: List[str], force: bool, clean: bool):
     versions = list(versions)
     # preview is not a version, it is an option to include preview versions
     preview = "preview" in versions
     versions = [v for v in versions if v != "preview"]
 
     boards = list(boards) or DEFAULT_BOARDS
-    versions = [
-        clean_version(v, drop_v=True) for v in versions
-    ]  # remove leading v from version
+    versions = [clean_version(v, drop_v=True) for v in versions]  # remove leading v from version
     destination.mkdir(exist_ok=True)
-    download_firmwares(
-        destination, boards, versions, preview=preview, force=force, clean=clean
-    )
+    download_firmwares(destination, boards, versions, preview=preview, force=force, clean=clean)

{mptool/mptool → mpflash/mpflash}/flash_uf2.py

@@ -17,9 +17,7 @@ from .flash_uf2_linux import dismount_uf2, wait_for_UF2_linux
 from .flash_uf2_windows import wait_for_UF2_windows
 
 
-def flash_uf2(
-    mcu: MPRemoteBoard, fw_file: Path, erase: bool
-) -> Optional[MPRemoteBoard]:
+def flash_uf2(mcu: MPRemoteBoard, fw_file: Path, erase: bool) -> Optional[MPRemoteBoard]:
     """
     Flash .UF2 devices via bootloader and filecopy
     - mpremote bootloader
@@ -49,16 +47,12 @@ def flash_uf2(
         log.error(f"OS {sys.platform} not supported")
         return None
 
-    if (
-        not destination
-        or not destination.exists()
-        or not (destination / "INFO_UF2.TXT").exists()
-    ):
+    if not destination or not destination.exists() or not (destination / "INFO_UF2.TXT").exists():
         log.error("Board is not in bootloader mode")
         return None
 
     log.info("Board is in bootloader mode")
-    log.info(f"Copying {fw_file} to {destination}")
+    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")
     if sys.platform == "linux":

{mptool/mptool → mpflash/mpflash}/flash_uf2_linux.py

@@ -1,11 +1,13 @@
 from __future__ import annotations
-from pathlib import Path
+
 import subprocess
 import sys
 import time
+from pathlib import Path
+from typing import List
+
 from loguru import logger as log
 
-from typing import List
 from .uf2_boardid import get_board_id
 
 glb_dismount_me: List[UF2Disk] = []
@@ -112,10 +114,14 @@ def wait_for_UF2_linux():
         for drive in get_uf2_drives():
             pmount(drive)
             time.sleep(1)
-            if Path(drive.mountpoint, "INFO_UF2.TXT").exists():
-                board_id = get_board_id(Path(drive.mountpoint))  # type: ignore
-                destination = Path(drive.mountpoint)
-                break
+            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
         time.sleep(1)
         wait -= 1
     return destination

{mptool/mptool → mpflash/mpflash}/flasher.py

@@ -104,9 +104,7 @@ def auto_update(conn_boards: List[MPRemoteBoard], target_version: str, fw_folder
     wl: WorkList = []
     for mcu in conn_boards:
         if mcu.family != "micropython":
-            log.warning(
-                f"Skipping {mcu.board} on {mcu.serialport} as it is not a micropython board"
-            )
+            log.warning(f"Skipping {mcu.board} on {mcu.serialport} as it is not a micropython board")
             continue
         board_firmwares = find_firmware(
             fw_folder=fw_folder,
@@ -117,19 +115,13 @@ def auto_update(conn_boards: List[MPRemoteBoard], target_version: str, fw_folder
         )
 
         if not board_firmwares:
-            log.error(
-                f"No {target_version} firmware found for {mcu.board} on {mcu.serialport}."
-            )
+            log.error(f"No {target_version} firmware found for {mcu.board} on {mcu.serialport}.")
             continue
         if len(board_firmwares) > 1:
-            log.debug(
-                f"Multiple {target_version} firmwares found for {mcu.board} on {mcu.serialport}."
-            )
+            log.debug(f"Multiple {target_version} firmwares found for {mcu.board} on {mcu.serialport}.")
         # just use the last firmware
         fw_info = board_firmwares[-1]
-        log.info(
-            f"Found {target_version} firmware {fw_info['filename']} for {mcu.board} on {mcu.serialport}."
-        )
+        log.info(f"Found {target_version} firmware {fw_info['filename']} for {mcu.board} on {mcu.serialport}.")
         wl.append((mcu, fw_info))
     return wl
 
@@ -148,7 +140,7 @@ def auto_update(conn_boards: List[MPRemoteBoard], target_version: str, fw_folder
     "-f",
     "fw_folder",
     type=click.Path(exists=True, file_okay=False, dir_okay=True, path_type=Path),
-    default="./firmware",
+    default=DEFAULT_FW_PATH,
     show_default=True,
     help="The folder to retrieve the firmware from.",
 )
@@ -233,9 +225,7 @@ def flash_board(
         if serial_port == "auto":
             # update all connected boards
             conn_boards = [
-                MPRemoteBoard(sp)
-                for sp in MPRemoteBoard.connected_boards()
-                if sp not in config.ignore_ports
+                MPRemoteBoard(sp) for sp in MPRemoteBoard.connected_boards() if sp not in config.ignore_ports
             ]
         else:
             # just this serial port
@@ -247,9 +237,7 @@ def flash_board(
     for mcu, fw_info in todo:
         fw_file = fw_folder / fw_info["filename"]  # type: ignore
         if not fw_file.exists():
-            log.error(
-                f"File {fw_file} does not exist, skipping {mcu.board} on {mcu.serialport}"
-            )
+            log.error(f"File {fw_file} does not exist, skipping {mcu.board} on {mcu.serialport}")
             continue
         log.info(f"Updating {mcu.board} on {mcu.serialport} to {fw_info['version']}")
 
@@ -269,12 +257,13 @@ def flash_board(
 
     if flashed:
         log.info(f"Flashed {len(flashed)} boards")
-        conn_boards = [
-            MPRemoteBoard(sp)
-            for sp in MPRemoteBoard.connected_boards()
-            if sp not in config.ignore_ports
-        ]
-        show_boards(conn_boards, title="Connected boards after flashing")
+        # conn_boards = [
+        #     MPRemoteBoard(sp)
+        #     for sp in MPRemoteBoard.connected_boards()
+        #     if sp not in config.ignore_ports
+        # ]
+
+        show_boards(flashed, title="Connected boards after flashing")
 
 
 # TODO:

{mptool/mptool → mpflash/mpflash}/list.py

@@ -24,11 +24,7 @@ from .config import config
     help="""Output in json format""",
 )
 def list_boards(as_json: bool):
-    conn_boards = [
-        MPRemoteBoard(sp)
-        for sp in MPRemoteBoard.connected_boards()
-        if sp not in config.ignore_ports
-    ]
+    conn_boards = [MPRemoteBoard(sp) for sp in MPRemoteBoard.connected_boards() if sp not in config.ignore_ports]
 
     for mcu in track(conn_boards, description="Getting board info"):
         try:

{mptool → mpflash}/poetry.lock

@@ -813,45 +813,41 @@ files = [
 
 [[package]]
 name = "micropython-stubber"
-version = "1.17.3"
+version = "1.17.4"
 description = "Tooling to create and maintain stubs for MicroPython"
 optional = false
 python-versions = ">=3.9,<3.12"
-files = []
-develop = false
+files = [
+    {file = "micropython_stubber-1.17.4-py3-none-any.whl", hash = "sha256:8daae4ffcdacd523f1e8577873b3d5c7b27f293808b7b161b79c4400bbfd1db6"},
+    {file = "micropython_stubber-1.17.4.tar.gz", hash = "sha256:da9132ad5b601d06c2e84aaf3741f17d9873966274c503d7a95e41466dc91fab"},
+]
 
 [package.dependencies]
 autoflake = ">=1.7,<3.0"
 black = ">=22.10,<23.0"
-cachetools = "^5.3.0"
-click = "^8.1.3"
-executing = "^2.0.1"
-libcst = "^1.1.0"
+cachetools = ">=5.3.0,<6.0.0"
+click = ">=8.1.3,<9.0.0"
+executing = ">=2.0.1,<3.0.0"
+libcst = ">=1.1.0,<2.0.0"
 loguru = ">=0.6,<0.8"
-mpremote = "^1.22.0"
+mpremote = ">=1.22.0,<2.0.0"
 mypy = "1.7.0"
-mypy-gitlab-code-quality = "^1.1.0"
+mypy-gitlab-code-quality = ">=1.1.0,<2.0.0"
 packaging = ">=21.3,<24.0"
-pipx = "^1.1.0"
-pygithub = "^2.1.1"
-pypi-simple = "^1.0.0"
-pyright = "^1.1.341"
-pyserial = "^3.5"
-pysondb-v2 = "^2.1.0"
-python-minifier = {version = "^2.7.0", markers = "python_version < \"3.12\""}
-requests = "^2.28.0"
-rich-click = "^1.7.3"
-tabulate = "^0.9.0"
-tenacity = "^8.2.2"
-tomli = {version = "^2.0.1", markers = "python_version < \"3.11\""}
-tomli-w = "^1.0.0"
-typed-config = "^1.3.0"
-
-[package.source]
-type = "git"
-url = "https://github.com/josverl/micropython-stubber.git"
-reference = "action_board_stubber"
-resolved_reference = "8a41135ed57256fc603a6feb857ffc091196dad8"
+pipx = ">=1.1.0,<2.0.0"
+pygithub = ">=2.1.1,<3.0.0"
+pypi-simple = ">=1.0.0,<2.0.0"
+pyright = ">=1.1.341,<2.0.0"
+pyserial = ">=3.5,<4.0"
+pysondb-v2 = ">=2.1.0,<3.0.0"
+python-minifier = {version = ">=2.7.0,<3.0.0", markers = "python_version < \"3.12\""}
+requests = ">=2.28.0,<3.0.0"
+rich-click = ">=1.7.3,<2.0.0"
+tabulate = ">=0.9.0,<0.10.0"
+tenacity = ">=8.2.2,<9.0.0"
+tomli = {version = ">=2.0.1,<3.0.0", markers = "python_version < \"3.11\""}
+tomli-w = ">=1.0.0,<2.0.0"
+typed-config = ">=1.3.0,<2.0.0"
 
 [[package]]
 name = "mpremote"
@@ -1374,6 +1370,7 @@ files = [
     {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"},
     {file = "PyYAML-6.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28"},
     {file = "PyYAML-6.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9"},
+    {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a08c6f0fe150303c1c6b71ebcd7213c2858041a7e01975da3a99aed1e7a378ef"},
     {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0"},
     {file = "PyYAML-6.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4"},
     {file = "PyYAML-6.0.1-cp312-cp312-win32.whl", hash = "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54"},
@@ -1780,4 +1777,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p
 [metadata]
 lock-version = "2.0"
 python-versions = ">=3.9,<3.12"
-content-hash = "36c40f30eed93cb30f39fd83b79a71a2bdbfd68b0c9a400248089b0a524246da"
+content-hash = "f759dfee8eeeb1da187db90a1a4a53c08e0029961413ce4bfc209b8593d6f3b0"

mpflash/pyproject.toml

@@ -0,0 +1,41 @@
+[tool.poetry]
+name = "mpflash"
+version = "0.2.3"
+description = "Download and flash tool for MicroPython firmwares"
+authors = ["Jos Verlinde <jos_verlinde@hotmail.com>"]
+license = "MIT"
+readme = "README.md"
+keywords = ["MicroPython", "firmware", "flash", "download", "UF2", "esptool"]
+homepage = "https://github.com/Josverl/micropython-stubber/blob/main/src/mpflash/README.md"
+repository = "https://github.com/Josverl/micropython-stubber"
+classifiers = [
+    "Programming Language :: Python :: Implementation :: MicroPython",
+    "Programming Language :: Python :: Implementation :: CPython",
+    "Topic :: Software Development :: Build Tools",
+]
+
+[tool.poetry.scripts]
+mpflash = "mpflash.cli_main:mpflash"
+
+[tool.poetry.dependencies]
+python = ">=3.9,<3.12"
+requests = "^2.31.0"
+beautifulsoup4 = "^4.12.3"
+loguru = "^0.7.2"
+esptool = "^4.7.0"
+jsonlines = "^4.0.0"
+bincopy = "^20.0.0"
+strip-ansi = "^0.1.1"
+rich-click = "^1.7.3"
+micropython-stubber = ">=1.17.4"
+psutil = "^5.9.8"
+blkinfo = "^0.2.0"
+pygithub = "^2.1.1"
+platformdirs = "^4.2.0"
+
+[tool.poetry.group.dev.dependencies]
+types-beautifulsoup4 = "^4.12.0.20240106"
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"

stubber/__init__.py

@@ -1,4 +1,3 @@
 """get the version"""
 
-
-__version__ = "1.17.4"
+__version__ = "1.17.6"

stubber/board/createstubs.py

@@ -24,7 +24,7 @@ try:
 except ImportError:
     from ucollections import OrderedDict  # type: ignore
 
-__version__ = "v1.17.4"
+__version__ = "v1.17.6"
 ENOENT = 2
 _MAX_CLASS_LEVEL = 2  # Max class nesting
 LIBS = ["lib", "/lib", "/sd/lib", "/flash/lib", "."]
@@ -363,6 +363,8 @@ class Stubber:
                     else:
                         # Requires Python 3.6 syntax, which is OK for the stubs/pyi
                         t = "Incomplete"
+                        if " at " in item_repr:
+                            item_repr = item_repr.split(" at ")[0] + " at ...>"
                         if " at " in item_repr:
                             item_repr = item_repr.split(" at ")[0] + " at ...>"
                         s = "{0}{1}: {2} ## {3} = {4}\n".format(indent, item_name, t, item_type_txt, item_repr)

stubber/board/createstubs_db.py

@@ -18,7 +18,7 @@ Create stubs for (all) modules on a MicroPython board.
     - cross compilation, using mpy-cross, to avoid the compilation step on the micropython device 
 
 
-This variant was generated from createstubs.py by micropython-stubber v1.17.4
+This variant was generated from createstubs.py by micropython-stubber v1.17.6
 """
 
 # Copyright (c) 2019-2023 Jos Verlinde
@@ -43,7 +43,7 @@ try:
 except ImportError:
     from ucollections import OrderedDict  # type: ignore
 
-__version__ = "v1.17.4"
+__version__ = "v1.17.6"
 ENOENT = 2
 _MAX_CLASS_LEVEL = 2  # Max class nesting
 LIBS = ["lib", "/lib", "/sd/lib", "/flash/lib", "."]
@@ -376,6 +376,8 @@ class Stubber:
                     else:
                         # Requires Python 3.6 syntax, which is OK for the stubs/pyi
                         t = "Incomplete"
+                        if " at " in item_repr:
+                            item_repr = item_repr.split(" at ")[0] + " at ...>"
                         if " at " in item_repr:
                             item_repr = item_repr.split(" at ")[0] + " at ...>"
                         s = "{0}{1}: {2} ## {3} = {4}\n".format(indent, item_name, t, item_type_txt, item_repr)

stubber/board/createstubs_db_min.py

@@ -51,7 +51,7 @@ try:from machine import reset
 except O:pass
 try:from collections import OrderedDict as k
 except O:from ucollections import OrderedDict as k
-__version__='v1.17.4'
+__version__='v1.17.6'
 A3=2
 A4=2
 A5=['lib','/lib','/sd/lib','/flash/lib',J]
@@ -131,40 +131,41 @@ class Stubber:
 			try:del N
 			except(D,q):A.warning('could not del new_module')
 		F.collect();return R
-	def write_object_stub(K,fp,object_expr,obj_name,indent,in_class=0):
-		Y=' at ';X='generator';W='{0}{1}: {3} = {2}\n';V='bound_method';U='Incomplete';N=in_class;M='Exception';L=object_expr;I=fp;D=indent;F.collect()
-		if L in K.problematic:A.warning('SKIPPING problematic module:{}'.format(L));return
-		Z,O=K.get_obj_attributes(L)
-		if O:A.error(O)
-		for(E,J,H,a,c)in Z:
-			if E in['classmethod','staticmethod','BaseException',M]:continue
+	def write_object_stub(L,fp,object_expr,obj_name,indent,in_class=0):
+		Z=' at ...>';Y='generator';X='{0}{1}: {3} = {2}\n';W='bound_method';V='Incomplete';O=in_class;N='Exception';M=object_expr;K=' at ';J=fp;D=indent;F.collect()
+		if M in L.problematic:A.warning('SKIPPING problematic module:{}'.format(M));return
+		a,Q=L.get_obj_attributes(M)
+		if Q:A.error(Q)
+		for(E,H,I,b,g)in a:
+			if E in['classmethod','staticmethod','BaseException',N]:continue
 			if E[0].isdigit():A.warning('NameError: invalid name {}'.format(E));continue
-			if H=="<class 'type'>"and P(D)<=A4*4:
-				Q=B;R=E.endswith(M)or E.endswith('Error')or E in['KeyboardInterrupt','StopIteration','SystemExit']
-				if R:Q=M
-				C='\n{}class {}({}):\n'.format(D,E,Q)
-				if R:C+=D+'    ...\n';I.write(C);continue
-				I.write(C);K.write_object_stub(I,a,'{0}.{1}'.format(obj_name,E),D+'    ',N+1);C=D+'    def __init__(self, *argv, **kwargs) -> None:\n';C+=D+'        ...\n\n';I.write(C)
-			elif any(A in H for A in[A0,z,'closure']):
-				S=U;T=B
-				if N>0:T='self, '
-				if V in H or V in J:C='{}@classmethod\n'.format(D)+'{}def {}(cls, *args, **kwargs) -> {}:\n'.format(D,E,S)
-				else:C='{}def {}({}*args, **kwargs) -> {}:\n'.format(D,E,T,S)
-				C+=D+'    ...\n\n';I.write(C)
-			elif H=="<class 'module'>":0
-			elif H.startswith("<class '"):
-				G=H[8:-2];C=B
-				if G in(x,v,w,y,'bytearray','bytes'):C=W.format(D,E,J,G)
-				elif G in(f,e,d):b={f:'{}',e:'[]',d:'()'};C=W.format(D,E,b[G],G)
-				elif G in('object','set','frozenset','Pin',X):
-					if G==X:G='Generator'
-					C='{0}{1}: {2} ## = {4}\n'.format(D,E,G,H,J)
+			if I=="<class 'type'>"and P(D)<=A4*4:
+				R=B;S=E.endswith(N)or E.endswith('Error')or E in['KeyboardInterrupt','StopIteration','SystemExit']
+				if S:R=N
+				C='\n{}class {}({}):\n'.format(D,E,R)
+				if S:C+=D+'    ...\n';J.write(C);continue
+				J.write(C);L.write_object_stub(J,b,'{0}.{1}'.format(obj_name,E),D+'    ',O+1);C=D+'    def __init__(self, *argv, **kwargs) -> None:\n';C+=D+'        ...\n\n';J.write(C)
+			elif any(A in I for A in[A0,z,'closure']):
+				T=V;U=B
+				if O>0:U='self, '
+				if W in I or W in H:C='{}@classmethod\n'.format(D)+'{}def {}(cls, *args, **kwargs) -> {}:\n'.format(D,E,T)
+				else:C='{}def {}({}*args, **kwargs) -> {}:\n'.format(D,E,U,T)
+				C+=D+'    ...\n\n';J.write(C)
+			elif I=="<class 'module'>":0
+			elif I.startswith("<class '"):
+				G=I[8:-2];C=B
+				if G in(x,v,w,y,'bytearray','bytes'):C=X.format(D,E,H,G)
+				elif G in(f,e,d):c={f:'{}',e:'[]',d:'()'};C=X.format(D,E,c[G],G)
+				elif G in('object','set','frozenset','Pin',Y):
+					if G==Y:G='Generator'
+					C='{0}{1}: {2} ## = {4}\n'.format(D,E,G,I,H)
 				else:
-					G=U
-					if Y in J:J=J.split(Y)[0]+' at ...>'
-					C='{0}{1}: {2} ## {3} = {4}\n'.format(D,E,G,H,J)
-				I.write(C)
-			else:I.write("# all other, type = '{0}'\n".format(H));I.write(D+E+' # type: Incomplete\n')
+					G=V
+					if K in H:H=H.split(K)[0]+Z
+					if K in H:H=H.split(K)[0]+Z
+					C='{0}{1}: {2} ## {3} = {4}\n'.format(D,E,G,I,H)
+				J.write(C)
+			else:J.write("# all other, type = '{0}'\n".format(I));J.write(D+E+' # type: Incomplete\n')
 	@property
 	def flat_fwid(self):
 		A=self._fwid;B=' .()/\\:$'

stubber/board/createstubs_mem.py

@@ -9,7 +9,7 @@
     - cross compilation, using mpy-cross, 
       to avoid the compilation step on the micropython device 
 
-This variant was generated from createstubs.py by micropython-stubber v1.17.4
+This variant was generated from createstubs.py by micropython-stubber v1.17.6
 """
 
 # Copyright (c) 2019-2023 Jos Verlinde
@@ -34,7 +34,7 @@ try:
 except ImportError:
     from ucollections import OrderedDict  # type: ignore
 
-__version__ = "v1.17.4"
+__version__ = "v1.17.6"
 ENOENT = 2
 _MAX_CLASS_LEVEL = 2  # Max class nesting
 LIBS = ["lib", "/lib", "/sd/lib", "/flash/lib", "."]
@@ -367,6 +367,8 @@ class Stubber:
                     else:
                         # Requires Python 3.6 syntax, which is OK for the stubs/pyi
                         t = "Incomplete"
+                        if " at " in item_repr:
+                            item_repr = item_repr.split(" at ")[0] + " at ...>"
                         if " at " in item_repr:
                             item_repr = item_repr.split(" at ")[0] + " at ...>"
                         s = "{0}{1}: {2} ## {3} = {4}\n".format(indent, item_name, t, item_type_txt, item_repr)

stubber/board/createstubs_mem_min.py

@@ -47,7 +47,7 @@ try:from machine import reset
 except N:pass
 try:from collections import OrderedDict as f
 except N:from ucollections import OrderedDict as f
-__version__='v1.17.4'
+__version__='v1.17.6'
 y=2
 z=2
 A0=['lib','/lib','/sd/lib','/flash/lib',J]
@@ -127,40 +127,41 @@ class Stubber:
 			try:del M
 			except(F,l):A.warning('could not del new_module')
 		D.collect();return R
-	def write_object_stub(K,fp,object_expr,obj_name,indent,in_class=0):
-		Y=' at ';X='generator';W='{0}{1}: {3} = {2}\n';V='bound_method';U='Incomplete';N=in_class;M='Exception';L=object_expr;I=fp;E=indent;D.collect()
-		if L in K.problematic:A.warning('SKIPPING problematic module:{}'.format(L));return
-		Z,O=K.get_obj_attributes(L)
-		if O:A.error(O)
-		for(F,J,H,a,f)in Z:
-			if F in['classmethod','staticmethod','BaseException',M]:continue
+	def write_object_stub(L,fp,object_expr,obj_name,indent,in_class=0):
+		Z=' at ...>';Y='generator';X='{0}{1}: {3} = {2}\n';W='bound_method';V='Incomplete';O=in_class;N='Exception';M=object_expr;K=' at ';J=fp;E=indent;D.collect()
+		if M in L.problematic:A.warning('SKIPPING problematic module:{}'.format(M));return
+		a,Q=L.get_obj_attributes(M)
+		if Q:A.error(Q)
+		for(F,H,I,e,g)in a:
+			if F in['classmethod','staticmethod','BaseException',N]:continue
 			if F[0].isdigit():A.warning('NameError: invalid name {}'.format(F));continue
-			if H=="<class 'type'>"and P(E)<=z*4:
-				Q=B;R=F.endswith(M)or F.endswith('Error')or F in['KeyboardInterrupt','StopIteration','SystemExit']
-				if R:Q=M
-				C='\n{}class {}({}):\n'.format(E,F,Q)
-				if R:C+=E+'    ...\n';I.write(C);continue
-				I.write(C);K.write_object_stub(I,a,'{0}.{1}'.format(obj_name,F),E+'    ',N+1);C=E+'    def __init__(self, *argv, **kwargs) -> None:\n';C+=E+'        ...\n\n';I.write(C)
-			elif any(A in H for A in[u,t,'closure']):
-				S=U;T=B
-				if N>0:T='self, '
-				if V in H or V in J:C='{}@classmethod\n'.format(E)+'{}def {}(cls, *args, **kwargs) -> {}:\n'.format(E,F,S)
-				else:C='{}def {}({}*args, **kwargs) -> {}:\n'.format(E,F,T,S)
-				C+=E+'    ...\n\n';I.write(C)
-			elif H=="<class 'module'>":0
-			elif H.startswith("<class '"):
-				G=H[8:-2];C=B
-				if G in(r,p,q,s,'bytearray','bytes'):C=W.format(E,F,J,G)
-				elif G in(d,c,b):e={d:'{}',c:'[]',b:'()'};C=W.format(E,F,e[G],G)
-				elif G in('object','set','frozenset','Pin',X):
-					if G==X:G='Generator'
-					C='{0}{1}: {2} ## = {4}\n'.format(E,F,G,H,J)
+			if I=="<class 'type'>"and P(E)<=z*4:
+				R=B;S=F.endswith(N)or F.endswith('Error')or F in['KeyboardInterrupt','StopIteration','SystemExit']
+				if S:R=N
+				C='\n{}class {}({}):\n'.format(E,F,R)
+				if S:C+=E+'    ...\n';J.write(C);continue
+				J.write(C);L.write_object_stub(J,e,'{0}.{1}'.format(obj_name,F),E+'    ',O+1);C=E+'    def __init__(self, *argv, **kwargs) -> None:\n';C+=E+'        ...\n\n';J.write(C)
+			elif any(A in I for A in[u,t,'closure']):
+				T=V;U=B
+				if O>0:U='self, '
+				if W in I or W in H:C='{}@classmethod\n'.format(E)+'{}def {}(cls, *args, **kwargs) -> {}:\n'.format(E,F,T)
+				else:C='{}def {}({}*args, **kwargs) -> {}:\n'.format(E,F,U,T)
+				C+=E+'    ...\n\n';J.write(C)
+			elif I=="<class 'module'>":0
+			elif I.startswith("<class '"):
+				G=I[8:-2];C=B
+				if G in(r,p,q,s,'bytearray','bytes'):C=X.format(E,F,H,G)
+				elif G in(d,c,b):f={d:'{}',c:'[]',b:'()'};C=X.format(E,F,f[G],G)
+				elif G in('object','set','frozenset','Pin',Y):
+					if G==Y:G='Generator'
+					C='{0}{1}: {2} ## = {4}\n'.format(E,F,G,I,H)
 				else:
-					G=U
-					if Y in J:J=J.split(Y)[0]+' at ...>'
-					C='{0}{1}: {2} ## {3} = {4}\n'.format(E,F,G,H,J)
-				I.write(C)
-			else:I.write("# all other, type = '{0}'\n".format(H));I.write(E+F+' # type: Incomplete\n')
+					G=V
+					if K in H:H=H.split(K)[0]+Z
+					if K in H:H=H.split(K)[0]+Z
+					C='{0}{1}: {2} ## {3} = {4}\n'.format(E,F,G,I,H)
+				J.write(C)
+			else:J.write("# all other, type = '{0}'\n".format(I));J.write(E+F+' # type: Incomplete\n')
 	@property
 	def flat_fwid(self):
 		A=self._fwid;B=' .()/\\:$'

stubber/board/createstubs_min.py

@@ -50,7 +50,7 @@ try:from machine import reset
 except N:pass
 try:from collections import OrderedDict as g
 except N:from ucollections import OrderedDict as g
-__version__='v1.17.4'
+__version__='v1.17.6'
 A0=2
 A1=2
 A5=['lib','/lib','/sd/lib','/flash/lib',J]
@@ -130,40 +130,41 @@ class Stubber:
 			try:del M
 			except(E,l):A.warning('could not del new_module')
 		F.collect();return U
-	def write_object_stub(K,fp,object_expr,obj_name,indent,in_class=0):
-		Y=' at ';X='generator';W='{0}{1}: {3} = {2}\n';V='bound_method';U='Incomplete';N=in_class;M='Exception';L=object_expr;I=fp;D=indent;F.collect()
-		if L in K.problematic:A.warning('SKIPPING problematic module:{}'.format(L));return
-		Z,O=K.get_obj_attributes(L)
-		if O:A.error(O)
-		for(E,J,H,a,f)in Z:
-			if E in['classmethod','staticmethod','BaseException',M]:continue
+	def write_object_stub(L,fp,object_expr,obj_name,indent,in_class=0):
+		Z=' at ...>';Y='generator';X='{0}{1}: {3} = {2}\n';W='bound_method';V='Incomplete';O=in_class;N='Exception';M=object_expr;K=' at ';J=fp;D=indent;F.collect()
+		if M in L.problematic:A.warning('SKIPPING problematic module:{}'.format(M));return
+		a,P=L.get_obj_attributes(M)
+		if P:A.error(P)
+		for(E,H,I,e,g)in a:
+			if E in['classmethod','staticmethod','BaseException',N]:continue
 			if E[0].isdigit():A.warning('NameError: invalid name {}'.format(E));continue
-			if H=="<class 'type'>"and R(D)<=A1*4:
-				P=B;Q=E.endswith(M)or E.endswith('Error')or E in['KeyboardInterrupt','StopIteration','SystemExit']
-				if Q:P=M
-				C='\n{}class {}({}):\n'.format(D,E,P)
-				if Q:C+=D+'    ...\n';I.write(C);continue
-				I.write(C);K.write_object_stub(I,a,'{0}.{1}'.format(obj_name,E),D+'    ',N+1);C=D+'    def __init__(self, *argv, **kwargs) -> None:\n';C+=D+'        ...\n\n';I.write(C)
-			elif any(A in H for A in[u,t,'closure']):
-				S=U;T=B
-				if N>0:T='self, '
-				if V in H or V in J:C='{}@classmethod\n'.format(D)+'{}def {}(cls, *args, **kwargs) -> {}:\n'.format(D,E,S)
-				else:C='{}def {}({}*args, **kwargs) -> {}:\n'.format(D,E,T,S)
-				C+=D+'    ...\n\n';I.write(C)
-			elif H=="<class 'module'>":0
-			elif H.startswith("<class '"):
-				G=H[8:-2];C=B
-				if G in(r,p,q,s,'bytearray','bytes'):C=W.format(D,E,J,G)
-				elif G in(d,c,b):e={d:'{}',c:'[]',b:'()'};C=W.format(D,E,e[G],G)
-				elif G in('object','set','frozenset','Pin',X):
-					if G==X:G='Generator'
-					C='{0}{1}: {2} ## = {4}\n'.format(D,E,G,H,J)
+			if I=="<class 'type'>"and R(D)<=A1*4:
+				Q=B;S=E.endswith(N)or E.endswith('Error')or E in['KeyboardInterrupt','StopIteration','SystemExit']
+				if S:Q=N
+				C='\n{}class {}({}):\n'.format(D,E,Q)
+				if S:C+=D+'    ...\n';J.write(C);continue
+				J.write(C);L.write_object_stub(J,e,'{0}.{1}'.format(obj_name,E),D+'    ',O+1);C=D+'    def __init__(self, *argv, **kwargs) -> None:\n';C+=D+'        ...\n\n';J.write(C)
+			elif any(A in I for A in[u,t,'closure']):
+				T=V;U=B
+				if O>0:U='self, '
+				if W in I or W in H:C='{}@classmethod\n'.format(D)+'{}def {}(cls, *args, **kwargs) -> {}:\n'.format(D,E,T)
+				else:C='{}def {}({}*args, **kwargs) -> {}:\n'.format(D,E,U,T)
+				C+=D+'    ...\n\n';J.write(C)
+			elif I=="<class 'module'>":0
+			elif I.startswith("<class '"):
+				G=I[8:-2];C=B
+				if G in(r,p,q,s,'bytearray','bytes'):C=X.format(D,E,H,G)
+				elif G in(d,c,b):f={d:'{}',c:'[]',b:'()'};C=X.format(D,E,f[G],G)
+				elif G in('object','set','frozenset','Pin',Y):
+					if G==Y:G='Generator'
+					C='{0}{1}: {2} ## = {4}\n'.format(D,E,G,I,H)
 				else:
-					G=U
-					if Y in J:J=J.split(Y)[0]+' at ...>'
-					C='{0}{1}: {2} ## {3} = {4}\n'.format(D,E,G,H,J)
-				I.write(C)
-			else:I.write("# all other, type = '{0}'\n".format(H));I.write(D+E+' # type: Incomplete\n')
+					G=V
+					if K in H:H=H.split(K)[0]+Z
+					if K in H:H=H.split(K)[0]+Z
+					C='{0}{1}: {2} ## {3} = {4}\n'.format(D,E,G,I,H)
+				J.write(C)
+			else:J.write("# all other, type = '{0}'\n".format(I));J.write(D+E+' # type: Incomplete\n')
 	@property
 	def flat_fwid(self):
 		A=self._fwid;B=' .()/\\:$'

stubber/bulk/runner.py

@@ -11,6 +11,7 @@ from loguru import logger as log
 
 LogTagList = List[str]
 
+
 @dataclass
 class LogTags:
     reset_tags: LogTagList
@@ -115,9 +116,10 @@ def run(
         if proc.stderr and log_errors:
             for line in proc.stderr:
                 log.warning(line)
+    except UnicodeDecodeError as e:
+        log.error(f"Failed to decode output: {e}")
     finally:
         timer.cancel()
 
     proc.wait(timeout=1)
     return proc.returncode or 0, output
-

mptool/README.md

@@ -1,10 +0,0 @@
-Download script
-
-
-install using 
-
-pip install git+https://github.com/josverl/micropython-stubber.git@main#subdirectory=modules/mp_downloader
-
-Development:
-
-pip install git+https://github.com/josverl/micropython-stubber.git@action_board_stubber#subdirectory=modules/mp_downloader

mptool/pyproject.toml

@@ -1,34 +0,0 @@
-[tool.poetry]
-name = "mptool"
-version = "0.2.0"
-description = "Download and flashing tool for MicroPython firmwares"
-authors = ["Jos Verlinde <jos.verlinde@microsoft.com>"]
-license = "MIT"
-readme = "README.md"
-# packages = [{ include = "**/*.*", from = "src" }]
-
-[tool.poetry.scripts]
-mptool = "mptool.cli_main:mptool"
-
-
-[tool.poetry.dependencies]
-python = ">=3.9,<3.12"
-requests = "^2.31.0"
-beautifulsoup4 = "^4.12.3"
-loguru = "^0.7.2"
-esptool = "^4.7.0"
-jsonlines = "^4.0.0"
-bincopy = "^20.0.0"
-strip-ansi = "^0.1.1"
-rich-click = "^1.7.3"
-micropython-stubber = {git = "https://github.com/josverl/micropython-stubber.git", rev = "action_board_stubber"}
-psutil = "^5.9.8"
-blkinfo = "^0.2.0"
-pygithub = "^2.1.1"
-
-[tool.poetry.group.dev.dependencies]
-types-beautifulsoup4 = "^4.12.0.20240106"
-
-[build-system]
-requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"