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: increase timeout for send block command

Browse Source 
Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2025-07-23 08:01:04 -04:00
parent 94e4255d32
commit 399e50e121
No known key found for this signature in database
GPG Key ID: 5A1EB336DFB4C71B
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/flashtool.py
View File

@ -322,7 +322,8 @@ class CanFlasher:
self, self,
cmdname: str, cmdname: str,
payload: bytes = b"", payload: bytes = b"",
tries: int = 5 tries: int = 5,
read_timeout: float = 2.0
) -> bytearray: ) -> bytearray:
cmd = BOOTLOADER_CMDS[cmdname] cmd = BOOTLOADER_CMDS[cmdname]
out_cmd = self._build_command(cmd, payload) out_cmd = self._build_command(cmd, payload)
@ -334,7 +335,7 @@ class CanFlasher:
self.node.write(out_cmd) self.node.write(out_cmd)
read_done = False read_done = False
while not read_done: while not read_done:
ret = await self.node.readuntil(CMD_TRAILER) ret = await self.node.readuntil(CMD_TRAILER, read_timeout)
data.extend(ret) data.extend(ret)
while len(data) > 7: while len(data) > 7:
if data[:2] != CMD_HEADER: if data[:2] != CMD_HEADER:
@ -424,7 +425,14 @@ class CanFlasher:
self.fw_sha.update(buf) self.fw_sha.update(buf)
prefix = struct.pack("<I", flash_address) prefix = struct.pack("<I", flash_address)
for _ in range(3): for _ in range(3):
resp = await self.send_command('SEND_BLOCK', prefix + buf) try:
resp = await self.send_command(
'SEND_BLOCK', prefix + buf, 3, 5.0
)
except FlashError as e:
raise FlashError(
f"Flash write failed, flash address 0x{flash_address:4X}"
) from e
recd_addr, = struct.unpack("<I", resp) recd_addr, = struct.unpack("<I", resp)
if recd_addr == flash_address: if recd_addr == flash_address:
break break