Merge pull request #128 from danielhrisca/master

restrict the USB search based on the vendor ID and product ID

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.20.0
+current_version = 0.20.1
 commit = True
 tag = False
 

pyproject.toml

@@ -32,7 +32,7 @@ dependencies = [
     "uptime>=3.0.1",
 ]
 name = "pyxcp"
-version = "0.20.0"
+version = "0.20.1"
 readme = "README.md"
 description = "Universal Calibration Protocol for Python"
 keywords = ["automotive", "ecu", "xcp", "asam", "autosar"]

pyxcp/__init__.py

@@ -24,4 +24,4 @@
 from .transport import Usb
 
 # if you update this manually, do not forget to update .bumpversion.cfg
-__version__ = "0.20.0"
+__version__ = "0.20.1"

pyxcp/transport/usb_transport.py

@@ -26,6 +26,8 @@ class Usb(BaseTransport):
         "interface_number": (int, True, 2),
         "command_endpoint_number": (int, True, 0),
         "reply_endpoint_number": (int, True, 1),
+        "vendor_id": (int, False, 0),
+        "product_id": (int, False, 0),
     }
     HEADER = struct.Struct("<2H")
     HEADER_SIZE = HEADER.size
@@ -34,6 +36,8 @@ def __init__(self, config=None):
         super(Usb, self).__init__(config)
         self.loadConfig(config)
         self.serial_number = self.config.get("serial_number").strip()
+        self.vendor_id = self.config.get("vendor_id")
+        self.product_id = self.config.get("product_id")
         self.configuration_number = self.config.get("configuration_number")
         self.interface_number = self.config.get("interface_number")
         self.command_endpoint_number = self.config.get("command_endpoint_number")
@@ -50,16 +54,22 @@ def __init__(self, config=None):
         self._packets = deque()
 
     def connect(self):
-        for device in usb.core.find(find_all=True):
+        if self.vendor_id and self.product_id:
+            kwargs = {
+                "find_all": True,
+                "idVendor": self.vendor_id,
+                "idProduct": self.product_id,
+            }
+        else:
+            kwargs = {
+                "find_all": True,
+            }
+
+        for device in usb.core.find(**kwargs):
             try:
                 if device.serial_number.strip().strip("\0").lower() == self.serial_number.lower():
                     self.device = device
                     break
-                else:
-                    print(
-                        device.serial_number.strip().strip("\0").lower(),
-                        self.serial_number.lower(),
-                    )
             except BaseException:
                 continue
         else: