Merge branch 'master' into ccnc-port

This reverts commit 15e5d2efb9.

selfdrive/car/tests/test_models.py

@@ -13,7 +13,7 @@ from opendbc.car import DT_CTRL, gen_empty_fingerprint, structs
 from opendbc.car.can_definitions import CanData
 from opendbc.car.car_helpers import FRAME_FINGERPRINT, interfaces
 from opendbc.car.fingerprints import MIGRATION
-from opendbc.car.honda.values import CAR as HONDA, HondaFlags
+from opendbc.car.honda.values import HondaFlags
 from opendbc.car.structs import car
 from opendbc.car.tests.routes import non_tested_cars, routes, CarTestRoute
 from opendbc.car.values import Platform, PLATFORMS
@@ -358,13 +358,7 @@ class TestCarModelBase(unittest.TestCase):
         self.assertEqual(CS.gasPressed, self.safety.get_gas_pressed_prev())
 
       if self.safety.get_brake_pressed_prev() != prev_panda_brake:
-        # TODO: remove this exception once this mismatch is resolved
-        brake_pressed = CS.brakePressed
-        if CS.brakePressed and not self.safety.get_brake_pressed_prev():
-          if self.CP.carFingerprint in (HONDA.HONDA_PILOT, HONDA.HONDA_RIDGELINE) and CS.brake > 0.05:
-            brake_pressed = False
-
-        self.assertEqual(brake_pressed, self.safety.get_brake_pressed_prev())
+        self.assertEqual(CS.brakePressed, self.safety.get_brake_pressed_prev())
 
       if self.safety.get_regen_braking_prev() != prev_panda_regen_braking:
         self.assertEqual(CS.regenBraking, self.safety.get_regen_braking_prev())
@@ -448,12 +442,7 @@ class TestCarModelBase(unittest.TestCase):
         checks['steeringAngleDeg'] += (angle_can > (self.safety.get_angle_meas_max() + 1) or
                                        angle_can < (self.safety.get_angle_meas_min() - 1))
 
-      # TODO: remove this exception once this mismatch is resolved
-      brake_pressed = CS.brakePressed
-      if CS.brakePressed and not self.safety.get_brake_pressed_prev():
-        if self.CP.carFingerprint in (HONDA.HONDA_PILOT, HONDA.HONDA_RIDGELINE) and CS.brakeDEPRECATED > 0.05:
-          brake_pressed = False
-      checks['brakePressed'] += brake_pressed != self.safety.get_brake_pressed_prev()
+      checks['brakePressed'] += CS.brakePressed != self.safety.get_brake_pressed_prev()
       checks['regenBraking'] += CS.regenBraking != self.safety.get_regen_braking_prev()
       checks['steeringDisengage'] += CS.steeringDisengage != self.safety.get_steering_disengage_prev()
 

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

@@ -134,11 +134,6 @@ class SteeringLayout(Widget):
 
     enforce_torque_enabled = self._torque_control_toggle.action_item.get_state()
     nnlc_enabled = self._nnlc_toggle.action_item.get_state()
-    if enforce_torque_enabled and nnlc_enabled:
-      self._torque_control_toggle.action_item.set_state(False)
-      self._nnlc_toggle.action_item.set_state(False)
-      enforce_torque_enabled = False
-      nnlc_enabled = False
     self._nnlc_toggle.action_item.set_enabled(ui_state.is_offroad() and torque_allowed and not enforce_torque_enabled)
     self._torque_control_toggle.action_item.set_enabled(ui_state.is_offroad() and torque_allowed and not nnlc_enabled)
     self._torque_customization_button.action_item.set_enabled(self._torque_control_toggle.action_item.get_state())

selfdrive/ui/sunnypilot/ui_state.py

@@ -179,10 +179,6 @@ class UIStateSP:
     CP = self.CP
 
     if CP is not None:
-      if self.params.get_bool("EnforceTorqueControl") and self.params.get_bool("NeuralNetworkLateralControl"):
-        self.params.put_bool("EnforceTorqueControl", False, block=True)
-        self.params.put_bool("NeuralNetworkLateralControl", False, block=True)
-
       # Angle steering: no torque-based lateral controls
       if CP.steerControlType == car.CarParams.SteerControlType.angle:
         self.params.remove("EnforceTorqueControl")

sunnypilot/sunnylink/athena/sunnylinkd.py

@@ -41,6 +41,7 @@ LOCAL_PORT_WHITELIST = {8022}
 SUNNYLINK_LOG_ATTR_NAME = "user.sunny.upload"
 SUNNYLINK_RECONNECT_TIMEOUT_S = 70  # FYI changing this will also would require a change on sidebar.cc
 DISALLOW_LOG_UPLOAD = threading.Event()
+METADATA_PATH = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "params_metadata.json")
 
 params = Params()
 
@@ -169,6 +170,39 @@ def getParamsAllKeys() -> list[str]:
   return keys
 
 
