Merge branch 'master' into better-exp

cereal/custom.capnp

@@ -342,6 +342,7 @@ struct OnroadEventSP @0xda96579883444c35 {
     speedLimitChanged @21;
     speedLimitPending @22;
     e2eChime @23;
+    chillModeSwitched @24;
   }
 }
 

common/params_keys.h

@@ -54,7 +54,6 @@ inline static std::unordered_map<std::string, ParamKeyAttributes> keys = {
     {"GsmRoaming", {PERSISTENT | BACKUP, BOOL}},
     {"HardwareSerial", {PERSISTENT, STRING}},
     {"HasAcceptedTerms", {PERSISTENT, STRING, "0"}},
-    {"HideCamera", {PERSISTENT | BACKUP, BOOL, "0"}},
     {"InstallDate", {PERSISTENT, TIME}},
     {"IsDriverViewEnabled", {CLEAR_ON_MANAGER_START, BOOL}},
     {"IsEngaged", {PERSISTENT, BOOL}},

selfdrive/ui/mici/onroad/augmented_road_view.py

@@ -213,8 +213,6 @@ class AugmentedRoadView(CameraView):
 
     # Render the base camera view
     super()._render(self._content_rect)
-    if ui_state.hide_camera:
-      rl.draw_rectangle_rec(self._content_rect, rl.BLACK)
 
     # Draw all UI overlays
     self._model_renderer.render(self._content_rect)

selfdrive/ui/onroad/augmented_road_view.py

@@ -86,8 +86,6 @@ class AugmentedRoadView(CameraView, AugmentedRoadViewSP):
 
     # Render the base camera view
     super()._render(rect)
-    if ui_state.hide_camera:
-      rl.draw_rectangle_rec(self._content_rect, rl.BLACK)
 
     # Draw all UI overlays
     self.model_renderer.render(self._content_rect)

selfdrive/ui/sunnypilot/layouts/settings/visuals.py

@@ -93,11 +93,6 @@ class VisualsLayout(Widget):
            "This displays what the car is currently doing, not what the planner is requesting."),
         None,
       ),
-      "HideCamera": (
-        lambda: tr("Hide Camera"),
-        tr("Hide the camera live view from the driving screen."),
-        None,
-      ),
     }
     self._toggles = {}
     for param, (title, desc, callback) in self._toggle_defs.items():

selfdrive/ui/sunnypilot/ui_state.py

@@ -150,7 +150,6 @@ class UIStateSP:
     self.chevron_metrics = self.params.get("ChevronInfo")
     self.custom_interactive_timeout = self.params.get("InteractivityTimeout", return_default=True)
     self.developer_ui = self.params.get("DevUIInfo")
-    self.hide_camera = self.params.get_bool("HideCamera")
     self.hide_v_ego_ui = self.params.get_bool("HideVEgoUI")
     self.onroad_brightness = int(float(self.params.get("OnroadScreenOffBrightness", return_default=True)))
     self.onroad_brightness_timer_param = self.params.get("OnroadScreenOffTimer", return_default=True)

sunnypilot/selfdrive/car/cruise_helpers.py

@@ -46,5 +46,8 @@ class CruiseHelper:
     if self.button_frame_counts[ButtonType.gapAdjustCruise] >= DISTANCE_LONG_PRESS and not self.experimental_mode_switched:
       self._experimental_mode = not experimental_mode
       self.params.put_bool("ExperimentalMode", self._experimental_mode)
-      events.add(EventNameSP.experimentalModeSwitched)
+      if self._experimental_mode:
+        events.add(EventNameSP.experimentalModeSwitched)
+      else:
+        events.add(EventNameSP.chillModeSwitched)
       self.experimental_mode_switched = True

sunnypilot/selfdrive/selfdrived/events.py

@@ -181,7 +181,11 @@ EVENTS_SP: dict[int, dict[str, Alert | AlertCallbackType]] = {
   },
 
   EventNameSP.experimentalModeSwitched: {
-    ET.WARNING: NormalPermanentAlert("Experimental Mode Switched", duration=1.5)
+    ET.WARNING: NormalPermanentAlert("Experimental Mode", duration=1.5)
+  },
+
+  EventNameSP.chillModeSwitched: {
+    ET.WARNING: NormalPermanentAlert("Chill Mode", duration=1.5)
   },
 
   EventNameSP.wrongCarModeAlertOnly: {

sunnypilot/sunnylink/settings_ui.json

@@ -1296,12 +1296,6 @@
               "title": "Display Turn Signals",
               "description": "When enabled, visual turn indicators are drawn on the HUD."
             },
-            {
-              "key": "HideCamera",
-              "widget": "toggle",
-              "title": "Hide Camera",
-              "description": "Hide the camera live view from the driving screen."
-            },
             {
               "key": "RoadNameToggle",
               "widget": "toggle",

sunnypilot/sunnylink/settings_ui_src/pages/visuals.yaml

@@ -24,10 +24,6 @@ sections:
     widget: toggle
     title: Display Turn Signals
     description: When enabled, visual turn indicators are drawn on the HUD.
-  - key: HideCamera
-    widget: toggle
-    title: Hide Camera
-    description: Hide the camera live view from the driving screen.
   - key: RoadNameToggle
     widget: toggle
     title: Display Road Name