pull/26585/head
Shane Smiskol 3 years ago
parent 6d9592c268
commit 5b2991929b
  1. 4
      selfdrive/car/toyota/interface.py
  2. 2
      selfdrive/controls/controlsd.py

@ -247,8 +247,8 @@ class CarInterface(CarInterfaceBase):
# events # events
events = self.create_common_events(ret) events = self.create_common_events(ret)
if ret.cruiseState.standstill and not ret.brakePressed: # if ret.cruiseState.standstill and not ret.brakePressed:
events.add(EventName.resumeRequired) # events.add(EventName.resumeRequired)
if self.CS.low_speed_lockout and self.CP.openpilotLongitudinalControl: if self.CS.low_speed_lockout and self.CP.openpilotLongitudinalControl:
events.add(EventName.lowSpeedLockout) events.add(EventName.lowSpeedLockout)
if ret.vEgo < self.CP.minEnableSpeed and self.CP.openpilotLongitudinalControl: if ret.vEgo < self.CP.minEnableSpeed and self.CP.openpilotLongitudinalControl:

@ -683,6 +683,8 @@ class Controls:
speeds = self.sm['longitudinalPlan'].speeds speeds = self.sm['longitudinalPlan'].speeds
if len(speeds): if len(speeds):
CC.cruiseControl.resume = self.enabled and CS.cruiseState.standstill and speeds[-1] > 0.1 CC.cruiseControl.resume = self.enabled and CS.cruiseState.standstill and speeds[-1] > 0.1
if CC.cruiseControl.resume and not CS.brakePressed:
self.events.add(EventName.resumeRequired)
hudControl = CC.hudControl hudControl = CC.hudControl
hudControl.setSpeed = float(self.v_cruise_helper.v_cruise_cluster_kph * CV.KPH_TO_MS) hudControl.setSpeed = float(self.v_cruise_helper.v_cruise_cluster_kph * CV.KPH_TO_MS)

Loading…
Cancel
Save