Merge branch 'develop' into vector_channel_config

hardbyte · web-flow · commit 2d9e830a6547 · 2020-11-02T08:57:36.000+13:00
diff --git a/can/interfaces/ixxat/canlib.py b/can/interfaces/ixxat/canlib.py
@@ -29,6 +29,7 @@
 __all__ = [
     "VCITimeout",
     "VCIError",
+    "VCIBusOffError",
     "VCIDeviceNotFoundError",
     "IXXATBus",
     "vciFormatError",
@@ -354,6 +355,15 @@ def __check_status(result, function, arguments):
     constants.CAN_ERROR_CRC: "CAN CRC error",
     constants.CAN_ERROR_OTHER: "Other (unknown) CAN error",
 }
+
+CAN_STATUS_FLAGS = {
+    constants.CAN_STATUS_TXPEND: "transmission pending",
+    constants.CAN_STATUS_OVRRUN: "data overrun occurred",
+    constants.CAN_STATUS_ERRLIM: "error warning limit exceeded",
+    constants.CAN_STATUS_BUSOFF: "bus off",
+    constants.CAN_STATUS_ININIT: "init mode active",
+    constants.CAN_STATUS_BUSCERR: "bus coupling error",
+}
 # ----------------------------------------------------------------------------
 
 
@@ -378,6 +388,10 @@ class IXXATBus(BusABC):
             125000: constants.CAN_BT0_125KB,
             250000: constants.CAN_BT0_250KB,
             500000: constants.CAN_BT0_500KB,
+            666000: constants.CAN_BT0_667KB,
+            666666: constants.CAN_BT0_667KB,
+            666667: constants.CAN_BT0_667KB,
+            667000: constants.CAN_BT0_667KB,
             800000: constants.CAN_BT0_800KB,
             1000000: constants.CAN_BT0_1000KB,
         },
@@ -389,6 +403,10 @@ class IXXATBus(BusABC):
             125000: constants.CAN_BT1_125KB,
             250000: constants.CAN_BT1_250KB,
             500000: constants.CAN_BT1_500KB,
+            666000: constants.CAN_BT1_667KB,
+            666666: constants.CAN_BT1_667KB,
+            666667: constants.CAN_BT1_667KB,
+            667000: constants.CAN_BT1_667KB,
             800000: constants.CAN_BT1_800KB,
             1000000: constants.CAN_BT1_1000KB,
         },
@@ -636,6 +654,13 @@ def _recv_internal(self, timeout):
                             )
                         )
 
+                    elif (
+                        self._message.uMsgInfo.Bits.type == constants.CAN_MSGTYPE_STATUS
+                    ):
+                        log.info(_format_can_status(self._message.abData[0]))
+                        if self._message.abData[0] & constants.CAN_STATUS_BUSOFF:
+                            raise VCIBusOffError()
+
                     elif (
                         self._message.uMsgInfo.Bits.type
                         == constants.CAN_MSGTYPE_TIMEOVR
@@ -753,3 +778,25 @@ def stop(self):
         # the list with permanently stopped messages
         _canlib.canSchedulerRemMessage(self._scheduler, self._index)
         self._index = None
+
+
+def _format_can_status(status_flags: int):
+    """
+    Format a status bitfield found in CAN_MSGTYPE_STATUS messages or in dwStatus
+    field in CANLINESTATUS.
+
+    Valid states are defined in the CAN_STATUS_* constants in cantype.h
+    """
+    states = []
+    for flag, description in CAN_STATUS_FLAGS.items():
+        if status_flags & flag:
+            states.append(description)
+            status_flags &= ~flag
+
+    if status_flags:
+        states.append("unknown state 0x{:02x}".format(status_flags))
+
+    if states:
+        return "CAN status message: {}".format(", ".join(states))
+    else:
+        return "Empty CAN status message"
diff --git a/can/interfaces/ixxat/constants.py b/can/interfaces/ixxat/constants.py
@@ -26,6 +26,8 @@
 CAN_BT1_250KB = 0x1C
 CAN_BT0_500KB = 0x00
 CAN_BT1_500KB = 0x1C
+CAN_BT0_667KB = 0x00
+CAN_BT1_667KB = 0x18
 CAN_BT0_800KB = 0x00
 CAN_BT1_800KB = 0x16
 CAN_BT0_1000KB = 0x00
diff --git a/can/interfaces/ixxat/exceptions.py b/can/interfaces/ixxat/exceptions.py
@@ -6,7 +6,13 @@
 
 from can import CanError
 
-__all__ = ["VCITimeout", "VCIError", "VCIRxQueueEmptyError", "VCIDeviceNotFoundError"]
+__all__ = [
+    "VCITimeout",
+    "VCIError",
+    "VCIRxQueueEmptyError",
+    "VCIBusOffError",
+    "VCIDeviceNotFoundError",
+]
 
 
 class VCITimeout(CanError):
@@ -24,5 +30,10 @@ def __init__(self):
         super().__init__("Receive queue is empty")
 
 
+class VCIBusOffError(VCIError):
+    def __init__(self):
+        super().__init__("Controller is in BUSOFF state")
+
+
 class VCIDeviceNotFoundError(CanError):
     pass
diff --git a/can/interfaces/seeedstudio/seeedstudio.py b/can/interfaces/seeedstudio/seeedstudio.py
@@ -8,6 +8,7 @@
 
 import logging
 import struct
+import io
 from time import time
 from can import BusABC, Message
 
@@ -262,7 +263,7 @@ def _recv_internal(self, timeout):
         return None, None
 
     def fileno(self):
-        if hasattr(self.ser, "fileno"):
+        try:
             return self.ser.fileno()
-        # Return an invalid file descriptor on Windows
-        return -1
+        except io.UnsupportedOperation:
+            raise NotImplementedError("fileno is not implemented using current CAN bus")
diff --git a/can/notifier.py b/can/notifier.py
@@ -158,7 +158,7 @@ def add_listener(self, listener: Listener):
 
     def remove_listener(self, listener: Listener):
         """Remove a listener from the notification list. This method
-        trows an exception if the given listener is not part of the
+        throws an exception if the given listener is not part of the
         stored listeners.
 
         :param listener: Listener to be removed from the list to be notified
