IQ.Pilot Release Commit @ bec7652

iqpilot/selfdrive/selfdrived/events.py

@@ -648,8 +648,16 @@ EVENTS: dict[int, dict[str, Alert | AlertCallbackType]] = {
   },
 
   EventName.wrongGear: {
-    ET.SOFT_DISABLE: user_soft_disable_alert("Gear not D"),
-    ET.NO_ENTRY: NoEntryAlert("Gear not D"),
+    ET.SOFT_DISABLE: Alert(
+      "",
+      "",
+      AlertStatus.normal, AlertSize.none,
+      Priority.LOWEST, VisualAlert.none, AudibleAlert.none, 0.),
+    ET.NO_ENTRY: Alert(
+      "",
+      "",
+      AlertStatus.normal, AlertSize.none,
+      Priority.LOWEST, VisualAlert.none, AudibleAlert.none, 0.),
   },
 
   # This alert is thrown when the calibration angles are outside of the acceptable range.

iqpilot/selfdrive/selfdrived/iq_events.py

@@ -269,7 +269,7 @@ _ENGAGE_EVENTS: EVENTS_IQ_TYPE = {
   EventNameIQ.steeringOverrideReengageAlc: {
     ET.WARNING: Alert(
       "Steering Overridden By Driver",
-      "Re-Engage ALC",
+      "Double Tap SET or Cycle the Cruise Main to Re-Engage ALC",
       AlertStatus.userPrompt, AlertSize.mid,
       Priority.MID, VisualAlert.none, AudibleAlert.prompt, 2.0),
   },
@@ -294,9 +294,9 @@ _CABIN_BLOCK_EVENTS: EVENTS_IQ_TYPE = {
       AlertStatus.normal, AlertSize.none,
       Priority.LOWEST, VisualAlert.none, AudibleAlert.none, 0.),
     ET.NO_ENTRY: Alert(
-      "Not in Drive",
-      "IQ.Pilot Unavailable",
-      AlertStatus.normal, AlertSize.mid,
+      "",
+      "",
+      AlertStatus.normal, AlertSize.none,
       Priority.LOW, VisualAlert.none, AudibleAlert.none, 0.),
   },
 
@@ -344,11 +344,11 @@ _NOTICE_EVENTS: EVENTS_IQ_TYPE = {
   },
 
   EventNameIQ.pedalHeldNotice: {
-    ET.WARNING: NoEntryAlert("Pedal Held")
+    ET.WARNING: NoEntryAlert("Brake Pedal Held")
   },
 
   EventNameIQ.experimentalToggled: {
-    ET.WARNING: NormalPermanentAlert("Experimental Mode Switched", duration=1.5)
+    ET.WARNING: NormalPermanentAlert("Switched to IQ.Pilot End to End Control", duration=1.5)
   },
 
   EventNameIQ.e2eChime: {
@@ -365,7 +365,6 @@ _NOTICE_EVENTS: EVENTS_IQ_TYPE = {
                                        priority=Priority.LOW),
   },
 
-  # outranks the generic processNotRunning alert so the driver sees why engagement is blocked
   EventNameIQ.modelUpdating: {
     ET.NO_ENTRY: NoEntryAlert("Update finishes while parked with internet",
                               alert_text_1="Driving Model Updating",

iqpilot/selfdrive/selfdrived/tests/test_alerts.py

@@ -4,11 +4,12 @@ import os
 import random
 from PIL import Image, ImageDraw, ImageFont
 
-from iqpilot.cereal import log, car
+from iqpilot.cereal import log, car, custom
 from iqpilot.cereal.messaging import SubMaster
 from iqpilot.common.basedir import BASEDIR
 from iqpilot.common.params import Params
 from iqpilot.selfdrive.selfdrived.events import Alert, EVENTS, ET
+from iqpilot.selfdrive.selfdrived.iq_events import EVENTS_IQ
 from iqpilot.selfdrive.selfdrived.events import invalid_lkas_setting_alert, invalid_lkas_setting_no_entry_alert
 from iqpilot.selfdrive.selfdrived.alertmanager import set_offroad_alert
 from iqpilot.selfdrive.test.process_replay.process_replay import CONFIGS
@@ -26,6 +27,17 @@ for event_types in EVENTS.values():
 
 class TestAlerts:
 
+  def test_wrong_gear_alerts_are_silent_and_invisible(self):
+    wrong_gear_alerts = (EVENTS[log.OnroadEvent.EventName.wrongGear][ET.SOFT_DISABLE],
+                         EVENTS[log.OnroadEvent.EventName.wrongGear][ET.NO_ENTRY],
+                         EVENTS_IQ[custom.IQOnroadEvent.EventName.gearNotDriveSilent][ET.NO_ENTRY])
+
+    for alert in wrong_gear_alerts:
+      assert alert.alert_size == AlertSize.none
+      assert alert.audible_alert == car.CarControl.HUDControl.AudibleAlert.none
+      assert alert.alert_text_1 == ""
+      assert alert.alert_text_2 == ""
+
   @classmethod
   def setup_class(cls):
     with open(OFFROAD_ALERTS_PATH) as f: