CANPacker: msg type is tuple (commaai#1077)

not mutable list
adurham · Aug 7, 2024 · f4d077b · f4d077b
1 parent 1e9f853
commit f4d077b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/opendbc/can/packer_pyx.pyx b/opendbc/can/packer_pyx.pyx
@@ -50,4 +50,4 @@ cdef class CANPacker:
         pass
 
     cdef vector[uint8_t] val = self.pack(addr, values)
-    return [addr, (<char *>&val[0])[:val.size()], bus]
+    return addr, (<char *>&val[0])[:val.size()], bus
diff --git a/opendbc/can/tests/test_packer_parser.py b/opendbc/can/tests/test_packer_parser.py
@@ -107,8 +107,9 @@ def rx_steering_msg(values, bad_checksum=False):
       msg = packer.make_can_msg("STEERING_CONTROL", 0, values)
       if bad_checksum:
         # add 1 to checksum
-        msg[1] = bytearray(msg[1])
-        msg[1][4] = (msg[1][4] & 0xF0) | ((msg[1][4] & 0x0F) + 1)
+        dat = bytearray(msg[1])
+        dat[4] = (dat[4] & 0xF0) | ((dat[4] & 0x0F) + 1)
+        msg = (msg[0], bytes(dat), msg[2])
 
       parser.update_strings([0, [msg]])
 
@@ -350,6 +351,6 @@ def test_allow_undefined_msgs(self):
     #  discovery tests in openpilot first
     packer = CANPacker("toyota_nodsu_pt_generated")
 
-    assert packer.make_can_msg("ACC_CONTROL", 0, {"UNKNOWN_SIGNAL": 0}) == [835, b'\x00\x00\x00\x00\x00\x00\x00N', 0]
-    assert packer.make_can_msg("UNKNOWN_MESSAGE", 0, {"UNKNOWN_SIGNAL": 0}) == [0, b'', 0]
-    assert packer.make_can_msg(0, 0, {"UNKNOWN_SIGNAL": 0}) == [0, b'', 0]
+    assert packer.make_can_msg("ACC_CONTROL", 0, {"UNKNOWN_SIGNAL": 0}) == (835, b'\x00\x00\x00\x00\x00\x00\x00N', 0)
+    assert packer.make_can_msg("UNKNOWN_MESSAGE", 0, {"UNKNOWN_SIGNAL": 0}) == (0, b'', 0)
+    assert packer.make_can_msg(0, 0, {"UNKNOWN_SIGNAL": 0}) == (0, b'', 0)