think adding a no entry conditionally is nicer

pull/25393/head
Shane Smiskol 3 years ago
parent 47444510c0
commit 0e5be53bbe
  1. 8
      selfdrive/car/gm/interface.py
  2. 4
      selfdrive/controls/lib/events.py

@ -178,10 +178,12 @@ class CarInterface(CarInterfaceBase):
if ret.vEgo < self.CP.minSteerSpeed:
events.add(car.CarEvent.EventName.belowSteerSpeed)
# handle button presses
# The ECM will fault if resume triggers an enable while speed is unset (unset is greater than 70 m/s)
resume_enabled = c.hudControl.setSpeed < 70
events.events.extend(create_button_enable_events(ret.buttonEvents, pcm_cruise=self.CP.pcmCruise, resume_enabled=resume_enabled))
if c.hudControl.setSpeed >= 70:
events.add(car.CarEvent.EventName.resumeBlocked)
# handle button presses
events.events.extend(create_button_enable_events(ret.buttonEvents, pcm_cruise=self.CP.pcmCruise, resume_enabled=True))
ret.events = events.to_msg()

@ -635,6 +635,10 @@ EVENTS: Dict[int, Dict[str, Union[Alert, AlertCallbackType]]] = {
ET.NO_ENTRY: wrong_car_mode_alert,
},
EventName.resumeBlocked: {
ET.NO_ENTRY: NoEntryAlert("Press Set to Engage"),
},
EventName.wrongCruiseMode: {
ET.USER_DISABLE: EngagementAlert(AudibleAlert.disengage),
ET.NO_ENTRY: NoEntryAlert("Adaptive Cruise Disabled"),

Loading…
Cancel
Save