andreil/katapult
1
0
Fork 0
mirror of https://github.com/andreili/katapult.git synced 2025-08-23 19:34:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

flashtool: handle situation where software version is not reported

Browse Source 
Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2025-03-31 05:28:53 -04:00
parent 418b43b0fa
commit bc1ecea7f7
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/flashtool.py
View File

@ -285,9 +285,12 @@ class CanFlasher:
raise FlashError("Invalid Block Size: %d" % (self.block_size,))
mcu_info = mcu_info.rstrip(b"\x00")
if self.proto_version >= (1, 1, 0):
mcu_bytes, sv_bytes = mcu_info.split(b"\x00", maxsplit=1)
mcu_type = mcu_bytes.decode()
self.software_version = sv_bytes.decode()
build_info = mcu_info.split(b"\x00", maxsplit=1)
mcu_type = build_info[0].decode()
if len(build_info) == 2:
self.software_version = build_info[1].decode()
else:
output_line("Katapult build not reporting software version!")
else:
mcu_type = mcu_info.decode()
output_line(