Implement CanProtocol for KvaserBus

Author: lumagi

can/interfaces/kvaser/canlib.py

@@ -6,17 +6,21 @@
 Copyright (C) 2010 Dynamic Controls
 """
 
+import ctypes
+import logging
 import sys
 import time
-import logging
-import ctypes
 
-from can import BusABC
-from ...exceptions import CanError, CanInitializationError, CanOperationError
-from can import Message
+from can import (
+    BusABC,
+    Message,
+    CanProtocol,
+    CanError,
+    CanInitializationError,
+    CanOperationError,
+)
 from can.util import time_perfcounter_correlation
-from . import constants as canstat
-from . import structures
+from . import constants as canstat, structures
 
 log = logging.getLogger("can.kvaser")
 
@@ -520,7 +524,12 @@ def __init__(self, channel, can_filters=None, **kwargs):
             self._timestamp_offset = time.time() - (timer.value * TIMESTAMP_FACTOR)
 
         self._is_filtered = False
-        super().__init__(channel=channel, can_filters=can_filters, **kwargs)
+        super().__init__(
+            channel=channel,
+            can_filters=can_filters,
+            protocol=CanProtocol.CAN_FD if fd else CanProtocol.CAN_20,
+            **kwargs,
+        )
 
     def _apply_filters(self, filters):
         if filters and len(filters) == 1:

test/test_kvaser.py

@@ -46,6 +46,7 @@ def tearDown(self):
 
     def test_bus_creation(self):
         self.assertIsInstance(self.bus, canlib.KvaserBus)
+        self.assertEqual(self.bus.protocol, can.CanProtocol.CAN_20)
         self.assertTrue(canlib.canOpenChannel.called)
         self.assertTrue(canlib.canBusOn.called)
 
@@ -149,7 +150,8 @@ def test_available_configs(self):
     def test_canfd_default_data_bitrate(self):
         canlib.canSetBusParams.reset_mock()
         canlib.canSetBusParamsFd.reset_mock()
-        can.Bus(channel=0, interface="kvaser", fd=True)
+        bus = can.Bus(channel=0, interface="kvaser", fd=True)
+        self.assertEqual(bus.protocol, can.CanProtocol.CAN_FD)
         canlib.canSetBusParams.assert_called_once_with(
             0, constants.canFD_BITRATE_500K_80P, 0, 0, 0, 0, 0
         )
@@ -161,7 +163,8 @@ def test_canfd_nondefault_data_bitrate(self):
         canlib.canSetBusParams.reset_mock()
         canlib.canSetBusParamsFd.reset_mock()
         data_bitrate = 2000000
-        can.Bus(channel=0, interface="kvaser", fd=True, data_bitrate=data_bitrate)
+        bus = can.Bus(channel=0, interface="kvaser", fd=True, data_bitrate=data_bitrate)
+        self.assertEqual(bus.protocol, can.CanProtocol.CAN_FD)
         bitrate_constant = canlib.BITRATE_FD[data_bitrate]
         canlib.canSetBusParams.assert_called_once_with(
             0, constants.canFD_BITRATE_500K_80P, 0, 0, 0, 0, 0