+@dispatcher.add_method
+def getParamsAllKeysV1() -> dict[str, str]:
+  try:
+    with open(METADATA_PATH) as f:
+      metadata = json.load(f)
+  except Exception:
+    cloudlog.exception("sunnylinkd.getParamsAllKeysV1.metadata.exception")
+    metadata = {}
+
+  try:
+    available_keys: list[str] = [k.decode('utf-8') for k in Params().all_keys()]
+
+    params_dict: dict[str, list[dict[str, str | bool | int | object | dict | None]]] = {"params": []}
+    for key in available_keys:
+      value = get_param_as_byte(key, get_default=True)
+
+      param_entry = {
+        "key": key,
+        "type": int(params.get_type(key).value),
+        "default_value": base64.b64encode(value).decode('utf-8') if value else None,
+      }
+
+      if key in metadata:
+        meta_copy = metadata[key].copy()
+        param_entry["_extra"] = meta_copy
+
+      params_dict["params"].append(param_entry)
+    return {"keys": json.dumps(params_dict.get("params", []))}
+  except Exception:
+    cloudlog.exception("sunnylinkd.getParamsAllKeysV1.exception")
+    raise
+
+
 @dispatcher.add_method
 def getParamsMetadata() -> str:
   """Return settings_ui.json + live capabilities as gzip-compressed, base64-encoded string.

sunnypilot/sunnylink/docs/README.md

@@ -97,11 +97,12 @@ The compiler splices a list-context `$ref` into its parent list. Macros may refe
 
 ```
 1. common/params_keys.h               — add/remove the C++ param key
-2. settings_ui_src/pages/<page>.yaml  — add/edit/remove the item in the right section
-3. python sunnypilot/sunnylink/tools/compile_settings_ui.py
-4. python sunnypilot/sunnylink/tools/validate_settings_ui.py  (or: --check on the compiler)
-5. uv run python -m pytest sunnypilot/sunnylink/tests/   # run regression + compiler tests
-6. commit
+2. params_metadata.json               — automated via update_params_metadata.py
+3. settings_ui_src/pages/<page>.yaml  — add/edit/remove the item in the right section
+4. python sunnypilot/sunnylink/tools/compile_settings_ui.py
+5. python sunnypilot/sunnylink/tools/validate_settings_ui.py  (or: --check on the compiler)
+6. uv run python -m pytest sunnypilot/sunnylink/tests/   # run regression + compiler tests
+7. commit
 ```
 
 CI runs `compile_settings_ui.py --check` to fail on hand-edited `settings_ui.json`.

sunnypilot/sunnylink/tests/test_params_metadata.py

@@ -0,0 +1,86 @@
+"""
+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.
+"""
+import json
+
+from openpilot.sunnypilot.sunnylink.athena.sunnylinkd import getParamsAllKeysV1, METADATA_PATH
+
+
+def test_get_params_all_keys_v1():
+  """
+  Test the getParamsAllKeysV1 API endpoint.
+
+  Why:
+  This endpoint is used by the UI (and potentially external tools) to fetch the list of
+  available parameters along with their metadata (titles, descriptions, options, constraints).
+  We need to ensure it returns the correct structure and that the metadata from
+  params_metadata.json is correctly merged into the response.
+
+  Expected:
+  - The response should contain a "keys" field which is a JSON string of a list of parameters.
+  - Each parameter object should have "key", "type", "default_value", and optionally "_extra".
+  - The "_extra" field should contain the rich metadata (title, options, min/max, etc.) matching
+    the source of truth (params_metadata.json).
+  """
+  response = getParamsAllKeysV1()
+  assert "keys" in response
+
+  keys_json = response["keys"]
+  params_list = json.loads(keys_json)
+
+  assert isinstance(params_list, list)
+  assert len(params_list) > 0
+
+  # Check structure of first item
+  first_param = params_list[0]
+  assert "key" in first_param
+  assert "type" in first_param
+  assert "default_value" in first_param
+
+  if "_extra" in first_param:
+    assert isinstance(first_param["_extra"], dict)
+    assert "default" not in first_param["_extra"]
+    assert "type" not in first_param["_extra"]
+
+  # Load the source of truth
+  with open(METADATA_PATH) as f:
+    metadata = json.load(f)
+
+  # Verify that the API response matches the metadata file for a few sample keys
+  # This ensures the plumbing is working without being brittle to content changes
+
+  # 1. Check a key that should have metadata
+  keys_with_metadata = [k for k in params_list if k["key"] in metadata]
+  assert len(keys_with_metadata) > 0, "No parameters found that match metadata keys"
+
+  for param in keys_with_metadata[:5]:  # Check first 5 matches
+    key = param["key"]
+    expected_meta = metadata[key]
+
+    assert "_extra" in param, f"Parameter {key} should have _extra field"
+    actual_meta = param["_extra"]
+
+    # Verify all fields in JSON are present in the API response
+    for meta_key, meta_val in expected_meta.items():
+      assert meta_key in actual_meta, f"Missing {meta_key} in API response for {key}"
+      assert actual_meta[meta_key] == meta_val, f"Mismatch for {key}.{meta_key}: expected {meta_val}, got {actual_meta[meta_key]}"
+
+  # 2. Check that we are correctly serving options if they exist
+  params_with_options = [k for k in keys_with_metadata if "options" in k.get("_extra", {})]
+  if params_with_options:
+    param = params_with_options[0]
+    key = param["key"]
+    assert isinstance(param["_extra"]["options"], list), f"Options for {key} should be a list"
+    assert param["_extra"]["options"] == metadata[key]["options"]
+
+  # 3. Check that we are correctly serving numeric constraints if they exist
+  params_with_constraints = [k for k in keys_with_metadata if "min" in k.get("_extra", {})]
+  if params_with_constraints:
+    param = params_with_constraints[0]
+    key = param["key"]
+    assert param["_extra"]["min"] == metadata[key]["min"]
+    assert param["_extra"]["max"] == metadata[key]["max"]
+    assert param["_extra"]["step"] == metadata[key]["step"]

sunnypilot/sunnylink/tests/test_params_sync.py

@@ -0,0 +1,284 @@
+"""
+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.
+"""
+import json
+import os
+import pytest
+
+from openpilot.common.params import Params
+from openpilot.sunnypilot.sunnylink.athena.sunnylinkd import METADATA_PATH
+
+
+def test_metadata_json_exists():
+  """
+  Test that the params_metadata.json file exists at the expected path.
+
+  Why:
+  The metadata file is the source of truth for parameter descriptions, options, and constraints.
+  If it's missing, the UI will not be able to display rich information for parameters.
+
+  Expected:
+  The file should exist at sunnypilot/sunnylink/params_metadata.json.
+  """
+  assert os.path.exists(METADATA_PATH), f"Metadata file not found at {METADATA_PATH}"
+
+
+def test_metadata_json_valid():
+  """
+  Test that the params_metadata.json file contains valid JSON.
+
+  Why:
+  Invalid JSON will cause the metadata loading to fail, potentially crashing the UI or
+  resulting in missing metadata.
+
+  Expected:
+  The file content should be parseable as a JSON object (dictionary).
+  """
+  with open(METADATA_PATH) as f:
+    try:
+      data = json.load(f)
+    except json.JSONDecodeError:
+      pytest.fail("Metadata file is not valid JSON")
+
+    assert isinstance(data, dict), "Metadata root must be a dictionary"
+
+
+def test_all_params_have_metadata():
+  """
+  Test that every parameter in the codebase has a corresponding entry in params_metadata.json.
+
+  Why:
+  We want to ensure 100% coverage of parameter metadata. Any parameter added to the codebase
+  should also be documented in the metadata file.
+
+  Expected:
+  There should be no parameters in Params() that are missing from the metadata file.
+  If this fails, run 'python3 sunnypilot/sunnylink/tools/update_params_metadata.py'.
+  """
+  params = Params()
+  all_keys = [k.decode('utf-8') for k in params.all_keys()]
+
+  with open(METADATA_PATH) as f:
+    metadata = json.load(f)
+
+  missing_keys = [key for key in all_keys if key not in metadata]
+
+  if missing_keys:
+    pytest.fail(
+      f"The following parameters are missing from metadata: {missing_keys}. "
+      + "Please run 'python3 sunnypilot/sunnylink/tools/update_params_metadata.py' to update."
+    )
+
+
+def test_metadata_keys_exist_in_params():
+  """
+  Test that all keys in params_metadata.json actually exist in the codebase.
+
+  Why:
+  We want to avoid stale metadata for parameters that have been removed or renamed.
+  This keeps the metadata file clean and relevant.
+
+  Expected:
+  There should be no keys in the metadata file that are not present in Params().
+  This prints a warning rather than failing, as it's less critical than missing metadata.
+  """
+  params = Params()
+  all_keys = {k.decode('utf-8') for k in params.all_keys()}
+
+  with open(METADATA_PATH) as f:
+    metadata = json.load(f)
+
+  extra_keys = [key for key in metadata.keys() if key not in all_keys]
+
+  if extra_keys:
+    print(f"Warning: The following keys in metadata do not exist in Params: {extra_keys}")
+
+
+def test_no_default_titles():
+  """
+  Test that no parameter has a title that is identical to its key.
+
+  Why:
+  The default behavior of the update script is to set the title equal to the key.
+  We want to force developers to provide human-readable, descriptive titles for all parameters.
+
+  Expected:
+  No parameter metadata should have 'title' == 'key'.
+  """
+  with open(METADATA_PATH) as f:
+    metadata = json.load(f)
+
+  default_title_keys = [key for key, meta in metadata.items() if meta.get("title") == key]
+
+  if default_title_keys:
+    pytest.fail(
+      f"The following parameters have default titles (title == key): {default_title_keys}. "
+      + "Please update 'params_metadata.json' with descriptive titles."
+    )
+
+
+def test_options_structure():
+  """
+  Test that the 'options' field in metadata follows the correct structure.
+
+  Why:
+  The UI expects 'options' to be a list of objects with 'value' and 'label' keys.
+  Incorrect structure will break the UI rendering for dropdowns/toggles.
+
+  Expected:
+  If 'options' is present, it must be a list of dicts, and each dict must have 'value' and 'label'.
+  """
+  with open(METADATA_PATH) as f:
+    metadata = json.load(f)
+
+  for key, meta in metadata.items():
+    if "options" in meta:
+      options = meta["options"]
+      assert isinstance(options, list), f"Options for {key} must be a list"
+      for option in options:
+        assert isinstance(option, dict), f"Option in {key} must be a dictionary"
+        assert "value" in option, f"Option in {key} must have a 'value' key"
+        assert "label" in option, f"Option in {key} must have a 'label' key"
+
+
+def test_numeric_constraints():
+  """
+  Test that numeric parameters have valid 'min', 'max', and 'step' constraints.
+
+  Why:
+  The UI uses these constraints to validate user input and render sliders/steppers.
+  Missing or invalid constraints can lead to UI bugs or invalid parameter values.
+
+  Expected:
+  If any of min/max/step is present, ALL of them must be present.
+  They must be numbers (int/float), and min must be less than max.
+  """
+  with open(METADATA_PATH) as f:
+    metadata = json.load(f)
+
+  for key, meta in metadata.items():
+    if "min" in meta or "max" in meta or "step" in meta:
+      assert "min" in meta, f"Numeric param {key} must have 'min'"
+      assert "max" in meta, f"Numeric param {key} must have 'max'"
+      assert "step" in meta, f"Numeric param {key} must have 'step'"
+
+      assert isinstance(meta["min"], (int, float)), f"Min for {key} must be number"
+      assert isinstance(meta["max"], (int, float)), f"Max for {key} must be number"
+      assert isinstance(meta["step"], (int, float)), f"Step for {key} must be number"
+      assert meta["min"] < meta["max"], f"Min must be less than max for {key}"
+
+
+def test_known_params_metadata():
+  """
+  Test specific known parameters to ensure they have the expected rich metadata.
+
+  Why:
+  This acts as a spot check to ensure that our rich metadata population logic is working correctly
+  and that critical parameters (like LongitudinalPersonality) have their options and constraints preserved.
+
+  Expected:
+  'LongitudinalPersonality' should have 3 options (Aggressive, Standard, Relaxed).
+  'CustomAccLongPressIncrement' should have min=1, max=10, step=1.
+  """
+  with open(METADATA_PATH) as f:
+    metadata = json.load(f)
+
+  # Check an enum-like param
+  lp = metadata.get("LongitudinalPersonality")
+  assert lp is not None
+  assert "options" in lp
+  assert len(lp["options"]) == 3
+  assert lp["options"][0]["label"] == "Aggressive"
+  assert lp["options"][0]["value"] == 0
+
+  # Check a numeric param
+  acc_long = metadata.get("CustomAccLongPressIncrement")
+  assert acc_long is not None
+  assert acc_long["min"] == 1
+  assert acc_long["max"] == 10
+  assert acc_long["step"] == 1
+
+
+def test_torque_control_tune_versions_in_sync():
+  """
+  Test that TorqueControlTune options in params_metadata.json match versions in latcontrol_torque_versions.json.
+
+  Why:
+  The TorqueControlTune dropdown in the UI should always reflect the available torque tune versions.
+  If versions are added/removed from latcontrol_torque_versions.json, the metadata must be updated accordingly.
+
+  Expected:
+  - TorqueControlTune should have a 'Default' option with empty string value
+  - All versions from latcontrol_torque_versions.json should be present in the options
+  - The version values and labels should match between both files
+  """
+  from openpilot.common.basedir import BASEDIR
+
+  versions_json_path = os.path.join(BASEDIR, "sunnypilot", "selfdrive", "controls", "lib", "latcontrol_torque_versions.json")
+  sync_script_path = "python3 sunnypilot/sunnylink/tools/sync_torque_versions.py"
+
+  # Load both files
+  with open(METADATA_PATH) as f:
+    metadata = json.load(f)
+
+  with open(versions_json_path) as f:
+    versions = json.load(f)
+
+  # Get TorqueControlTune metadata
+  torque_tune = metadata.get("TorqueControlTune")
+  if torque_tune is None:
+    pytest.fail(f"TorqueControlTune not found in params_metadata.json. Please run '{sync_script_path}' to sync.")
+
+  if "options" not in torque_tune:
+    pytest.fail(f"TorqueControlTune must have options. Please run '{sync_script_path}' to sync.")
+
+  options = torque_tune["options"]
+  if not isinstance(options, list):
+    pytest.fail(f"TorqueControlTune options must be a list. Please run '{sync_script_path}' to sync.")
+
+  if len(options) == 0:
+    pytest.fail(f"TorqueControlTune must have at least one option. Please run '{sync_script_path}' to sync.")
+
+  # Check that Default option exists
+  default_option = next((opt for opt in options if opt.get("value") == ""), None)
+  if default_option is None:
+    pytest.fail(f"TorqueControlTune must have a 'Default' option with empty string value. Please run '{sync_script_path}' to sync.")
+
+  if default_option.get("label") != "Default":
+    pytest.fail(f"Default option must have label 'Default'. Please run '{sync_script_path}' to sync.")
+
+  # Build expected options from versions.json
+  expected_version_keys = set(versions.keys())
+  actual_version_keys = set()
+
+  for option in options:
+    if option.get("value") == "":
+      continue  # Skip the default option
+
+    label = option.get("label")
+    value = option.get("value")
+
+    # Check that this option corresponds to a version
+    if label not in versions:
+      pytest.fail(f"Option label '{label}' not found in latcontrol_torque_versions.json. Please run '{sync_script_path}' to sync.")
+
+    # Check that the value matches the version number
+    expected_value = float(versions[label]["version"])
+    if value != expected_value:
+      pytest.fail(f"Option '{label}' has value {value}, expected {expected_value}. Please run '{sync_script_path}' to sync.")
+
+    actual_version_keys.add(label)
+
+  # Check that all versions are represented
+  missing_versions = expected_version_keys - actual_version_keys
+  if missing_versions:
+    pytest.fail(f"The following versions are missing from TorqueControlTune options: {missing_versions}. " +
+                f"Please run '{sync_script_path}' to sync.")
+
+  extra_versions = actual_version_keys - expected_version_keys
+  if extra_versions:
+    pytest.fail("The following versions in TorqueControlTune options are not in latcontrol_torque_versions.json: " +
+                f"{extra_versions}. Please run '{sync_script_path}' to sync.")

sunnypilot/sunnylink/tools/update_params_metadata.py

@@ -0,0 +1,133 @@
+#!/usr/bin/env python3
+"""
+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.
+"""
+import json
+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")
+
+
+def main():
+  params = Params()
+  all_keys = params.all_keys()
+
+  if os.path.exists(METADATA_PATH):
+    with open(METADATA_PATH) as f:
+      try:
+        data = json.load(f)
+      except json.JSONDecodeError:
+        data = {}
+  else:
+    data = {}
+
+  # Add new keys
+  for key in all_keys:
+    key_str = key.decode("utf-8")
+    if key_str not in data:
+      print(f"Adding new key: {key_str}")
+      data[key_str] = {
+        "title": key_str,
+        "description": "",
+      }
+
+  # Remove deleted keys
+  # keys_to_remove = [k for k in data.keys() if k.encode("utf-8") not in all_keys]
+  # for k in keys_to_remove:
+  #   print(f"Removing deleted key: {k}")
+  #   del data[k]
+
+  # Sort keys
+  sorted_data = dict(sorted(data.items()))
+
+  with open(METADATA_PATH, "w") as f:
+    json.dump(sorted_data, f, indent=2)
+    f.write("\n")
+
+  print(f"Updated {METADATA_PATH}")
+
+  # 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()
+
+
+def update_onroad_brightness_param():
+  try:
+    with open(METADATA_PATH) as f:
+      params_metadata = json.load(f)
+    if "OnroadScreenOffBrightness" in params_metadata:
+      options = [
+        {"value": 0, "label": "Auto (Default)"},
+        {"value": 1, "label": "Auto (Dark)"},
+        {"value": 2, "label": "Screen Off"},
+      ]
+      for i in range(3, 23):
+        options.append({"value": i, "label": f"{(i - 2) * 5} %"})
+      params_metadata["OnroadScreenOffBrightness"]["options"] = options
+      with open(METADATA_PATH, 'w') as f:
+        json.dump(params_metadata, f, indent=2)
+        f.write('\n')
+      print(f"Updated OnroadScreenOffBrightness options in params_metadata.json with {len(options)} options.")
+  except Exception as e:
+    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)
+
+  try:
+    with open(METADATA_PATH) as f:
+      params_metadata = json.load(f)
+
+    options = [{"value": "", "label": "Default"}]
+    for version_key, version_data in current_versions.items():
+      version_value = float(version_data["version"])
+      options.append({"value": version_value, "label": str(version_key)})
+
+    if "TorqueControlTune" in params_metadata:
+      params_metadata["TorqueControlTune"]["options"] = options
+
+      with open(METADATA_PATH, 'w') as f:
+        json.dump(params_metadata, f, indent=2)
+        f.write('\n')
+
+      print(f"Updated TorqueControlTune options in params_metadata.json with {len(options)} options: \n{options}")
+
+  except Exception as e:
+    print(f"Failed to update TorqueControlTune versions in params_metadata.json: {e}")
+
+
+if __name__ == "__main__":
+  main()

uv.lock

@@ -1369,15 +1369,15 @@ wheels = [
 
 [[package]]
 name = "sentry-sdk"
-version = "2.62.0"
+version = "2.61.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "certifi" },
     { name = "urllib3" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/f6/5d/a343201726150e05f2036eeb6e493e2e2f8bf8a66f5aa70f2f4ac96f9ca3/sentry_sdk-2.62.0.tar.gz", hash = "sha256:3c870b9f50d9fd15b58c817dbde1c7cfaa9fe3f05df0a4c6edd5571cb82f5491", size = 463986, upload-time = "2026-06-08T13:23:49.223Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/63/3b/4bc6b348bbd331daa14d4babe9f2b99bc854f4da41560eefb9488d78481d/sentry_sdk-2.61.1.tar.gz", hash = "sha256:9c6adccb3feefa9ba032c8d295ca477575c2f11896046a2b0ad686c47c4af555", size = 459429, upload-time = "2026-06-01T07:24:18.875Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/3d/07/05440381627877aae223fd68f330df9b9fc6641d08bf65328b55235617a2/sentry_sdk-2.62.0-py3-none-any.whl", hash = "sha256:27f61d13a86c3c1648dec666dd5a64f79772dd6a84b446f11866601ecab24f6f", size = 490586, upload-time = "2026-06-08T13:23:47.486Z" },
+    { url = "https://files.pythonhosted.org/packages/df/54/c9218db183846e08efaf68534889ef42e499dde432778881104a42f7071b/sentry_sdk-2.61.1-py3-none-any.whl", hash = "sha256:fa36eaf4b8ad708f718500d4bdcc1532637526a22beb874d88cbc0a46458b5ae", size = 483735, upload-time = "2026-06-01T07:24:17.027Z" },
 ]
 
 [[package]]
@@ -1491,27 +1491,27 @@ wheels = [
 
 [[package]]
 name = "ty"
-version = "0.0.46"
+version = "0.0.44"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/5a/7d/d95b5a9dea83472006be3ce5e480028c44b34138d84d0172e910f287fb69/ty-0.0.46.tar.gz", hash = "sha256:c6c2d7105b5633b49950b4c3a90d1ed2613eb9d794ad582bbbf6c4ffcb93accf", size = 5832380, upload-time = "2026-06-09T03:28:05.056Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/13/f4/fbb120226e4f239652525a664bad976a23fea58c646d1323f2296fee8a61/ty-0.0.44.tar.gz", hash = "sha256:5886229830ab77022842a1c55d2ef57405621a91fc465969fa6d538661898173", size = 5803665, upload-time = "2026-06-05T03:33:48.612Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/0e/24/f9f7533c391610521f4164e6b8e37ef72d0c1ee8651bc0d9ce9e658b953b/ty-0.0.46-py3-none-linux_armv6l.whl", hash = "sha256:5e716337994699cbc1a1a7b7a3e6622306f2574c710330f9d9691c2c3d8391b0", size = 11756264, upload-time = "2026-06-09T03:28:20.112Z" },
-    { url = "https://files.pythonhosted.org/packages/66/49/ff3d13655b9b5cc8176f4c3446bf7ec2df43c8ad9e5272d4adc5d952fa45/ty-0.0.46-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:51d618dec5403635690d0e3e298cd0ad3d84ebc6a576652939ef30ce96fce4b2", size = 11492723, upload-time = "2026-06-09T03:28:13.23Z" },
-    { url = "https://files.pythonhosted.org/packages/82/4a/e7e3209e353c5835c7756339bbcdfda10852407b80fbb9ed46c17241873a/ty-0.0.46-py3-none-macosx_11_0_arm64.whl", hash = "sha256:acbafd6a2351b07a6cf4c945b0b1d47f6d2826faac2526a351dfa74d3a3cc664", size = 10892822, upload-time = "2026-06-09T03:27:51.179Z" },
-    { url = "https://files.pythonhosted.org/packages/6c/20/4390c90434a9ddefcecb65e8df00e4c2700e9739dc0baf58bed36d25f713/ty-0.0.46-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:de5df602ffd760612ae36602bbad69b0123ff6cffd92e62aa92b7709317d69e3", size = 11408745, upload-time = "2026-06-09T03:27:58.049Z" },
-    { url = "https://files.pythonhosted.org/packages/75/0c/f13a1bf9c6798530c773667095a6cf8f73ec9721db359423e7249bff7fbc/ty-0.0.46-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:7abf5a10b30d8641faad90f6a19989daec941bb90261159e05cfeb04d2012046", size = 11544432, upload-time = "2026-06-09T03:27:53.519Z" },
-    { url = "https://files.pythonhosted.org/packages/56/69/eb3710c13dff846a0362df04fadd8a39b64ccc244c0d02ce5285ede8eae5/ty-0.0.46-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8770404139c6ccee2ce2fc226478cfa4100915133c876c257e52197b8b92051d", size = 12031228, upload-time = "2026-06-09T03:28:29.816Z" },
-    { url = "https://files.pythonhosted.org/packages/e9/68/5f5db9c84c1d44acdc67281089b372d9d818ee68123a60c59c66187095e2/ty-0.0.46-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f960d5a6e4860076924d2b86891d9872c4a3daa4663fb416e640b22cf3dbf68e", size = 12596073, upload-time = "2026-06-09T03:28:25.204Z" },
-    { url = "https://files.pythonhosted.org/packages/14/be/cfd0bb272e6a1491f6de30c60da1f39c2b3c3524ec64a5c92b71365c9185/ty-0.0.46-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1d9000a4a3ed08fc37e8a2ff0b801cde06e1c2af3bc053677744bb5a1b751030", size = 12284885, upload-time = "2026-06-09T03:28:10.58Z" },
-    { url = "https://files.pythonhosted.org/packages/a8/3a/2cd541f6320f5d6f70a45725c4e1016efedd5545348bb23b47ffb3e4c724/ty-0.0.46-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d1160e6dc86536109ab755f7142f36f4dda5333c8330cf230d61819494d27125", size = 12079480, upload-time = "2026-06-09T03:27:55.847Z" },
-    { url = "https://files.pythonhosted.org/packages/de/91/8e0075bc6568fb477e7ef4d805c67fa6902b692cb4419e0bf5ce3c04c5bc/ty-0.0.46-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:b619c0efe007731f8221fa787701bfa4402da7a83eb26c61ae25e77b6ace6384", size = 12316547, upload-time = "2026-06-09T03:28:08.28Z" },
-    { url = "https://files.pythonhosted.org/packages/00/28/b96cbfeda019a4044c6a8cd06ff84d08b631d4ba7d9a1e6dc0311df3563a/ty-0.0.46-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:ad98fccb6a8a94c4121b993761a0deee602f5826c4162e0a91f4f8118ddadd42", size = 11392846, upload-time = "2026-06-09T03:28:00.418Z" },
-    { url = "https://files.pythonhosted.org/packages/3b/d0/4d77f699a95ac7a13b94ca1a58682667cfe974f91557d9e2a9fc0b808a7f/ty-0.0.46-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:74536b13c3cc3f5944408669c202d4c57c3d19ff154732df8e6145718aef9191", size = 11559017, upload-time = "2026-06-09T03:28:17.619Z" },
-    { url = "https://files.pythonhosted.org/packages/88/62/1d6f6b51c2b132da8011c6a41ead0c1fd2a0b17ea72304bcf6ce084d581a/ty-0.0.46-py3-none-musllinux_1_2_i686.whl", hash = "sha256:5e50b1e96ced41b609e24ed27d9e4f508584ed7f4d0bb717ca8c8d75d2fd1b7c", size = 11666509, upload-time = "2026-06-09T03:28:22.454Z" },
-    { url = "https://files.pythonhosted.org/packages/fe/9a/6643894bc12cb30c281f4c8bf37f6d30c1fbd9484ef39a12b0ea6dae3c1c/ty-0.0.46-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:0a7d9f58d26d938e5d2f607481b7a412d8c00d675a1ec72004fa9d6b3b9def99", size = 12180448, upload-time = "2026-06-09T03:28:32.329Z" },
-    { url = "https://files.pythonhosted.org/packages/86/68/0f3b7bb03a7da676ef51b1c0af0bde1e500d69d5f0c807ed63b6f30b66dd/ty-0.0.46-py3-none-win32.whl", hash = "sha256:26db0ce89c573e60132d14e9688c9329a1633b1a8c26fe457025c7c406f7d5e6", size = 10960002, upload-time = "2026-06-09T03:28:02.832Z" },
-    { url = "https://files.pythonhosted.org/packages/b1/f4/91ff618b2dee39d0633d23e1adac0174aa1de80df17e270acac534034dbc/ty-0.0.46-py3-none-win_amd64.whl", hash = "sha256:90e8e6d446b9cb7cb4bede9fca7b3c99fd1e2355605ecf431c131a51db2a5e93", size = 12097413, upload-time = "2026-06-09T03:28:27.495Z" },
-    { url = "https://files.pythonhosted.org/packages/e5/2e/300174fca375a27a7c28dd80e990d857d7b3e3b25980c65063f980aa2f17/ty-0.0.46-py3-none-win_arm64.whl", hash = "sha256:ebd320d82605079b901a095dc4711037a0c488b4ace79a602fef4df0d3f4cf74", size = 11439595, upload-time = "2026-06-09T03:28:15.355Z" },
+    { url = "https://files.pythonhosted.org/packages/e8/c6/b5b8c4762efb4d85401652658786506867553ecfc2beac3bcf361a15937f/ty-0.0.44-py3-none-linux_armv6l.whl", hash = "sha256:272d31e7ad49b1dc5e8465a9fe700354e14c755b40d9c75f08f031d786903df3", size = 11607267, upload-time = "2026-06-05T03:33:27.154Z" },
+    { url = "https://files.pythonhosted.org/packages/1c/5c/f4b405570737f44ab0fc4214117fe43353f8f0825a1823d9e99e9c8e57be/ty-0.0.44-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:b92c4ddd7a3daf2049715edec9dc70cf6fd31a5a318ee647258f90dd75495eed", size = 11382826, upload-time = "2026-06-05T03:33:54.374Z" },
+    { url = "https://files.pythonhosted.org/packages/9d/aa/fb9835aa492b148d7754cb4c3db07f31a7e2e09f0d8e0e8e297f01125dd2/ty-0.0.44-py3-none-macosx_11_0_arm64.whl", hash = "sha256:4d42cfd84a690f6654b2a4f0515027c21b692cf2512d32e6433f754893a95609", size = 10809741, upload-time = "2026-06-05T03:33:33.22Z" },
+    { url = "https://files.pythonhosted.org/packages/47/f5/0b20ba6b66837a5a37bab7f74ac0732c66e766b5f0b2d55b30816b15f348/ty-0.0.44-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5dc47ae87e4cb7db2a9166bb23b78a905c3626e523296ec5bccf36b5e89bda6b", size = 11318153, upload-time = "2026-06-05T03:34:09.403Z" },
+    { url = "https://files.pythonhosted.org/packages/ca/bb/b82ea730774a4f950f06d355fbc120d51eac7da23b57fc79ef6ff7c79cbb/ty-0.0.44-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:46d867e80f16f421ac72c9a85240dbf050d62d9b3fbd10a8b5b082fb21679e0b", size = 11403108, upload-time = "2026-06-05T03:33:57.745Z" },
+    { url = "https://files.pythonhosted.org/packages/8b/41/e2c83856165291049c702eda4e2ef3d3ebd875e8a0a77b8cc4ef3156aa1c/ty-0.0.44-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:411f5de0f96a4e4e5cccc3e0d55954c41f6a99ee6ca1fe5a7226cbc68406e053", size = 11944815, upload-time = "2026-06-05T03:34:15.793Z" },
+    { url = "https://files.pythonhosted.org/packages/66/95/1fa6a101eb9d5bec042b87e5ca9c8fc349b75961beca6306f95af5cd5539/ty-0.0.44-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4b15f01ecb4e2b46c05a1769293f9d32c3d4a1e4e7dfccf37c604d705dc3e3f4", size = 12476121, upload-time = "2026-06-05T03:33:51.529Z" },
+    { url = "https://files.pythonhosted.org/packages/72/6a/da4b45b1229d39207c6140681c2aaf4f5691bcb1dc830b84450ca25c8f57/ty-0.0.44-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:edd32b7467af509c99c0244c2226a4e4c03400699003ec33373282ab931654d9", size = 12091340, upload-time = "2026-06-05T03:33:36.289Z" },
+    { url = "https://files.pythonhosted.org/packages/16/c7/e1c9260ea5188195962ff1214ace418b5d69187e8fa7c0a1ec4994b8071b/ty-0.0.44-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:503a585f4007387c3afc58bae23a7ca1b9f236cbdb1a881dc36110655ceb1937", size = 11986201, upload-time = "2026-06-05T03:34:00.624Z" },
+    { url = "https://files.pythonhosted.org/packages/92/f9/312bb112da9b1a7da295bb0426be85e72ad48da4e4266c36d77256b4058d/ty-0.0.44-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:2d28bcfa83243d77c2316944e8cf197f73597bf17d1ddc047d0b10a762531252", size = 12168475, upload-time = "2026-06-05T03:33:30.386Z" },
+    { url = "https://files.pythonhosted.org/packages/02/de/64978d603f6c3e5dd7cb97eca2214567d8ad0c85fa4a7435b7852ae4b779/ty-0.0.44-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:56fd2dd0192def189715b25f5338f6222fb827884dc34111e50aa1c4e061cee5", size = 11292937, upload-time = "2026-06-05T03:34:06.448Z" },
+    { url = "https://files.pythonhosted.org/packages/64/63/a625d8a3c71dcaa01988d330f849c465fe72ead4b0bbab44fe4bd6e672b5/ty-0.0.44-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:7f8d990489032de1984e73c159f3e760d754cf83a602b874827d943821f63595", size = 11421560, upload-time = "2026-06-05T03:33:23.995Z" },
+    { url = "https://files.pythonhosted.org/packages/99/96/61aeba0e629b0c91bd316ff94d00e38817ec493ae4316f39508988daa287/ty-0.0.44-py3-none-musllinux_1_2_i686.whl", hash = "sha256:f61ffe72996a755432922fe90b28db593f572eb5cbf48e3ef4e67b282533d1b0", size = 11580282, upload-time = "2026-06-05T03:34:03.308Z" },
+    { url = "https://files.pythonhosted.org/packages/fa/f7/256e1538ce21cab67b381201444c42454de69d310059c4929d92a0ee9c48/ty-0.0.44-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:2b237a143bac4f30cec9257d45f01e72da97030a80a09a2b69cfef065f09c37f", size = 12085723, upload-time = "2026-06-05T03:33:45.953Z" },
+    { url = "https://files.pythonhosted.org/packages/d3/76/ec3957c10872643a98db7a7895101ad89c5b7cba4bc6c4aebbbfc91756cc/ty-0.0.44-py3-none-win32.whl", hash = "sha256:6a24586c65419223ac5bab4822d49ab493a5d19ea2a897514284c232b9d6166a", size = 10892978, upload-time = "2026-06-05T03:34:12.603Z" },
+    { url = "https://files.pythonhosted.org/packages/a5/7d/ba24050432196e7d7f03945e5c379951593c48e04e5c5d5275cfc4624791/ty-0.0.44-py3-none-win_amd64.whl", hash = "sha256:8cccb27e348c89a9733fbad1b2efadfbad79b107c7e52adb52dfd8a70156a38d", size = 11987058, upload-time = "2026-06-05T03:33:42.692Z" },
+    { url = "https://files.pythonhosted.org/packages/71/34/16ec3f1fec75292d9c56a8b5fef037ceaba85a5c30562206c1a245a00a67/ty-0.0.44-py3-none-win_arm64.whl", hash = "sha256:58049504e7a12bf1957f24a5384a332c94d5590127083a80db5e5a1bed34190b", size = 11329961, upload-time = "2026-06-05T03:33:39.427Z" },
 ]
 
 [[package]]