From 4bf4ad32da52604acfacad60998e5368cf85ac86 Mon Sep 17 00:00:00 2001 From: Jason Wen Date: Mon, 27 Nov 2023 14:34:35 -0500 Subject: [PATCH] SLC: User Confirm: Remove temp active with opposite buttons --- .../controls/lib/sunnypilot/speed_limit_controller.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/selfdrive/controls/lib/sunnypilot/speed_limit_controller.py b/selfdrive/controls/lib/sunnypilot/speed_limit_controller.py index f93769d38f..3ef40b518b 100644 --- a/selfdrive/controls/lib/sunnypilot/speed_limit_controller.py +++ b/selfdrive/controls/lib/sunnypilot/speed_limit_controller.py @@ -193,14 +193,10 @@ class SpeedLimitController: if self._speed_limit_changed: self._last_op_enabled_time = self._current_time - 2. # immediately prompt confirmation elif self._v_cruise_prev_rounded < self._speed_limit_offsetted_rounded: - if self._v_cruise_setpoint < self._v_cruise_setpoint_prev: - self.state = SpeedLimitControlState.tempInactive - elif self._v_cruise_setpoint > self._v_cruise_setpoint_prev: + if self._v_cruise_setpoint > self._v_cruise_setpoint_prev: self.state = SpeedLimitControlState.active elif self._v_cruise_prev_rounded > self._speed_limit_offsetted_rounded: - if self._v_cruise_setpoint > self._v_cruise_setpoint_prev: - self.state = SpeedLimitControlState.tempInactive - elif self._v_cruise_setpoint < self._v_cruise_setpoint_prev: + if self._v_cruise_setpoint < self._v_cruise_setpoint_prev: self.state = SpeedLimitControlState.active elif self._v_cruise_prev_rounded == self._speed_limit_offsetted_rounded: self.state = SpeedLimitControlState.active