From af2cc9d693f3753f27a5bdf0884273294fe8ac26 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Sat, 15 May 2021 21:07:57 -0700 Subject: [PATCH] cancel is never true if cruise isn't enabled and pedal --- selfdrive/controls/controlsd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/selfdrive/controls/controlsd.py b/selfdrive/controls/controlsd.py index cfd81bc451..22d10b5c64 100755 --- a/selfdrive/controls/controlsd.py +++ b/selfdrive/controls/controlsd.py @@ -450,7 +450,7 @@ class Controls: CC.actuators = actuators CC.cruiseControl.override = True - CC.cruiseControl.cancel = not self.CP.enableCruise or (not self.enabled and CS.cruiseState.enabled) + CC.cruiseControl.cancel = (not self.CP.enableCruise and not self.CP.enableGasInterceptor) or (not self.enabled and CS.cruiseState.enabled) # Some override values for Honda # brake discount removes a sharp nonlinearity