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: support busy acknowledgements

Browse Source 
Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2024-09-17 06:22:53 -04:00
parent 318d13a812
commit a8de2feab7
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/flashtool.py
View File

@ -62,6 +62,8 @@ BOOTLOADER_CMDS = {
ACK_SUCCESS = 0xa0 ACK_SUCCESS = 0xa0
NACK = 0xf1 NACK = 0xf1
ACK_ERROR = 0xf2
ACK_BUSY = 0xf3
# Klipper Admin Defs (for jumping to bootloader) # Klipper Admin Defs (for jumping to bootloader)
KLIPPER_ADMIN_ID = 0x3f0 KLIPPER_ADMIN_ID = 0x3f0
@ -192,6 +194,11 @@ class CanFlasher:
f"Command '{cmdname}': Frame CRC Mismatch, expected: " f"Command '{cmdname}': Frame CRC Mismatch, expected: "
f"{calc_crc}, received {recd_crc}" f"{calc_crc}, received {recd_crc}"
) )
elif recd_ack == ACK_ERROR:
logging.info(f"Command '{cmdname}': Received Error Response")
elif recd_ack == ACK_BUSY:
logging.info(f"Command '{cmdname}': Received busy signal")
await asyncio.sleep(1.5)
elif recd_ack != ACK_SUCCESS: elif recd_ack != ACK_SUCCESS:
logging.info(f"Command '{cmdname}': Received NACK") logging.info(f"Command '{cmdname}': Received NACK")
elif cmd_response != cmd: elif cmd_response != cmd:
@ -212,7 +219,7 @@ class CanFlasher:
pass pass
else: else:
logging.info(f"Read Buffer Contents: {ret!r}") logging.info(f"Read Buffer Contents: {ret!r}")
await asyncio.sleep(.1) await asyncio.sleep(.5)
raise FlashError("Error sending command [%s] to Device" % (cmdname)) raise FlashError("Error sending command [%s] to Device" % (cmdname))
async def send_file(self): async def send_file(self):
@ -302,17 +309,17 @@ class CanNode:
self._cansocket = cansocket self._cansocket = cansocket
async def read( async def read(
self, n: int = -1, timeout: Optional[float] = 5. self, n: int = -1, timeout: Optional[float] = 2.
) -> bytes: ) -> bytes:
return await asyncio.wait_for(self._reader.read(n), timeout) return await asyncio.wait_for(self._reader.read(n), timeout)
async def readexactly( async def readexactly(
self, n: int, timeout: Optional[float] = 5. self, n: int, timeout: Optional[float] = 2.
) -> bytes: ) -> bytes:
return await asyncio.wait_for(self._reader.readexactly(n), timeout) return await asyncio.wait_for(self._reader.readexactly(n), timeout)
async def readuntil( async def readuntil(
self, sep: bytes = b"\x03", timeout: Optional[float] = 5. self, sep: bytes = b"\x03", timeout: Optional[float] = 2.
) -> bytes: ) -> bytes:
return await asyncio.wait_for(self._reader.readuntil(sep), timeout) return await asyncio.wait_for(self._reader.readuntil(sep), timeout)