cancel lane change

selfdrive/controls/lib/desire_helper.py

@@ -71,7 +71,7 @@ class DesireHelper:
     elif self.lane_change_direction == LaneChangeDirection.right and (carstate.steeringPressed and carstate.steeringTorque > 0):
       cancel_lane_change = frogpilot_toggles.nudgeless
 
-    if cancel_lane_change:
+    if cancel_lane_change or self.lane_change_canceled:
       self.lane_change_state = LaneChangeState.off
       self.lane_change_direction = LaneChangeDirection.none
       self.lane_change_timer = 0.0
@@ -82,17 +82,6 @@ class DesireHelper:
       self.prev_one_blinker = one_blinker
       return
 
-    # Prevent lane change if canceled
-    if self.lane_change_canceled:
-      self.lane_change_state = LaneChangeState.off
-      self.lane_change_direction = LaneChangeDirection.none
-      self.lane_change_timer = 0.0
-      self.lane_change_ll_prob = 1.0
-      self.lane_change_completed = False
-      self.desire = log.Desire.none
-      self.prev_one_blinker = one_blinker
-      return
-
     if not (frogpilot_toggles.lane_detection and one_blinker) or below_lane_change_speed:
       lane_available = True
     else: