controlsd: no cruise speed while main off (#24052)

* controlsd: no cruise speed while main off

* probably more accurate

* update refs
pull/23887/head
Adeeb Shihadeh 3 years ago committed by GitHub
parent f7e9f93c38
commit 49498aa7b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 5
      selfdrive/controls/controlsd.py
  2. 2
      selfdrive/test/process_replay/ref_commit

@ -403,8 +403,11 @@ class Controls:
# if stock cruise is completely disabled, then we can use our own set speed logic # if stock cruise is completely disabled, then we can use our own set speed logic
if not self.CP.pcmCruise: if not self.CP.pcmCruise:
self.v_cruise_kph = update_v_cruise(self.v_cruise_kph, CS.buttonEvents, self.button_timers, self.enabled, self.is_metric) self.v_cruise_kph = update_v_cruise(self.v_cruise_kph, CS.buttonEvents, self.button_timers, self.enabled, self.is_metric)
elif CS.cruiseState.enabled: else:
if CS.cruiseState.available:
self.v_cruise_kph = CS.cruiseState.speed * CV.MS_TO_KPH self.v_cruise_kph = CS.cruiseState.speed * CV.MS_TO_KPH
else:
self.v_cruise_kph = 0
# decrement the soft disable timer at every step, as it's reset on # decrement the soft disable timer at every step, as it's reset on
# entrance in SOFT_DISABLING state # entrance in SOFT_DISABLING state

@ -1 +1 @@
81ec7708ef7582ab950f9af4810d403fce292eb1 98d82b2da600755b12e9ecb2744bf4a8b0942ca1
Loading…
Cancel
Save