mirror of
https://github.com/firestar5683/StarPilot.git
synced 2026-07-31 14:12:06 +08:00
Papaw visits MICI... for science
This commit is contained in:
@@ -2,7 +2,6 @@ import time
|
||||
import pyray as rl
|
||||
from collections.abc import Callable
|
||||
from enum import IntEnum
|
||||
from openpilot.common.params import Params
|
||||
from openpilot.selfdrive.ui.ui_state import ui_state
|
||||
from openpilot.selfdrive.ui.widgets.offroad_alerts import UpdateAlert, OffroadAlert
|
||||
from openpilot.selfdrive.ui.widgets.exp_mode_button import ExperimentalModeButton
|
||||
@@ -32,7 +31,7 @@ class HomeLayoutState(IntEnum):
|
||||
class HomeLayout(Widget):
|
||||
def __init__(self):
|
||||
super().__init__()
|
||||
self.params = Params()
|
||||
self.params = ui_state.params
|
||||
|
||||
self.update_alert = UpdateAlert()
|
||||
self.offroad_alert = OffroadAlert()
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
from openpilot.common.params import Params
|
||||
from openpilot.selfdrive.ui.widgets.ssh_key import ssh_key_item
|
||||
from openpilot.selfdrive.ui.ui_state import ui_state
|
||||
from openpilot.system.ui.widgets import Widget
|
||||
@@ -9,6 +8,7 @@ from openpilot.system.ui.lib.application import gui_app
|
||||
from openpilot.system.ui.lib.multilang import tr, tr_noop
|
||||
from openpilot.system.ui.widgets import DialogResult
|
||||
|
||||
|
||||
# Description constants
|
||||
DESCRIPTIONS = {
|
||||
'enable_adb': tr_noop(
|
||||
@@ -35,7 +35,7 @@ DESCRIPTIONS = {
|
||||
class DeveloperLayout(Widget):
|
||||
def __init__(self):
|
||||
super().__init__()
|
||||
self._params = Params()
|
||||
self._params = ui_state.params
|
||||
|
||||
# Build items and keep references for callbacks/state updates
|
||||
self._adb_toggle = toggle_item(
|
||||
|
||||
@@ -11,7 +11,6 @@ import pyray as rl
|
||||
import qrcode
|
||||
|
||||
from openpilot.common.basedir import BASEDIR
|
||||
from openpilot.common.params import Params
|
||||
from openpilot.common.swaglog import cloudlog
|
||||
from openpilot.selfdrive.ui.onroad.driver_camera_dialog import DriverCameraDialog
|
||||
from openpilot.selfdrive.ui.ui_state import ui_state
|
||||
@@ -112,7 +111,7 @@ class DeviceLayout(Widget):
|
||||
def __init__(self):
|
||||
super().__init__()
|
||||
|
||||
self._params = Params()
|
||||
self._params = ui_state.params
|
||||
self._select_language_dialog: MultiOptionDialog | None = None
|
||||
self._driver_camera: DriverCameraDialog | None = None
|
||||
self._pair_device_dialog: PairingDialog | None = None
|
||||
|
||||
@@ -3538,8 +3538,8 @@ class AetherCategoryDrawer(AetherSettingsView):
|
||||
|
||||
# Read driving side dynamically for ergonomic layout (LHD vs RHD)
|
||||
try:
|
||||
from openpilot.common.params import Params
|
||||
self._is_rhd = Params().get_bool("IsRHD")
|
||||
from openpilot.selfdrive.ui.ui_state import ui_state
|
||||
self._is_rhd = ui_state.params.get_bool("IsRHD")
|
||||
except Exception:
|
||||
self._is_rhd = False
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ from enum import IntEnum
|
||||
|
||||
import pyray as rl
|
||||
|
||||
from openpilot.common.params import Params
|
||||
from openpilot.selfdrive.ui.ui_state import ui_state
|
||||
from openpilot.starpilot.common.starpilot_variables import update_starpilot_toggles
|
||||
from openpilot.system.ui.lib.multilang import tr
|
||||
from openpilot.system.ui.lib.application import gui_app
|
||||
@@ -18,7 +18,7 @@ import time
|
||||
|
||||
class FrameCachedParams:
|
||||
def __init__(self):
|
||||
self._params = Params()
|
||||
self._params = ui_state.params
|
||||
self._cache = {}
|
||||
self._last_frame_time = 0.0
|
||||
|
||||
|
||||
@@ -38,7 +38,7 @@ DESCRIPTIONS = {
|
||||
class TogglesLayout(Widget):
|
||||
def __init__(self):
|
||||
super().__init__()
|
||||
self._params = Params()
|
||||
self._params = ui_state.params
|
||||
self._sync_rhd_toggle()
|
||||
|
||||
# param, title, desc, icon, needs_restart
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
from openpilot.common.params import Params
|
||||
from openpilot.selfdrive.ui.ui_state import ui_state
|
||||
from openpilot.selfdrive.ui.lib.starpilot_visuals import lead_indicator_enabled
|
||||
from openpilot.selfdrive.ui.mici.widgets.button import BigButton, BigParamControl, BigToggle
|
||||
from openpilot.selfdrive.ui.mici.widgets.dialog import BigDialog, BigMultiOptionDialog
|
||||
@@ -11,7 +11,7 @@ CAMERA_VIEW_LABELS = ["Auto", "Driver", "Standard", "Wide", "None"]
|
||||
class CameraViewBigButton(BigButton):
|
||||
def __init__(self):
|
||||
super().__init__("camera view", "", gui_app.texture("icons_mici/onroad/eye_fill.png", 64, 64))
|
||||
self._params = Params()
|
||||
self._params = ui_state.params
|
||||
self.set_click_callback(self._show_selector)
|
||||
self.refresh()
|
||||
|
||||
@@ -42,7 +42,7 @@ class CameraViewBigButton(BigButton):
|
||||
class LeadIndicatorBigButton(BigToggle):
|
||||
def __init__(self):
|
||||
super().__init__("lead indicator")
|
||||
self.params = Params()
|
||||
self.params = ui_state.params
|
||||
self.refresh()
|
||||
|
||||
def _handle_mouse_release(self, mouse_pos):
|
||||
|
||||
@@ -3,7 +3,6 @@ import numpy as np
|
||||
import pyray as rl
|
||||
from cereal import messaging, car
|
||||
from dataclasses import dataclass, field
|
||||
from openpilot.common.params import Params
|
||||
from openpilot.common.constants import CV
|
||||
from openpilot.common.filter_simple import FirstOrderFilter
|
||||
from openpilot.selfdrive.locationd.calibrationd import HEIGHT_INIT
|
||||
@@ -92,7 +91,7 @@ class ModelRenderer(Widget):
|
||||
self._rainbow_path = RainbowPath()
|
||||
|
||||
# Get longitudinal control setting from car parameters
|
||||
self._params = Params()
|
||||
self._params = ui_state.params
|
||||
if car_params := self._params.get("CarParams"):
|
||||
cp = messaging.log_from_bytes(car_params, car.CarParams)
|
||||
self._longitudinal_control = cp.openpilotLongitudinalControl
|
||||
|
||||
@@ -9,10 +9,8 @@ from openpilot.system.ui.widgets.scroller import DO_ZOOM
|
||||
from openpilot.system.ui.lib.application import gui_app, FontWeight, MousePos
|
||||
from openpilot.common.filter_simple import BounceFilter
|
||||
|
||||
try:
|
||||
from openpilot.common.params import Params
|
||||
except ImportError:
|
||||
Params = None
|
||||
from openpilot.selfdrive.ui.ui_state import ui_state
|
||||
from openpilot.common.params import Params
|
||||
|
||||
SCROLLING_SPEED_PX_S = 50
|
||||
COMPLICATION_SIZE = 36
|
||||
@@ -394,7 +392,7 @@ class BigParamControl(BigToggle):
|
||||
def __init__(self, text: str, param: str, toggle_callback: Callable | None = None):
|
||||
super().__init__(text, "", toggle_callback=toggle_callback)
|
||||
self.param = param
|
||||
self.params = Params()
|
||||
self.params = ui_state.params
|
||||
self.set_checked(self.params.get_bool(self.param, False))
|
||||
|
||||
def _handle_mouse_release(self, mouse_pos: MousePos):
|
||||
@@ -411,7 +409,7 @@ class BigCircleParamControl(BigCircleToggle):
|
||||
icon_offset: tuple[int, int] = (0, 0)):
|
||||
super().__init__(icon, toggle_callback, icon_offset=icon_offset)
|
||||
self._param = param
|
||||
self.params = Params()
|
||||
self.params = ui_state.params
|
||||
self.set_checked(self.params.get_bool(self._param, False))
|
||||
|
||||
def _handle_mouse_release(self, mouse_pos: MousePos):
|
||||
|
||||
Reference in New Issue
Block a user