From f016bd7e1603d8f5f7aeff1a22133a2ec86fd91a Mon Sep 17 00:00:00 2001
From: FrogAi <91348155+FrogAi@users.noreply.github.com>
Date: Fri, 12 Jan 2024 22:39:30 -0700
Subject: [PATCH] Disable resume required event after it's been shown

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

diff --git a/selfdrive/car/gm/interface.py b/selfdrive/car/gm/interface.py
index 3aa20f3..6f55d2a 100644
--- a/selfdrive/car/gm/interface.py
+++ b/selfdrive/car/gm/interface.py
@@ -365,8 +365,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 68a659b..717405e 100644
--- a/selfdrive/car/interfaces.py
+++ b/selfdrive/car/interfaces.py
@@ -94,6 +94,9 @@ class CarInterfaceBase(ABC):
     self.belowSteerSpeed_shown = False
     self.disable_belowSteerSpeed = False
 
+    self.resumeRequired_shown = False
+    self.disable_resumeRequired = False
+
   @staticmethod
   def get_pid_accel_limits(CP, current_speed, cruise_speed, sport_plus):
     if sport_plus: