From a5547c6d5b530569cce3b000111e84b282f2a7c9 Mon Sep 17 00:00:00 2001 From: Willem Melching Date: Mon, 15 Mar 2021 11:33:45 +0100 Subject: [PATCH] Fix vehicleModelInvalid alert (#20352) * Fix vehicleModelInvalid alert * remove from if else tree old-commit-hash: 9685be40901f938ba10335a2f26f3ece4f448a66 --- selfdrive/controls/controlsd.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/selfdrive/controls/controlsd.py b/selfdrive/controls/controlsd.py index 5d8fc2ea27..62b4e0f8a7 100755 --- a/selfdrive/controls/controlsd.py +++ b/selfdrive/controls/controlsd.py @@ -135,6 +135,7 @@ class Controls: self.sm['driverMonitoringState'].events = [] self.sm['driverMonitoringState'].awarenessStatus = 1. self.sm['driverMonitoringState'].faceDetected = False + self.sm['liveParameters'].valid = True self.startup_event = get_startup_event(car_recognized, controller_available) @@ -210,10 +211,11 @@ class Controls: self.mismatch_counter >= 200: self.events.add(EventName.controlsMismatch) + if not self.sm['liveParameters'].valid: + self.events.add(EventName.vehicleModelInvalid) + if len(self.sm['radarState'].radarErrors): self.events.add(EventName.radarFault) - elif not self.sm.valid['liveParameters']: - self.events.add(EventName.vehicleModelInvalid) elif not self.sm.all_alive_and_valid(): self.events.add(EventName.commIssue) if not self.logged_comm_issue: