diff --git a/cereal b/cereal index f05953e72a..c609a29345 160000 --- a/cereal +++ b/cereal @@ -1 +1 @@ -Subproject commit f05953e72ae8eddc87605136e8c1d9d778455c59 +Subproject commit c609a29345dc42c90663cb3705bf9c4c2ee13628 diff --git a/selfdrive/car/interfaces.py b/selfdrive/car/interfaces.py index 199914a9b2..f01c8a8aa0 100644 --- a/selfdrive/car/interfaces.py +++ b/selfdrive/car/interfaces.py @@ -125,7 +125,7 @@ class CarInterfaceBase(ABC): if cs_out.espDisabled: events.add(EventName.espDisabled) if cs_out.gasPressed: - events.add(EventName.gasPressed) + events.add(EventName.pedalPressedPreEnable) if cs_out.stockFcw: events.add(EventName.stockFcw) if cs_out.stockAeb: diff --git a/selfdrive/controls/lib/events.py b/selfdrive/controls/lib/events.py index ab1a78d025..b5c244a678 100644 --- a/selfdrive/controls/lib/events.py +++ b/selfdrive/controls/lib/events.py @@ -356,14 +356,6 @@ EVENTS: Dict[int, Dict[str, Union[Alert, AlertCallbackType]]] = { # ********** events only containing alerts that display while engaged ********** - EventName.gasPressed: { - ET.PRE_ENABLE: Alert( - "Release Gas Pedal to Engage", - "", - AlertStatus.normal, AlertSize.small, - Priority.LOWEST, VisualAlert.none, AudibleAlert.none, .1, creation_delay=1.), - }, - # openpilot tries to learn certain parameters about your car by observing # how the car behaves to steering inputs from both human and openpilot driving. # This includes: @@ -549,6 +541,14 @@ EVENTS: Dict[int, Dict[str, Union[Alert, AlertCallbackType]]] = { visual_alert=VisualAlert.brakePressed), }, + EventName.pedalPressedPreEnable: { + ET.PRE_ENABLE: Alert( + "Release Pedal to Engage", + "", + AlertStatus.normal, AlertSize.small, + Priority.LOWEST, VisualAlert.none, AudibleAlert.none, .1, creation_delay=1.), + }, + EventName.wrongCarMode: { ET.USER_DISABLE: EngagementAlert(AudibleAlert.disengage), ET.NO_ENTRY: wrong_car_mode_alert,