Toyota: alert when in standstill (#26585)

* add resume required alert

* possibly need this (pressing resume with brake held does nothing)

* better text (has both meanings)

* try this

* Revert "try this"

This reverts commit 5b2991929b.

* no alert with interceptor

* check long
old-commit-hash: 3253b85900

selfdrive/car/toyota/interface.py

@@ -247,16 +247,19 @@ class CarInterface(CarInterfaceBase):
     # events
     events = self.create_common_events(ret)
 
-    if self.CS.low_speed_lockout and self.CP.openpilotLongitudinalControl:
-      events.add(EventName.lowSpeedLockout)
-    if ret.vEgo < self.CP.minEnableSpeed and self.CP.openpilotLongitudinalControl:
-      events.add(EventName.belowEngageSpeed)
-      if c.actuators.accel > 0.3:
-        # some margin on the actuator to not false trigger cancellation while stopping
-        events.add(EventName.speedTooLow)
-      if ret.vEgo < 0.001:
-        # while in standstill, send a user alert
-        events.add(EventName.manualRestart)
+    if self.CP.openpilotLongitudinalControl:
+      if ret.cruiseState.standstill and not ret.brakePressed and not self.CP.enableGasInterceptor:
+        events.add(EventName.resumeRequired)
+      if self.CS.low_speed_lockout:
+        events.add(EventName.lowSpeedLockout)
+      if ret.vEgo < self.CP.minEnableSpeed:
+        events.add(EventName.belowEngageSpeed)
+        if c.actuators.accel > 0.3:
+          # some margin on the actuator to not false trigger cancellation while stopping
+          events.add(EventName.speedTooLow)
+        if ret.vEgo < 0.001:
+          # while in standstill, send a user alert
+          events.add(EventName.manualRestart)
 
     ret.events = events.to_msg()
 

selfdrive/controls/lib/events.py

@@ -501,7 +501,7 @@ EVENTS: Dict[int, Dict[str, Union[Alert, AlertCallbackType]]] = {
   EventName.resumeRequired: {
     ET.WARNING: Alert(
       "STOPPED",
-      "Press Resume to Go",
+      "Press Resume to Exit Standstill",
       AlertStatus.userPrompt, AlertSize.mid,
       Priority.LOW, VisualAlert.none, AudibleAlert.none, .2),
   },