Merge branch 'develop' into bit-timing-class

felixdivo · web-flow · commit 8e98b74c8f19 · 2019-06-13T10:55:30.000+02:00
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
@@ -27,3 +27,4 @@ Alexander Mueller<XelaRellum@web.de>
 Jan Goeteyn
 "ykzheng" <wishdo@gmail.com>
 Lear Corporation
+Nick Black <dank@qemfd.net>
diff --git 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/can/interfaces/ics_neovi/neovi_bus.py b/can/interfaces/ics_neovi/neovi_bus.py
@@ -11,6 +11,8 @@
 """
 
 import logging
+import os
+import tempfile
 from collections import deque
 
 from can import Message, CanError, BusABC
@@ -28,6 +30,35 @@
     ics = None
 
 
+try:
+    from filelock import FileLock
+except ImportError as ie:
+
+    logger.warning(
+        "Using ICS NeoVi can backend without the "
+        "filelock module installed may cause some issues!: %s",
+        ie,
+    )
+
+    class FileLock:
+        """Dummy file lock that does not actually do anything"""
+
+        def __init__(self, lock_file, timeout=-1):
+            self._lock_file = lock_file
+            self.timeout = timeout
+
+        def __enter__(self):
+            return self
+
+        def __exit__(self, exc_type, exc_val, exc_tb):
+            return None
+
+
+# Use inter-process mutex to prevent concurrent device open.
+# When neoVI server is enabled, there is an issue with concurrent device open.
+open_lock = FileLock(os.path.join(tempfile.gettempdir(), "neovi.lock"))
+
+
 class ICSApiError(CanError):
     """
     Indicates an error with the ICS API.
@@ -122,7 +153,9 @@ def __init__(self, channel, can_filters=None, **kwargs):
         type_filter = kwargs.get("type_filter")
         serial = kwargs.get("serial")
         self.dev = self._find_device(type_filter, serial)
-        ics.open_device(self.dev)
+
+        with open_lock:
+            ics.open_device(self.dev)
 
         if "bitrate" in kwargs:
             for channel in self.channels:
diff --git 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`            |
++---------------------+-------------------------------------+
diff --git a/setup.py b/setup.py
@@ -24,7 +24,10 @@
     long_description = f.read()
 
 # Dependencies
-extras_require = {"serial": ["pyserial~=3.0"], "neovi": ["python-ics>=2.12"]}
+extras_require = {
+    "serial": ["pyserial~=3.0"],
+    "neovi": ["python-ics>=2.12", "filelock"],
+}
 
 tests_require = [
     "pytest~=4.3",
@@ -90,6 +93,7 @@
         "wrapt~=1.10",
         "aenum",
         'windows-curses;platform_system=="Windows"',
+        "filelock",
     ],
     setup_requires=["pytest-runner"],
     extras_require=extras_require,
