From 4699eed8f348e3581e84bcac5c02c8ab8b1ae351 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Tue, 22 Aug 2023 23:43:52 -0700 Subject: [PATCH] FW Query: test noOBD queries on aux panda (#29547) * huh, this test just works! * fix * Update selfdrive/car/tests/test_fw_fingerprint.py old-commit-hash: 7de9842245dfb506ec340290469d7412989e2233 --- selfdrive/car/ford/values.py | 1 - selfdrive/car/tests/test_fw_fingerprint.py | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/selfdrive/car/ford/values.py b/selfdrive/car/ford/values.py index 5d99db945..8968d1dc2 100644 --- a/selfdrive/car/ford/values.py +++ b/selfdrive/car/ford/values.py @@ -108,7 +108,6 @@ FW_QUERY_CONFIG = FwQueryConfig( [StdQueries.TESTER_PRESENT_REQUEST, StdQueries.MANUFACTURER_SOFTWARE_VERSION_REQUEST], [StdQueries.TESTER_PRESENT_RESPONSE, StdQueries.MANUFACTURER_SOFTWARE_VERSION_RESPONSE], # whitelist_ecus=[Ecu.engine], - auxiliary=True, ), Request( [StdQueries.TESTER_PRESENT_REQUEST, StdQueries.MANUFACTURER_SOFTWARE_VERSION_REQUEST], diff --git a/selfdrive/car/tests/test_fw_fingerprint.py b/selfdrive/car/tests/test_fw_fingerprint.py index 3280dea7d..f5892a609 100755 --- a/selfdrive/car/tests/test_fw_fingerprint.py +++ b/selfdrive/car/tests/test_fw_fingerprint.py @@ -168,6 +168,10 @@ class TestFwFingerprint(unittest.TestCase): for request_obj in config.requests: self.assertEqual(len(request_obj.request), len(request_obj.response)) + # No request on the OBD port (bus 1, multiplexed) should be run on an aux panda + self.assertFalse(request_obj.auxiliary and request_obj.bus == 1 and request_obj.obd_multiplexing, + f"{brand.title()}: OBD multiplexed request is marked auxiliary: {request_obj}") + class TestFwFingerprintTiming(unittest.TestCase): N: int = 5 @@ -237,7 +241,7 @@ class TestFwFingerprintTiming(unittest.TestCase): 'volkswagen': 0.2, }, 2: { - 'ford': 0.4, + 'ford': 0.3, 'hyundai': 1.1, } }