mpflash 0.8.2__py3-none-any.whl → 0.8.3__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- mpflash/downloaded.py +7 -3
- mpflash/flash_uf2_boardid.py +2 -1
- {mpflash-0.8.2.dist-info → mpflash-0.8.3.dist-info}/METADATA +1 -1
- {mpflash-0.8.2.dist-info → mpflash-0.8.3.dist-info}/RECORD +7 -7
- {mpflash-0.8.2.dist-info → mpflash-0.8.3.dist-info}/LICENSE +0 -0
- {mpflash-0.8.2.dist-info → mpflash-0.8.3.dist-info}/WHEEL +0 -0
- {mpflash-0.8.2.dist-info → mpflash-0.8.3.dist-info}/entry_points.txt +0 -0
mpflash/downloaded.py
CHANGED
@@ -39,6 +39,7 @@ def clean_downloaded_firmwares(fw_folder: Path) -> None:
|
|
39
39
|
writer.write(fw.to_dict())
|
40
40
|
log.info(f"Removed duplicate entries from firmware.jsonl in {fw_folder}")
|
41
41
|
|
42
|
+
|
42
43
|
def find_downloaded_firmware(
|
43
44
|
*,
|
44
45
|
board_id: str,
|
@@ -53,6 +54,7 @@ def find_downloaded_firmware(
|
|
53
54
|
selector = {}
|
54
55
|
fw_folder = fw_folder or config.firmware_folder
|
55
56
|
# Use the information in firmwares.jsonl to find the firmware file
|
57
|
+
log.debug(f"{trie}] Looking for firmware for {board_id} {version} ")
|
56
58
|
fw_list = downloaded_firmwares(fw_folder)
|
57
59
|
if not fw_list:
|
58
60
|
log.error("No firmware files found. Please download the firmware first.")
|
@@ -102,12 +104,13 @@ def filter_downloaded_fwlist(
|
|
102
104
|
fw_list = [fw for fw in fw_list if fw.preview]
|
103
105
|
else:
|
104
106
|
# FWInfo version has no v1.2.3 prefix
|
105
|
-
_version = clean_version(version, drop_v=True)
|
106
|
-
fw_list = [fw for fw in fw_list if fw.version
|
107
|
-
|
107
|
+
_version = {clean_version(version, drop_v=True), clean_version(version, drop_v=False)}
|
108
|
+
fw_list = [fw for fw in fw_list if fw.version in _version]
|
109
|
+
log.trace(f"Filtering firmware for {version} : {len(fw_list)} found.")
|
108
110
|
# filter by port
|
109
111
|
if port:
|
110
112
|
fw_list = [fw for fw in fw_list if fw.port == port]
|
113
|
+
log.trace(f"Filtering firmware for {port} : {len(fw_list)} found.")
|
111
114
|
|
112
115
|
if board_id:
|
113
116
|
if variants:
|
@@ -116,6 +119,7 @@ def filter_downloaded_fwlist(
|
|
116
119
|
else:
|
117
120
|
# the firmware variant should match exactly the board_id
|
118
121
|
fw_list = [fw for fw in fw_list if fw.variant == board_id]
|
122
|
+
log.trace(f"Filtering firmware for {board_id} : {len(fw_list)} found.")
|
119
123
|
if selector and port in selector:
|
120
124
|
fw_list = [fw for fw in fw_list if fw.filename.endswith(selector[port])]
|
121
125
|
return fw_list
|
mpflash/flash_uf2_boardid.py
CHANGED
@@ -1,4 +1,5 @@
|
|
1
1
|
from pathlib import Path
|
2
|
+
|
2
3
|
from loguru import logger as log
|
3
4
|
|
4
5
|
|
@@ -10,5 +11,5 @@ def get_board_id(path: Path):
|
|
10
11
|
for line in data:
|
11
12
|
if line.startswith("Board-ID"):
|
12
13
|
board_id = line[9:].strip()
|
13
|
-
log.
|
14
|
+
log.debug(f"INFO_UF2.TXT Board-ID={board_id}")
|
14
15
|
return board_id
|
@@ -10,7 +10,7 @@ mpflash/common.py,sha256=MmyLadb_z7bhVy6U8jb4f3pnBK8n7x28smFBcA9ZfGg,5608
|
|
10
10
|
mpflash/config.py,sha256=R7PomStIFHSTnLhpWhw9P2DL_b-8a8Wrja3aY-dPm6A,762
|
11
11
|
mpflash/connected.py,sha256=CBG_DJ33OPWAPbX-ICQpL1LcFOhNYpLUSB0Q5v7gi9s,3029
|
12
12
|
mpflash/download.py,sha256=NErA2SJEhXnTElvq6z4BJl-L-5M_ETJpqX6pM0oubsg,14290
|
13
|
-
mpflash/downloaded.py,sha256=
|
13
|
+
mpflash/downloaded.py,sha256=FQuVl21bx4JotfnXufoihexKeJt3gDMqhSWUvVKBSDk,4868
|
14
14
|
mpflash/errors.py,sha256=Q5LR12Wo8iUCg5n_qq4GjdBdBflbvCOdKsRJ5InYRfI,96
|
15
15
|
mpflash/flash.py,sha256=JoskuwaHVYqeG4YW8kgbv26vPFnqDmkTz1VRs-pTRiY,2468
|
16
16
|
mpflash/flash_esp.py,sha256=dEc_B7-f1BMUGBMrwIm83ulcCqaS5MlrPAp3FCNgNfk,2311
|
@@ -18,7 +18,7 @@ mpflash/flash_stm32.py,sha256=d4BoQl3a9Tchnvn2ZTuq2MpYBB4MTaRukwtEncI95k0,823
|
|
18
18
|
mpflash/flash_stm32_cube.py,sha256=w7aGWjReeWUKl0Q3ZjXH8BRqNO1Tk9AO7gtRNUg1c9Y,3970
|
19
19
|
mpflash/flash_stm32_dfu.py,sha256=G70EZodWb-aRi507Jxbys-VEwbBGU1oZacow3_nq-d4,2972
|
20
20
|
mpflash/flash_uf2.py,sha256=2IKgEOnlsB9bILJWHILMKbGo9b39NKazBWp1-T_eKKs,2463
|
21
|
-
mpflash/flash_uf2_boardid.py,sha256=
|
21
|
+
mpflash/flash_uf2_boardid.py,sha256=U5wGM8VA3wEpUxQCMtuXpMZZomdVH8J_Zd5_GekUMuU,423
|
22
22
|
mpflash/flash_uf2_linux.py,sha256=Oy9V4g7JSuks2hHFeO_OHdBKSGktbqZOtsivuxfl-xg,4055
|
23
23
|
mpflash/flash_uf2_macos.py,sha256=HGUg2HSw4qalfSP7npLYgos2WlVRxtOVTDcAnBL7qPY,1078
|
24
24
|
mpflash/flash_uf2_windows.py,sha256=a-iIGPkwIoUXA7atCz0_uZp-kipSL24P-IE5ka1B1Mk,1025
|
@@ -40,8 +40,8 @@ mpflash/vendor/pydfu.py,sha256=_MdBRo1EeNeKDqFPSTB5tNL1jGSBJgsVeVjE5e7Pb8s,20542
|
|
40
40
|
mpflash/vendor/readme.md,sha256=iIIZxuLUIGHQ0KODzYVtMezsztvyxCXcNJp_AzwTIPk,86
|
41
41
|
mpflash/vendor/versions.py,sha256=thk1a5wEEhXIQoL0zZ7oooeFyQeSoI00CIUbZF0b3rI,3783
|
42
42
|
mpflash/worklist.py,sha256=MKHDynttVP3lsHSfb7DEqeQ2mRV0da96lD4lIcS_zQY,5962
|
43
|
-
mpflash-0.8.
|
44
|
-
mpflash-0.8.
|
45
|
-
mpflash-0.8.
|
46
|
-
mpflash-0.8.
|
47
|
-
mpflash-0.8.
|
43
|
+
mpflash-0.8.3.dist-info/entry_points.txt,sha256=Jk_visOhYOsZIcSP2Ms9hKqfKy1iorR-6dYltSoWCpY,52
|
44
|
+
mpflash-0.8.3.dist-info/LICENSE,sha256=mWpNhsIxWzetYNnTpr4eb3HtgsxGIC8KcYWxXEcxQvE,1077
|
45
|
+
mpflash-0.8.3.dist-info/METADATA,sha256=m_L6esjRSJk_xjDafV9in_boKNX2c4wmQ8P-rl9xzL4,15275
|
46
|
+
mpflash-0.8.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
|
47
|
+
mpflash-0.8.3.dist-info/RECORD,,
|
File without changes
|
File without changes
|
File without changes
|