From 64d8be9176046e7bdbca780a2b8f0ba4d0108a41 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Mon, 28 Jul 2025 13:17:02 -0700 Subject: [PATCH] DM: fix always on permanent lockout (#35834) fix check and comments --- selfdrive/monitoring/helpers.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/selfdrive/monitoring/helpers.py b/selfdrive/monitoring/helpers.py index e451dd9145..a9cb21a3f1 100644 --- a/selfdrive/monitoring/helpers.py +++ b/selfdrive/monitoring/helpers.py @@ -309,15 +309,15 @@ class DriverMonitoring: def _update_events(self, driver_engaged, op_engaged, standstill, wrong_gear, car_speed): self._reset_events() - # Block engaging after max number of distrations or when alert active + # Block engaging until ignition cycle after max number or time of distractions if self.terminal_alert_cnt >= self.settings._MAX_TERMINAL_ALERTS or \ - self.terminal_time >= self.settings._MAX_TERMINAL_DURATION or \ - self.always_on and self.awareness <= self.threshold_prompt: + self.terminal_time >= self.settings._MAX_TERMINAL_DURATION: if not self.too_distracted: self.params.put_bool_nonblocking("DriverTooDistracted", True) self.too_distracted = True - if self.too_distracted: + # Always-on distraction lockout is temporary + if self.too_distracted or (self.always_on and self.awareness <= self.threshold_prompt): self.current_events.add(EventName.tooDistracted) always_on_valid = self.always_on and not wrong_gear