Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions can/interfaces/slcan.py
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,11 @@ def set_bitrate(self, bitrate: int, data_bitrate: Optional[int] = None) -> None:
else:
bitrates = ", ".join(str(k) for k in self._BITRATES.keys())
raise ValueError(f"Invalid bitrate, choose one of {bitrates}.")

# If data_bitrate is None, we set it to 0 which means no data bitrate
if data_bitrate is None:
data_bitrate = 0

if data_bitrate in self._DATA_BITRATES:
dbitrate_code = self._DATA_BITRATES[data_bitrate]
else:
Expand Down
1 change: 1 addition & 0 deletions doc/changelog.d/1978.fixed.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix initialisation of an slcan bus, when setting a bitrate. When using CAN 2.0 (not FD), the default setting for `data_bitrate` was invalid, causing an exception.
8 changes: 7 additions & 1 deletion test/test_slcan.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,13 @@ class slcanTestCase(unittest.TestCase):
def setUp(self):
self.bus = cast(
can.interfaces.slcan.slcanBus,
can.Bus("loop://", interface="slcan", sleep_after_open=0, timeout=TIMEOUT),
can.Bus(
"loop://",
interface="slcan",
sleep_after_open=0,
timeout=TIMEOUT,
bitrate=500000,
),
)
self.serial = cast(SerialMock, self.bus.serialPortOrig)
self.serial.reset_input_buffer()
Expand Down
Loading