From 934a753671d243729e92c9a045bb344e0dab6ee8 Mon Sep 17 00:00:00 2001 From: nick black Date: Sat, 8 Jun 2019 11:32:42 -0400 Subject: [PATCH 1/5] [canalystii] get CANalystII working through init --- can/interfaces/canalystii.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/can/interfaces/canalystii.py b/can/interfaces/canalystii.py index 10de8b170..a28e182d2 100644 --- a/can/interfaces/canalystii.py +++ b/can/interfaces/canalystii.py @@ -73,18 +73,18 @@ 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 (bytes/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 +100,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") From f0017ca7b7f8cb29ece23ac2518f4ce2de9ef8c0 Mon Sep 17 00:00:00 2001 From: nick black Date: Sat, 8 Jun 2019 11:54:47 -0400 Subject: [PATCH 2/5] Add canalystii+systec to configuration doc --- doc/configuration.rst | 4 ++++ 1 file changed, 4 insertions(+) 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` | ++---------------------+-------------------------------------+ From c3b18b19e9b07b10853ada7b76d582ae47795ec2 Mon Sep 17 00:00:00 2001 From: nick black Date: Sat, 8 Jun 2019 11:55:21 -0400 Subject: [PATCH 3/5] Add myself to CONTRIBUTORS --- CONTRIBUTORS.txt | 1 + 1 file changed, 1 insertion(+) 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 From 07d8fc2c8d62803af7ea9930c795a4552edb7527 Mon Sep 17 00:00:00 2001 From: nick black Date: Sat, 8 Jun 2019 12:02:40 -0400 Subject: [PATCH 4/5] [black] normalize indentation --- can/interfaces/canalystii.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/can/interfaces/canalystii.py b/can/interfaces/canalystii.py index a28e182d2..cc68ff240 100644 --- a/can/interfaces/canalystii.py +++ b/can/interfaces/canalystii.py @@ -73,7 +73,14 @@ class VCI_CAN_OBJ(Structure): class CANalystIIBus(BusABC): def __init__( - self, channel, device=0, bitrate=None, Timing0=None, Timing1=None, can_filters=None, **kwargs, + self, + channel, + device=0, + bitrate=None, + Timing0=None, + Timing1=None, + can_filters=None, + **kwargs, ): """ From afc6eaf5dd75c97bbb81d20c8902a21edfe264bd Mon Sep 17 00:00:00 2001 From: nick black Date: Tue, 11 Jun 2019 11:11:46 -0400 Subject: [PATCH 5/5] [canalystii] fix param description bytes->bits --- can/interfaces/canalystii.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/can/interfaces/canalystii.py b/can/interfaces/canalystii.py index cc68ff240..1134ffe51 100644 --- a/can/interfaces/canalystii.py +++ b/can/interfaces/canalystii.py @@ -86,7 +86,7 @@ def __init__( :param channel: channel number :param device: device number - :param bitrate: CAN network bandwidth (bytes/s) + :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