This is probably better

pull/20922/head
Shane Smiskol 4 years ago
parent af2cc9d693
commit 14683140c9
  1. 4
      selfdrive/car/honda/carcontroller.py
  2. 2
      selfdrive/controls/controlsd.py

@ -101,6 +101,10 @@ class CarController():
# send pcm acc cancel cmd if drive is disabled but pcm is still on, or if the system can't be activated
pcm_cancel_cmd = True
# Never send cancel command if we never enter cruise state (pedal)
# Cancel cmd causes brakes to release at a standstill
pcm_cancel_cmd &= CS.CP.enableCruise
# *** rate limit after the enable check ***
self.brake_last = rate_limit(brake, self.brake_last, -2., DT_CTRL)

@ -450,7 +450,7 @@ class Controls:
CC.actuators = actuators
CC.cruiseControl.override = True
CC.cruiseControl.cancel = (not self.CP.enableCruise and not self.CP.enableGasInterceptor) or (not self.enabled and CS.cruiseState.enabled)
CC.cruiseControl.cancel = not self.CP.enableCruise or (not self.enabled and CS.cruiseState.enabled)
# Some override values for Honda
# brake discount removes a sharp nonlinearity

Loading…
Cancel
Save