From 0d9b2c15af9f6e836c1876b877c4c295e0bd660c Mon Sep 17 00:00:00 2001 From: Jason Wen Date: Sat, 4 Jan 2025 11:44:36 -0500 Subject: [PATCH] remove unused event --- cereal/log.capnp | 19 +++++++++---------- selfdrive/selfdrived/events.py | 7 ------- sunnypilot/mads/helpers.py | 2 +- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/cereal/log.capnp b/cereal/log.capnp index 8708ff038b..50d4d8e4dd 100644 --- a/cereal/log.capnp +++ b/cereal/log.capnp @@ -189,16 +189,15 @@ struct OnroadEvent @0xc4fa6047f024e718 { lkasDisable @152; manualSteeringRequired @153; manualLongitudinalRequired @154; - silentPedalPressed @155; - silentLkasEnable @156; - silentLkasDisable @157; - silentBrakeHold @158; - silentWrongGear @159; - silentReverseGear @160; - silentDoorOpen @161; - silentSeatbeltNotLatched @162; - silentParkBrake @163; - controlsMismatchLateral @164; + silentLkasEnable @155; + silentLkasDisable @156; + silentBrakeHold @157; + silentWrongGear @158; + silentReverseGear @159; + silentDoorOpen @160; + silentSeatbeltNotLatched @161; + silentParkBrake @162; + controlsMismatchLateral @163; soundsUnavailableDEPRECATED @47; } diff --git a/selfdrive/selfdrived/events.py b/selfdrive/selfdrived/events.py index 80984bc5f8..672d809dd9 100755 --- a/selfdrive/selfdrived/events.py +++ b/selfdrive/selfdrived/events.py @@ -994,13 +994,6 @@ EVENTS: dict[int, dict[str, Alert | AlertCallbackType]] = { Priority.LOW, VisualAlert.none, AudibleAlert.none, 1.), }, - # TODO-SP: remove prior merging - EventName.silentPedalPressed: { - ET.USER_DISABLE: EngagementAlert(AudibleAlert.none), - ET.NO_ENTRY: NoEntryAlert("Pedal Pressed During Attempt", - visual_alert=VisualAlert.brakePressed), - }, - EventName.silentLkasEnable: { ET.ENABLE: EngagementAlert(AudibleAlert.none), }, diff --git a/sunnypilot/mads/helpers.py b/sunnypilot/mads/helpers.py index 7ed13b30cf..02f4c2f317 100644 --- a/sunnypilot/mads/helpers.py +++ b/sunnypilot/mads/helpers.py @@ -57,6 +57,6 @@ class MadsParams: CP.safetyConfigs[-1].safetyParam |= Panda.FLAG_HYUNDAI_LONG_MAIN_CRUISE_TOGGLEABLE # MADS is currently not supported in Tesla due to lack of consistent states to engage controls - # TODO-SP: To enable MADS for Tesla Identify consistent signals for MADS toggling + # TODO-SP: To enable MADS for Tesla, dentify consistent signals for MADS toggling if CP.carName == "tesla": self.params.remove("Mads")