From 1244074094eb2d124b3b8f0eae4209fcbb16ef7c Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Tue, 31 Aug 2021 10:48:21 -0700 Subject: [PATCH] add TSS2 replay route (#21953) * add TSS2 replay route * skip on sim * do not set on import time * update ref Co-authored-by: Willem Melching old-commit-hash: 86f68ff22ed184dc40bfe58761a554aea1e3995e --- selfdrive/controls/controlsd.py | 2 +- selfdrive/test/process_replay/process_replay.py | 3 ++- selfdrive/test/process_replay/ref_commit | 2 +- selfdrive/test/process_replay/test_processes.py | 11 ++++++----- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/selfdrive/controls/controlsd.py b/selfdrive/controls/controlsd.py index 4a0c13f473..a3242d6028 100755 --- a/selfdrive/controls/controlsd.py +++ b/selfdrive/controls/controlsd.py @@ -332,7 +332,7 @@ class Controls: self.sm.update(0) all_valid = CS.canValid and self.sm.all_alive_and_valid() - if not self.initialized and (all_valid or self.sm.frame * DT_CTRL > 3.5): + if not self.initialized and (all_valid or self.sm.frame * DT_CTRL > 3.5 or SIMULATION): self.CI.init(self.CP, self.can_sock, self.pm.sock['sendcan']) self.initialized = True Params().put_bool("ControlsReady", True) diff --git a/selfdrive/test/process_replay/process_replay.py b/selfdrive/test/process_replay/process_replay.py index 322594fb8d..0d4bd3e74f 100755 --- a/selfdrive/test/process_replay/process_replay.py +++ b/selfdrive/test/process_replay/process_replay.py @@ -363,6 +363,8 @@ def python_replay_process(cfg, lr, fingerprint=None): params.put_bool("CommunityFeaturesToggle", True) os.environ['NO_RADAR_SLEEP'] = "1" + os.environ["SIMULATION"] = "1" + # TODO: remove after getting new route for civic & accord migration = { @@ -441,7 +443,6 @@ def cpp_replay_process(cfg, lr, fingerprint=None): pub_msgs = [msg for msg in all_msgs if msg.which() in list(cfg.pub_sub.keys())] log_msgs = [] - os.environ["SIMULATION"] = "1" # Disable submaster alive checks managed_processes[cfg.proc_name].prepare() managed_processes[cfg.proc_name].start() diff --git a/selfdrive/test/process_replay/ref_commit b/selfdrive/test/process_replay/ref_commit index 086db9fadb..51350258c5 100644 --- a/selfdrive/test/process_replay/ref_commit +++ b/selfdrive/test/process_replay/ref_commit @@ -1 +1 @@ -b845a62e02d23f734dad2811b6a96d17447a933f \ No newline at end of file +f283ecf7e7938410a81880120ccbabaabe2b3d67 \ No newline at end of file diff --git a/selfdrive/test/process_replay/test_processes.py b/selfdrive/test/process_replay/test_processes.py index 7630e0ddfd..bd84d6017e 100755 --- a/selfdrive/test/process_replay/test_processes.py +++ b/selfdrive/test/process_replay/test_processes.py @@ -15,12 +15,12 @@ original_segments = [ ("HYUNDAI", "02c45f73a2e5c6e9|2021-01-01--19-08-22--1"), # HYUNDAI.SONATA ("TOYOTA", "0982d79ebb0de295|2021-01-04--17-13-21--13"), # TOYOTA.PRIUS (INDI) ("TOYOTA2", "0982d79ebb0de295|2021-01-03--20-03-36--6"), # TOYOTA.RAV4 (LQR) - ("HONDA", "eb140f119469d9ab|2021-06-12--10-46-24--27"), # HONDA.CIVIC (NIDEC) - ("HONDA2", "7d2244f34d1bbcda|2021-06-25--12-25-37--26"), # HONDA.ACCORD (BOSCH) - ("CHRYSLER", "4deb27de11bee626|2021-02-20--11-28-55--8"), # CHRYSLER.PACIFICA + ("HONDA", "eb140f119469d9ab|2021-06-12--10-46-24--27"), # HONDA.CIVIC (NIDEC) + ("HONDA2", "7d2244f34d1bbcda|2021-06-25--12-25-37--26"), # HONDA.ACCORD (BOSCH) + ("CHRYSLER", "4deb27de11bee626|2021-02-20--11-28-55--8"), # CHRYSLER.PACIFICA ("SUBARU", "4d70bc5e608678be|2021-01-15--17-02-04--5"), # SUBARU.IMPREZA - ("GM", "0c58b6a25109da2b|2021-02-23--16-35-50--11"), # GM.VOLT - ("NISSAN", "35336926920f3571|2021-02-12--18-38-48--46"), # NISSAN.XTRAIL + ("GM", "0c58b6a25109da2b|2021-02-23--16-35-50--11"), # GM.VOLT + ("NISSAN", "35336926920f3571|2021-02-12--18-38-48--46"), # NISSAN.XTRAIL ("VOLKSWAGEN", "de9592456ad7d144|2021-06-29--11-00-15--6"), # VOLKSWAGEN.GOLF # Enable when port is tested and dascamOnly is no longer set @@ -32,6 +32,7 @@ segments = [ ("HYUNDAI", "fakedata|2021-07-09--16-01-34--0"), ("TOYOTA", "1d6dfff4b6098f01|2021-07-26--07-56-21--2"), ("TOYOTA2", "fakedata|2021-07-09--16-03-56--0"), + ("TOYOTA3", "f7d7e3538cda1a2a|2021-08-16--08-55-34--6"), # TOYOTA.COROLLA_TSS2 ("HONDA", "fakedata|2021-07-09--16-05-07--0"), ("HONDA2", "fakedata|2021-07-09--16-08-28--0"), ("CHRYSLER", "fakedata|2021-07-09--16-09-39--0"),