From 07e5ed05b02b59a29eb03b9a79d50f9439491db2 Mon Sep 17 00:00:00 2001 From: John Whittington Date: Mon, 4 Aug 2025 15:16:40 +0200 Subject: [PATCH] reader: mf4: test for 'S' type .Dir like asammdf --- can/io/mf4.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/can/io/mf4.py b/can/io/mf4.py index 68aff87ae..bf594e3a5 100644 --- a/can/io/mf4.py +++ b/can/io/mf4.py @@ -352,7 +352,10 @@ def __iter__(self) -> Generator[Message, None, None]: if "CAN_DataFrame.BusChannel" in names: kv["channel"] = int(data["CAN_DataFrame.BusChannel"][i]) if "CAN_DataFrame.Dir" in names: - kv["is_rx"] = int(data["CAN_DataFrame.Dir"][i]) == 0 + if data["CAN_DataFrame.Dir"][i].dtype.kind == "S": + kv["is_rx"] = data["CAN_DataFrame.Dir"][i] == b"Rx" + else: + kv["is_rx"] = int(data["CAN_DataFrame.Dir"][i]) == 0 if "CAN_DataFrame.IDE" in names: kv["is_extended_id"] = bool(data["CAN_DataFrame.IDE"][i]) if "CAN_DataFrame.EDL" in names: @@ -387,7 +390,10 @@ def __iter__(self) -> Generator[Message, None, None]: if "CAN_ErrorFrame.BusChannel" in names: kv["channel"] = int(data["CAN_ErrorFrame.BusChannel"][i]) if "CAN_ErrorFrame.Dir" in names: - kv["is_rx"] = int(data["CAN_ErrorFrame.Dir"][i]) == 0 + if data["CAN_ErrorFrame.Dir"][i].dtype.kind == "S": + kv["is_rx"] = data["CAN_ErrorFrame.Dir"][i] == b"Rx" + else: + kv["is_rx"] = int(data["CAN_ErrorFrame.Dir"][i]) == 0 if "CAN_ErrorFrame.ID" in names: kv["arbitration_id"] = ( int(data["CAN_ErrorFrame.ID"][i]) & 0x1FFFFFFF @@ -441,7 +447,10 @@ def __iter__(self) -> Generator[Message, None, None]: if "CAN_RemoteFrame.BusChannel" in names: kv["channel"] = int(data["CAN_RemoteFrame.BusChannel"][i]) if "CAN_RemoteFrame.Dir" in names: - kv["is_rx"] = int(data["CAN_RemoteFrame.Dir"][i]) == 0 + if data["CAN_RemoteFrame.Dir"][i].dtype.kind == "S": + kv["is_rx"] = data["CAN_RemoteFrame.Dir"][i] == b"Rx" + else: + kv["is_rx"] = int(data["CAN_RemoteFrame.Dir"][i]) == 0 if "CAN_RemoteFrame.IDE" in names: kv["is_extended_id"] = bool(data["CAN_RemoteFrame.IDE"][i])