Merge branch 'master' into alert-dedup

one liner
Update selfdrived.py
2026-09-06 01:13:42 +08:00 · 2026-09-03 08:01:35 -04:00 · 2026-08-24 01:37:10 -04:00 · 2026-08-24 01:30:43 -04:00 · 2026-08-24 01:30:43 -04:00 · 2026-08-24 01:30:43 -04:00
1 changed files with 1 additions and 1 deletions
@@ -576,7 +576,7 @@ class SelfdriveD(CruiseHelper):
    clear_event_types = set()
    if ET.WARNING not in self.state_machine.current_alert_types:
      clear_event_types.add(ET.WARNING)
-    if self.enabled:
+    if self.enabled or (ET.NO_ENTRY not in (c := self.state_machine.current_alert_types) and (ET.ENABLE in c or ET.USER_DISABLE in c)):
      clear_event_types.add(ET.NO_ENTRY)

    pers = LONGITUDINAL_PERSONALITY_MAP[self.personality]
Author	SHA1	Message	Date
royjr	45e5620b13	Merge branch 'master' into alert-dedup	2026-09-03 08:01:35 -04:00
royjr	1c3558e017	one liner	2026-08-24 01:37:10 -04:00
royjr	bf567847de	Update selfdrived.py	2026-08-24 01:30:43 -04:00
royjr	bd1d54e239	Update selfdrived.py	2026-08-24 01:30:43 -04:00
royjr	8d49466b62	alert-dedup	2026-08-24 01:30:43 -04:00