Volkswagen: log FW on non-OBD buses (commaai#31556)

* log lots * update refs * cmt
DDC-NDRS · Feb 23, 2024 · 72a7f00 · 72a7f00
1 parent c9c2ab9
commit 72a7f00
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/selfdrive/car/tests/test_fw_fingerprint.py b/selfdrive/car/tests/test_fw_fingerprint.py
@@ -263,7 +263,7 @@ def fake_get_ecu_addrs(*_, timeout):
         print(f'get_vin {name} case, query time={self.total_time / self.N} seconds')
 
   def test_fw_query_timing(self):
-    total_ref_time = {1: 6.05, 2: 6.95}
+    total_ref_time = {1: 6.5, 2: 7.4}
     brand_ref_times = {
       1: {
         'gm': 0.5,
@@ -277,7 +277,7 @@ def test_fw_query_timing(self):
         'subaru': 0.45,
         'tesla': 0.2,
         'toyota': 1.6,
-        'volkswagen': 0.2,
+        'volkswagen': 0.65,
       },
       2: {
         'ford': 0.3,

diff --git a/selfdrive/car/volkswagen/values.py b/selfdrive/car/volkswagen/values.py
@@ -293,17 +293,24 @@ def init_make(self, CP: car.CarParams):
 VOLKSWAGEN_RX_OFFSET = 0x6a
 
 FW_QUERY_CONFIG = FwQueryConfig(
-  requests=[
+  # TODO: add back whitelists after we gather enough data
+  requests=[request for bus, obd_multiplexing in [(1, True), (1, False), (0, False)] for request in [
     Request(
       [VOLKSWAGEN_VERSION_REQUEST_MULTI],
       [VOLKSWAGEN_VERSION_RESPONSE],
-      whitelist_ecus=[Ecu.srs, Ecu.eps, Ecu.fwdRadar],
+      # whitelist_ecus=[Ecu.srs, Ecu.eps, Ecu.fwdRadar],
       rx_offset=VOLKSWAGEN_RX_OFFSET,
+      bus=bus,
+      logging=(bus != 1 or not obd_multiplexing),
+      obd_multiplexing=obd_multiplexing,
     ),
     Request(
       [VOLKSWAGEN_VERSION_REQUEST_MULTI],
       [VOLKSWAGEN_VERSION_RESPONSE],
-      whitelist_ecus=[Ecu.engine, Ecu.transmission],
+      # whitelist_ecus=[Ecu.engine, Ecu.transmission],
+      bus=bus,
+      logging=(bus != 1 or not obd_multiplexing),
+      obd_multiplexing=obd_multiplexing,
     ),
-  ],
+  ]],
 )