From 1c43aefada1e8b8a681c2f5167b5eb207c914ecc Mon Sep 17 00:00:00 2001 From: dragonpilot Date: Wed, 14 Aug 2019 10:28:58 +1000 Subject: [PATCH] =?UTF-8?q?=E8=AA=BF=E6=95=B4=20DragonEnableDriverSafetyCh?= =?UTF-8?q?eck=20Logic?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- selfdrive/controls/lib/driver_monitor.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/selfdrive/controls/lib/driver_monitor.py b/selfdrive/controls/lib/driver_monitor.py index 472a60839..d39678a09 100644 --- a/selfdrive/controls/lib/driver_monitor.py +++ b/selfdrive/controls/lib/driver_monitor.py @@ -173,6 +173,9 @@ class DriverStatus(): self.dragon_enable_driver_safety_check = False if params.get("DragonEnableDriverSafetyCheck") == "0" else True self.dp_last_check = ts + if not self.dragon_enable_driver_safety_check: + return events + driver_engaged |= (self.driver_distraction_filter.x < 0.37 and self.monitor_on) awareness_prev = self.awareness @@ -197,7 +200,7 @@ class DriverStatus(): elif self.awareness <= self.threshold_pre: # pre green alert alert = 'preDriverDistracted' if self.monitor_on else 'preDriverUnresponsive' - if alert is not None and self.dragon_enable_driver_safety_check: + if alert is not None: events.append(create_event(alert, [ET.WARNING])) return events