Merge branch 'master' into visuals-hide-camera

Co-authored-by: Jason Wen <haibin.wen3@gmail.com>

common/params_keys.h

@@ -54,6 +54,7 @@ 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

@@ -212,6 +212,8 @@ 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

@@ -91,6 +91,8 @@ 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,6 +93,11 @@ 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

@@ -133,6 +133,7 @@ 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/sunnylink/params_metadata.json

@@ -370,6 +370,10 @@
     "title": "Has Accepted sunnypilot Terms",
     "description": ""
   },
+  "HideCamera": {
+    "title": "Hide Camera",
+    "description": "Hide the camera live view from the driving screen."
+  },
   "HideVEgoUI": {
     "title": "[TIZI/TICI only] Speedometer: Hide from Onroad Screen",
     "description": "When enabled, the speedometer on the onroad screen is not displayed."