mpflash 1.0.0__py3-none-any.whl → 1.0.2__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.
Files changed (52) hide show
  1. mpflash/add_firmware.py +98 -98
  2. mpflash/ask_input.py +236 -236
  3. mpflash/basicgit.py +284 -284
  4. mpflash/bootloader/__init__.py +2 -2
  5. mpflash/bootloader/activate.py +60 -60
  6. mpflash/bootloader/detect.py +82 -82
  7. mpflash/bootloader/manual.py +101 -101
  8. mpflash/bootloader/micropython.py +12 -12
  9. mpflash/bootloader/touch1200.py +36 -36
  10. mpflash/cli_download.py +129 -129
  11. mpflash/cli_flash.py +224 -216
  12. mpflash/cli_group.py +111 -111
  13. mpflash/cli_list.py +87 -87
  14. mpflash/cli_main.py +39 -39
  15. mpflash/common.py +210 -166
  16. mpflash/config.py +44 -44
  17. mpflash/connected.py +104 -77
  18. mpflash/download.py +364 -364
  19. mpflash/downloaded.py +130 -130
  20. mpflash/errors.py +9 -9
  21. mpflash/flash/__init__.py +55 -55
  22. mpflash/flash/esp.py +59 -59
  23. mpflash/flash/stm32.py +19 -19
  24. mpflash/flash/stm32_dfu.py +104 -104
  25. mpflash/flash/uf2/__init__.py +88 -88
  26. mpflash/flash/uf2/boardid.py +15 -15
  27. mpflash/flash/uf2/linux.py +136 -130
  28. mpflash/flash/uf2/macos.py +42 -42
  29. mpflash/flash/uf2/uf2disk.py +12 -12
  30. mpflash/flash/uf2/windows.py +43 -43
  31. mpflash/flash/worklist.py +170 -170
  32. mpflash/list.py +106 -106
  33. mpflash/logger.py +41 -41
  34. mpflash/mpboard_id/__init__.py +93 -93
  35. mpflash/mpboard_id/add_boards.py +251 -251
  36. mpflash/mpboard_id/board.py +37 -37
  37. mpflash/mpboard_id/board_id.py +86 -86
  38. mpflash/mpboard_id/store.py +43 -43
  39. mpflash/mpremoteboard/__init__.py +266 -266
  40. mpflash/mpremoteboard/mpy_fw_info.py +141 -141
  41. mpflash/mpremoteboard/runner.py +140 -140
  42. mpflash/vendor/click_aliases.py +91 -91
  43. mpflash/vendor/dfu.py +165 -165
  44. mpflash/vendor/pydfu.py +605 -605
  45. mpflash/vendor/readme.md +2 -2
  46. mpflash/versions.py +135 -135
  47. {mpflash-1.0.0.dist-info → mpflash-1.0.2.dist-info}/LICENSE +20 -20
  48. {mpflash-1.0.0.dist-info → mpflash-1.0.2.dist-info}/METADATA +1 -1
  49. mpflash-1.0.2.dist-info/RECORD +53 -0
  50. mpflash-1.0.0.dist-info/RECORD +0 -53
  51. {mpflash-1.0.0.dist-info → mpflash-1.0.2.dist-info}/WHEEL +0 -0
  52. {mpflash-1.0.0.dist-info → mpflash-1.0.2.dist-info}/entry_points.txt +0 -0
