diff --git a/selfdrive/ui/mici/onroad/alert_renderer.py b/selfdrive/ui/mici/onroad/alert_renderer.py index 5c93e5e423..b5f796bb03 100644 --- a/selfdrive/ui/mici/onroad/alert_renderer.py +++ b/selfdrive/ui/mici/onroad/alert_renderer.py @@ -222,9 +222,6 @@ class AlertRenderer(Widget): self._alert_y_filter.update(self._rect.y - 50 if alert is None else self._rect.y) self._alpha_filter.update(0 if alert is None else 1) - if gui_app.sunnypilot_ui(): - ui_state.onroad_brightness_handle_alerts(ui_state.started, alert) - if alert is None: # If still animating out, keep the previous alert if self._alpha_filter.x > 0.01 and self._prev_alert is not None: diff --git a/selfdrive/ui/mici/onroad/augmented_road_view.py b/selfdrive/ui/mici/onroad/augmented_road_view.py index 0546920e53..5fe33a7e48 100644 --- a/selfdrive/ui/mici/onroad/augmented_road_view.py +++ b/selfdrive/ui/mici/onroad/augmented_road_view.py @@ -19,9 +19,6 @@ from openpilot.common.transformations.camera import DEVICE_CAMERAS, DeviceCamera from openpilot.common.transformations.orientation import rot_from_euler from enum import IntEnum -if gui_app.sunnypilot_ui(): - from openpilot.selfdrive.ui.sunnypilot.ui_state import OnroadTimerStatus - OpState = log.SelfdriveState.OpenpilotState CALIBRATED = log.LiveCalibrationData.Status.calibrated ROAD_CAM = VisionStreamType.VISION_STREAM_ROAD @@ -354,14 +351,6 @@ class AugmentedRoadView(CameraView): return self._cached_matrix - def show_event(self): - if gui_app.sunnypilot_ui(): - ui_state.reset_onroad_sleep_timer(OnroadTimerStatus.RESUME) - - def hide_event(self): - if gui_app.sunnypilot_ui(): - ui_state.reset_onroad_sleep_timer(OnroadTimerStatus.PAUSE) - if __name__ == "__main__": gui_app.init_window("OnRoad Camera View") diff --git a/selfdrive/ui/onroad/alert_renderer.py b/selfdrive/ui/onroad/alert_renderer.py index 2c21b4006e..1e5f99cc66 100644 --- a/selfdrive/ui/onroad/alert_renderer.py +++ b/selfdrive/ui/onroad/alert_renderer.py @@ -116,10 +116,6 @@ class AlertRenderer(Widget): def _render(self, rect: rl.Rectangle): alert = self.get_alert(ui_state.sm) - - if gui_app.sunnypilot_ui(): - ui_state.onroad_brightness_handle_alerts(ui_state.started, alert) - if not alert: return diff --git a/selfdrive/ui/onroad/augmented_road_view.py b/selfdrive/ui/onroad/augmented_road_view.py index bcbcb2dcfb..a1d10193a8 100644 --- a/selfdrive/ui/onroad/augmented_road_view.py +++ b/selfdrive/ui/onroad/augmented_road_view.py @@ -15,10 +15,10 @@ from openpilot.common.transformations.camera import DEVICE_CAMERAS, DeviceCamera from openpilot.common.transformations.orientation import rot_from_euler if gui_app.sunnypilot_ui(): - from openpilot.selfdrive.ui.sunnypilot.onroad.augmented_road_view import BORDER_COLORS_SP - from openpilot.selfdrive.ui.sunnypilot.onroad.driver_state import DriverStateRendererSP as DriverStateRenderer from openpilot.selfdrive.ui.sunnypilot.onroad.hud_renderer import HudRendererSP as HudRenderer - from openpilot.selfdrive.ui.sunnypilot.ui_state import OnroadTimerStatus + from openpilot.selfdrive.ui.sunnypilot.onroad.driver_state import DriverStateRendererSP as DriverStateRenderer + +from openpilot.selfdrive.ui.sunnypilot.onroad.augmented_road_view import BORDER_COLORS_SP OpState = log.SelfdriveState.OpenpilotState CALIBRATED = log.LiveCalibrationData.Status.calibrated @@ -224,14 +224,6 @@ class AugmentedRoadView(CameraView): return self._cached_matrix - def show_event(self): - if gui_app.sunnypilot_ui(): - ui_state.reset_onroad_sleep_timer(OnroadTimerStatus.RESUME) - - def hide_event(self): - if gui_app.sunnypilot_ui(): - ui_state.reset_onroad_sleep_timer(OnroadTimerStatus.PAUSE) - if __name__ == "__main__": gui_app.init_window("OnRoad Camera View") diff --git a/selfdrive/ui/sunnypilot/ui_state.py b/selfdrive/ui/sunnypilot/ui_state.py index 701644c37d..bbfbc91e2b 100644 --- a/selfdrive/ui/sunnypilot/ui_state.py +++ b/selfdrive/ui/sunnypilot/ui_state.py @@ -4,24 +4,13 @@ Copyright (c) 2021-, Haibin Wen, sunnypilot, and a number of other contributors. This file is part of sunnypilot and is licensed under the MIT License. See the LICENSE.md file in the root directory for more details. """ -from enum import Enum - from cereal import messaging, log, custom from openpilot.common.params import Params from openpilot.sunnypilot.sunnylink.sunnylink_state import SunnylinkState -from openpilot.system.ui.lib.application import gui_app OpenpilotState = log.SelfdriveState.OpenpilotState MADSState = custom.ModularAssistiveDrivingSystem.ModularAssistiveDrivingSystemState -ONROAD_BRIGHTNESS_TIMER_DISABLED = -1 - - -class OnroadTimerStatus(Enum): - NONE = 0 - PAUSE = 1 - RESUME = 2 - class UIStateSP: def __init__(self): @@ -32,12 +21,9 @@ class UIStateSP: ] self.sunnylink_state = SunnylinkState() - self.update_params() - self.onroad_brightness_timer: int = 0 self.custom_interactive_timeout: int = self.params.get("InteractivityTimeout", return_default=True) self.global_brightness_override: int = self.params.get("Brightness", return_default=True) - self.reset_onroad_sleep_timer() def update(self) -> None: if self.sunnylink_enabled: @@ -45,33 +31,6 @@ class UIStateSP: else: self.sunnylink_state.stop() - def onroad_brightness_handle_alerts(self, started: bool, alert): - has_alert = started and self.onroad_brightness_toggle and alert is not None - - self.update_onroad_brightness(has_alert) - if has_alert: - self.reset_onroad_sleep_timer() - - def update_onroad_brightness(self, has_alert: bool) -> None: - if has_alert: - return - - if self.onroad_brightness_timer > 0: - self.onroad_brightness_timer -= 1 - - def reset_onroad_sleep_timer(self, timer_status: OnroadTimerStatus = OnroadTimerStatus.NONE) -> None: - # Toggling from active state to inactive - if timer_status == OnroadTimerStatus.PAUSE and self.onroad_brightness_timer != ONROAD_BRIGHTNESS_TIMER_DISABLED: - self.onroad_brightness_timer = ONROAD_BRIGHTNESS_TIMER_DISABLED - # Toggling from a previously inactive state or resetting an active timer - elif (self.onroad_brightness_timer_param >= 0 and self.onroad_brightness_toggle and - self.onroad_brightness_timer != ONROAD_BRIGHTNESS_TIMER_DISABLED) or timer_status == OnroadTimerStatus.RESUME: - self.onroad_brightness_timer = self.onroad_brightness_timer_param * gui_app.target_fps - - @property - def onroad_brightness_timer_expired(self) -> bool: - return self.onroad_brightness_toggle and self.onroad_brightness_timer == 0 - @staticmethod def update_status(ss, ss_sp, onroad_evt) -> str: state = ss.state @@ -121,11 +80,6 @@ class UIStateSP: self.custom_interactive_timeout = self.params.get("InteractivityTimeout", return_default=True) self.global_brightness_override = self.params.get("Brightness", return_default=True) - # Onroad Screen Brightness - self.onroad_brightness_toggle = self.params.get_bool("OnroadScreenOffControl") - self.onroad_brightness = self.params.get("OnroadScreenOffBrightness", return_default=True) - self.onroad_brightness_timer_param = self.params.get("OnroadScreenOffTimer", return_default=True) - class DeviceSP: def __init__(self): @@ -153,17 +107,3 @@ class DeviceSP: :rtype: float """ return float(min(max(brightness_override, 30), 100)) - - @staticmethod - def set_onroad_brightness(_ui_state, awake: bool, cur_brightness: float) -> float: - if awake and _ui_state.started and _ui_state.onroad_brightness_toggle and _ui_state.onroad_brightness_timer == 0: - return float(max(min(_ui_state.onroad_brightness, cur_brightness), 0)) - - return cur_brightness - - @staticmethod - def wake_from_dimmed_onroad_brightness(_ui_state, evs) -> None: - if _ui_state.started and _ui_state.onroad_brightness_timer_expired: - if any(ev.left_down for ev in evs): - gui_app.mouse_events.clear() - _ui_state.reset_onroad_sleep_timer() diff --git a/selfdrive/ui/ui_state.py b/selfdrive/ui/ui_state.py index f5addd969c..e8c64994fc 100644 --- a/selfdrive/ui/ui_state.py +++ b/selfdrive/ui/ui_state.py @@ -265,9 +265,6 @@ class Device(DeviceSP): if gui_app.sunnypilot_ui() and ui_state.global_brightness_override != 0: brightness = DeviceSP.update_max_global_brightness(ui_state.global_brightness_override) - if gui_app.sunnypilot_ui(): - brightness = DeviceSP.set_onroad_brightness(ui_state, self._awake, brightness) - if not self._awake: brightness = 0 @@ -283,9 +280,6 @@ class Device(DeviceSP): self._ignition = ui_state.ignition if ignition_just_turned_off or any(ev.left_down for ev in gui_app.mouse_events): - if gui_app.sunnypilot_ui(): - DeviceSP.wake_from_dimmed_onroad_brightness(ui_state, gui_app.mouse_events) - self._reset_interactive_timeout() interaction_timeout = time.monotonic() > self._interaction_time