diff --git a/selfdrive/controls/controlsd.py b/selfdrive/controls/controlsd.py index 86f6ff0f56..731e8968d1 100755 --- a/selfdrive/controls/controlsd.py +++ b/selfdrive/controls/controlsd.py @@ -316,6 +316,8 @@ class Controls: elif self.state == State.preEnabled: if not self.events.any(ET.PRE_ENABLE): self.state = State.enabled + else: + self.current_alert_types.append(ET.PRE_ENABLE) # DISABLED elif self.state == State.disabled: diff --git a/selfdrive/controls/lib/events.py b/selfdrive/controls/lib/events.py index f49a0c2fdd..cffff8b7c1 100644 --- a/selfdrive/controls/lib/events.py +++ b/selfdrive/controls/lib/events.py @@ -204,8 +204,6 @@ def wrong_car_mode_alert(CP, sm, metric): EVENTS = { # ********** events with no alerts ********** - EventName.gasPressed: {ET.PRE_ENABLE: None}, - # ********** events only containing alerts displayed in all states ********** EventName.debugAlert: { @@ -333,6 +331,14 @@ EVENTS = { # ********** events only containing alerts that display while engaged ********** + EventName.gasPressed: { + ET.PRE_ENABLE: Alert( + "openpilot will not brake while gas pressed", + "", + AlertStatus.normal, AlertSize.small, + Priority.LOWEST, VisualAlert.none, AudibleAlert.none, .0, .0, .1), + }, + EventName.vehicleModelInvalid: { ET.WARNING: Alert( "Vehicle Parameter Identification Failed",