Finds usb2can serial numbers by name

Author: melloa

can/interfaces/usb2can/serial_selector.py

@@ -40,7 +40,7 @@ def WMIDateStringToDate(dtmDate) -> str:
     return strDateTime
 
 
-def find_serial_devices(serial_matcher: str = "ED") -> List[str]:
+def find_serial_devices(serial_matcher: str = "") -> List[str]:
     """
     Finds a list of USB devices where the serial number (partially) matches the given string.
 
@@ -49,6 +49,9 @@ def find_serial_devices(serial_matcher: str = "ED") -> List[str]:
     """
     objWMIService = win32com.client.Dispatch("WbemScripting.SWbemLocator")
     objSWbemServices = objWMIService.ConnectServer(".", "root\\cimv2")
-    items = objSWbemServices.ExecQuery("SELECT * FROM Win32_USBControllerDevice")
-    ids = (item.Dependent.strip('"')[-8:] for item in items)
-    return [e for e in ids if e.startswith(serial_matcher)]
+    query = "SELECT * FROM CIM_LogicalDevice where Name LIKE '%USB2CAN%'"
+    usbs = objSWbemServices.ExecQuery(query)
+    serial_numbers = [usb.DeviceID.split("\\")[-1] for usb in usbs]
+    if serial_matcher:
+        return [sn for sn in serial_numbers if serial_matcher in sn]
+    return serial_numbers