diff --git a/cereal/car.capnp b/cereal/car.capnp index 34f2ac37e3..73f9ca9dc4 100644 --- a/cereal/car.capnp +++ b/cereal/car.capnp @@ -52,7 +52,6 @@ struct OnroadEvent @0x9b1657f34caf3ad3 { brakeHold @28; parkBrake @29; manualRestart @30; - lowSpeedLockout @31; joystickDebug @34; longitudinalManeuver @124; steerTempUnavailableSilent @35; @@ -150,6 +149,7 @@ struct OnroadEvent @0x9b1657f34caf3ad3 { wideRoadCameraErrorDEPRECATED @102; highCpuUsageDEPRECATED @105; startupNoFwDEPRECATED @104; + lowSpeedLockoutDEPRECATED @31; } } diff --git a/opendbc_repo b/opendbc_repo index bed4c18a95..01f47ff1a3 160000 --- a/opendbc_repo +++ b/opendbc_repo @@ -1 +1 @@ -Subproject commit bed4c18a959475251e48c28fadfa6bc207f20ec6 +Subproject commit 01f47ff1a324ade77d99f79c7ea0f4e87110147d diff --git a/selfdrive/car/car_specific.py b/selfdrive/car/car_specific.py index db46a75ccc..9602400250 100644 --- a/selfdrive/car/car_specific.py +++ b/selfdrive/car/car_specific.py @@ -99,8 +99,6 @@ class CarSpecificEvents: if self.CP.openpilotLongitudinalControl: if CS.out.cruiseState.standstill and not CS.out.brakePressed: events.add(EventName.resumeRequired) - if CS.low_speed_lockout: # type: ignore[attr-defined] - events.add(EventName.lowSpeedLockout) if CS.out.vEgo < self.CP.minEnableSpeed: events.add(EventName.belowEngageSpeed) if CC_prev.actuators.accel > 0.3: diff --git a/selfdrive/selfdrived/events.py b/selfdrive/selfdrived/events.py index 29b1933701..cb71126627 100755 --- a/selfdrive/selfdrived/events.py +++ b/selfdrive/selfdrived/events.py @@ -945,11 +945,6 @@ EVENTS: dict[int, dict[str, Alert | AlertCallbackType]] = { ET.NO_ENTRY: NoEntryAlert("Slow down to engage"), }, - EventName.lowSpeedLockout: { - ET.PERMANENT: NormalPermanentAlert("Cruise Fault: Restart the car to engage"), - ET.NO_ENTRY: NoEntryAlert("Cruise Fault: Restart the Car"), - }, - EventName.lkasDisabled: { ET.PERMANENT: NormalPermanentAlert("LKAS Disabled: Enable LKAS to engage"), ET.NO_ENTRY: NoEntryAlert("LKAS Disabled"),