From 25a82f57ea77478f9c536053d7642c005bb20fb4 Mon Sep 17 00:00:00 2001
From: FrogAi <91348155+FrogAi@users.noreply.github.com>
Date: Mon, 8 Apr 2024 15:22:06 -0700
Subject: [PATCH] Disable resume required event after it's been shown

---
 selfdrive/car/gm/interface.py | 8 +++++++-
 selfdrive/car/interfaces.py   | 2 ++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/selfdrive/car/gm/interface.py b/selfdrive/car/gm/interface.py
index dbbbed2d5..bc806c6e0 100755
--- a/selfdrive/car/gm/interface.py
+++ b/selfdrive/car/gm/interface.py
@@ -295,8 +295,14 @@ class CarInterface(CarInterfaceBase):
     if below_min_enable_speed and not (ret.standstill and ret.brake >= 20 and
                                       (self.CP.networkLocation == NetworkLocation.fwdCamera and not self.CP.carFingerprint in SDGM_CAR)):
       events.add(EventName.belowEngageSpeed)
-    if ret.cruiseState.standstill:
+    if ret.cruiseState.standstill and not self.disable_resumeRequired:
       events.add(EventName.resumeRequired)
+      self.resumeRequired_shown = True
+
+    # Disable the "resumeRequired" event after it's been shown once to not annoy the driver
+    if self.resumeRequired_shown and not ret.cruiseState.standstill:
+      self.disable_resumeRequired = True
+
     if ret.vEgo < self.CP.minSteerSpeed and not self.disable_belowSteerSpeed:
       events.add(EventName.belowSteerSpeed)
       self.belowSteerSpeed_shown = True
diff --git a/selfdrive/car/interfaces.py b/selfdrive/car/interfaces.py
index d15be6e5e..36f8739ff 100644
--- a/selfdrive/car/interfaces.py
+++ b/selfdrive/car/interfaces.py
@@ -107,6 +107,8 @@ class CarInterfaceBase(ABC):
 
     self.belowSteerSpeed_shown = False
     self.disable_belowSteerSpeed = False
+    self.disable_resumeRequired = False
+    self.resumeRequired_shown = False
 
   @staticmethod
   def get_pid_accel_limits(CP, current_speed, cruise_speed, frogpilot_variables):