etas interface: timestamps relative to epoch

Felix Nieuwenhuizen · Felix Nieuwenhuizen · commit 23046fa93959 · 2021-11-11T18:35:13.000+01:00
diff --git a/can/interfaces/etas/__init__.py b/can/interfaces/etas/__init__.py
@@ -1,3 +1,4 @@
+import time
 from typing import Any, List, Optional, Tuple
 
 import can
@@ -122,9 +123,23 @@ def __init__(
         # Common
 
         timerCapabilities = OCI_TimerCapabilities()
-        OCI_GetTimerCapabilities(self.ctrl, ctypes.byref(timerCapabilities))
+        ec = OCI_GetTimerCapabilities(self.ctrl, ctypes.byref(timerCapabilities))
+        if ec != 0x0:
+            raise can.exceptions.CanInitializationError(
+                f"OCI_GetTimerCapabilities failed with error 0x{ec:X}"
+            )
         self.tickFrequency = timerCapabilities.tickFrequency  # clock ticks per second
 
+        # all timestamps are hardware timestamps relative to powerup
+        # calculate an offset to make them relative to epoch
+        now = OCI_Time()
+        ec = OCI_GetTimerValue(self.ctrl, ctypes.byref(now))
+        if ec != 0x0:
+            raise can.exceptions.CanInitializationError(
+                f"OCI_GetTimerValue failed with error 0x{ec:X}"
+            )
+        self.timeOffset = time.time() - (float(now.value) / self.tickFrequency)
+
         self.channel_info = channel
 
     def _recv_internal(
@@ -163,7 +178,8 @@ def _recv_internal(
             if m.type == OCI_CANFDRX_MESSAGE.value:
                 msg = can.Message(
                     timestamp=float(m.data.canFDRxMessage.timeStamp)
-                    / self.tickFrequency,
+                    / self.tickFrequency
+                    + self.timeOffset,
                     arbitration_id=m.data.canFDRxMessage.frameID,
                     is_extended_id=bool(
                         m.data.canFDRxMessage.flags & OCI_CAN_MSG_FLAG_EXTENDED
@@ -187,7 +203,8 @@ def _recv_internal(
                 )
             elif m.type == OCI_CAN_RX_MESSAGE.value:
                 msg = can.Message(
-                    timestamp=float(m.data.rxMessage.timeStamp) / self.tickFrequency,
+                    timestamp=float(m.data.rxMessage.timeStamp) / self.tickFrequency
+                    + self.timeOffset,
                     arbitration_id=m.data.rxMessage.frameID,
                     is_extended_id=bool(
                         m.data.rxMessage.flags & OCI_CAN_MSG_FLAG_EXTENDED
diff --git a/can/interfaces/etas/boa.py b/can/interfaces/etas/boa.py
@@ -231,6 +231,13 @@ class OCI_TimerEventMessage(ctypes.Structure):
 ]
 OCI_GetTimerCapabilities.restype = OCI_ErrorCode
 
+OCI_GetTimerValue = _oci.OCI_GetTimerValue
+OCI_GetTimerValue.argtypes = [
+    OCI_ControllerHandle,
+    ctypes.POINTER(OCI_Time),
+]
+OCI_GetTimerValue.restype = OCI_ErrorCode
+
 # OCI CAN
 
 # OCI CAN - CAN-FD
diff --git a/test/back2back_test.py b/test/back2back_test.py
@@ -337,6 +337,11 @@ class BasicTestEtas(Back2BackTestCase):
         INTERFACE_2 = "etas"
         CHANNEL_2 = configs[2]["channel"]
 
+    def test_unique_message_instances(self):
+        self.skipTest(
+            "creating a second instance of a channel with differing self-reception settings is not supported"
+        )
+
 
 @unittest.skipUnless(TEST_INTERFACE_SOCKETCAN, "skip testing of socketcan")
 class SocketCanBroadcastChannel(unittest.TestCase):
