|
|
@ -404,7 +404,7 @@ 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 self.CP.pcmCruise and CS.cruiseState.enabled: |
|
|
|
elif CS.cruiseState.enabled: |
|
|
|
self.v_cruise_kph = CS.cruiseState.speed * CV.MS_TO_KPH |
|
|
|
self.v_cruise_kph = CS.cruiseState.speed * CV.MS_TO_KPH |
|
|
|
|
|
|
|
|
|
|
|
# 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 |
|
|
|