mawei/MoreTore
1
0
Fork 0
mirror of https://github.com/MoreTore/openpilot.git synced 2026-08-01 14:16:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

BigUI WIP: More prints of the finger stuff

Browse Source
This commit is contained in:
firestarsdog
2026-06-08 13:22:43 -04:00
parent 6d61feff11
commit 796d081fce
2 changed files with 57 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/ui/layouts/settings/starpilot/vehicle.py
+25 -9
View File
@@ -37,6 +37,7 @@ from openpilot.selfdrive.ui.layouts.settings.starpilot.aethergrid import (
from openpilot.selfdrive.ui.lib.starpilot_state import starpilot_state
from openpilot.selfdrive.ui.lib.fingerprint_catalog import (
FingerprintModelOption,
format_fingerprint_value,
get_fingerprint_catalog,
shorten_model_label,
)
@@ -115,6 +116,11 @@ class VehicleSettingsManagerView(AetherInteractiveMixin, Widget):
self._last_make = ""
self._last_model = ""
def show_event(self):
super().show_event()
starpilot_state.update(force=True)
self._rebuild_toggle_grid()
def _build_driving_toggles(self) -> list[dict]:
cs = starpilot_state.car_state
toggles = []
@@ -402,9 +408,11 @@ class VehicleSettingsManagerView(AetherInteractiveMixin, Widget):
identity_rows = [
{"target_id": "select:CarMake", "type": "select", "title": tr("Car Make"),
"get_value": self._controller._get_display_make, "pill_width": 160},
"get_value": self._controller._get_display_make, "pill_width": 160,
"is_enabled": self._controller._params.get_bool("ForceFingerprint")},
{"target_id": "select:CarModel", "type": "select", "title": tr("Car Model"),
"get_value": self._controller._get_display_model, "pill_width": 160},
"get_value": self._controller._get_display_model, "pill_width": 160,
"is_enabled": self._controller._params.get_bool("ForceFingerprint")},
]
if cs.isToyota:
identity_rows.append({"target_id": "select:LockDoorsTimer", "type": "select",
@@ -504,7 +512,8 @@ class VehicleSettingsManagerView(AetherInteractiveMixin, Widget):
def _draw_row(self, rect: rl.Rectangle, row: dict, is_last: bool):
target_id = row["target_id"]
hovered, pressed = self._interactive_state(target_id, rect)
is_enabled = row.get("is_enabled", True)
hovered, pressed = self._interactive_state(target_id, rect) if is_enabled else (False, False)
row_type = row.get("type", "toggle")
if row_type == "toggle":
@@ -517,14 +526,15 @@ class VehicleSettingsManagerView(AetherInteractiveMixin, Widget):
elif row_type == "select":
draw_selection_list_row(
rect, title=row["title"], subtitle=row.get("subtitle", ""),
action_text=row["get_value"](), hovered=hovered, pressed=pressed,
is_last=is_last, action_width=188, action_pill=True,
action_text=row["get_value"](), hovered=hovered and is_enabled,
pressed=pressed and is_enabled, is_last=is_last,
action_width=188, action_pill=True,
action_pill_width=row.get("pill_width", 108), action_pill_height=44,
title_size=34, subtitle_size=22, action_text_size=18,
row_separator=PANEL_STYLE.divider_color,
action_fill=PANEL_STYLE.current_fill,
action_border=PANEL_STYLE.current_border,
action_text_color=AetherListColors.HEADER,
action_fill=PANEL_STYLE.current_fill if is_enabled else _with_alpha(PANEL_STYLE.current_fill, 120),
action_border=PANEL_STYLE.current_border if is_enabled else _with_alpha(PANEL_STYLE.current_border, 100),
action_text_color=AetherListColors.HEADER if is_enabled else AetherListColors.MUTED,
)
elif row_type == "info":
draw_settings_list_row(
@@ -623,8 +633,12 @@ class StarPilotVehicleSettingsLayout(_SettingsPage):
current = self._params.get_bool(param_key) if self._params.get(param_key) is not None else False
self._params.put_bool(param_key, not current)
starpilot_state.update(force=True)
if param_key == "ForceFingerprint":
self._manager_view._rebuild_toggle_grid()
def _on_select(self, key: str):
if key in ("CarMake", "CarModel") and not self._params.get_bool("ForceFingerprint"):
return
if key == "CarMake":
self._on_select_make()
elif key == "CarModel":
@@ -720,7 +734,7 @@ class StarPilotVehicleSettingsLayout(_SettingsPage):
return make
model = self._params.get("CarModel") or ""
if model:
return self._make_by_model.get(model, tr("None"))
return self._make_by_model.get(model, format_fingerprint_value(model.split("_", 1)[0]))
return tr("None")
def _get_display_model(self) -> str:
@@ -734,6 +748,8 @@ class StarPilotVehicleSettingsLayout(_SettingsPage):
return shorten_model_label(make, model_name) if make else model_name
if model and model in self._models_by_value:
return self._models_by_value[model].button_label
if model:
return format_fingerprint_value(model)
return tr("None")
def _get_selected_model_option(self) -> FingerprintModelOption | None:
selfdrive/ui/lib/starpilot_state.py
+32 -30
View File
@@ -77,36 +77,31 @@ class StarPilotState:
self.update()
def _apply_manual_fingerprint(self, starpilot_toggles: dict):
fallback_make = starpilot_toggles.get("car_make") or self.params.get("CarMake") or "gm"
fallback_model = starpilot_toggles.get("car_model") or self.params.get("CarModel") or "CHEVROLET_BOLT_ACC_2022_2023"
fallback_make = starpilot_toggles.get("car_make") or self.params.get("CarMake")
fallback_model = starpilot_toggles.get("car_model") or self.params.get("CarModel")
if not fallback_make and not fallback_model:
return
from openpilot.selfdrive.ui.lib.fingerprint_catalog import FINGERPRINT_MAKE_TO_VALUES_DIR
fallback_make_lower = fallback_make.lower()
brand = FINGERPRINT_MAKE_TO_VALUES_DIR.get(fallback_make_lower, fallback_make_lower)
if fallback_make:
from openpilot.selfdrive.ui.lib.fingerprint_catalog import FINGERPRINT_MAKE_TO_VALUES_DIR
fallback_make_lower = fallback_make.lower()
brand = FINGERPRINT_MAKE_TO_VALUES_DIR.get(fallback_make_lower, fallback_make_lower)
self.car_state.isGM = brand == "gm"
self.car_state.isHKG = brand == "hyundai"
self.car_state.isSubaru = brand == "subaru"
self.car_state.isToyota = brand == "toyota"
self.car_state.isHKGCanFd = False
self.car_state.hasModeStarButtons = False
self.car_state.isBolt = False
self.car_state.isVolt = False
self.params.put("CarMake", fallback_make.title())
self.car_state.isBolt = fallback_model.startswith("CHEVROLET_BOLT")
self.car_state.isGM = brand == "gm"
self.car_state.isHKG = brand == "hyundai"
self.car_state.isSubaru = brand == "subaru"
self.car_state.isToyota = brand == "toyota"
self.car_state.isVolt = fallback_model.startswith("CHEVROLET_VOLT")
if fallback_model:
self.params.put("CarModel", fallback_model)
# Determine isHKGCanFd for manual selection
is_canfd = False
try:
from opendbc.car.hyundai.values import CANFD_CAR
is_canfd = any(fallback_model == getattr(c, "value", str(c)) for c in CANFD_CAR)
except Exception:
pass
self.car_state.isHKGCanFd = self.car_state.isHKG and is_canfd
self.car_state.hasModeStarButtons = self.car_state.isHKGCanFd
self.car_state.hasPedal = starpilot_toggles.get("has_pedal", True)
self.car_state.hasSASCM = starpilot_toggles.get("has_sascm", False)
self.car_state.hasSDSU = starpilot_toggles.get("has_sdsu", False)
self.car_state.hasZSS = starpilot_toggles.get("has_zss", False)
self.car_state.canUsePedal = self.car_state.hasPedal or self.car_state.isBolt
self.car_state.canUseSDSU = self.car_state.hasSDSU
if not starpilot_toggles:
self.car_state.hasOpenpilotLongitudinal = True
self.car_state.hasSNG = False
def _safe_get(self, obj, field: str, default=None):
try:
@@ -185,10 +180,17 @@ class StarPilotState:
self.car_state.stoppingDecelRate = float(self._safe_get(CP, "stoppingDecelRate", self.car_state.stoppingDecelRate))
self.car_state.vEgoStarting = float(self._safe_get(CP, "vEgoStarting", self.car_state.vEgoStarting))
self.car_state.vEgoStopping = float(self._safe_get(CP, "vEgoStopping", self.car_state.vEgoStopping))
if (PC or force_fingerprint) and (car_make == "mock" or car_fingerprint == "MOCK"):
if car_fingerprint and (not force_fingerprint or PC):
cp_make = car_fingerprint.split('_')[0].title()
user_make = self.params.get("CarMake")
if not (force_fingerprint and PC and user_make and user_make != cp_make):
self.params.put("CarModel", car_fingerprint)
self.params.put("CarMake", cp_make)
if car_make == "mock" or car_fingerprint == "MOCK":
self._apply_manual_fingerprint(starpilot_toggles)
elif PC or force_fingerprint:
elif force_fingerprint:
self._apply_manual_fingerprint(starpilot_toggles)
elif PC or force_fingerprint: