From d4998dad763389acf52ea34d0538e8973fe15bd2 Mon Sep 17 00:00:00 2001 From: FrogAi <91348155+FrogAi@users.noreply.github.com> Date: Thu, 9 May 2024 22:17:49 -0700 Subject: [PATCH] FrogPilot features - 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 131102d92..86e258037 100644 --- a/selfdrive/car/gm/interface.py +++ b/selfdrive/car/gm/interface.py @@ -328,8 +328,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 and not self.CP.autoResumeSng: + if ret.cruiseState.standstill and not (self.CP.autoResumeSng or 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 76e023e39..297184e3a 100644 --- a/selfdrive/car/interfaces.py +++ b/selfdrive/car/interfaces.py @@ -117,6 +117,8 @@ class CarInterfaceBase(ABC): self.belowSteerSpeed_shown = False self.disable_belowSteerSpeed = False + self.disable_resumeRequired = False + self.resumeRequired_shown = False def apply(self, c: car.CarControl, now_nanos: int, frogpilot_toggles) -> tuple[car.CarControl.Actuators, list[tuple[int, int, bytes, int]]]: return self.CC.update(c, self.CS, now_nanos, frogpilot_toggles)