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

flash_can: update for latest changes

Browse Source 
Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2022-04-25 17:13:17 -04:00
parent 6351e2b1be
commit f754ae2746
No known key found for this signature in database
GPG Key ID: 7027245FBBDDF59A
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
scripts/flash_can.py
View File

@ -49,11 +49,11 @@ KLIPPER_ADMIN_ID = 0x3f0
KLIPPER_REBOOT_CMD = 0x02 KLIPPER_REBOOT_CMD = 0x02
# CAN Admin Defs # CAN Admin Defs
CANBUS_ID_ADMIN = 0x3da CANBUS_ID_ADMIN = 0x3f0
CANBUS_ID_ADMIN_RESP = 0x3db CANBUS_ID_ADMIN_RESP = 0x3f1
CANBUS_CMD_QUERY_UNASSIGNED = 0x00 CANBUS_CMD_QUERY_UNASSIGNED = 0x00
CANBUS_CMD_SET_NODEID = 0x01 CANBUS_CMD_SET_NODEID = 0x11
CANBUS_CMD_CLEAR_NODE_ID = 0x02 CANBUS_CMD_CLEAR_NODE_ID = 0x12
CANBUS_RESP_NEED_NODEID = 0x20 CANBUS_RESP_NEED_NODEID = 0x20
CANBUS_NODE_OFFSET = 0x200 CANBUS_NODE_OFFSET = 0x200
@ -158,7 +158,9 @@ class CanFlasher:
if resp == i: if resp == i:
# command should ack with the requested block as # command should ack with the requested block as
# parameter # parameter
buf = await self.node.readexactly(self.block_size, timeout=10.) buf = await self.node.readexactly(
self.block_size, timeout=10.
)
if len(buf) == self.block_size: if len(buf) == self.block_size:
break break
tries -= 1 tries -= 1
@ -315,16 +317,21 @@ class CanSocket:
while curtime < endtime: while curtime < endtime:
diff = endtime - curtime diff = endtime - curtime
try: try:
resp = await self.admin_node.readexactly(7, diff) resp = await self.admin_node.readexactly(8, diff)
except asyncio.TimeoutError: except asyncio.TimeoutError:
break break
finally: finally:
curtime = self._loop.time() curtime = self._loop.time()
if resp[0] != CANBUS_RESP_NEED_NODEID: if resp[0] != CANBUS_RESP_NEED_NODEID:
continue continue
output_line(f"Detected UUID: {resp[1:].hex()}") app = "unknown"
if resp[-1] == 1:
app = "CanBoot"
elif resp[-1] == 0:
app = "Klipper"
output_line(f"Detected UUID: {resp[1:].hex()}, Application: {app}")
uuid = sum([v << ((5 - i) * 8) for i, v in enumerate(resp[1:7])]) uuid = sum([v << ((5 - i) * 8) for i, v in enumerate(resp[1:7])])
if uuid not in self.uuids: if uuid not in self.uuids and app == "CanBoot":
self.uuids.append(uuid) self.uuids.append(uuid)
return self.uuids return self.uuids
@ -364,7 +371,7 @@ class CanSocket:
id_list = await self._query_uuids() id_list = await self._query_uuids()
if uuid not in id_list: if uuid not in id_list:
raise FlashCanError( raise FlashCanError(
f"Unable to find node matching UUID: {uuid}" f"Unable to find node matching UUID: {uuid:06x}"
) )
node = self._set_node_id(uuid) node = self._set_node_id(uuid)
flasher = CanFlasher(node, fw_path) flasher = CanFlasher(node, fw_path)