Add USB support

pybricksdev/ble/pybricks.py

@@ -328,6 +328,12 @@ def _standard_uuid(short: int) -> str:
 .. availability:: Since Pybricks protocol v1.0.0.
 """
 
+DEVICE_NAME_UUID = _standard_uuid(0x2A00)
+"""Standard Device Name UUID
+
+.. availability:: Since Pybricks protocol v1.0.0.
+"""
+
 FW_REV_UUID = _standard_uuid(0x2A26)
 """Standard Firmware Revision String characteristic UUID
 

pybricksdev/cli/__init__.py

@@ -20,6 +20,12 @@
 
 from .. import __name__ as MODULE_NAME
 from .. import __version__ as MODULE_VERSION
+from ..usb import (
+    LEGO_USB_VID,
+    PYBRICKS_USB_DEVICE_CLASS,
+    PYBRICKS_USB_DEVICE_PROTOCOL,
+    PYBRICKS_USB_DEVICE_SUBCLASS,
+)
 
 PROG_NAME = (
     f"{path.basename(sys.executable)} -m {MODULE_NAME}"
@@ -171,9 +177,10 @@ def add_parser(self, subparsers: argparse._SubParsersAction):
             )
 
     async def run(self, args: argparse.Namespace):
-        from ..ble import find_device
+        from usb.core import find as find_usb
+
+        from ..ble import find_device as find_ble
         from ..connections.ev3dev import EV3Connection
-        from ..connections.lego import REPLHub
         from ..connections.pybricks import PybricksHub
 
         # Pick the right connection
@@ -189,11 +196,20 @@ async def run(self, args: argparse.Namespace):
             # It is a Pybricks Hub with BLE. Device name or address is given.
             hub = PybricksHub()
             print(f"Searching for {args.name or 'any hub with Pybricks service'}...")
-            device_or_address = await find_device(args.name)
+            device_or_address = await find_ble(args.name)
 
         elif args.conntype == "usb":
-            hub = REPLHub()
-            device_or_address = None
+            hub = PybricksHub()
+            device_or_address = find_usb(
+                idVendor=LEGO_USB_VID,
+                bDeviceClass=PYBRICKS_USB_DEVICE_CLASS,
+                bDeviceSubClass=PYBRICKS_USB_DEVICE_SUBCLASS,
+                bDeviceProtocol=PYBRICKS_USB_DEVICE_PROTOCOL,
+            )
+            if device_or_address is None:
+                print("No Pybricks USB device found.", file=sys.stderr)
+                exit(1)
+
         else:
             raise ValueError(f"Unknown connection type: {args.conntype}")
 

pybricksdev/connections/ev3.py

@@ -10,10 +10,7 @@
 import hid
 
 from ..tools import chunk
-
-LEGO_VENDOR_ID = 0x0694
-EV3_PRODUCT_ID = 0x0005
-EV3_BOOTLOADER_PRODUCT_ID = 0x0006
+from ..usb import LEGO_USB_VID, LegoUsbPid
 
 
 class MessageType(enum.IntEnum):
@@ -70,9 +67,7 @@ def open(self) -> None:
         """
         Opens an HID connection to the EV3 bootloader.
         """
-        self._device.open(
-            vendor_id=LEGO_VENDOR_ID, product_id=EV3_BOOTLOADER_PRODUCT_ID
-        )
+        self._device.open(vendor_id=LEGO_USB_VID, product_id=LegoUsbPid.EV3_FW_UPDATE)
 
     def close(self) -> None:
         """

pybricksdev/connections/lego.py

@@ -8,6 +8,7 @@
 from serial.tools import list_ports
 
 from ..tools import chunk
+from ..usb import LEGO_USB_VID
 from .pybricks import PybricksHub
 
 FILE_PACKET_SIZE = 1024
@@ -77,7 +78,10 @@ async def connect(self, device=None):
         port = None
         devices = list_ports.comports()
         for dev in devices:
-            if dev.product == "LEGO Technic Large Hub in FS Mode" or dev.vid == 0x0694:
+            if (
+                dev.product == "LEGO Technic Large Hub in FS Mode"
+                or dev.vid == LEGO_USB_VID
+            ):
                 port = dev.device
                 break