Merge pull request #415 from pierreluctg/neovi-multi-channels

felixdivo · web-flow · commit 24c50dfb104a · 2018-09-23T13:16:48.000+02:00
Adding multiple channels support to neoVI
diff --git a/can/interfaces/ics_neovi/neovi_bus.py b/can/interfaces/ics_neovi/neovi_bus.py
@@ -69,12 +69,14 @@ class NeoViBus(BusABC):
 
     def __init__(self, channel, can_filters=None, **config):
         """
-
-        :param int channel:
-            The Channel id or name to create this bus with.
+        :param channel:
+            The channel ids to create this bus with.
+            Can also be a single integer, netid name or a comma separated
+            string.
+        :type channel: int or str or list(int) or list(str)
         :param list can_filters:
             See :meth:`can.BusABC.set_filters` for details.
-        :param use_system_timestamp:
+        :param bool use_system_timestamp:
             Use system timestamp for can messages instead of the hardware time
             stamp
         :param str serial:
@@ -98,18 +100,14 @@ def __init__(self, channel, can_filters=None, **config):
         logger.info("CAN Filters: {}".format(can_filters))
         logger.info("Got configuration of: {}".format(config))
 
-        self._use_system_timestamp = bool(
-            config.get('use_system_timestamp', False)
-        )
-        try:
-            channel = int(channel)
-        except ValueError:
-            channel = getattr(ics, "NETID_{}".format(channel.upper()), -1)
-            if channel == -1:
-                raise ValueError(
-                    'channel must be an integer or '
-                    'a valid ICS channel name'
-                )
+        if isinstance(channel, (list, tuple)):
+            self.channels = channel
+        elif isinstance(channel, int):
+            self.channels = [channel]
+        else:
+            # Assume comma separated string of channels
+            self.channels = [ch.strip() for ch in channel.split(',')]
+        self.channels = [NeoViBus.channel_to_netid(ch) for ch in self.channels]
 
         type_filter = config.get('type_filter')
         serial = config.get('serial')
@@ -125,15 +123,33 @@ def __init__(self, channel, can_filters=None, **config):
                 ics.set_fd_bit_rate(
                     self.dev, config.get('data_bitrate'), channel)
 
+        self._use_system_timestamp = bool(
+            config.get('use_system_timestamp', False)
+        )
+
         self.channel_info = '%s %s CH:%s' % (
             self.dev.Name,
             self.get_serial_number(self.dev),
-            channel
+            self.channels
         )
         logger.info("Using device: {}".format(self.channel_info))
 
         self.rx_buffer = deque()
-        self.network = channel if channel is not None else None
+
+    @staticmethod
+    def channel_to_netid(channel_name_or_id):
+        try:
+            channel = int(channel_name_or_id)
+        except ValueError:
+            netid = "NETID_{}".format(channel_name_or_id.upper())
+            if hasattr(ics, netid):
+                channel = getattr(ics, netid)
+            else:
+                raise ValueError(
+                    'channel must be an integer or '
+                    'a valid ICS channel name'
+                )
+        return channel
 
     @staticmethod
     def get_serial_number(device):
@@ -203,7 +219,7 @@ def _process_msg_queue(self, timeout=0.1):
         except ics.RuntimeError:
             return
         for ics_msg in messages:
-            if ics_msg.NetworkID != self.network:
+            if ics_msg.NetworkID not in self.channels:
                 continue
             self.rx_buffer.append(ics_msg)
         if errors:
@@ -314,7 +330,13 @@ def send(self, msg, timeout=None):
         message.StatusBitField = flag0
         message.StatusBitField2 = 0
         message.StatusBitField3 = flag3
-        message.NetworkID = self.network
+        if msg.channel is not None:
+            message.NetworkID = msg.channel
+        elif len(self.channels) == 1:
+            message.NetworkID = self.channels[0]
+        else:
+            raise ValueError(
+                "msg.channel must be set when using multiple channels.")
 
         try:
             ics.transmit_messages(self.dev, message)
