Skip to content

Commit cdbfa13

Browse files
committed
Implement CanProtocol for CantactBus
1 parent 76465e4 commit cdbfa13

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

can/interfaces/cantact.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
Interface for CANtact devices from Linklayer Labs
33
"""
44

5-
import time
65
import logging
6+
import time
77
from typing import Optional, Union, Any
88
from unittest.mock import Mock
99

10-
from can import BusABC, Message, BitTiming, BitTimingFd
10+
from can import BusABC, Message, BitTiming, BitTimingFd, CanProtocol
1111
from ..exceptions import (
1212
CanInitializationError,
1313
CanInterfaceNotImplementedError,
@@ -113,7 +113,11 @@ def __init__(
113113
self.interface.start()
114114

115115
super().__init__(
116-
channel=channel, bitrate=bitrate, poll_interval=poll_interval, **kwargs
116+
channel=channel,
117+
bitrate=bitrate,
118+
poll_interval=poll_interval,
119+
protocol=CanProtocol.CAN_20,
120+
**kwargs,
117121
)
118122

119123
def _recv_internal(self, timeout):

test/test_cantact.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ class CantactTest(unittest.TestCase):
1414
def test_bus_creation(self):
1515
bus = can.Bus(channel=0, interface="cantact", _testing=True)
1616
self.assertIsInstance(bus, cantact.CantactBus)
17+
self.assertEqual(bus.protocol, can.CanProtocol.CAN_20)
18+
1719
cantact.MockInterface.set_bitrate.assert_called()
1820
cantact.MockInterface.set_bit_timing.assert_not_called()
1921
cantact.MockInterface.set_enabled.assert_called()
@@ -25,7 +27,10 @@ def test_bus_creation_bittiming(self):
2527

2628
bt = can.BitTiming(f_clock=24_000_000, brp=3, tseg1=13, tseg2=2, sjw=1)
2729
bus = can.Bus(channel=0, interface="cantact", timing=bt, _testing=True)
30+
2831
self.assertIsInstance(bus, cantact.CantactBus)
32+
self.assertEqual(bus.protocol, can.CanProtocol.CAN_20)
33+
2934
cantact.MockInterface.set_bitrate.assert_not_called()
3035
cantact.MockInterface.set_bit_timing.assert_called()
3136
cantact.MockInterface.set_enabled.assert_called()

0 commit comments

Comments
 (0)