From 8e19185ceeef0ffd0bc83d67aacc27a990adcd87 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Tue, 18 Feb 2025 13:48:28 -0800 Subject: [PATCH] Bump submodules (#34616) * bump * now libsafety * skip rivian for now --- opendbc_repo | 2 +- panda | 2 +- selfdrive/car/tests/test_models.py | 14 +++++++------- selfdrive/test/process_replay/test_processes.py | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/opendbc_repo b/opendbc_repo index 130bf3183f..87a51e38b5 160000 --- a/opendbc_repo +++ b/opendbc_repo @@ -1 +1 @@ -Subproject commit 130bf3183f4ab871ee8dd56b122cfbb038542606 +Subproject commit 87a51e38b53d91075419f01b4cd2e625ee7d4516 diff --git a/panda b/panda index 978ee19005..2a4d3a9923 160000 --- a/panda +++ b/panda @@ -1 +1 @@ -Subproject commit 978ee190051806f8e5b7b8fede6b6be4e4db4aae +Subproject commit 2a4d3a9923bc5f972d8cdd9df4375252ff49234f diff --git a/selfdrive/car/tests/test_models.py b/selfdrive/car/tests/test_models.py index c20677c05d..fc0b2d5ffb 100644 --- a/selfdrive/car/tests/test_models.py +++ b/selfdrive/car/tests/test_models.py @@ -26,7 +26,7 @@ from openpilot.tools.lib.logreader import LogReader, LogsUnavailable, openpilotc internal_source_zst, comma_api_source, auto_source from openpilot.tools.lib.route import SegmentName -from panda.tests.libpanda import libpanda_py +from panda.tests.libsafety import libsafety_py SafetyModel = car.CarParams.SafetyModel @@ -169,7 +169,7 @@ class TestCarModelBase(unittest.TestCase): assert self.CI # TODO: check safetyModel is in release panda build - self.safety = libpanda_py.libpanda + self.safety = libsafety_py.libsafety cfg = self.CP.safetyConfigs[-1] set_status = self.safety.set_safety_hooks(cfg.safetyModel.raw, cfg.safetyParam) @@ -241,7 +241,7 @@ class TestCarModelBase(unittest.TestCase): if msg.src >= 64: continue - to_send = libpanda_py.make_CANPacket(msg.address, msg.src % 4, msg.dat) + to_send = libsafety_py.make_CANPacket(msg.address, msg.src % 4, msg.dat) if self.safety.safety_rx_hook(to_send) != 1: failed_addrs[hex(msg.address)] += 1 @@ -280,7 +280,7 @@ class TestCarModelBase(unittest.TestCase): now_nanos += DT_CTRL * 1e9 msgs_sent += len(sendcan) for addr, dat, bus in sendcan: - to_send = libpanda_py.make_CANPacket(addr, bus % 4, dat) + to_send = libsafety_py.make_CANPacket(addr, bus % 4, dat) self.assertTrue(self.safety.safety_tx_hook(to_send), (addr, dat, bus)) # Make sure we attempted to send messages @@ -331,7 +331,7 @@ class TestCarModelBase(unittest.TestCase): prev_panda_cruise_engaged = self.safety.get_cruise_engaged_prev() prev_panda_acc_main_on = self.safety.get_acc_main_on() - to_send = libpanda_py.make_CANPacket(address, bus, dat) + to_send = libsafety_py.make_CANPacket(address, bus, dat) self.safety.safety_rx_hook(to_send) can = [(int(time.monotonic() * 1e9), [CanData(address=address, dat=dat, src=bus)])] @@ -374,7 +374,7 @@ class TestCarModelBase(unittest.TestCase): for can in self.can_msgs[:300]: self.CI.update(can_capnp_to_list((can.as_builder().to_bytes(), ))) for msg in filter(lambda m: m.src in range(64), can.can): - to_send = libpanda_py.make_CANPacket(msg.address, msg.src % 4, msg.dat) + to_send = libsafety_py.make_CANPacket(msg.address, msg.src % 4, msg.dat) self.safety.safety_rx_hook(to_send) controls_allowed_prev = False @@ -383,7 +383,7 @@ class TestCarModelBase(unittest.TestCase): for idx, can in enumerate(self.can_msgs): CS = self.CI.update(can_capnp_to_list((can.as_builder().to_bytes(), ))).as_reader() for msg in filter(lambda m: m.src in range(64), can.can): - to_send = libpanda_py.make_CANPacket(msg.address, msg.src % 4, msg.dat) + to_send = libsafety_py.make_CANPacket(msg.address, msg.src % 4, msg.dat) ret = self.safety.safety_rx_hook(to_send) self.assertEqual(1, ret, f"safety rx failed ({ret=}): {(msg.address, msg.src % 4)}") diff --git a/selfdrive/test/process_replay/test_processes.py b/selfdrive/test/process_replay/test_processes.py index 8af779ccf8..c849e42173 100755 --- a/selfdrive/test/process_replay/test_processes.py +++ b/selfdrive/test/process_replay/test_processes.py @@ -60,7 +60,7 @@ segments = [ ] # dashcamOnly makes don't need to be tested until a full port is done -excluded_interfaces = ["mock", "tesla"] +excluded_interfaces = ["mock", "tesla", "rivian"] BASE_URL = "https://commadataci.blob.core.windows.net/openpilotci/" REF_COMMIT_FN = os.path.join(PROC_REPLAY_DIR, "ref_commit")