trc reader support for RTR frames parsing

Author: denis-jullien

can/io/trc.py

@@ -153,7 +153,10 @@ def _parse_msg_v1_0(self, cols: tuple[str, ...]) -> Optional[Message]:
         msg.is_extended_id = len(arbit_id) > 4
         msg.channel = 1
         msg.dlc = int(cols[3])
-        msg.data = bytearray([int(cols[i + 4], 16) for i in range(msg.dlc)])
+        if len(cols) > 4 and cols[4] == "RTR":
+            msg.is_remote_frame = True
+        else:
+            msg.data = bytearray([int(cols[i + 4], 16) for i in range(msg.dlc)])
         return msg
 
     def _parse_msg_v1_1(self, cols: tuple[str, ...]) -> Optional[Message]:
@@ -165,7 +168,10 @@ def _parse_msg_v1_1(self, cols: tuple[str, ...]) -> Optional[Message]:
         msg.is_extended_id = len(arbit_id) > 4
         msg.channel = 1
         msg.dlc = int(cols[4])
-        msg.data = bytearray([int(cols[i + 5], 16) for i in range(msg.dlc)])
+        if len(cols) > 5 and cols[5] == "RTR":
+            msg.is_remote_frame = True
+        else:
+            msg.data = bytearray([int(cols[i + 5], 16) for i in range(msg.dlc)])
         msg.is_rx = cols[2] == "Rx"
         return msg
 
@@ -178,7 +184,10 @@ def _parse_msg_v1_3(self, cols: tuple[str, ...]) -> Optional[Message]:
         msg.is_extended_id = len(arbit_id) > 4
         msg.channel = int(cols[2])
         msg.dlc = int(cols[6])
-        msg.data = bytearray([int(cols[i + 7], 16) for i in range(msg.dlc)])
+        if len(cols) > 7 and cols[7] == "RTR":
+            msg.is_remote_frame = True
+        else:
+            msg.data = bytearray([int(cols[i + 7], 16) for i in range(msg.dlc)])
         msg.is_rx = cols[3] == "Rx"
         return msg
 
@@ -200,7 +209,8 @@ def _parse_msg_v2_x(self, cols: tuple[str, ...]) -> Optional[Message]:
         msg.is_extended_id = len(cols[self.columns["I"]]) > 4
         msg.channel = int(cols[bus]) if bus is not None else 1
         msg.dlc = dlc
-        if dlc:
+        msg.is_remote_frame = type_ in {"RR"}
+        if dlc and not msg.is_remote_frame:
             msg.data = bytearray.fromhex(cols[self.columns["D"]])
         msg.is_rx = cols[self.columns["d"]] == "Rx"
         msg.is_fd = type_ in {"FD", "FB", "FE", "BI"}
@@ -227,7 +237,7 @@ def _parse_cols_v1_3(self, cols: tuple[str, ...]) -> Optional[Message]:
 
     def _parse_cols_v2_x(self, cols: tuple[str, ...]) -> Optional[Message]:
         dtype = cols[self.columns["T"]]
-        if dtype in {"DT", "FD", "FB", "FE", "BI"}:
+        if dtype in {"DT", "FD", "FB", "FE", "BI", "RR"}:
             return self._parse_msg_v2_x(cols)
         else:
             logger.info("TRCReader: Unsupported type '%s'", dtype)

test/logformats_test.py

@@ -990,6 +990,7 @@ def test_can_message(self):
             ("V1_0", "test_CanMessage_V1_0_BUS1.trc", False),
             ("V1_1", "test_CanMessage_V1_1.trc", True),
             ("V1_3", "test_CanMessage_V1_3.trc", True),
+            ("V2_0", "test_CanMessage_V2_0_BUS1.trc", True),
             ("V2_1", "test_CanMessage_V2_1.trc", True),
         ]
     )
@@ -1029,6 +1030,20 @@ def msg_ext(timestamp):
                     msg.is_rx = False
                 return msg
 
+            def msg_rtr(timestamp):
+                msg = can.Message(
+                    timestamp=timestamp + start_time,
+                    arbitration_id=0x704,
+                    is_extended_id=False,
+                    is_remote_frame=True,
+                    channel=1,
+                    dlc=1,
+                    data=[],
+                )
+                if is_rx_support:
+                    msg.is_rx = True
+                return msg
+
             expected_messages = [
                 msg_ext(17.5354),
                 msg_ext(17.7003),
@@ -1040,6 +1055,7 @@ def msg_ext(timestamp):
                 msg_ext(20.7986),
                 msg_ext(20.9560),
                 msg_ext(21.0971),
+                msg_rtr(48.9376)
             ]
             actual = self._read_log_file(filename)
             self.assertMessagesEqual(actual, expected_messages)