Implement CANProtocol for the CANalystIIBus

Author: lumagi

can/interfaces/canalystii.py

@@ -1,16 +1,16 @@
 import collections
-from ctypes import c_ubyte
 import logging
 import time
+from ctypes import c_ubyte
 from typing import Any, Dict, Optional, Deque, Sequence, Tuple, Union
 
-from can import BitTiming, BusABC, Message, BitTimingFd
-from can.exceptions import CanTimeoutError, CanInitializationError
+import canalystii as driver
+
+from can import BitTiming, BusABC, Message, BitTimingFd, CANProtocol
+from can.exceptions import CanTimeoutError
 from can.typechecking import CanFilters
 from can.util import deprecated_args_alias, check_or_adjust_timing_clock
 
-import canalystii as driver
-
 logger = logging.getLogger(__name__)
 
 
@@ -50,7 +50,12 @@ def __init__(
             If set, software received message queue can only grow to this many
             messages (for all channels) before older messages are dropped
         """
-        super().__init__(channel=channel, can_filters=can_filters, **kwargs)
+        super().__init__(
+            channel=channel,
+            can_filters=can_filters,
+            protocol=CANProtocol.CAN_20,
+            **kwargs,
+        )
 
         if not (bitrate or timing):
             raise ValueError("Either bitrate or timing argument is required")

test/test_interface_canalystii.py

@@ -3,12 +3,12 @@
 """
 """
 
-import time
 import unittest
-from unittest.mock import Mock, patch, call
 from ctypes import c_ubyte
+from unittest.mock import patch, call
 
 import canalystii as driver  # low-level driver module, mock out this layer
+
 import can
 from can.interfaces.canalystii import CANalystIIBus
 
@@ -22,6 +22,9 @@ def test_initialize_from_constructor(self):
         with create_mock_device() as mock_device:
             instance = mock_device.return_value
             bus = CANalystIIBus(bitrate=1000000)
+
+            self.assertEqual(bus.protocol, can.CANProtocol.CAN_20)
+
             instance.init.assert_has_calls(
                 [
                     call(0, bitrate=1000000),
@@ -34,6 +37,8 @@ def test_initialize_single_channel_only(self):
             with create_mock_device() as mock_device:
                 instance = mock_device.return_value
                 bus = CANalystIIBus(channel, bitrate=1000000)
+
+                self.assertEqual(bus.protocol, can.CANProtocol.CAN_20)
                 instance.init.assert_called_once_with(channel, bitrate=1000000)
 
     def test_initialize_with_timing_registers(self):
@@ -43,6 +48,8 @@ def test_initialize_with_timing_registers(self):
                 f_clock=8_000_000, btr0=0x03, btr1=0x6F
             )
             bus = CANalystIIBus(bitrate=None, timing=timing)
+            self.assertEqual(bus.protocol, can.CANProtocol.CAN_20)
+
             instance.init.assert_has_calls(
                 [
                     call(0, timing0=0x03, timing1=0x6F),