TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2024-12-13 19:54:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Python2 string type error.

Browse Source
This commit is contained in:
Jared Boone 2016-07-02 18:15:39 -07:00
parent f10eb77436
commit 53434f3789
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firmware/tools/make_image_chunk.py
View File

@ -43,11 +43,11 @@ def write_image(data, path):
if len(sys.argv) == 4: if len(sys.argv) == 4:
input_image = read_image(sys.argv[1]) input_image = read_image(sys.argv[1])
tag = sys.argv[2].encode() tag = tuple(map(ord, sys.argv[2]))
output_path = sys.argv[3] output_path = sys.argv[3]
elif len(sys.argv) == 2: elif len(sys.argv) == 2:
input_image = bytearray() input_image = bytearray()
tag = bytearray((0,) * 4) tag = (0, 0, 0, 0)
output_path = sys.argv[1] output_path = sys.argv[1]
else: else:
print(usage_message) print(usage_message)
@ -64,7 +64,7 @@ if (len(input_image) & 3) != 0:
raise RuntimeError('image size of %d is not multiple of four' % (len(input_image,))) raise RuntimeError('image size of %d is not multiple of four' % (len(input_image,)))
output_image = bytearray() output_image = bytearray()
output_image += struct.pack('<4sI', tag, len(input_image)) output_image += struct.pack('<4BI', tag[0], tag[1], tag[2], tag[3], len(input_image))
output_image += input_image output_image += input_image
write_image(output_image, output_path) write_image(output_image, output_path)