@@ -1,91 +1,91 @@
1
- # Copyright (c) 2016 Robbin Bonthond
2
-
3
- # Permission is hereby granted, free of charge, to any person obtaining a copy
4
- # of this software and associated documentation files (the "Software"), to deal
5
- # in the Software without restriction, including without limitation the rights
6
- # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7
- # copies of the Software, and to permit persons to whom the Software is
8
- # furnished to do so, subject to the following conditions:
9
-
10
- # The above copyright notice and this permission notice shall be included in all
11
- # copies or substantial portions of the Software.
12
- # ------------------------------------------------------------------------------------
13
- # modified to avoid conflcts with rich_click
14
-
15
- # sourcery skip: assign-if-exp, use-named-expression
16
-
17
- import rich_click as click
18
-
19
- _click7 = click.__version__[0] >= "7"
20
-
21
-
22
- class ClickAliasedGroup(click.RichGroup):
23
- def __init__(self, *args, **kwargs):
24
- super().__init__(*args, **kwargs)
25
- self._commands = {}
26
- self._aliases = {}
27
-
28
- def add_command(self, *args, **kwargs):
29
- aliases = kwargs.pop("aliases", [])
30
- super().add_command(*args, **kwargs)
31
- if aliases:
32
- cmd = args[0]
33
- name = args[1] if len(args) > 1 else None
34
- name = name or cmd.name
35
- if name is None:
36
- raise TypeError("Command has no name.")
37
-
38
- self._commands[name] = aliases
39
- for alias in aliases:
40
- self._aliases[alias] = cmd.name
41
-
42
- def command(self, *args, **kwargs):
43
- aliases = kwargs.pop("aliases", [])
44
- decorator = super().command(*args, **kwargs)
45
- if not aliases:
46
- return decorator
47
-
48
- def _decorator(f):
49
- cmd = decorator(f)
50
- if aliases:
51
- self._commands[cmd.name] = aliases
52
- for alias in aliases:
53
- self._aliases[alias] = cmd.name
54
- return cmd
55
-
56
- return _decorator
57
-
58
- def group(self, *args, **kwargs):
59
- aliases = kwargs.pop("aliases", [])
60
- decorator = super().group(*args, **kwargs)
61
- if not aliases:
62
- return decorator
63
-
64
- def _decorator(f):
65
- cmd = decorator(f)
66
- if aliases:
67
- self._commands[cmd.name] = aliases
68
- for alias in aliases:
69
- self._aliases[alias] = cmd.name
70
- return cmd
71
-
72
- return _decorator
73
-
74
- def resolve_alias(self, cmd_name):
75
- if cmd_name in self._aliases:
76
- return self._aliases[cmd_name]
77
- return cmd_name
78
-
79
- def get_command(self, ctx, cmd_name):
80
- cmd_name = self.resolve_alias(cmd_name)
81
- command = super().get_command(ctx, cmd_name)
82
- if command:
83
- return command
84
- return None
85
-
86
- # def format_commands(self, ctx, formatter):
87
- # TODO: output alias with commands - but that is a significant re-write
88
- # for now add alias to help text
89
-
90
-
91
- # ------------------------------------------------------------------------------------
1
+ # Copyright (c) 2016 Robbin Bonthond
2
+
3
+ # Permission is hereby granted, free of charge, to any person obtaining a copy
4
+ # of this software and associated documentation files (the "Software"), to deal
5
+ # in the Software without restriction, including without limitation the rights
6
+ # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7
+ # copies of the Software, and to permit persons to whom the Software is
8
+ # furnished to do so, subject to the following conditions:
9
+
10
+ # The above copyright notice and this permission notice shall be included in all
11
+ # copies or substantial portions of the Software.
12
+ # ------------------------------------------------------------------------------------
13
+ # modified to avoid conflcts with rich_click
14
+
15
+ # sourcery skip: assign-if-exp, use-named-expression
16
+
17
+ import rich_click as click
18
+
19
+ _click7 = click.__version__[0] >= "7"
20
+
21
+
22
+ class ClickAliasedGroup(click.RichGroup):
23
+ def __init__(self, *args, **kwargs):
24
+ super().__init__(*args, **kwargs)
25
+ self._commands = {}
26
+ self._aliases = {}
27
+
28
+ def add_command(self, *args, **kwargs):
29
+ aliases = kwargs.pop("aliases", [])
30
+ super().add_command(*args, **kwargs)
31
+ if aliases:
32
+ cmd = args[0]
33
+ name = args[1] if len(args) > 1 else None
34
+ name = name or cmd.name
35
+ if name is None:
36
+ raise TypeError("Command has no name.")
37
+
38
+ self._commands[name] = aliases
39
+ for alias in aliases:
40
+ self._aliases[alias] = cmd.name
41
+
42
+ def command(self, *args, **kwargs):
43
+ aliases = kwargs.pop("aliases", [])
44
+ decorator = super().command(*args, **kwargs)
45
+ if not aliases:
46
+ return decorator
47
+
48
+ def _decorator(f):
49
+ cmd = decorator(f)
50
+ if aliases:
51
+ self._commands[cmd.name] = aliases
52
+ for alias in aliases:
53
+ self._aliases[alias] = cmd.name
54
+ return cmd
55
+
56
+ return _decorator
57
+
58
+ def group(self, *args, **kwargs):
59
+ aliases = kwargs.pop("aliases", [])
60
+ decorator = super().group(*args, **kwargs)
61
+ if not aliases:
62
+ return decorator
63
+
64
+ def _decorator(f):
65
+ cmd = decorator(f)
66
+ if aliases:
67
+ self._commands[cmd.name] = aliases
68
+ for alias in aliases:
69
+ self._aliases[alias] = cmd.name
70
+ return cmd
71
+
72
+ return _decorator
73
+
74
+ def resolve_alias(self, cmd_name):
75
+ if cmd_name in self._aliases:
76
+ return self._aliases[cmd_name]
77
+ return cmd_name
78
+
79
+ def get_command(self, ctx, cmd_name):
80
+ cmd_name = self.resolve_alias(cmd_name)
81
+ command = super().get_command(ctx, cmd_name)
82
+ if command:
83
+ return command
84
+ return None
85
+
86
+ # def format_commands(self, ctx, formatter):
87
+ # TODO: output alias with commands - but that is a significant re-write
88
+ # for now add alias to help text
89
+
90
+
91
+ # ------------------------------------------------------------------------------------
mpflash/vendor/dfu.py CHANGED
@@ -1,165 +1,165 @@
1
- # sourcery skip: require-parameter-annotation
2
- # sourcery skip: replace-interpolation-with-fstring
3
- # type: ignore
4
- #!/usr/bin/python
5
-
6
- # Written by Antonio Galea - 2010/11/18
7
- # Distributed under Gnu LGPL 3.0
8
- # see http://www.gnu.org/licenses/lgpl-3.0.txt
9
-
10
- import os
11
- import struct
12
- import sys
13
- import zlib
14
- from optparse import OptionParser
15
-
16
- DEFAULT_DEVICE = "0x0483:0xdf11"
17
-
18
-
19
- def named(tuple, names):
20
- return dict(zip(names.split(), tuple))
21
-
22
-
23
- def consume(fmt, data, names):
24
- n = struct.calcsize(fmt)
25
- return named(struct.unpack(fmt, data[:n]), names), data[n:]
26
-
27
-
28
- def cstring(string):
29
- return string.split(b"\0", 1)[0]
30
-
31
-
32
- def compute_crc(data):
33
- return 0xFFFFFFFF & -zlib.crc32(data) - 1
34
-
35
-
36
- def parse(file, dump_images=False):
37
- print('File: "%s"' % file)
38
- data = open(file, "rb").read()
39
- crc = compute_crc(data[:-4])
40
- prefix, data = consume("<5sBIB", data, "signature version size targets")
41
- print("%(signature)s v%(version)d, image size: %(size)d, targets: %(targets)d" % prefix)
42
- for t in range(prefix["targets"]):
43
- tprefix, data = consume("<6sBI255s2I", data, "signature altsetting named name size elements")
44
- tprefix["num"] = t
45
- if tprefix["named"]:
46
- tprefix["name"] = cstring(tprefix["name"])
47
- else:
48
- tprefix["name"] = ""
49
- print(
50
- '%(signature)s %(num)d, alt setting: %(altsetting)s, name: "%(name)s", size: %(size)d, elements: %(elements)d'
51
- % tprefix
52
- )
53
- tsize = tprefix["size"]
54
- target, data = data[:tsize], data[tsize:]
55
- for e in range(tprefix["elements"]):
56
- eprefix, target = consume("<2I", target, "address size")
57
- eprefix["num"] = e
58
- print(" %(num)d, address: 0x%(address)08x, size: %(size)d" % eprefix)
59
- esize = eprefix["size"]
60
- image, target = target[:esize], target[esize:]
61
- if dump_images:
62
- out = "%s.target%d.image%d.bin" % (file, t, e)
63
- open(out, "wb").write(image)
64
- print(' DUMPED IMAGE TO "%s"' % out)
65
- if len(target):
66
- print("target %d: PARSE ERROR" % t)
67
- suffix = named(struct.unpack("<4H3sBI", data[:16]), "device product vendor dfu ufd len crc")
68
- print(
69
- "usb: %(vendor)04x:%(product)04x, device: 0x%(device)04x, dfu: 0x%(dfu)04x, %(ufd)s, %(len)d, 0x%(crc)08x"
70
- % suffix
71
- )
72
- if crc != suffix["crc"]:
73
- print("CRC ERROR: computed crc32 is 0x%08x" % crc)
74
- data = data[16:]
75
- if data:
76
- print("PARSE ERROR")
77
-
78
-
79
- def build(file, targets, device=DEFAULT_DEVICE):
80
- data = b""
81
- for _, target in enumerate(targets):
82
- tdata = b""
83
- for image in target:
84
- # pad image to 8 bytes (needed at least for L476)
85
- pad = (8 - len(image["data"]) % 8) % 8
86
- image["data"] = image["data"] + bytes(bytearray(8)[0:pad])
87
- #
88
- tdata += struct.pack("<2I", image["address"], len(image["data"])) + image["data"]
89
- tdata = struct.pack("<6sBI255s2I", b"Target", 0, 1, b"ST...", len(tdata), len(target)) + tdata
90
- data += tdata
91
- data = struct.pack("<5sBIB", b"DfuSe", 1, len(data) + 11, len(targets)) + data
92
- v, d = map(lambda x: int(x, 0) & 0xFFFF, device.split(":", 1))
93
- data += struct.pack("<4H3sB", 0, d, v, 0x011A, b"UFD", 16)
94
- crc = compute_crc(data)
95
- data += struct.pack("<I", crc)
96
- open(file, "wb").write(data)
97
-
98
-
99
- if __name__ == "__main__":
100
- usage = """
101
- %prog [-d|--dump] infile.dfu
102
- %prog {-b|--build} address:file.bin [-b address:file.bin ...] [{-D|--device}=vendor:device] outfile.dfu"""
103
- parser = OptionParser(usage=usage)
104
- parser.add_option(
105
- "-b",
106
- "--build",
107
- action="append",
108
- dest="binfiles",
109
- help="build a DFU file from given BINFILES",
110
- metavar="BINFILES",
111
- )
112
- parser.add_option(
113
- "-D",
114
- "--device",
115
- action="store",
116
- dest="device",
117
- help="build for DEVICE, defaults to %s" % DEFAULT_DEVICE,
118
- metavar="DEVICE",
119
- )
120
- parser.add_option(
121
- "-d",
122
- "--dump",
123
- action="store_true",
124
- dest="dump_images",
125
- default=False,
126
- help="dump contained images to current directory",
127
- )
128
- (options, args) = parser.parse_args()
129
-
130
- if options.binfiles and len(args) == 1:
131
- target = []
132
- for arg in options.binfiles:
133
- try:
134
- address, binfile = arg.split(":", 1)
135
- except ValueError:
136
- print("Address:file couple '%s' invalid." % arg)
137
- sys.exit(1)
138
- try:
139
- address = int(address, 0) & 0xFFFFFFFF
140
- except ValueError:
141
- print("Address %s invalid." % address)
142
- sys.exit(1)
143
- if not os.path.isfile(binfile):
144
- print("Unreadable file '%s'." % binfile)
145
- sys.exit(1)
146
- target.append({"address": address, "data": open(binfile, "rb").read()})
147
- outfile = args[0]
148
- device = DEFAULT_DEVICE
149
- if options.device:
150
- device = options.device
151
- try:
152
- v, d = map(lambda x: int(x, 0) & 0xFFFF, device.split(":", 1))
153
- except:
154
- print("Invalid device '%s'." % device)
155
- sys.exit(1)
156
- build(outfile, [target], device)
157
- elif len(args) == 1:
158
- infile = args[0]
159
- if not os.path.isfile(infile):
160
- print("Unreadable file '%s'." % infile)
161
- sys.exit(1)
162
- parse(infile, dump_images=options.dump_images)
163
- else:
164
- parser.print_help()
165
- sys.exit(1)
1
+ # sourcery skip: require-parameter-annotation
2
+ # sourcery skip: replace-interpolation-with-fstring
3
+ # type: ignore
4
+ #!/usr/bin/python
5
+
6
+ # Written by Antonio Galea - 2010/11/18
7
+ # Distributed under Gnu LGPL 3.0
8
+ # see http://www.gnu.org/licenses/lgpl-3.0.txt
9
+
10
+ import os
11
+ import struct
12
+ import sys
13
+ import zlib
14
+ from optparse import OptionParser
15
+
16
+ DEFAULT_DEVICE = "0x0483:0xdf11"
17
+
18
+
19
+ def named(tuple, names):
20
+ return dict(zip(names.split(), tuple))
21
+
22
+
23
+ def consume(fmt, data, names):
24
+ n = struct.calcsize(fmt)
25
+ return named(struct.unpack(fmt, data[:n]), names), data[n:]
26
+
27
+
28
+ def cstring(string):
29
+ return string.split(b"\0", 1)[0]
30
+
31
+
32
+ def compute_crc(data):
33
+ return 0xFFFFFFFF & -zlib.crc32(data) - 1
34
+
35
+
36
+ def parse(file, dump_images=False):
37
+ print('File: "%s"' % file)
38
+ data = open(file, "rb").read()
39
+ crc = compute_crc(data[:-4])
40
+ prefix, data = consume("<5sBIB", data, "signature version size targets")
41
+ print("%(signature)s v%(version)d, image size: %(size)d, targets: %(targets)d" % prefix)
42
+ for t in range(prefix["targets"]):
43
+ tprefix, data = consume("<6sBI255s2I", data, "signature altsetting named name size elements")
44
+ tprefix["num"] = t
45
+ if tprefix["named"]:
46
+ tprefix["name"] = cstring(tprefix["name"])
47
+ else:
48
+ tprefix["name"] = ""
49
+ print(
50
+ '%(signature)s %(num)d, alt setting: %(altsetting)s, name: "%(name)s", size: %(size)d, elements: %(elements)d'
51
+ % tprefix
52
+ )
53
+ tsize = tprefix["size"]
54
+ target, data = data[:tsize], data[tsize:]
55
+ for e in range(tprefix["elements"]):
56
+ eprefix, target = consume("<2I", target, "address size")
57
+ eprefix["num"] = e
58
+ print(" %(num)d, address: 0x%(address)08x, size: %(size)d" % eprefix)
59
+ esize = eprefix["size"]
60
+ image, target = target[:esize], target[esize:]
61
+ if dump_images:
62
+ out = "%s.target%d.image%d.bin" % (file, t, e)
63
+ open(out, "wb").write(image)
64
+ print(' DUMPED IMAGE TO "%s"' % out)
65
+ if len(target):
66
+ print("target %d: PARSE ERROR" % t)
67
+ suffix = named(struct.unpack("<4H3sBI", data[:16]), "device product vendor dfu ufd len crc")
68
+ print(
69
+ "usb: %(vendor)04x:%(product)04x, device: 0x%(device)04x, dfu: 0x%(dfu)04x, %(ufd)s, %(len)d, 0x%(crc)08x"
70
+ % suffix
71
+ )
72
+ if crc != suffix["crc"]:
73
+ print("CRC ERROR: computed crc32 is 0x%08x" % crc)
74
+ data = data[16:]
75
+ if data:
76
+ print("PARSE ERROR")
77
+
78
+
79
+ def build(file, targets, device=DEFAULT_DEVICE):
80
+ data = b""
81
+ for _, target in enumerate(targets):
82
+ tdata = b""
83
+ for image in target:
84
+ # pad image to 8 bytes (needed at least for L476)
85
+ pad = (8 - len(image["data"]) % 8) % 8
86
+ image["data"] = image["data"] + bytes(bytearray(8)[0:pad])
87
+ #
88
+ tdata += struct.pack("<2I", image["address"], len(image["data"])) + image["data"]
89
+ tdata = struct.pack("<6sBI255s2I", b"Target", 0, 1, b"ST...", len(tdata), len(target)) + tdata
90
+ data += tdata
91
+ data = struct.pack("<5sBIB", b"DfuSe", 1, len(data) + 11, len(targets)) + data
92
+ v, d = map(lambda x: int(x, 0) & 0xFFFF, device.split(":", 1))
93
+ data += struct.pack("<4H3sB", 0, d, v, 0x011A, b"UFD", 16)
94
+ crc = compute_crc(data)
95
+ data += struct.pack("<I", crc)
96
+ open(file, "wb").write(data)
97
+
98
+
99
+ if __name__ == "__main__":
100
+ usage = """
101
+ %prog [-d|--dump] infile.dfu
102
+ %prog {-b|--build} address:file.bin [-b address:file.bin ...] [{-D|--device}=vendor:device] outfile.dfu"""
103
+ parser = OptionParser(usage=usage)
104
+ parser.add_option(
105
+ "-b",
106
+ "--build",
107
+ action="append",
108
+ dest="binfiles",
109
+ help="build a DFU file from given BINFILES",
110
+ metavar="BINFILES",
111
+ )
112
+ parser.add_option(
113
+ "-D",
114
+ "--device",
115
+ action="store",
116
+ dest="device",
117
+ help="build for DEVICE, defaults to %s" % DEFAULT_DEVICE,
118
+ metavar="DEVICE",
119
+ )
120
+ parser.add_option(
121
+ "-d",
122
+ "--dump",
123
+ action="store_true",
124
+ dest="dump_images",
125
+ default=False,
126
+ help="dump contained images to current directory",
127
+ )
128
+ (options, args) = parser.parse_args()
129
+
130
+ if options.binfiles and len(args) == 1:
131
+ target = []
132
+ for arg in options.binfiles:
133
+ try:
134
+ address, binfile = arg.split(":", 1)
135
+ except ValueError:
136
+ print("Address:file couple '%s' invalid." % arg)
137
+ sys.exit(1)
138
+ try:
139
+ address = int(address, 0) & 0xFFFFFFFF
140
+ except ValueError:
141
+ print("Address %s invalid." % address)
142
+ sys.exit(1)
143
+ if not os.path.isfile(binfile):
144
+ print("Unreadable file '%s'." % binfile)
145
+ sys.exit(1)
146
+ target.append({"address": address, "data": open(binfile, "rb").read()})
147
+ outfile = args[0]
148
+ device = DEFAULT_DEVICE
149
+ if options.device:
150
+ device = options.device
151
+ try:
152
+ v, d = map(lambda x: int(x, 0) & 0xFFFF, device.split(":", 1))
153
+ except:
154
+ print("Invalid device '%s'." % device)
155
+ sys.exit(1)
156
+ build(outfile, [target], device)
157
+ elif len(args) == 1:
158
+ infile = args[0]
159
+ if not os.path.isfile(infile):
160
+ print("Unreadable file '%s'." % infile)
161
+ sys.exit(1)
162
+ parse(infile, dump_images=options.dump_images)
163
+ else:
164
+ parser.print_help()
165
+ sys.exit(1)