micropython-stubber 1.20.2__py3-none-any.whl → 1.20.5__py3-none-any.whl

{micropython_stubber-1.20.2.dist-info → micropython_stubber-1.20.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: micropython-stubber
-Version: 1.20.2
+Version: 1.20.5
 Summary: Tooling to create and maintain stubs for MicroPython
 Home-page: https://github.com/Josverl/micropython-stubber#readme
 License: MIT
@@ -13,6 +13,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: MicroPython
 Classifier: Topic :: Software Development :: Build Tools
@@ -25,8 +26,8 @@ Requires-Dist: executing (>=2.0.1,<3.0.0)
 Requires-Dist: importlib-metadata (>=1.0,<2.0) ; python_version < "3.8"
 Requires-Dist: libcst (>=1.1.0,<2.0.0)
 Requires-Dist: loguru (>=0.6,<0.8)
-Requires-Dist: mpflash (>=0.7.4,<0.8.0)
-Requires-Dist: mpremote (>=1.22.0,<2.0.0)
+Requires-Dist: mpflash (>=0.8.6,<0.9.0)
+Requires-Dist: mpremote (>=1.23.0,<2.0.0)
 Requires-Dist: mypy (==1.9.0)
 Requires-Dist: mypy-gitlab-code-quality (>=1.1.0,<2.0.0)
 Requires-Dist: packaging (>=21.3,<24.0)
@@ -38,7 +39,7 @@ Requires-Dist: pyserial (>=3.5,<4.0)
 Requires-Dist: pysondb-v2 (>=2.1.0,<3.0.0)
 Requires-Dist: python-minifier (>=2.7.0,<3.0.0) ; python_version < "3.12"
 Requires-Dist: requests (>=2.28.0,<3.0.0)
-Requires-Dist: rich-click (>=1.7.3,<2.0.0)
+Requires-Dist: rich-click (>=1.8.3,<2.0.0)
 Requires-Dist: tabulate (>=0.9.0,<0.10.0)
 Requires-Dist: tenacity (>=8.2.2,<9.0.0)
 Requires-Dist: tomli (>=2.0.1,<3.0.0) ; python_version < "3.11"

{micropython_stubber-1.20.2.dist-info → micropython_stubber-1.20.5.dist-info}/RECORD

@@ -1,74 +1,79 @@
 mpflash/libusb_flash.ipynb,sha256=7RGtGg1mPPMWrfJOobOfYYwAAhsFpykpTJtfNwevY9o,6631
 mpflash/mpflash/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mpflash/mpflash/add_firmware.py,sha256=u_g9mID557fptLEJ1Nld9n27V1R1og8uEkadm0O3YTw,3435
-mpflash/mpflash/ask_input.py,sha256=e54WfgktG7Ff8dBUknXioROq3lPNZ-eacUjfmUvFfS0,8496
-mpflash/mpflash/cli_download.py,sha256=6ctC4ga6q2LcpHUHMrz1trbePziQpuIFPbjcJnc3K7E,3645
-mpflash/mpflash/cli_flash.py,sha256=QHEb-e2ABjISfuGCWpTxOM7kkcTZSQxBXmVaWh3WVnE,7074
-mpflash/mpflash/cli_group.py,sha256=-qkR4ou7bmIwfDIzyL1s34z6ya1wckKtL22nanvyQGU,1974
-mpflash/mpflash/cli_list.py,sha256=Mdaf13gKZCoLp8Y2ja0L5rYMzkE_t3d4r62bF7isI3E,1997
-mpflash/mpflash/cli_main.py,sha256=yABFFf45TpPMcC1qEVARAWe4EI9zui2pUXjoPms0mq8,1030
-mpflash/mpflash/common.py,sha256=kanbO22SQDWb4ASQG8vLF0Z83ahujKPbrsCw3llN5T4,5594
-mpflash/mpflash/config.py,sha256=hBc1Hf4XQ0YIoeiPBbannnqDg0C7226Y7Vu8o4jUkBQ,495
+mpflash/mpflash/ask_input.py,sha256=ipkRIMb_kl4j9o8f_LtpX8jL8dZnTeGiTvE87fA8LBw,8953
+mpflash/mpflash/bootloader/__init__.py,sha256=-izynXMMvv-6PLFf3wjvDj_E4dCwdTrKqhrcYYfsGQc,1308
+mpflash/mpflash/bootloader/manual.py,sha256=4FNQg0JpyRmfISrDDfZ5j9iQBK-Jyrnz8nLqKf1ZEuc,3104
+mpflash/mpflash/bootloader/micropython.py,sha256=QQJlXUnyVA4cRS2O4GbrQhpKhFFvxtQC5G6WQcSCbp8,409
+mpflash/mpflash/bootloader/touch1200.py,sha256=AJ4GPLtvCR5LDDe5Uu_5Rg8OI2JHxEB-blzCcO5x9Tc,1511
+mpflash/mpflash/cli_download.py,sha256=zufBC0xNPZCq28mG_fepupziizbm86wTpfNEszkei9Q,3656
+mpflash/mpflash/cli_flash.py,sha256=KOn1T9lThFs5pkhWZY_QCEdyB66xk6eJjS3n995hwPk,7354
+mpflash/mpflash/cli_group.py,sha256=MsySUNipL8xkQAu4yuQPkFLoZNtQ5RPWtX3diHHrPdE,2334
+mpflash/mpflash/cli_list.py,sha256=_3XzR8RyjlojbOqGKm_TLwcQojCb4OgCYi7mcjjoflI,2046
+mpflash/mpflash/cli_main.py,sha256=MHhU1cAYEhwOpHG2p3OEfwpSrn9-J2foGVZqby_HO8k,1134
+mpflash/mpflash/common.py,sha256=gkj71hGibMEcmThJ5LSrAV5vp6SpJAJNLHWO4GjB040,5929
+mpflash/mpflash/config.py,sha256=VqaS6dT1UFigVmYRtVVBTi7cNQ6UKReaN4VUj3D5Ip4,1166
 mpflash/mpflash/connected.py,sha256=CBG_DJ33OPWAPbX-ICQpL1LcFOhNYpLUSB0Q5v7gi9s,3029
-mpflash/mpflash/download.py,sha256=axAs30i7VZ0jQXY9MVOQB49JH6OCFxy5_zERfysF33I,11421
-mpflash/mpflash/downloaded.py,sha256=IYMyx_67paKFSKOg3whgwsWf8IlHaLgpmSlukMT7V9Q,3804
-mpflash/mpflash/errors.py,sha256=Q5LR12Wo8iUCg5n_qq4GjdBdBflbvCOdKsRJ5InYRfI,96
-mpflash/mpflash/flash.py,sha256=JoskuwaHVYqeG4YW8kgbv26vPFnqDmkTz1VRs-pTRiY,2468
+mpflash/mpflash/download.py,sha256=VFV0XP8mTnBXOeo_JbyHBjIQJ0PUUiXu8hoO0lAxid8,14235
+mpflash/mpflash/downloaded.py,sha256=cHq_fWUuZ0sXOCs5d3NIf3etUDsAXtnwnO7tkRqJE9A,4870
+mpflash/mpflash/errors.py,sha256=IAidY3qkZsXy6Pm1rdmVFmGyg81ywHhse3itaPctA2w,247
+mpflash/mpflash/flash.py,sha256=U17kp3ftG-noqhgA1HSYxK945sLhIR-Rh3xZgckT4H8,1927
 mpflash/mpflash/flash_esp.py,sha256=dEc_B7-f1BMUGBMrwIm83ulcCqaS5MlrPAp3FCNgNfk,2311
 mpflash/mpflash/flash_stm32.py,sha256=d4BoQl3a9Tchnvn2ZTuq2MpYBB4MTaRukwtEncI95k0,823
 mpflash/mpflash/flash_stm32_cube.py,sha256=w7aGWjReeWUKl0Q3ZjXH8BRqNO1Tk9AO7gtRNUg1c9Y,3970
 mpflash/mpflash/flash_stm32_dfu.py,sha256=G70EZodWb-aRi507Jxbys-VEwbBGU1oZacow3_nq-d4,2972
-mpflash/mpflash/flash_uf2.py,sha256=FFO2zpKFPdpEDi4aK1-JFsvPi8KEKLXXuOt_lXtI9tk,2508
-mpflash/mpflash/flash_uf2_boardid.py,sha256=WZKucGu_hJ8ymb236uuZbiR6pD6AA_l4LA-7LwtQhq8,414
+mpflash/mpflash/flash_uf2.py,sha256=2IKgEOnlsB9bILJWHILMKbGo9b39NKazBWp1-T_eKKs,2463
+mpflash/mpflash/flash_uf2_boardid.py,sha256=U5wGM8VA3wEpUxQCMtuXpMZZomdVH8J_Zd5_GekUMuU,423
 mpflash/mpflash/flash_uf2_linux.py,sha256=Oy9V4g7JSuks2hHFeO_OHdBKSGktbqZOtsivuxfl-xg,4055
-mpflash/mpflash/flash_uf2_macos.py,sha256=JButLjccuKlVyArwNkHDGjNMB_9ezyTKlbCWNia-R5Y,2696
-mpflash/mpflash/flash_uf2_windows.py,sha256=94YoO2UIzfyJs4CPJ9sjG_WY26SX8aUPl9mf9R9W5xk,1093
+mpflash/mpflash/flash_uf2_macos.py,sha256=fGz-LGoYKX772sqJb4pAvcMw-2Orlc83ecOIk0-1GYc,987
+mpflash/mpflash/flash_uf2_windows.py,sha256=a-iIGPkwIoUXA7atCz0_uZp-kipSL24P-IE5ka1B1Mk,1025
 mpflash/mpflash/list.py,sha256=0TawTkwhjKPPj7nTHoDn8nQ54WOkGRurP1BJVeg956g,2963
 mpflash/mpflash/logger.py,sha256=dI_H_a7EOdQJyvoeRHQuYeZuTKYVUS3DUPTLhE9rkdM,1098
-mpflash/mpflash/mpboard_id/__init__.py,sha256=QRLVUpeiXeiY3P-im2Bv8zX8xGS_MIqiH-3svuVoWyY,3576
+mpflash/mpflash/mpboard_id/__init__.py,sha256=9IS8E-4eimd_bclgGgWE1wGEx0IRzKnu5Jzl8pQih_g,3816
 mpflash/mpflash/mpboard_id/add_boards.py,sha256=OWclyLWf9L-pCVmZ22b-xQYfvi3yQVsJHmGMgMzWxoU,9684
 mpflash/mpflash/mpboard_id/board.py,sha256=CwtBux8y7GDUe7CADVxL8YefGRl9Fg8OAJBUhgaBYCI,1151
-mpflash/mpflash/mpboard_id/board_id.py,sha256=63K91S_KWdSL5vHkZhpU-ibOhpOrUt0YPwxDsUBEmnc,2489
+mpflash/mpflash/mpboard_id/board_id.py,sha256=uVBbqksE1S4RPO1kNAVk4-xJWj6vwAX6QeuE0ekkZEc,2964
 mpflash/mpflash/mpboard_id/board_info.zip,sha256=F6YowS96DAqjten4ySe4MXgZwPtE-saZOUfY5OQkqKk,19759
-mpflash/mpflash/mpboard_id/store.py,sha256=hhNTPlraQYH_Tx3syoi_NBx8z13efkgXn433OZ2GjpU,1462
+mpflash/mpflash/mpboard_id/store.py,sha256=4lLEff6a30lIOb4fOYYzanE4G4qfgikfprmpV1eUf2U,1536
 mpflash/mpflash/mpremoteboard/__init__.py,sha256=fJ_N1F6R3CfP9F7pmocb5l8yRvzmSmtHi4u_uTQHR1w,7683
 mpflash/mpflash/mpremoteboard/mpy_fw_info.py,sha256=6AQbN3jtQgllqWQYl4e-63KeEtV08EXk8_JnM6XBkvo,4554
 mpflash/mpflash/mpremoteboard/runner.py,sha256=-PgzAeBGbyXaAUlwyiw4mcINsP2U1XRRjP1_QdBrxpg,4786
 mpflash/mpflash/uf2disk.py,sha256=4_P2l-kedM7VSliA2u706LQLxvu3xWSod1-lj-xjZis,298
 mpflash/mpflash/vendor/basicgit.py,sha256=sflgCv7apLbV2w8F6gmhc-3kuqDnnS4tdGol6JT2uTM,9545
+mpflash/mpflash/vendor/click_aliases.py,sha256=c853EHSlkE2DvFqeFvFpwXKuJj3_jsXDP7iotVOKaAw,3156
 mpflash/mpflash/vendor/dfu.py,sha256=ZXMcE6aH4-43Wh4tbQT4U-q-BU3RUiL3JAxmP_QAK2s,5755
 mpflash/mpflash/vendor/pydfu.py,sha256=_MdBRo1EeNeKDqFPSTB5tNL1jGSBJgsVeVjE5e7Pb8s,20542
 mpflash/mpflash/vendor/readme.md,sha256=iIIZxuLUIGHQ0KODzYVtMezsztvyxCXcNJp_AzwTIPk,86
 mpflash/mpflash/vendor/versions.py,sha256=thk1a5wEEhXIQoL0zZ7oooeFyQeSoI00CIUbZF0b3rI,3783
 mpflash/mpflash/worklist.py,sha256=MKHDynttVP3lsHSfb7DEqeQ2mRV0da96lD4lIcS_zQY,5962
-mpflash/poetry.lock,sha256=pHC8OhQvF5HWKPlw2Ysd39cL4XmJIqDX_Lwo-ngm1SY,121346
-mpflash/pyproject.toml,sha256=xaMDME1wBJf-KTf_qqK2jlY7f3o3b1L8utaXw8ZK8PU,1651
+mpflash/poetry.lock,sha256=nazCqSd9wbD-8YFG3UMOyO8JfV1sQlchNsh-O0H7yqE,119577
+mpflash/pyproject.toml,sha256=phWxCni9TdlEMsN7ArG-dRDhpwbGL3kXULr1K6TDAro,1651
 mpflash/README.md,sha256=1SVCxNG88akXYv1BOeLvqwfI9phy8PdkfJ2sqxL_nkE,13680
 mpflash/stm32_udev_rules.md,sha256=uxvC8FvU7K0R1QQUqCIvVfW9yfWYlIHhIVtirAjQVHE,2684
-stubber/__init__.py,sha256=tthm_uidIn3vd1lcFmiTkjY46W8_vGp6D9i0K_FJuds,49
+stubber/__init__.py,sha256=mu1ef5O9zEsBrHCk1VLUFfWs2r9h-HAGeLMHCbrgQuo,49
 stubber/basicgit.py,sha256=sflgCv7apLbV2w8F6gmhc-3kuqDnnS4tdGol6JT2uTM,9545
 stubber/board/board_info.csv,sha256=K2VSmfR013fN-oJWkQUmiQ19w09dVwJHDquPy6QmMhY,8627
 stubber/board/boot.py,sha256=XjWlKErU5nI1HJSugXIP_3hlwgRQboE6sJrpcbSygnk,1120
-stubber/board/createstubs.py,sha256=eA1mHRmjhVENwtRjdcqmfC-x_U9peimZJETTBbaMagE,32739
-stubber/board/createstubs_db.py,sha256=xZqBLLfdrMYdG_sW_ZzvoOEFTvPcT5R5S3zN1pWhtxo,30419
-stubber/board/createstubs_db_min.py,sha256=J0HwWl5xsTcnq-K9hDU4V5aAxfOJqHHvNZTI-wxmLOs,11473
-stubber/board/createstubs_db_mpy.mpy,sha256=KJeOJW1y_PKI9hrtJaUyy07Y_DiV57rT71bolf13L-E,9536
+stubber/board/createstubs.py,sha256=_hy_bxiv7FPTbKD66Gw8WCXQAXIWY0Nf2_18I9CIVYM,32922
+stubber/board/createstubs_db.py,sha256=c4UtzBY7XRD5lDL9JqcXJWg4qb7XYrIloPBWEpTJKis,30383
+stubber/board/createstubs_db_min.py,sha256=c9zdIoc94RfgiDsb-L2Z_PV83EbtzaR_kC_jYQ8ePGQ,11473
+stubber/board/createstubs_db_mpy.mpy,sha256=QnV60Zxf_zjpJIZFmTmfGDERQU5GGS_AZ3jBQuVIIKk,9536
 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=_SRTvJG78fbEDCFii82Cof6cJwF_xqkXeOFDIJAx9o8,28755
-stubber/board/createstubs_mem_min.py,sha256=8tTzYjlgepjhepMLplN_8eOGLjEKY2NpffGPvGelP-I,11019
-stubber/board/createstubs_mem_mpy.mpy,sha256=RVuULJrwFQT0zJqa3JYrnOdbbU51K7rDX8mKR6Elq3k,9118
-stubber/board/createstubs_min.py,sha256=1x0SpetEPuH8rnRkF9mE3qltevkKlA4tE9DySXkmwFM,13570
-stubber/board/createstubs_mpy.mpy,sha256=spYC-x1c2zOOzVz2n-2roqFCcMNNFwsDjUsKPFuCuKk,12236
+stubber/board/createstubs_mem.py,sha256=N-JRZ9mGi0rhPCY-oxrjAXSajFXXL_GxYko1v3K40lQ,28719
+stubber/board/createstubs_mem_min.py,sha256=KL_ro2hkhn_5gcioaXWdoBRHxeWwzdc9fxOlIRksctg,11019
+stubber/board/createstubs_mem_mpy.mpy,sha256=VHfdVvClxKd5SEbGNq4PDIJGa-EavxYih7IhODfIpOk,9118
+stubber/board/createstubs_min.py,sha256=saSoVmNEariIiA4CUCjylg-SI1L5IGGb0vPepXqR2Nc,13699
+stubber/board/createstubs_mpy.mpy,sha256=W3DnSocykRO0CanCMjwbR1nHVgMtDqsNJ3BK1ElFpL8,12388
 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
-stubber/board/modulelist.txt,sha256=DUD4wbJ2YSOBkajklW6CFeoyUOwlVAs_Qc_-r3WXUW0,2780
+stubber/board/modulelist.txt,sha256=f5WxcG8OBjwhZFDtvxllGDp-6bmH9M5A9knc_6YE7xI,2900
 stubber/board/pyrightconfig.json,sha256=6oHS4aDOfwKBAFeUPsCGJzEXpUgBZsPaF0M4P-N26D4,1376
-stubber/bulk/mcu_stubber.py,sha256=_1z0LUzcMbEIXIYInMJcAJZbBPTI8yCHgd1-1nlMscM,16379
+stubber/bulk/mcu_stubber.py,sha256=R5twR8f-44O1PIXTWwyAu96sK-2Y8o4zel9FtjuCxVI,16347
 stubber/codemod/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-stubber/codemod/_partials/__init__.py,sha256=4v1lkgSBzFw08gxwujh5sivpbJbYqg5lZeRzgyvN4TE,1561
+stubber/codemod/_partials/__init__.py,sha256=LVJ-QkEKlc5IqOZ-bYrNXWRd9J5eolsTR_kRTyS9p6w,1430
 stubber/codemod/_partials/db_main.py,sha256=ZKzxV0LOEyHu1zcsBr4xRf9i1a4Jyh808sdbmcmkrWE,4003
 stubber/codemod/_partials/lvgl_main.py,sha256=9BAJP6P1R2SQVbNya2ujes35eATa56D_Ri2_PjeRBq0,1964
 stubber/codemod/_partials/modules_reader.py,sha256=dJj-H0ncUWVtilSyohQ-dyiUZOjQObds_-llwy_LkYU,2046
@@ -111,23 +116,23 @@ stubber/get_lobo.py,sha256=jyysWbeEwNuZZtkTudJP1QbyVvh-TwFom5cE7iCi9lE,1776
 stubber/minify.py,sha256=QC5TbyNH7xJRauo8IMJgMnKGocqdjEXGb6YQgBvMTTA,15026
 stubber/publish/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stubber/publish/bump.py,sha256=qSb1DpaIxgyoH3YcPU1XKyDKgqkomxSm0WWf1sAVh0Y,3262
-stubber/publish/candidates.py,sha256=vR_oNw3fjtWBa6Gvufe28Y6EKV3mWlJ1X6tq9Go0U1g,11576
+stubber/publish/candidates.py,sha256=bhuLATHm19pfIdZ91tqEas8ADE0dU_RABVWxGYKGCxw,10672
 stubber/publish/database.py,sha256=CLy5oiLasA-YzTTXi9d01qLAyk7NpugCDUOa5R9Ac2g,623
 stubber/publish/defaults.py,sha256=-Ey04lflKVnT0xO8r8AGliQSdtek9Dm_LDjpwvAnAVk,1636
-stubber/publish/enums.py,sha256=55TrwB7zlbCeXE3EdC4CCVmhRFlie-DlTqFuaAg-qXo,944
+stubber/publish/enums.py,sha256=Z_x798ArtxyjQIRRY43GDGNB9BD4uPfpeGsXYdj31w0,780
 stubber/publish/helpers.py,sha256=909umfKUHBMBoVnAanop1vKx8loCrWntlfiiG6z89lY,716
 stubber/publish/merge_docstubs.py,sha256=bo35onpFgcmcqExKSbpbZKprVs2D_feSy0awNZ09a7A,5319
 stubber/publish/missing_class_methods.py,sha256=i_tPnGpEpmu53N3exPCrwR1HprxxBpgHgLAZSwJCb4o,1823
-stubber/publish/package.py,sha256=9Op5nPJNOmjTv3QxVeaL86m6Aak2UlUgcQIcDGBbX5w,6320
+stubber/publish/package.py,sha256=yKIYKzbSXlh71_1QpTQ_8fXAAYkteqyXmAtWwfNL8bM,5274
 stubber/publish/pathnames.py,sha256=O-9519j6FTIlmTFyDWqCxdG3k8MWhDI89rClBrgUONQ,1811
-stubber/publish/publish.py,sha256=Iguc0e6u0EZY8G33z7JafvKAp1CkvDIXFTBH8oDqNsc,4016
+stubber/publish/publish.py,sha256=812OS3jVJcWs09DkMJxqoKiYXUg9xJSejFyXlhd-mTI,3953
 stubber/publish/pypi.py,sha256=Mu1F7Xx4e0NPWK1_Erck6QGEfdY8w67EBeWFi6JiAzk,1240
 stubber/publish/stubpackage.py,sha256=45yquQiBlJhacYEOmAHP6BgDfl1EtUWjdDLx06rCWgE,44731
 stubber/rst/__init__.py,sha256=5VcbDCotIICa2xnJDs_gw2sFXpjjGOZZbwCrNKXy1OE,293
 stubber/rst/classsort.py,sha256=YCmF4QEYXqZ1Yu2FZb1iPQBrVkq-mrZaBaRcSUlC7ZE,2655
-stubber/rst/lookup.py,sha256=9ouUrZO5FoWLMb02C-sUw_IDHrcFldbKgxcEx2J1Wmw,20149
+stubber/rst/lookup.py,sha256=RrxEC6otlQDQKjmc0s3rEvZzB48P0JO0c41jfuuuBiU,20186
 stubber/rst/output_dict.py,sha256=cpBXRtUD-uh0EgjWIBiRrMLBmIAEXjoJFSOAg-qJQiU,14755
-stubber/rst/reader.py,sha256=ZR2vrB0xup7qY2zAC6HKKytaiQjlUdr-gxFGamkSfHQ,33382
+stubber/rst/reader.py,sha256=-upWvHL1CsEVdyDi0n3B_FSW6VRP5TWRM4Er1nP55HU,33700
 stubber/rst/report_return.py,sha256=WZJSbgjsjxFeCeY-vLms56gv_x3TubaGXGQ8--d8RqI,2814
 stubber/rst/rst_utils.py,sha256=q4MCmhCeI0fnx6KNVdgz1nE4_hAK4T-F7oAMBnmwZ4w,17817
 stubber/stubber.py,sha256=41zvyaDQt25Y8IRsMvcQR68LxDZrTz_iVJpEQ5D3VWc,1634
@@ -136,7 +141,7 @@ stubber/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stubber/tools/manifestfile.py,sha256=D5Plwj5LRDe6zq5m-ETKfum0vFAykka70WXSEHl83a4,23721
 stubber/tools/readme.md,sha256=kH7dA2Rs4BLCXa2ILoTDIj3sJHcGYtDPntyxVIOXvtI,199
 stubber/update_fallback.py,sha256=NUxp1sN1-8BLPd0rpExTcYBppUXYWPP8dOcjNeLY2Zo,4921
-stubber/update_module_list.py,sha256=QJ-c2K1Wf2SQdpMeGvlVabasKqsN9ZQV4ye5PbSpsWE,4640
+stubber/update_module_list.py,sha256=P6V6Z-PgiNdL6UghtSRNLoUiHxEpp_s7ESgF6A0MyjM,4009
 stubber/utils/__init__.py,sha256=nV9FsOZsJ_hXsyUv4j0Qqp-PKycxyIktU9IoLs4kQmQ,225
 stubber/utils/config.py,sha256=Jg4eHhgKim4uP4IqZRWykRNiX1r-SXC2xSrbsVprGAA,4859
 stubber/utils/makeversionhdr.py,sha256=dO8sWLAY_ifT1IJJ1-JJ2z_thvfqJnK3c1_bHF_UI28,1953
@@ -147,8 +152,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=4cGr-4Nbgqzoi-iJC08b_LFZH-CiyTNODlT-ihv4ZE0,3901
 stubber/variants.py,sha256=-o4TgotbKaCcYBdXkutPaBSR1JdxWmOAiuNT1UlahYc,3784
-micropython_stubber-1.20.2.dist-info/entry_points.txt,sha256=NQi_M36fgq5k6giSuASas3LrpF6CVdkzfvJC0ja73_g,55
-micropython_stubber-1.20.2.dist-info/LICENSE,sha256=Fx9qrL45ayRXgH6QzttboqZEjKXms0w1t_b_nkOqYCU,1572
-micropython_stubber-1.20.2.dist-info/METADATA,sha256=tOtMx82j-mRnlMlKbdPSSA_k-UWeJ6WXBbk92utyGdY,19107
-micropython_stubber-1.20.2.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
-micropython_stubber-1.20.2.dist-info/RECORD,,
+micropython_stubber-1.20.5.dist-info/entry_points.txt,sha256=NQi_M36fgq5k6giSuASas3LrpF6CVdkzfvJC0ja73_g,55
+micropython_stubber-1.20.5.dist-info/LICENSE,sha256=Fx9qrL45ayRXgH6QzttboqZEjKXms0w1t_b_nkOqYCU,1572
+micropython_stubber-1.20.5.dist-info/METADATA,sha256=HwORjeijeI8TVYN7UV0nnE3ZsPfcBhsGPv1soNzvPzk,19158
+micropython_stubber-1.20.5.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+micropython_stubber-1.20.5.dist-info/RECORD,,

{micropython_stubber-1.20.2.dist-info → micropython_stubber-1.20.5.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.7.0
+Generator: poetry-core 1.9.0
 Root-Is-Purelib: true
 Tag: py3-none-any

mpflash/mpflash/ask_input.py

@@ -11,7 +11,8 @@ 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, get_known_ports, known_stored_boards
+from .mpboard_id import (get_known_boards_for_port, get_known_ports,
+                         known_stored_boards)
 from .mpremoteboard import MPRemoteBoard
 from .vendor.versions import micropython_versions
 
@@ -28,6 +29,11 @@ def ask_missing_params(
     Returns:
         ParamType: The updated parameters.
     """
+    if not config.interactive:
+        # no interactivity allowed
+        log.info("Interactive mode disabled. Skipping ask for user input.")
+        return params
+
     import inquirer
 
     log.trace(f"ask_missing_params: {params}")
@@ -36,9 +42,6 @@ def ask_missing_params(
     # if action download, multiple input
     multi_select = isinstance(params, DownloadParams)
     action = "download" if isinstance(params, DownloadParams) else "flash"
-    if not config.interactive:
-        # no interactivity allowed
-        return params
 
     questions = []
     answers: dict[str, Union[str, List]] = {"action": action}
@@ -67,8 +70,14 @@ def ask_missing_params(
             answers["serial"] = [answers["serial"]]
         params.serial = [s.split()[0] for s in answers["serial"]]  # split to remove the description
     if "port" in answers:
-        params.ports = [p for p in params.ports if p != "?"]  # remove the "?" if present
-        params.ports.extend(answers["port"])
+        #  params.ports = [p for p in params.ports if p != "?"]  # remove the "?" if present
+        if isinstance(answers["port"], str):
+            params.ports.append(answers["port"])
+        elif isinstance(answers["port"], list): # type: ignore
+            params.ports.extend(answers["port"])
+        else:
+            raise ValueError(f"Unexpected type for answers['port']: {type(answers['port'])}")
+        
     if "boards" in answers:
         params.boards = [b for b in params.boards if b != "?"]  # remove the "?" if present
         params.boards.extend(answers["boards"] if isinstance(answers["boards"], list) else [answers["boards"]])
@@ -152,10 +161,18 @@ def ask_port_board(*, multi_select: bool, action: str):
                 "Which {port} board firmware do you want to {action} " + "to {serial} ?" if action == "flash" else "?"
             ),
             choices=filter_matching_boards,
-            validate=lambda _, x: True if x else "Please select at least one board",  # type: ignore
+            validate=at_least_one_validation,  # type: ignore
+            # validate=lambda _, x: True if x else "Please select at least one board",  # type: ignore
         ),
     ]
 
+def at_least_one_validation(answers, current) -> bool:
+    import inquirer.errors
+    if not current:
+        raise inquirer.errors.ValidationError("", reason="Please select at least one item.")
+    if isinstance(current, list) and not any(current):
+        raise inquirer.errors.ValidationError("", reason="Please select at least one item.")
+    return True
 
 def ask_mp_version(multi_select: bool, action: str):
     """
@@ -181,13 +198,6 @@ def ask_mp_version(multi_select: bool, action: str):
     # todo: this may be a little slow
     mp_versions = [v for v in mp_versions if "preview" in v or get_known_boards_for_port("stm32", [v])]
 
-    def at_least_one_validation(answers, current) -> bool:
-        if not current:
-            raise inquirer.errors.ValidationError("", reason="Please select at least one version")
-        if isinstance(current, list) and not any(current):
-            raise inquirer.errors.ValidationError("", reason="Please select at least one version")
-        return True
-
     message = "Which version(s) do you want to {action} " + ("to {serial} ?" if action == "flash" else "?")
     q = input_ux(
         # inquirer.List(

mpflash/mpflash/bootloader/__init__.py

@@ -0,0 +1,36 @@
+import time
+
+from mpflash.common import BootloaderMethod
+from mpflash.errors import MPFlashError
+from mpflash.logger import log
+from mpflash.mpremoteboard import MPRemoteBoard
+
+from .manual import enter_bootloader_manual
+from .micropython import enter_bootloader_mpy
+from .touch1200 import enter_bootloader_cdc_1200bps
+
+
+def enter_bootloader(
+    mcu: MPRemoteBoard,
+    method: BootloaderMethod = BootloaderMethod.MPY,
+    timeout: int = 10,
+    wait_after: int = 2,
+):
+    """Enter the bootloader mode for the board"""
+    if method == BootloaderMethod.NONE:
+        # NO bootloader requested, so must be OK to flash
+        return True
+
+    log.info(f"Entering bootloader on {mcu.board} on {mcu.serialport} using method: {method.value}")
+    if method == BootloaderMethod.MPY:
+        result = enter_bootloader_mpy(mcu, timeout=timeout)
+    elif method == BootloaderMethod.MANUAL:
+        result = enter_bootloader_manual(mcu, timeout=timeout)
+    elif method == BootloaderMethod.TOUCH_1200:
+        result = enter_bootloader_cdc_1200bps(mcu, timeout=timeout)
+    else:
+        raise MPFlashError(f"Unknown bootloader method {method}")
+    if result:
+        time.sleep(wait_after)
+        log.error(f"Failed to enter bootloader on {mcu.serialport}")
+    return result

mpflash/mpflash/bootloader/manual.py

@@ -0,0 +1,102 @@
+"""Manual bootloader mode entry for various MCUs."""
+
+from click.exceptions import Abort
+from rich.console import Console
+from rich.highlighter import RegexHighlighter
+from rich.panel import Panel
+from rich.prompt import Confirm
+from rich.theme import Theme
+
+# from mpflash.logger import console, log
+from mpflash.mpremoteboard import MPRemoteBoard
+
+
+class MCUHighlighter(RegexHighlighter):
+    """Apply style to anything that looks like an email."""
+
+    base_style = "mcu."
+    highlights = [
+        r"(?P<bold>Method[\s\d\:]*)",
+        r"(?P<bold> \d.)",  # numbered items
+        r"(?P<bold> - )",  # bullets
+        r"(?P<pad>GPIO[\d]*)",
+        r"(?P<pad>GPI[\d]*)",
+        r"(?P<pad>IO[\d]*)",
+        r"(?P<pad>RUN)",
+        r"(?P<pad>GND)",
+        r"(?P<pad>VCC)",
+        r"(?P<pad>3.3V)",
+        r"(?P<pad>5V)",
+        # buttons
+        r"(?P<button>BOOTSEL)",
+        r"(?P<button>RESET)",
+        r"(?P<button>reset)",
+        # other
+        r"(?P<cable>USB)",
+        # r"(?P<mcu>SAMD[\d]*)",
+        # r"(?P<mcu>ESP[\d]*)",
+        # r"(?P<mcu>rp2)",
+        # r"(?P<mcu>rp2040)",
+    ]
+
+
+# https://rich.readthedocs.io/en/stable/appendix/colors.html?highlight=colors#standard-colors
+mcu_theme = Theme(
+    {
+        "mcu.bold": "orange3",
+        "mcu.mcu": "orange3",
+        "mcu.button": "bold green",
+        "mcu.pad": "dodger_blue2",
+        "mcu.cable": "dodger_blue2",
+    }
+)
+
+
+def enter_bootloader_manual(mcu: MPRemoteBoard, timeout: int = 10):
+
+    message: str
+    if mcu.port == "rp2":
+        message = f"""\
+Please put your {" ".join([mcu.port,mcu.board])} device into bootloader mode by either:
+Method 1:
+  1. Unplug the USB cable, 
+  2. Press and hold the BOOTSEL button on the device, 
+  3. Plug the USB cable back in.
+  4. Release the BOOTSEL button.
+    
+Method 2:
+  1. Press and hold the BOOTSEL button on the device, 
+  2. Reset the device by either: 
+    - pressing the RESET button on the device 
+    - by power-cycling the device,
+    - by briefly connecting the RUN pin to GND
+  3. Release the BOOTSEL button.
+"""
+    elif mcu.port == "samd":
+        message = f"""\
+Please put your {mcu.port.upper()} device into bootloader mode by:
+  - Pressing or sliding the RESET button twice in fast succession
+"""
+    else:
+        message = f"""\
+Please put your {mcu.port.upper()} device into bootloader mode by:
+  - Pressing the RESET button on the device
+"""
+
+    # todo: would be nice to re-use the console instance from logger
+    console = Console(highlighter=MCUHighlighter(), theme=mcu_theme)
+    message += "\nIf you are unsure how to enter bootloader mode, please refer to the device documentation."
+    console.print(
+        Panel(
+            message,
+            highlight=True,
+            title="Manual Bootloader",
+            title_align="left",
+            expand=False,
+        )
+    )
+    try:
+        answer = Confirm.ask("Press Enter to continue", default="y")
+    except Abort:
+        return False
+    return answer in ["y", "Y", True]

mpflash/mpflash/bootloader/micropython.py

@@ -0,0 +1,10 @@
+"""Module for handling the bootloader mode for micropython boards"""
+
+from mpflash.mpremoteboard import MPRemoteBoard
+
+
+def enter_bootloader_mpy(mcu: MPRemoteBoard, timeout: int = 10):
+    """Enter the bootloader mode for the board using mpremote and micropython on the board"""
+    mcu.run_command("bootloader", timeout=timeout)
+    # todo: check if mpremote command was successful
+    return True

mpflash/mpflash/bootloader/touch1200.py

@@ -0,0 +1,45 @@
+import sys
+import time
+
+import serial
+
+from mpflash.errors import MPFlashError
+from mpflash.logger import log
+from mpflash.mpremoteboard import MPRemoteBoard
+
+from .manual import enter_bootloader_manual
+
+
+def enter_bootloader_cdc_1200bps(mcu: MPRemoteBoard, timeout: int = 10):
+    if sys.platform == "win32":
+        log.warning("Touch 1200bps method is currently not supported on Windows, switching to manual")
+        return enter_bootloader_manual(mcu, timeout=timeout)
+
+    log.info(f"Entering bootloader on {mcu.board} on {mcu.serialport} using CDC 1200bps")
+    # if port argument is present perform soft reset
+    if not mcu.serialport:
+        raise MPFlashError("No serial port specified")
+    # try to initiate serial port connection on PORT with 1200 baudrate
+    try:
+        with serial.Serial(
+            port=mcu.serialport,
+            baudrate=1200,
+            parity=serial.PARITY_NONE,
+            stopbits=serial.STOPBITS_ONE,
+            bytesize=serial.EIGHTBITS,
+            rtscts=True,
+        ) as connection:
+            print("Connection established")
+            connection.rts = True
+            connection.dtr = False
+            time.sleep(0.4)
+
+    except serial.SerialException as e:
+        log.exception(e)
+        raise MPFlashError("pySerial error: " + str(e) + "\n") from e
+    except Exception as e:
+        log.exception(e)
+        raise MPFlashError("Error: " + str(e) + "\n") from e
+
+    # be optimistic
+    return True

mpflash/mpflash/cli_download.py

@@ -80,6 +80,7 @@ from .download import download
 )
 @click.option(
     "--force",
+    "-f",
     default=False,
     is_flag=True,
     show_default=True,

mpflash/mpflash/cli_flash.py

@@ -4,7 +4,7 @@ from typing import List
 import rich_click as click
 from loguru import logger as log
 
-# from mpflash.common import filtered_comports
+from mpflash.common import BootloaderMethod
 from mpflash.errors import MPFlashError
 from mpflash.mpboard_id import find_known_board
 from mpflash.mpremoteboard import MPRemoteBoard
@@ -17,7 +17,8 @@ from .cli_list import show_mcus
 from .common import FlashParams
 from .config import config
 from .flash import flash_list
-from .worklist import WorkList, full_auto_worklist, manual_worklist, single_auto_worklist
+from .worklist import (WorkList, full_auto_worklist, manual_worklist,
+                       single_auto_worklist)
 
 # #########################################################################################################
 # CLI
@@ -101,11 +102,13 @@ from .worklist import WorkList, full_auto_worklist, manual_worklist, single_auto
     help="""Erase flash before writing new firmware. (Not supported on UF2 boards)""",
 )
 @click.option(
-    "--bootloader/--no-bootloader",
-    default=True,
-    is_flag=True,
+    "--bootloader",
+    "-b",
+    "bootloader",
+    type=click.Choice([e.value for e in BootloaderMethod]),
+    default="mpy",
     show_default=True,
-    help="""Enter micropython bootloader mode before flashing.""",
+    help="""How to enter the (MicroPython) bootloader before flashing.""",
 )
 def cli_flash_board(**kwargs) -> int:
     # version to versions, board to boards
@@ -118,9 +121,11 @@ def cli_flash_board(**kwargs) -> int:
 
     params = FlashParams(**kwargs)
     params.versions = list(params.versions)
-    params.boards = list(params.boards)
+    params.ports = list(params.ports)
+    params.boards = list(params.boards) 
     params.serial = list(params.serial)
     params.ignore = list(params.ignore)
+    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 == "*":
@@ -129,14 +134,16 @@ def cli_flash_board(**kwargs) -> int:
     # Detect connected boards if not specified,
     # and ask for input if boards cannot be detected
     all_boards: List[MPRemoteBoard] = []
-    if not params.boards or params.boards == []:
+    if not params.boards:
         # nothing specified - detect connected boards
         params.ports, params.boards, all_boards = connected_ports_boards(include=params.ports, ignore=params.ignore)
         if params.boards == []:
-            # No MicroPython boards detected, but it could be unflashed or not in bootloader mode
+            # No MicroPython boards detected, but it could be unflashed or in bootloader mode
             # Ask for serial port and board_id to flash
             params.serial = ["?"]
             params.boards = ["?"]
+            # assume manual mode if no board is detected
+            params.bootloader = BootloaderMethod("manual")
     else:
         resolve_board_ids(params)
 

mpflash/mpflash/cli_group.py

@@ -5,43 +5,50 @@ Additional comands are added in the submodules.
 
 import rich_click as click
 
-from .config import config
-from .logger import make_quiet, set_loglevel
+from mpflash.vendor.click_aliases import ClickAliasedGroup
+
+from .config import __version__, config
+from .logger import log, make_quiet, set_loglevel
 
 
 def cb_verbose(ctx, param, value):
     """Callback to set the log level to DEBUG if verbose is set"""
     if value and not config.quiet:
+        # log.debug(f"Setting verbose mode to {value}")
         config.verbose = True
         if value > 1:
             set_loglevel("TRACE")
         else:
             set_loglevel("DEBUG")
+        log.debug(f"version: {__version__}")
     else:
         set_loglevel("INFO")
         config.verbose = False
     return value
 
 
-def cb_interactive(ctx, param, value):
-    if value:
-        config.interactive = value
+def cb_interactive(ctx, param, value:bool):
+    log.trace(f"Setting interactive mode to {value}")
+    config.interactive = value
     return value
 
 
 def cb_test(ctx, param, value):
     if value:
+        log.trace(f"Setting tests to {value}")
         config.tests = value
     return value
 
 
 def cb_quiet(ctx, param, value):
+    log.trace(f"Setting quiet mode to {value}")
     if value:
         make_quiet()
     return value
 
 
-@click.group()
+@click.group(cls=ClickAliasedGroup)
+# @click.group()
 @click.version_option(package_name="mpflash")
 @click.option(
     "--quiet",

mpflash/mpflash/cli_list.py

@@ -5,12 +5,16 @@ import rich_click as click
 from rich import print
 
 from .cli_group import cli
+from .connected import list_mcus
 from .list import show_mcus
 from .logger import make_quiet
-from .connected import list_mcus
 
 
-@cli.command("list", help="List the connected MCU boards.")
+@cli.command(
+    "list",
+    help="List the connected MCU boards. alias: devs",
+    aliases=["devs"],
+)
 @click.option(
     "--json",
     "-j",