From df8b02b4bf152500bbdbf114612341d38436369c Mon Sep 17 00:00:00 2001 From: discountchubbs Date: Fri, 21 Nov 2025 11:56:37 -0800 Subject: [PATCH] Merge remote-tracking branch 'openpilot/master' into nov-19-sync --- selfdrive/ui/sunnypilot/layouts/settings/models.py | 4 ++-- system/ui/sunnypilot/widgets/option_control.py | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/selfdrive/ui/sunnypilot/layouts/settings/models.py b/selfdrive/ui/sunnypilot/layouts/settings/models.py index 21d1133497..baf1f2cfd0 100644 --- a/selfdrive/ui/sunnypilot/layouts/settings/models.py +++ b/selfdrive/ui/sunnypilot/layouts/settings/models.py @@ -83,8 +83,8 @@ class ModelsLayout(Widget): def _update_lane_turn_step(self): new_step = int(round(100 / CV.MPH_TO_KPH)) if self._params.get_bool("IsMetric") else 100 - if self.lane_turn_value_control.action_item.option_control.value_change_step != new_step: - self.lane_turn_value_control.action_item.option_control.value_change_step = new_step + if self.lane_turn_value_control.action_item.value_change_step != new_step: + self.lane_turn_value_control.action_item.value_change_step = new_step def _update_lagd_description(self): desc = tr("Enable this for the car to learn and adapt its steering response time. Disable to use a fixed steering response time. " + diff --git a/system/ui/sunnypilot/widgets/option_control.py b/system/ui/sunnypilot/widgets/option_control.py index 58fb778cf0..5aff6bc037 100644 --- a/system/ui/sunnypilot/widgets/option_control.py +++ b/system/ui/sunnypilot/widgets/option_control.py @@ -68,7 +68,10 @@ class OptionControlSP(ItemAction): if self.value_map: self.params.put(self.param_key, self.value_map[value]) else: - self.params.put(self.param_key, value) + if self.use_float_scaling: + self.params.put(self.param_key, value / 100.0) + else: + self.params.put(self.param_key, value) if self.on_value_changed: self.on_value_changed(value)