From 2fbe4e8f71cbb71dddedfe13b89706ab6ae2d918 Mon Sep 17 00:00:00 2001 From: Jason Wen Date: Mon, 25 Nov 2024 00:09:14 -0500 Subject: [PATCH] fix --- selfdrive/selfdrived/events.py | 12 ++++++++++-- sunnypilot/mads/mads.py | 4 ++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/selfdrive/selfdrived/events.py b/selfdrive/selfdrived/events.py index 9ec9254c4e..7c671de748 100755 --- a/selfdrive/selfdrived/events.py +++ b/selfdrive/selfdrived/events.py @@ -1037,12 +1037,20 @@ EVENTS: dict[int, dict[str, Alert | AlertCallbackType]] = { }, EventName.silentDoorOpen: { - ET.SOFT_DISABLE: user_soft_disable_alert("Door Open"), + ET.WARNING: Alert( + "", + "", + AlertStatus.normal, AlertSize.mid, + Priority.LOW, VisualAlert.none, AudibleAlert.none, 0.), ET.NO_ENTRY: NoEntryAlert("Door Open"), }, EventName.silentSeatbeltNotLatched: { - ET.SOFT_DISABLE: user_soft_disable_alert("Seatbelt Unlatched"), + ET.WARNING: Alert( + "", + "", + AlertStatus.normal, AlertSize.mid, + Priority.LOW, VisualAlert.none, AudibleAlert.none, 0.), ET.NO_ENTRY: NoEntryAlert("Seatbelt Unlatched"), }, diff --git a/sunnypilot/mads/mads.py b/sunnypilot/mads/mads.py index 1f2e7043b5..672b4c1a77 100644 --- a/sunnypilot/mads/mads.py +++ b/sunnypilot/mads/mads.py @@ -45,10 +45,10 @@ class ModularAssistiveDrivingSystem: self.events.add(EventName.silentLkasDisable) if not self.selfdrive.enabled and self.enabled: - if self.events.has(EventName.wrongGear) and not self.events.has(EventName.reverseGear): + if self.events.has(EventName.wrongGear): self.events.replace(EventName.wrongGear, EventName.silentWrongGear) transition_paused_state() - if self.events.has(EventName.reverseGear) and CS.vEgo < 5: + if self.events.has(EventName.reverseGear): self.events.replace(EventName.reverseGear, EventName.silentReverseGear) transition_paused_state() if self.events.has(EventName.brakeHold):