Update opendbc_repo

common/params_keys.h

@@ -172,7 +172,6 @@ inline static std::unordered_map<std::string, ParamKeyAttributes> keys = {
     {"OnroadScreenOffBrightness", {PERSISTENT | BACKUP, INT, "0"}},
     {"OnroadScreenOffBrightnessMigrated", {PERSISTENT | BACKUP, STRING, "0.0"}},
     {"OnroadScreenOffTimer", {PERSISTENT | BACKUP, INT, "15"}},
-    {"OnroadScreenOffTimerMigrated", {PERSISTENT | BACKUP, STRING, "0.0"}},
     {"OnroadUploads", {PERSISTENT | BACKUP, BOOL, "1"}},
     {"QuickBootToggle", {PERSISTENT | BACKUP, BOOL, "0"}},
     {"QuietMode", {PERSISTENT | BACKUP, BOOL, "0"}},

selfdrive/ui/layouts/settings/software.py

@@ -69,6 +69,7 @@ class SoftwareLayout(Widget):
 
     # Branch switcher
     self._branch_btn = button_item(lambda: tr("Target Branch"), lambda: tr("SELECT"), callback=self._on_select_branch)
+    self._branch_btn.set_visible(not ui_state.params.get_bool("IsTestedBranch"))
     self._branch_btn.action_item.set_value(ui_state.params.get("UpdaterTargetBranch") or "")
     self._branch_dialog: MultiOptionDialog | None = None
 

selfdrive/ui/mici/onroad/alert_renderer.py

@@ -231,7 +231,7 @@ class AlertRenderer(Widget, SpeedLimitAlertRenderer):
     self._alpha_filter.update(0 if alert is None else 1)
 
     if gui_app.sunnypilot_ui():
-      ui_state.onroad_brightness_handle_alerts(ui_state, alert)
+      ui_state.onroad_brightness_handle_alerts(ui_state.started, alert)
 
     if alert is None:
       # If still animating out, keep the previous alert

selfdrive/ui/onroad/alert_renderer.py

@@ -118,7 +118,7 @@ class AlertRenderer(Widget):
     alert = self.get_alert(ui_state.sm)
 
     if gui_app.sunnypilot_ui():
-      ui_state.onroad_brightness_handle_alerts(ui_state, alert)
+      ui_state.onroad_brightness_handle_alerts(ui_state.started, alert)
 
     if not alert:
       return

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

@@ -12,7 +12,8 @@ from openpilot.system.ui.widgets import Widget
 from openpilot.system.ui.lib.multilang import tr
 from openpilot.system.ui.widgets.scroller_tici import Scroller
 from openpilot.system.ui.sunnypilot.widgets.list_view import option_item_sp, ToggleActionSP
-from openpilot.sunnypilot.system.params_migration import ONROAD_BRIGHTNESS_TIMER_VALUES
+
+ONROAD_BRIGHTNESS_TIMER_VALUES = {0: 15, 1: 30, **{i: (i - 1) * 60 for i in range(2, 12)}}
 
 
 class OnroadBrightness(IntEnum):
@@ -45,7 +46,7 @@ class DisplayLayout(Widget):
       title=lambda: tr("Onroad Brightness Delay"),
       description="",
       min_value=0,
-      max_value=15,
+      max_value=11,
       value_change_step=1,
       value_map=ONROAD_BRIGHTNESS_TIMER_VALUES,
       label_callback=lambda value: f"{value} s" if value < 60 else f"{int(value/60)} m",
@@ -91,11 +92,7 @@ class DisplayLayout(Widget):
       if isinstance(_item.action_item, ToggleActionSP) and _item.action_item.toggle.param_key is not None:
         _item.action_item.set_state(self._params.get_bool(_item.action_item.toggle.param_key))
       elif isinstance(_item.action_item, OptionControlSP) and _item.action_item.param_key is not None:
-        raw_value = self._params.get(_item.action_item.param_key, return_default=True)
-        if _item.action_item.value_map:
-          reverse_map = {v: k for k, v in _item.action_item.value_map.items()}
-          raw_value = reverse_map.get(raw_value, _item.action_item.current_value)
-        _item.action_item.set_value(raw_value)
+        _item.action_item.set_value(self._params.get(_item.action_item.param_key, return_default=True))
 
     brightness_val = self._params.get("OnroadScreenOffBrightness", return_default=True)
     self._onroad_brightness_timer.action_item.set_enabled(brightness_val not in (OnroadBrightness.AUTO, OnroadBrightness.AUTO_DARK))

selfdrive/ui/sunnypilot/ui_state.py

@@ -49,11 +49,8 @@ class UIStateSP:
     else:
       self.sunnylink_state.stop()
 
-  def onroad_brightness_handle_alerts(self, _ui_state, alert):
-    if _ui_state.sm.recv_frame["carState"] < _ui_state.started_frame:
-      return
-
-    has_alert = _ui_state.started and self.onroad_brightness != OnroadBrightness.AUTO and alert is not None
+  def onroad_brightness_handle_alerts(self, started: bool, alert):
+    has_alert = started and self.onroad_brightness != OnroadBrightness.AUTO and alert is not None
 
     self.update_onroad_brightness(has_alert)
     if has_alert:

sunnypilot/sunnylink/params_metadata.json

@@ -941,22 +941,6 @@
     "title": "Onroad Brightness Delay",
     "description": "",
     "options": [
-      {
-        "value": 3,
-        "label": "3s"
-      },
-      {
-        "value": 5,
-        "label": "5s"
-      },
-      {
-        "value": 7,
-        "label": "7s"
-      },
-      {
-        "value": 10,
-        "label": "10s"
-      },
       {
         "value": 15,
         "label": "15s"
@@ -1007,10 +991,6 @@
       }
     ]
   },
