flash_can: update for latest changes

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2022-04-26 08:20:24 -04:00
parent 76b1de0574
commit 76474d6efd
No known key found for this signature in database
GPG Key ID: 7027245FBBDDF59A

View File

@ -46,6 +46,7 @@ NACK = bytearray(CMD_HEADER + b"\xf0")
# Klipper Admin Defs (for jumping to bootloader) # Klipper Admin Defs (for jumping to bootloader)
KLIPPER_ADMIN_ID = 0x3f0 KLIPPER_ADMIN_ID = 0x3f0
KLIPPER_SET_NODE_CMD = 0x01
KLIPPER_REBOOT_CMD = 0x02 KLIPPER_REBOOT_CMD = 0x02
# CAN Admin Defs # CAN Admin Defs
@ -329,11 +330,11 @@ class CanSocket:
curtime = self._loop.time() curtime = self._loop.time()
if resp[0] != CANBUS_RESP_NEED_NODEID: if resp[0] != CANBUS_RESP_NEED_NODEID:
continue continue
app = "unknown" app_names = {
if resp[-1] == 1: KLIPPER_SET_NODE_CMD: "Klipper",
app = "CanBoot" CANBUS_CMD_SET_NODEID: "CanBoot"
elif resp[-1] == 0: }
app = "Klipper" app = app_names.get(resp[7], "Unknown")
data = resp[1:7] data = resp[1:7]
output_line(f"Detected UUID: {data.hex()}, Application: {app}") output_line(f"Detected UUID: {data.hex()}, Application: {app}")
uuid = sum([v << ((5 - i) * 8) for i, v in enumerate(data)]) uuid = sum([v << ((5 - i) * 8) for i, v in enumerate(data)])