Implement CanProtocol for IXXATBus

Author: lumagi

can/interfaces/ixxat/canlib.py

@@ -132,6 +132,8 @@ def __init__(
                 **kwargs
             )
 
+        super().__init__(channel=channel, protocol=self.bus.protocol)
+
     def flush_tx_buffer(self):
         """Flushes the transmit buffer on the IXXAT"""
         return self.bus.flush_tx_buffer()

can/interfaces/ixxat/canlib_vcinpl.py

@@ -15,16 +15,18 @@
 import sys
 from typing import Optional, Callable, Tuple
 
-from can import BusABC, Message
-from can.bus import BusState
-from can.exceptions import CanInterfaceNotImplementedError, CanInitializationError
-from can.broadcastmanager import (
+from can import (
+    BusABC,
+    Message,
+    BusState,
+    CanProtocol,
+    CanInterfaceNotImplementedError,
+    CanInitializationError,
     LimitedDurationCyclicSendTaskABC,
     RestartableCyclicTaskABC,
 )
 from can.ctypesutil import CLibrary, HANDLE, PHANDLE, HRESULT as ctypes_HRESULT
 from can.util import deprecated_args_alias
-
 from . import constants, structures
 from .exceptions import *
 
@@ -631,7 +633,9 @@ def __init__(
             except (VCITimeout, VCIRxQueueEmptyError):
                 break
 
-        super().__init__(channel=channel, can_filters=None, **kwargs)
+        super().__init__(
+            channel=channel, can_filters=None, protocol=CanProtocol.CAN_20, **kwargs
+        )
 
     def _inWaiting(self):
         try:

can/interfaces/ixxat/canlib_vcinpl2.py

@@ -15,17 +15,17 @@
 import sys
 from typing import Optional, Callable, Tuple
 
-from can import BusABC, Message
-from can.exceptions import CanInterfaceNotImplementedError, CanInitializationError
-from can.broadcastmanager import (
+from can import (
+    BusABC,
+    Message,
+    CanProtocol,
+    CanInterfaceNotImplementedError,
+    CanInitializationError,
     LimitedDurationCyclicSendTaskABC,
     RestartableCyclicTaskABC,
 )
 from can.ctypesutil import CLibrary, HANDLE, PHANDLE, HRESULT as ctypes_HRESULT
-
-import can.util
-from can.util import deprecated_args_alias
-
+from can.util import deprecated_args_alias, dlc2len, len2dlc
 from . import constants, structures
 from .exceptions import *
 
@@ -742,7 +742,9 @@ def __init__(
             except (VCITimeout, VCIRxQueueEmptyError):
                 break
 
-        super().__init__(channel=channel, can_filters=None, **kwargs)
+        super().__init__(
+            channel=channel, can_filters=None, protocol=CanProtocol.CAN_FD, **kwargs
+        )
 
     @staticmethod
     def _canptb_build(defaults, bitrate, tseg1, tseg2, sjw, ssp):
@@ -865,7 +867,7 @@ def _recv_internal(self, timeout):
             # Timed out / can message type is not DATA
             return None, True
 
-        data_len = can.util.dlc2len(self._message.uMsgInfo.Bits.dlc)
+        data_len = dlc2len(self._message.uMsgInfo.Bits.dlc)
         # The _message.dwTime is a 32bit tick value and will overrun,
         # so expect to see the value restarting from 0
         rx_msg = Message(
@@ -915,7 +917,7 @@ def send(self, msg: Message, timeout: Optional[float] = None) -> None:
         message.uMsgInfo.Bits.edl = 1 if msg.is_fd else 0
         message.dwMsgId = msg.arbitration_id
         if msg.dlc:  # this dlc means number of bytes of payload
-            message.uMsgInfo.Bits.dlc = can.util.len2dlc(msg.dlc)
+            message.uMsgInfo.Bits.dlc = len2dlc(msg.dlc)
             data_len_dif = msg.dlc - len(msg.data)
             data = msg.data + bytearray(
                 [0] * data_len_dif