-  "OnroadScreenOffTimerMigrated": {
-    "title": "Onroad Brightness Delay Migration Version",
-    "description": "This param is to track whether OnroadScreenOffTimer needs to be migrated."
-  },
   "OnroadUploads": {
     "title": "Onroad Uploads",
     "description": ""
@@ -1310,7 +1290,7 @@
     "min": 0.1,
     "max": 5.0,
     "step": 0.1,
-    "unit": "m/s\u00b2"
+    "unit": "m/s²"
   },
   "ToyotaEnforceStockLongitudinal": {
     "title": "Toyota: Enforce Factory Longitudinal Control",

sunnypilot/sunnylink/tools/update_params_metadata.py

@@ -10,7 +10,6 @@ import os
 
 from openpilot.common.basedir import BASEDIR
 from openpilot.common.params import Params
-from openpilot.sunnypilot.system.params_migration import ONROAD_BRIGHTNESS_TIMER_VALUES
 
 METADATA_PATH = os.path.join(os.path.dirname(__file__), "../params_metadata.json")
 TORQUE_VERSIONS_JSON = os.path.join(BASEDIR, "sunnypilot", "selfdrive", "controls", "lib", "latcontrol_torque_versions.json")
@@ -57,9 +56,6 @@ def main():
   # update onroad screen brightness params
   update_onroad_brightness_param()
 
-  # update onroad screen brightness timer params
-  update_onroad_brightness_timer_param()
-
   # update torque versions param
   update_torque_versions_param()
 
@@ -85,24 +81,6 @@ def update_onroad_brightness_param():
     print(f"Failed to update OnroadScreenOffBrightness versions in params_metadata.json: {e}")
 
 
-def update_onroad_brightness_timer_param():
-  try:
-    with open(METADATA_PATH) as f:
-      params_metadata = json.load(f)
-    if "OnroadScreenOffTimer" in params_metadata:
-      options = []
-      for _index, seconds in sorted(ONROAD_BRIGHTNESS_TIMER_VALUES.items()):
-        label = f"{seconds}s" if seconds < 60 else f"{seconds // 60}m"
-        options.append({"value": seconds, "label": label})
-      params_metadata["OnroadScreenOffTimer"]["options"] = options
-      with open(METADATA_PATH, 'w') as f:
-        json.dump(params_metadata, f, indent=2)
-        f.write('\n')
-      print(f"Updated OnroadScreenOffTimer options in params_metadata.json with {len(options)} options.")
-  except Exception as e:
-    print(f"Failed to update OnroadScreenOffTimer options in params_metadata.json: {e}")
-
-
 def update_torque_versions_param():
   with open(TORQUE_VERSIONS_JSON) as f:
     current_versions = json.load(f)

sunnypilot/system/params_migration.py

@@ -7,18 +7,13 @@ See the LICENSE.md file in the root directory for more details.
 from openpilot.common.swaglog import cloudlog
 
 ONROAD_BRIGHTNESS_MIGRATION_VERSION: str = "1.0"
-ONROAD_BRIGHTNESS_TIMER_MIGRATION_VERSION: str = "1.0"
-
-# index → seconds mapping for OnroadScreenOffTimer (SSoT)
-ONROAD_BRIGHTNESS_TIMER_VALUES = {0: 3, 1: 5, 2: 7, 3: 10, 4: 15, 5: 30, **{i: (i - 5) * 60 for i in range(6, 16)}}
-VALID_TIMER_VALUES = set(ONROAD_BRIGHTNESS_TIMER_VALUES.values())
 
 
 def run_migration(_params):
   # migrate OnroadScreenOffBrightness
   if _params.get("OnroadScreenOffBrightnessMigrated") != ONROAD_BRIGHTNESS_MIGRATION_VERSION:
     try:
-      val = _params.get("OnroadScreenOffBrightness", return_default=True)
+      val = _params.get("OnroadScreenOffBrightness")
       if val >= 2:  # old: 5%, new: Screen Off
         new_val = val + 1
         _params.put("OnroadScreenOffBrightness", new_val)
@@ -30,18 +25,3 @@ def run_migration(_params):
       cloudlog.info(log_str + f" Setting OnroadScreenOffBrightnessMigrated to {ONROAD_BRIGHTNESS_MIGRATION_VERSION}")
     except Exception as e:
       cloudlog.exception(f"Error migrating OnroadScreenOffBrightness: {e}")
-
-  # migrate OnroadScreenOffTimer
-  if _params.get("OnroadScreenOffTimerMigrated") != ONROAD_BRIGHTNESS_TIMER_MIGRATION_VERSION:
-    try:
-      val = _params.get("OnroadScreenOffTimer", return_default=True)
-      if val not in VALID_TIMER_VALUES:
-        _params.put("OnroadScreenOffTimer", 15)
-        log_str = f"Successfully migrated OnroadScreenOffTimer from {val} to 15 (default)."
-      else:
-        log_str = "Migration not required for OnroadScreenOffTimer."
-
-      _params.put("OnroadScreenOffTimerMigrated", ONROAD_BRIGHTNESS_TIMER_MIGRATION_VERSION)
-      cloudlog.info(log_str + f" Setting OnroadScreenOffTimerMigrated to {ONROAD_BRIGHTNESS_TIMER_MIGRATION_VERSION}")
-    except Exception as e:
-      cloudlog.exception(f"Error migrating OnroadScreenOffTimer: {e}")

system/manager/manager.py

@@ -51,8 +51,7 @@ def manager_init() -> None:
   if params.get_bool("RecordFrontLock"):
     params.put_bool("RecordFront", True)
 
-  if not PC:
-    run_migration(params)
+  run_migration(params)
 
   # set unset params to their default value
   for k in params.all_keys():

tools/replay/SConscript

@@ -1,25 +1,8 @@
-import os
-import subprocess
-
 Import('env', 'arch', 'common', 'messaging', 'visionipc', 'cereal')
 
 replay_env = env.Clone()
 replay_env['CCFLAGS'] += ['-Wno-deprecated-declarations']
 
-if arch == "Darwin":
-  openssl_prefixes = []
-  for formula in ("openssl@3", "openssl"):
-    try:
-      prefix = subprocess.check_output(['brew', '--prefix', formula], encoding='utf8').strip()
-      if os.path.isdir(prefix):
-        openssl_prefixes.append(prefix)
-    except (FileNotFoundError, subprocess.CalledProcessError):
-      continue
-
-  for prefix in openssl_prefixes:
-    replay_env['CPPPATH'] += [f"{prefix}/include"]
-    replay_env['LIBPATH'] += [f"{prefix}/lib"]
-
 base_frameworks = []
 base_libs = [common, messaging, cereal, visionipc, 'm', 'ssl', 'crypto', 'pthread']