From 90da12f7d5f59fc6134d5541b5a2dc5baca5a776 Mon Sep 17 00:00:00 2001
From: Shane Smiskol <shane@smiskol.com>
Date: Mon, 29 Jan 2024 16:42:21 -0800
Subject: [PATCH] ugh gm is going to be slow

---
 selfdrive/car/gm/fingerprints.py           |  2 +-
 selfdrive/car/gm/values.py                 | 25 ++++++----------------
 selfdrive/car/tests/test_fw_fingerprint.py |  2 +-
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/selfdrive/car/gm/fingerprints.py b/selfdrive/car/gm/fingerprints.py
index 9ba8262557..973a1995b9 100644
--- a/selfdrive/car/gm/fingerprints.py
+++ b/selfdrive/car/gm/fingerprints.py
@@ -56,5 +56,5 @@ FINGERPRINTS = {
 }
 
 FW_VERSIONS = {
-  # CAR.BOLT_EUV: {}
+  CAR.BOLT_EUV: {}
 }
diff --git a/selfdrive/car/gm/values.py b/selfdrive/car/gm/values.py
index 6eb3f1d39e..2210cd43ae 100644
--- a/selfdrive/car/gm/values.py
+++ b/selfdrive/car/gm/values.py
@@ -163,27 +163,16 @@ GM_FW_REQUESTS = [
 GM_RX_OFFSET = 0x400
 
 FW_QUERY_CONFIG = FwQueryConfig(
-  requests=[
+  requests=[request for bus, obd_multiplexing in ((0, True), (1, True), (1, False)) for req in GM_FW_REQUESTS for request in [
     Request(
-      [StdQueries.SHORT_TESTER_PRESENT_REQUEST] + GM_FW_REQUESTS,
-      [StdQueries.SHORT_TESTER_PRESENT_RESPONSE] + [GM_FW_RESPONSE] * len(GM_FW_REQUESTS),
+      [StdQueries.SHORT_TESTER_PRESENT_REQUEST, req],
+      [StdQueries.SHORT_TESTER_PRESENT_RESPONSE, GM_FW_RESPONSE],
       rx_offset=GM_RX_OFFSET,
-      bus=0,
+      bus=bus,
+      logging=True,
+      obd_multiplexing=obd_multiplexing,
     ),
-    Request(
-      [StdQueries.SHORT_TESTER_PRESENT_REQUEST] + GM_FW_REQUESTS,
-      [StdQueries.SHORT_TESTER_PRESENT_RESPONSE] + [GM_FW_RESPONSE] * len(GM_FW_REQUESTS),
-      rx_offset=GM_RX_OFFSET,
-      bus=1,
-    ),
-    Request(
-      [StdQueries.SHORT_TESTER_PRESENT_REQUEST] + GM_FW_REQUESTS,
-      [StdQueries.SHORT_TESTER_PRESENT_RESPONSE] + [GM_FW_RESPONSE] * len(GM_FW_REQUESTS),
-      rx_offset=GM_RX_OFFSET,
-      bus=1,
-      obd_multiplexing=False,
-    ),
-  ],
+  ]],
   extra_ecus=[(Ecu.fwdCamera, 0x24b, None)],
 )
 
diff --git a/selfdrive/car/tests/test_fw_fingerprint.py b/selfdrive/car/tests/test_fw_fingerprint.py
index a835291f0d..04d4a69713 100755
--- a/selfdrive/car/tests/test_fw_fingerprint.py
+++ b/selfdrive/car/tests/test_fw_fingerprint.py
@@ -241,7 +241,7 @@ class TestFwFingerprintTiming(unittest.TestCase):
     total_ref_time = 6.5
     brand_ref_times = {
       1: {
-        'gm': 0.15,
+        'gm': 1.55,
         'body': 0.1,
         'chrysler': 0.3,
         'ford': 0.2,