From aa0f5882486e235745c2801d93a382ef8a311525 Mon Sep 17 00:00:00 2001 From: Jason Wen Date: Wed, 13 Nov 2024 19:42:05 -0500 Subject: [PATCH] change events --- cereal/log.capnp | 2 +- selfdrive/selfdrived/events.py | 2 +- sunnypilot/mads/mads.py | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cereal/log.capnp b/cereal/log.capnp index 32e51e7eab..2687d83e1d 100644 --- a/cereal/log.capnp +++ b/cereal/log.capnp @@ -132,7 +132,7 @@ struct OnroadEvent @0xc4fa6047f024e718 { manualSteeringRequired @95; manualLongitudinalRequired @96; silentPedalPressed @97; - silentButtonEnable @98; + silentLkasEnable @98; silentBrakeHold @99; silentWrongGear @100; diff --git a/selfdrive/selfdrived/events.py b/selfdrive/selfdrived/events.py index 12100a29ab..602de8b939 100755 --- a/selfdrive/selfdrived/events.py +++ b/selfdrive/selfdrived/events.py @@ -997,7 +997,7 @@ EVENTS: dict[int, dict[str, Alert | AlertCallbackType]] = { visual_alert=VisualAlert.brakePressed), }, - EventName.silentButtonEnable: { + EventName.silentLkasEnable: { ET.ENABLE: Alert( "", "", diff --git a/sunnypilot/mads/mads.py b/sunnypilot/mads/mads.py index aaf3f875bd..9b0bb00cd6 100644 --- a/sunnypilot/mads/mads.py +++ b/sunnypilot/mads/mads.py @@ -57,7 +57,7 @@ class ModifiedAssistDrivingSystem: if not CS.brakePressed and not CS.brakeHoldActive and not CS.parkingBrake and not CS.regenBraking: if self.state_machine.state == State.paused and self.active: - self.selfdrive.events.add(EventName.silentButtonEnable) + self.selfdrive.events.add(EventName.silentLkasEnable) for be in CS.buttonEvents: if be.type == ButtonType.cancel: @@ -68,10 +68,10 @@ class ModifiedAssistDrivingSystem: if self.selfdrive.enabled_prev: self.selfdrive.events.add(EventName.manualSteeringRequired) else: - self.selfdrive.events.add(EventName.buttonCancel) + self.selfdrive.events.add(EventName.lkasDisable) else: if not self.selfdrive.enabled_prev: - self.selfdrive.events.add(EventName.buttonEnable) + self.selfdrive.events.add(EventName.lkasEnable) self.selfdrive.events.remove(EventName.pedalPressed)