diff --git a/cereal/log.capnp b/cereal/log.capnp index a5828d61cb..6b5398405c 100644 --- a/cereal/log.capnp +++ b/cereal/log.capnp @@ -48,6 +48,7 @@ struct OnroadEvent @0xc4fa6047f024e718 { preEnableStandstill @12; # added during pre-enable state with brake gasPressedOverride @13; # added when user is pressing gas with no disengage on gas steerOverride @14; + steerDisengage @94; # exits active state cruiseDisabled @15; speedTooLow @16; outOfSpace @17; diff --git a/opendbc_repo b/opendbc_repo index 0d3b96f1db..7b87e9069c 160000 --- a/opendbc_repo +++ b/opendbc_repo @@ -1 +1 @@ -Subproject commit 0d3b96f1dbb6d6318b123e6c481248685c805f18 +Subproject commit 7b87e9069c387ee27187efac45cdff42f3378e20 diff --git a/selfdrive/car/car_specific.py b/selfdrive/car/car_specific.py index 2d69d3d590..bbecc6e688 100644 --- a/selfdrive/car/car_specific.py +++ b/selfdrive/car/car_specific.py @@ -191,6 +191,8 @@ class CarSpecificEvents: events.add(EventName.accFaulted) if CS.steeringPressed: events.add(EventName.steerOverride) + if CS.steeringDisengage: + events.add(EventName.steerDisengage) if CS.brakePressed and CS.standstill: events.add(EventName.preEnableStandstill) if CS.gasPressed: diff --git a/selfdrive/selfdrived/events.py b/selfdrive/selfdrived/events.py index ee2c418b6e..c187ed474a 100755 --- a/selfdrive/selfdrived/events.py +++ b/selfdrive/selfdrived/events.py @@ -670,6 +670,11 @@ EVENTS: dict[int, dict[str, Alert | AlertCallbackType]] = { visual_alert=VisualAlert.brakePressed), }, + EventName.steerDisengage: { + ET.USER_DISABLE: EngagementAlert(AudibleAlert.disengage), + ET.NO_ENTRY: NoEntryAlert("Steering Pressed"), + }, + EventName.preEnableStandstill: { ET.PRE_ENABLE: Alert( "Release Brake to Engage",