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 <willem.melching@gmail.com>
old-commit-hash: 86f68ff22e
commatwo_master
Adeeb Shihadeh 4 years ago committed by GitHub
parent 22fe4c0a12
commit 1244074094
  1. 2
      selfdrive/controls/controlsd.py
  2. 3
      selfdrive/test/process_replay/process_replay.py
  3. 2
      selfdrive/test/process_replay/ref_commit
  4. 11
      selfdrive/test/process_replay/test_processes.py

@ -332,7 +332,7 @@ class Controls:
self.sm.update(0) self.sm.update(0)
all_valid = CS.canValid and self.sm.all_alive_and_valid() 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.CI.init(self.CP, self.can_sock, self.pm.sock['sendcan'])
self.initialized = True self.initialized = True
Params().put_bool("ControlsReady", True) Params().put_bool("ControlsReady", True)

@ -363,6 +363,8 @@ def python_replay_process(cfg, lr, fingerprint=None):
params.put_bool("CommunityFeaturesToggle", True) params.put_bool("CommunityFeaturesToggle", True)
os.environ['NO_RADAR_SLEEP'] = "1" os.environ['NO_RADAR_SLEEP'] = "1"
os.environ["SIMULATION"] = "1"
# TODO: remove after getting new route for civic & accord # TODO: remove after getting new route for civic & accord
migration = { 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())] pub_msgs = [msg for msg in all_msgs if msg.which() in list(cfg.pub_sub.keys())]
log_msgs = [] log_msgs = []
os.environ["SIMULATION"] = "1" # Disable submaster alive checks
managed_processes[cfg.proc_name].prepare() managed_processes[cfg.proc_name].prepare()
managed_processes[cfg.proc_name].start() managed_processes[cfg.proc_name].start()

@ -1 +1 @@
b845a62e02d23f734dad2811b6a96d17447a933f f283ecf7e7938410a81880120ccbabaabe2b3d67

@ -15,12 +15,12 @@ original_segments = [
("HYUNDAI", "02c45f73a2e5c6e9|2021-01-01--19-08-22--1"), # HYUNDAI.SONATA ("HYUNDAI", "02c45f73a2e5c6e9|2021-01-01--19-08-22--1"), # HYUNDAI.SONATA
("TOYOTA", "0982d79ebb0de295|2021-01-04--17-13-21--13"), # TOYOTA.PRIUS (INDI) ("TOYOTA", "0982d79ebb0de295|2021-01-04--17-13-21--13"), # TOYOTA.PRIUS (INDI)
("TOYOTA2", "0982d79ebb0de295|2021-01-03--20-03-36--6"), # TOYOTA.RAV4 (LQR) ("TOYOTA2", "0982d79ebb0de295|2021-01-03--20-03-36--6"), # TOYOTA.RAV4 (LQR)
("HONDA", "eb140f119469d9ab|2021-06-12--10-46-24--27"), # HONDA.CIVIC (NIDEC) ("HONDA", "eb140f119469d9ab|2021-06-12--10-46-24--27"), # HONDA.CIVIC (NIDEC)
("HONDA2", "7d2244f34d1bbcda|2021-06-25--12-25-37--26"), # HONDA.ACCORD (BOSCH) ("HONDA2", "7d2244f34d1bbcda|2021-06-25--12-25-37--26"), # HONDA.ACCORD (BOSCH)
("CHRYSLER", "4deb27de11bee626|2021-02-20--11-28-55--8"), # CHRYSLER.PACIFICA ("CHRYSLER", "4deb27de11bee626|2021-02-20--11-28-55--8"), # CHRYSLER.PACIFICA
("SUBARU", "4d70bc5e608678be|2021-01-15--17-02-04--5"), # SUBARU.IMPREZA ("SUBARU", "4d70bc5e608678be|2021-01-15--17-02-04--5"), # SUBARU.IMPREZA
("GM", "0c58b6a25109da2b|2021-02-23--16-35-50--11"), # GM.VOLT ("GM", "0c58b6a25109da2b|2021-02-23--16-35-50--11"), # GM.VOLT
("NISSAN", "35336926920f3571|2021-02-12--18-38-48--46"), # NISSAN.XTRAIL ("NISSAN", "35336926920f3571|2021-02-12--18-38-48--46"), # NISSAN.XTRAIL
("VOLKSWAGEN", "de9592456ad7d144|2021-06-29--11-00-15--6"), # VOLKSWAGEN.GOLF ("VOLKSWAGEN", "de9592456ad7d144|2021-06-29--11-00-15--6"), # VOLKSWAGEN.GOLF
# Enable when port is tested and dascamOnly is no longer set # 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"), ("HYUNDAI", "fakedata|2021-07-09--16-01-34--0"),
("TOYOTA", "1d6dfff4b6098f01|2021-07-26--07-56-21--2"), ("TOYOTA", "1d6dfff4b6098f01|2021-07-26--07-56-21--2"),
("TOYOTA2", "fakedata|2021-07-09--16-03-56--0"), ("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"), ("HONDA", "fakedata|2021-07-09--16-05-07--0"),
("HONDA2", "fakedata|2021-07-09--16-08-28--0"), ("HONDA2", "fakedata|2021-07-09--16-08-28--0"),
("CHRYSLER", "fakedata|2021-07-09--16-09-39--0"), ("CHRYSLER", "fakedata|2021-07-09--16-09-39--0"),

Loading…
Cancel
Save