cars: remove duplicated cancel logic (commaai#23956)

Author: adeebshihadeh

selfdrive/car/mazda/carcontroller.py

@@ -32,7 +32,7 @@ def update(self, c, CS, frame):
         # TODO: improve the resume trigger logic by looking at actual radar data
         can_sends.append(mazdacan.create_button_cmd(self.packer, CS.CP.carFingerprint, CS.crz_btns_counter, Buttons.RESUME))
 
-    if c.cruiseControl.cancel or (CS.out.cruiseState.enabled and not c.enabled):
+    if c.cruiseControl.cancel:
       # If brake is pressed, let us wait >70ms before trying to disable crz to avoid
       # a race condition with the stock system, where the second cancel from openpilot
       # will disable the crz 'main on'. crz ctrl msg runs at 50hz. 70ms allows us to

selfdrive/car/nissan/carcontroller.py

@@ -24,7 +24,6 @@ def update(self, c, enabled, CS, frame, actuators, cruise_cancel, hud_alert,
     can_sends = []
 
     ### STEER ###
-    acc_active = CS.out.cruiseState.enabled
     lkas_hud_msg = CS.lkas_hud_msg
     lkas_hud_info_msg = CS.lkas_hud_info_msg
     apply_angle = actuators.steeringAngleDeg
@@ -58,10 +57,6 @@ def update(self, c, enabled, CS, frame, actuators, cruise_cancel, hud_alert,
 
     self.last_angle = apply_angle
 
-    if not enabled and acc_active:
-      # send acc cancel cmd if drive is disabled but pcm is still on, or if the system can't be activated
-      cruise_cancel = 1
-
     if self.CP.carFingerprint in (CAR.ROGUE, CAR.XTRAIL, CAR.ALTIMA) and cruise_cancel:
         can_sends.append(nissancan.create_acc_cancel_cmd(self.packer, self.car_fingerprint, CS.cruise_throttle_msg, frame))
 

selfdrive/car/tesla/carcontroller.py

@@ -50,10 +50,6 @@ def update(self, c, enabled, CS, frame, actuators, cruise_cancel):
     if hands_on_fault:
       cruise_cancel = True
 
-    # Cancel when openpilot is not enabled anymore
-    if not enabled and bool(CS.out.cruiseState.enabled):
-      cruise_cancel = True
-
     if ((frame % 10) == 0 and cruise_cancel):
       # Spam every possible counter value, otherwise it might not be accepted
       for counter in range(16):

selfdrive/car/volkswagen/carcontroller.py

@@ -88,7 +88,7 @@ def update(self, c, enabled, CS, frame, ext_bus, actuators, visual_alert, left_l
 
     if CS.CP.pcmCruise:
       if frame > self.graMsgStartFramePrev + P.GRA_VBP_STEP:
-        if not enabled and CS.out.cruiseState.enabled:
+        if c.cruiseControl.cancel:
           # Cancel ACC if it's engaged with OP disengaged.
           self.graButtonStatesToSend = BUTTON_STATES.copy()
           self.graButtonStatesToSend["cancel"] = True