From 0766214043132578f9d03a9d7de9a6db0257914f Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Thu, 22 Feb 2024 03:34:15 -0600 Subject: [PATCH] Ford: add back OBD queries for logging (#31543) * Revert "Reapply "Ford: don't fingerprint on engine (#31195)" part 2 (#31320)" This reverts commit 69a5ada092202482380241584ecdb6a3424b0087. * fix refs * mark logging old-commit-hash: a2bda8724d84fa46ab57ce15cd4143985c1b3470 --- selfdrive/car/ford/values.py | 5 +++++ selfdrive/car/tests/test_fw_fingerprint.py | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/selfdrive/car/ford/values.py b/selfdrive/car/ford/values.py index c080e02299..979cc6d20a 100644 --- a/selfdrive/car/ford/values.py +++ b/selfdrive/car/ford/values.py @@ -111,6 +111,11 @@ FW_QUERY_CONFIG = FwQueryConfig( requests=[ # CAN and CAN FD queries are combined. # FIXME: For CAN FD, ECUs respond with frames larger than 8 bytes on the powertrain bus + Request( + [StdQueries.TESTER_PRESENT_REQUEST, StdQueries.MANUFACTURER_SOFTWARE_VERSION_REQUEST], + [StdQueries.TESTER_PRESENT_RESPONSE, StdQueries.MANUFACTURER_SOFTWARE_VERSION_RESPONSE], + logging=True, + ), Request( [StdQueries.TESTER_PRESENT_REQUEST, StdQueries.MANUFACTURER_SOFTWARE_VERSION_REQUEST], [StdQueries.TESTER_PRESENT_RESPONSE, StdQueries.MANUFACTURER_SOFTWARE_VERSION_RESPONSE], diff --git a/selfdrive/car/tests/test_fw_fingerprint.py b/selfdrive/car/tests/test_fw_fingerprint.py index 493efc1bab..e1ebd5cf18 100755 --- a/selfdrive/car/tests/test_fw_fingerprint.py +++ b/selfdrive/car/tests/test_fw_fingerprint.py @@ -263,13 +263,13 @@ class TestFwFingerprintTiming(unittest.TestCase): print(f'get_vin {name} case, query time={self.total_time / self.N} seconds') def test_fw_query_timing(self): - total_ref_time = {1: 5.95, 2: 6.85} + total_ref_time = {1: 6.05, 2: 6.95} brand_ref_times = { 1: { 'gm': 0.5, 'body': 0.1, 'chrysler': 0.3, - 'ford': 0.1, + 'ford': 0.2, 'honda': 0.55, 'hyundai': 1.05, 'mazda': 0.1, @@ -280,7 +280,7 @@ class TestFwFingerprintTiming(unittest.TestCase): 'volkswagen': 0.2, }, 2: { - 'ford': 0.2, + 'ford': 0.3, 'hyundai': 1.85, } }