From 03d20ddbb16bbcd06832657f83837532d683a911 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Sun, 30 Jan 2022 20:17:17 -0800 Subject: [PATCH 1/3] controlsd: only add startup event until initialized --- selfdrive/controls/controlsd.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/selfdrive/controls/controlsd.py b/selfdrive/controls/controlsd.py index 0e9b0755eb0e42..f9260762ede231 100755 --- a/selfdrive/controls/controlsd.py +++ b/selfdrive/controls/controlsd.py @@ -181,10 +181,8 @@ def update_events(self, CS): """Compute carEvents from carState""" self.events.clear() - self.events.add_from_msg(CS.events) - self.events.add_from_msg(self.sm['driverMonitoringState'].events) - # Handle startup event + # Add startup event if self.startup_event is not None: self.events.add(self.startup_event) self.startup_event = None @@ -194,6 +192,9 @@ def update_events(self, CS): self.events.add(EventName.controlsInitializing) return + self.events.add_from_msg(CS.events) + self.events.add_from_msg(self.sm['driverMonitoringState'].events) + # Create events for battery, temperature, disk space, and memory if EON and (self.sm['peripheralState'].pandaType != PandaType.uno) and \ self.sm['deviceState'].batteryPercent < 1 and self.sm['deviceState'].chargingError: From c751c4948ec4e30706ff8a40129f0020214a7c63 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Sun, 30 Jan 2022 20:24:55 -0800 Subject: [PATCH 2/3] update refs --- selfdrive/test/process_replay/process_replay.py | 1 - selfdrive/test/process_replay/ref_commit | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/selfdrive/test/process_replay/process_replay.py b/selfdrive/test/process_replay/process_replay.py index 40ce5365aeb3c1..da9c7172858993 100755 --- a/selfdrive/test/process_replay/process_replay.py +++ b/selfdrive/test/process_replay/process_replay.py @@ -172,7 +172,6 @@ def fingerprint(msgs, fsm, can_sock, fingerprint): can_sock.data = [] fsm.update_ready.set() - print("finished fingerprinting") def get_car_params(msgs, fsm, can_sock, fingerprint): diff --git a/selfdrive/test/process_replay/ref_commit b/selfdrive/test/process_replay/ref_commit index 03062dfd1f9511..cf8aadff7b48b1 100644 --- a/selfdrive/test/process_replay/ref_commit +++ b/selfdrive/test/process_replay/ref_commit @@ -1 +1 @@ -d2ea206bf832dbc0625756d56820895e52d3029e \ No newline at end of file +03d20ddbb16bbcd06832657f83837532d683a911 \ No newline at end of file From e12d54c931a37b32c7f38a4c7d1c9b15c6dc1c9f Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Sun, 30 Jan 2022 20:31:52 -0800 Subject: [PATCH 3/3] update again --- selfdrive/test/process_replay/ref_commit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/selfdrive/test/process_replay/ref_commit b/selfdrive/test/process_replay/ref_commit index cf8aadff7b48b1..0694f88e9f6c18 100644 --- a/selfdrive/test/process_replay/ref_commit +++ b/selfdrive/test/process_replay/ref_commit @@ -1 +1 @@ -03d20ddbb16bbcd06832657f83837532d683a911 \ No newline at end of file +c751c4948ec4e30706ff8a40129f0020214a7c63 \ No newline at end of file