diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 9a37da3b5..b7ac9fbd4 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -27,3 +27,4 @@ Alexander Mueller Jan Goeteyn "ykzheng" Lear Corporation +Nick Black diff --git a/can/interfaces/canalystii.py b/can/interfaces/canalystii.py index 10de8b170..1134ffe51 100644 --- a/can/interfaces/canalystii.py +++ b/can/interfaces/canalystii.py @@ -73,18 +73,25 @@ class VCI_CAN_OBJ(Structure): class CANalystIIBus(BusABC): def __init__( - self, channel, device=0, baud=None, Timing0=None, Timing1=None, can_filters=None + self, + channel, + device=0, + bitrate=None, + Timing0=None, + Timing1=None, + can_filters=None, + **kwargs, ): """ :param channel: channel number :param device: device number - :param baud: baud rate - :param Timing0: customize the timing register if baudrate is not specified + :param bitrate: CAN network bandwidth (bits/s) + :param Timing0: customize the timing register if bitrate is not specified :param Timing1: :param can_filters: filters for packet """ - super().__init__(channel, can_filters) + super().__init__(channel=channel, can_filters=can_filters, **kwargs) if isinstance(channel, (list, tuple)): self.channels = channel @@ -100,11 +107,11 @@ def __init__( self.device, self.channels ) - if baud is not None: + if bitrate is not None: try: - Timing0, Timing1 = TIMING_DICT[baud] + Timing0, Timing1 = TIMING_DICT[bitrate] except KeyError: - raise ValueError("Baudrate is not supported") + raise ValueError("Bitrate is not supported") if Timing0 is None or Timing1 is None: raise ValueError("Timing registers are not set") diff --git a/doc/configuration.rst b/doc/configuration.rst index dda2ace2a..142e816da 100644 --- a/doc/configuration.rst +++ b/doc/configuration.rst @@ -126,3 +126,7 @@ Lookup table of interface names: +---------------------+-------------------------------------+ | ``"virtual"`` | :doc:`interfaces/virtual` | +---------------------+-------------------------------------+ +| ``"canalystii"`` | :doc:`interfaces/canalystii` | ++---------------------+-------------------------------------+ +| ``"systec"`` | :doc:`interfaces/systec` | ++---------------------+-------------------------------------+