[IO][ASC]: fix data length (#1246)

Co-authored-by: Nadhmi JAZI <[email protected]>

Author: jazi007

can/io/asc.py

@@ -13,7 +13,7 @@
 import logging
 
 from ..message import Message
-from ..util import channel2int
+from ..util import channel2int, len2dlc, dlc2len
 from .generic import FileIOMessageWriter, MessageReader
 from ..typechecking import StringPathLike
 
@@ -194,11 +194,20 @@ def _process_fd_can_frame(self, line: str, msg_kwargs: Dict[str, Any]) -> Messag
             msg_kwargs["bitrate_switch"] = brs == "1"
             msg_kwargs["error_state_indicator"] = esi == "1"
             dlc = int(dlc_str, self._converted_base)
-            msg_kwargs["dlc"] = dlc
             data_length = int(data_length_str)
-
-            # CAN remote Frame
-            msg_kwargs["is_remote_frame"] = data_length == 0
+            if data_length == 0:
+                # CAN remote Frame
+                msg_kwargs["is_remote_frame"] = True
+                msg_kwargs["dlc"] = dlc
+            else:
+                if dlc2len(dlc) != data_length:
+                    logger.warning(
+                        "DLC vs Data Length mismatch %d[%d] != %d",
+                        dlc,
+                        dlc2len(dlc),
+                        data_length,
+                    )
+                msg_kwargs["dlc"] = data_length
 
             self._process_data_string(data, data_length, msg_kwargs)
 
@@ -381,8 +390,8 @@ def on_message_received(self, msg: Message) -> None:
                 symbolic_name="",
                 brs=1 if msg.bitrate_switch else 0,
                 esi=1 if msg.error_state_indicator else 0,
-                dlc=msg.dlc,
-                data_length=len(data),
+                dlc=len2dlc(msg.dlc),
+                data_length=len(msg.data),
                 data=" ".join(data),
                 message_duration=0,
                 message_length=0,

test/logformats_test.py

@@ -520,7 +520,7 @@ def test_can_fd_message_64(self):
                 arbitration_id=0x4EE,
                 is_extended_id=False,
                 channel=3,
-                dlc=0xF,
+                dlc=64,
                 data=[0xA1, 2, 3, 4] + 59 * [0] + [0x64],
                 is_fd=True,
                 error_state_indicator=True,
@@ -529,7 +529,7 @@ def test_can_fd_message_64(self):
                 timestamp=31.506898,
                 arbitration_id=0x1C4D80A7,
                 channel=3,
-                dlc=0xF,
+                dlc=64,
                 data=[0xB1, 2, 3, 4] + 59 * [0] + [0x64],
                 is_fd=True,
                 bitrate_switch=True,