show usb3

Author: adeebshihadeh

openpilot/cereal/log.capnp

@@ -704,6 +704,13 @@ struct UsbState {
     manufacturer @6 :Text;
     product @5 :Text;
     linkErrorCount @7 :UInt16;
+    usb3Lane @8 :Usb3Lane;
+
+    enum Usb3Lane {
+      unknown @0;
+      a @1;
+      b @2;
+    }
   }
 }
 

openpilot/common/hardware/usb.py

@@ -5,6 +5,8 @@
 CHESTNUT_USB_IDS = ((0xADD1, 0x0001), (0x3801, 0x0001))
 CHESTNUT_ROM_USB_IDS = ((0x174C, 0x2464), (0x174C, 0x2463))
 USB_DEVICES_PATH = Path("/sys/bus/usb/devices")
+TYPEC_CC_ORIENTATION_PATH = Path("/sys/class/power_supply/usb/typec_cc_orientation")
+PRIMARY_USB_CONTROLLER = "a600000.ssusb"
 
 
 def get_usb_topology() -> set[str]:
@@ -45,6 +47,7 @@ def controller(device: Path) -> Path | None:
 
 def get_usb_state() -> list[dict]:
   devices = []
+  typec_orientation = read_int(TYPEC_CC_ORIENTATION_PATH)
   for device in usb_devices():
     vendor_id = read_int(device / "idVendor", 16)
     product_id = read_int(device / "idProduct", 16)
@@ -58,6 +61,7 @@ def get_usb_state() -> list[dict]:
       "manufacturer": read(device / "manufacturer") or "",
       "product": read(device / "product") or "",
       "linkErrorCount": read_int(ctrl / "portli", 0) & 0xFFFF if ctrl is not None else 0,
+      "usb3Lane": {1: "a", 2: "b"}.get(typec_orientation, "unknown") if ctrl is not None and ctrl.name == PRIMARY_USB_CONTROLLER else "unknown",
     })
   return devices
 
@@ -75,6 +79,7 @@ def set_usb_state(device_state, devices: list[dict]) -> None:
     entry.manufacturer = device["manufacturer"]
     entry.product = device["product"]
     entry.linkErrorCount = device["linkErrorCount"]
+    entry.usb3Lane = device.get("usb3Lane", "unknown")
 
     if (entry.vendorId, entry.productId) in CHESTNUT_USB_IDS:
       chestnut_present = True

openpilot/selfdrive/ui/mici/onroad/augmented_road_view.py

@@ -15,6 +15,7 @@
 from openpilot.system.ui.widgets.label import UnifiedLabel
 from openpilot.system.ui.widgets import Widget
 from openpilot.common.filter_simple import BounceFilter
+from openpilot.common.hardware.usb import CHESTNUT_ROM_USB_IDS, CHESTNUT_USB_IDS
 from openpilot.common.transformations.camera import DEVICE_CAMERAS, DeviceCameraConfig, view_frame_from_device_frame
 from openpilot.common.transformations.orientation import rot_from_euler
 from enum import IntEnum
@@ -245,10 +246,17 @@ def _render(self, _):
     self._bookmark_icon.render(self.rect)
 
     gps = ui_state.sm["gpsLocationExternal"]
+    chestnut = next((device for device in ui_state.sm["deviceState"].usbState.devices
+                     if (device.vendorId, device.productId) in CHESTNUT_USB_IDS + CHESTNUT_ROM_USB_IDS), None)
+    usb3_debug_text = "NO USB3"
+    if chestnut is not None and chestnut.speedMbps >= 5000:
+      usb3_debug_text = f"USB3 lane: {str(chestnut.usb3Lane).upper()}"
+
     gps_debug_text = (
       f"GPS sats: {gps.satelliteCount}",
       f"GPS fix: {gps.hasFix}",
       f"GPS hacc: {gps.horizontalAccuracy:.1f} m",
+      usb3_debug_text,
     )
     font_size = 36
     for i, text in enumerate(gps_debug_text):