Merge pull request #972 from jluebbe/openocd-st-link-3

OpenOCD fix and device support

Author: jluebbe

labgrid/driver/openocddriver.py

@@ -63,15 +63,8 @@ def __attrs_post_init__(self):
                 self.search = [self.search]
 
     def _get_usb_path_cmd(self):
-        # OpenOCD supports "adapter usb location" since a1b308ab, if the command is not known
-        # notice user and continue
-        message = ("Your OpenOCD version does not support specifying USB paths.\n"
-                   "Consider updating to OpenOCD v0.11 when using multiple USB Blasters.")
-        return [
-            "--command",
-            "'if {{ [catch {{adapter usb location \"{usbpath}\"}}] }} {{ puts stderr \"{msg}\" }}'"
-            .format(usbpath=self.interface.path, msg=message)
-        ]
+        # OpenOCD supports "adapter usb location" since a1b308ab, released with 0.11.0-rc1
+        return ["--command", f"'adapter usb location \"{self.interface.path}\"'"]
 
     def _run_commands(self, commands: list):
         cmd = self.interface.command_prefix+[self.tool]

labgrid/resource/udev.py

@@ -677,7 +677,8 @@ class USBDebugger(USBResource):
     def filter_match(self, device):
         match = (device.properties.get('ID_VENDOR_ID'), device.properties.get('ID_MODEL_ID'))
 
-        if match not in [("0403", "6010"),
+        if match not in [("0403", "6010"),  # FT2232C/D/H Dual UART/FIFO IC
+                         ("0483", "374f"),  # STLINK-V3
                          ]:
             return False