Skip to content

Commit be21976

Browse files
andrejrcarvalhotridge
authored andcommitted
Fix TypeError in slcan.py when formatting standard (non-extended) CAN frames
1 parent 37f416f commit be21976

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

dronecan/driver/slcan.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -408,9 +408,9 @@ def __init__(self, conn, rx_queue, tx_queue, termination_condition):
408408
self._termination_condition = termination_condition
409409

410410
def _send_frame(self, frame):
411-
marker = 'D' if frame.canfd else 'T'
411+
marker = 'D' if frame.canfd else ('T' if frame.extended else 't')
412412
dlc_len = CANFrame.datalength_to_dlc(len(frame.data))
413-
line = '%s%X%s\r' % (('%c%08X' if frame.extended else 't%03X') % (marker, frame.id),
413+
line = '%c%s%X%s\r' % (marker, ('%08X' if frame.extended else '%03X') % (frame.id),
414414
dlc_len,
415415
binascii.b2a_hex(frame.data).decode('ascii'))
416416

0 commit comments

Comments
 (0)