bump cereal

pull/24109/head
Shane Smiskol 3 years ago
parent e40c36f22b
commit ca3171c0f9
  1. 2
      cereal
  2. 2
      selfdrive/car/interfaces.py
  3. 16
      selfdrive/controls/lib/events.py

@ -1 +1 @@
Subproject commit f05953e72ae8eddc87605136e8c1d9d778455c59 Subproject commit c609a29345dc42c90663cb3705bf9c4c2ee13628

@ -125,7 +125,7 @@ class CarInterfaceBase(ABC):
if cs_out.espDisabled: if cs_out.espDisabled:
events.add(EventName.espDisabled) events.add(EventName.espDisabled)
if cs_out.gasPressed: if cs_out.gasPressed:
events.add(EventName.gasPressed) events.add(EventName.pedalPressedPreEnable)
if cs_out.stockFcw: if cs_out.stockFcw:
events.add(EventName.stockFcw) events.add(EventName.stockFcw)
if cs_out.stockAeb: if cs_out.stockAeb:

@ -356,14 +356,6 @@ EVENTS: Dict[int, Dict[str, Union[Alert, AlertCallbackType]]] = {
# ********** events only containing alerts that display while engaged ********** # ********** 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 # openpilot tries to learn certain parameters about your car by observing
# how the car behaves to steering inputs from both human and openpilot driving. # how the car behaves to steering inputs from both human and openpilot driving.
# This includes: # This includes:
@ -549,6 +541,14 @@ EVENTS: Dict[int, Dict[str, Union[Alert, AlertCallbackType]]] = {
visual_alert=VisualAlert.brakePressed), 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: { EventName.wrongCarMode: {
ET.USER_DISABLE: EngagementAlert(AudibleAlert.disengage), ET.USER_DISABLE: EngagementAlert(AudibleAlert.disengage),
ET.NO_ENTRY: wrong_car_mode_alert, ET.NO_ENTRY: wrong_car_mode_alert,

Loading…
Cancel
Save