Reapply "Ford: don't fingerprint on engine (#31195)" part 2 (#31320)

* Reapply "Ford: don't fingerprint on engine (#31195) part 2"

This reverts commit 0dccc2ab5776145bc3458d75c7c8b6ad51fff57d.

* add comment

Co-authored-by: Cameron Clough <cameronjclough@gmail.com>

---------

Co-authored-by: Cameron Clough <cameronjclough@gmail.com>
old-commit-hash: dd6065c33b

selfdrive/car/ford/values.py

@@ -111,21 +111,15 @@ 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
-    # TODO: properly handle auxiliary requests to separate queries and add back whitelists
     Request(
       [StdQueries.TESTER_PRESENT_REQUEST, StdQueries.MANUFACTURER_SOFTWARE_VERSION_REQUEST],
       [StdQueries.TESTER_PRESENT_RESPONSE, StdQueries.MANUFACTURER_SOFTWARE_VERSION_RESPONSE],
-      # whitelist_ecus=[Ecu.engine],
-    ),
-    Request(
-      [StdQueries.TESTER_PRESENT_REQUEST, StdQueries.MANUFACTURER_SOFTWARE_VERSION_REQUEST],
-      [StdQueries.TESTER_PRESENT_RESPONSE, StdQueries.MANUFACTURER_SOFTWARE_VERSION_RESPONSE],
-      # whitelist_ecus=[Ecu.eps, Ecu.abs, Ecu.fwdRadar, Ecu.fwdCamera, Ecu.shiftByWire],
       bus=0,
       auxiliary=True,
     ),
   ],
   extra_ecus=[
+    # We are unlikely to get a response from the PCM from behind the gateway
     (Ecu.engine, 0x7e0, None),
     (Ecu.shiftByWire, 0x732, None),
   ],

selfdrive/car/tests/test_fw_fingerprint.py

@@ -254,13 +254,13 @@ class TestFwFingerprintTiming(unittest.TestCase):
 
   @pytest.mark.timeout(60)
   def test_fw_query_timing(self):
-    total_ref_time = 7.0
+    total_ref_time = 6.8
     brand_ref_times = {
       1: {
         'gm': 0.5,
         'body': 0.1,
         'chrysler': 0.3,
-        'ford': 0.2,
+        'ford': 0.1,
         'honda': 0.55,
         'hyundai': 0.65,
         'mazda': 0.1,
@@ -271,7 +271,7 @@ class TestFwFingerprintTiming(unittest.TestCase):
         'volkswagen': 0.2,
       },
       2: {
-        'ford': 0.3,
+        'ford': 0.2,
         'hyundai': 1.05,
       }
     }