mirror of
https://jihulab.com/mr-one/openpilot.git
synced 2026-10-27 21:13:42 +08:00
ui: show usb connection (#38745)
* ui: show USB status * ui: resize USB icon * ui: classify USB device once * ui: debounce USB disconnect (cherry picked from commit 36561258facd79875b58567f8b72ef751810ae3a)
This commit is contained in:
committed by
Comma Device
parent
45ff674519
commit
de2a01a89c
Binary file not shown.
@@ -161,7 +161,7 @@ class MiciHomeLayout(Widget):
|
||||
self._mic_icon,
|
||||
], spacing=18)
|
||||
|
||||
self._openpilot_label = UnifiedLabel("sunnypilot", font_size=96, font_weight=FontWeight.DISPLAY, max_width=480, wrap_text=False)
|
||||
self._openpilot_label = UnifiedLabel("openpilot", font_size=96, font_weight=FontWeight.DISPLAY, max_width=480, wrap_text=False)
|
||||
self._version_label = UnifiedLabel("", font_size=36, font_weight=FontWeight.ROMAN, max_width=480, wrap_text=False)
|
||||
self._large_version_label = UnifiedLabel("", font_size=64, text_color=rl.GRAY, font_weight=FontWeight.ROMAN, max_width=480, wrap_text=False)
|
||||
self._date_label = UnifiedLabel("", font_size=36, text_color=rl.GRAY, font_weight=FontWeight.ROMAN, max_width=480, wrap_text=False)
|
||||
|
||||
@@ -12,6 +12,7 @@ from openpilot.common.swaglog import cloudlog
|
||||
from openpilot.selfdrive.ui.lib.prime_state import PrimeState
|
||||
from openpilot.system.ui.lib.application import gui_app
|
||||
from openpilot.common.hardware import HARDWARE, PC
|
||||
from openpilot.common.hardware.usb import TYPEC_CC_ORIENTATION_PATH, get_usb_state, is_chestnut_usb_id, read_int
|
||||
from openpilot.selfdrive.modeld.helpers import chestnut_compiled
|
||||
|
||||
from openpilot.selfdrive.ui.sunnypilot.ui_state import UIStateSP, DeviceSP
|
||||
@@ -95,6 +96,10 @@ class UIState(UIStateSP):
|
||||
self.chestnut_compiled: bool = chestnut_compiled()
|
||||
self.chestnut_active: bool | None = None
|
||||
self.chestnut_loading: bool = False
|
||||
self.usb_connected: bool = False
|
||||
self.usb_connected_ts: float | None = None
|
||||
self.usb_disconnected_ts: float | None = None
|
||||
self.usb_unknown: bool = False
|
||||
self.chestnut_state = ChestnutState.DISCONNECTED
|
||||
self.started: bool = False
|
||||
self.ignition: bool = False
|
||||
@@ -254,6 +259,23 @@ class UIState(UIStateSP):
|
||||
self.chestnut_compiled = chestnut_compiled()
|
||||
self.chestnut_active = self.params.get("ChestnutActive")
|
||||
self.chestnut_loading = self.params.get_bool("ChestnutLoading")
|
||||
now = time.monotonic()
|
||||
if read_int(TYPEC_CC_ORIENTATION_PATH) != 0:
|
||||
self.usb_disconnected_ts = None
|
||||
if not self.usb_connected:
|
||||
self.usb_connected = True
|
||||
self.usb_connected_ts = now
|
||||
self.usb_unknown = False
|
||||
elif self.usb_connected_ts is not None and now - self.usb_connected_ts > 10.:
|
||||
self.usb_unknown = not any(is_chestnut_usb_id(d["vendorId"], d["productId"], True) for d in get_usb_state())
|
||||
self.usb_connected_ts = None
|
||||
elif self.usb_connected:
|
||||
if self.usb_disconnected_ts is None:
|
||||
self.usb_disconnected_ts = now
|
||||
elif now - self.usb_disconnected_ts > PARAM_UPDATE_TIME:
|
||||
self.usb_connected = False
|
||||
self.usb_connected_ts = None
|
||||
self.usb_unknown = False
|
||||
|
||||
UIStateSP.update_params(self)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user