From 984134be0eacee8582957951faa6de8ace58fcf5 Mon Sep 17 00:00:00 2001
From: Shane Smiskol <shane@smiskol.com>
Date: Thu, 6 Oct 2022 15:24:52 -0700
Subject: [PATCH] FPv2: fixed fingerprint overrides query result (#25990)

* query FW versions if fixed (override after)

* skip here

* also skip here

* and here
old-commit-hash: e7805eb5c54d336a93af730594ef1ccc725dad82
---
 scripts/launch_corolla.sh            | 1 +
 selfdrive/car/car_helpers.py         | 2 +-
 selfdrive/test/profiling/profiler.py | 1 +
 tools/sim/launch_openpilot.sh        | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/launch_corolla.sh b/scripts/launch_corolla.sh
index 0801938e71..146fbacf0a 100755
--- a/scripts/launch_corolla.sh
+++ b/scripts/launch_corolla.sh
@@ -3,4 +3,5 @@
 DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"
 
 export FINGERPRINT="TOYOTA COROLLA TSS2 2019"
+export SKIP_FW_QUERY="1"
 $DIR/../launch_openpilot.sh
diff --git a/selfdrive/car/car_helpers.py b/selfdrive/car/car_helpers.py
index 273364071b..e1c299d5c3 100644
--- a/selfdrive/car/car_helpers.py
+++ b/selfdrive/car/car_helpers.py
@@ -81,7 +81,7 @@ def fingerprint(logcan, sendcan):
   skip_fw_query = os.environ.get('SKIP_FW_QUERY', False)
   ecu_rx_addrs = set()
 
-  if not fixed_fingerprint and not skip_fw_query:
+  if not skip_fw_query:
     # Vin query only reliably works through OBDII
     bus = 1
 
diff --git a/selfdrive/test/profiling/profiler.py b/selfdrive/test/profiling/profiler.py
index 91226fc577..732a69eebd 100755
--- a/selfdrive/test/profiling/profiler.py
+++ b/selfdrive/test/profiling/profiler.py
@@ -53,6 +53,7 @@ def profile(proc, func, car='toyota'):
   msgs = list(LogReader(rlog_url)) * int(os.getenv("LOOP", "1"))
 
   os.environ['FINGERPRINT'] = fingerprint
+  os.environ['SKIP_FW_QUERY'] = "1"
   os.environ['REPLAY'] = "1"
 
   def run(sm, pm, can_sock):
diff --git a/tools/sim/launch_openpilot.sh b/tools/sim/launch_openpilot.sh
index 15f45b4cc2..adabc40c2e 100755
--- a/tools/sim/launch_openpilot.sh
+++ b/tools/sim/launch_openpilot.sh
@@ -3,6 +3,7 @@
 export PASSIVE="0"
 export NOBOARD="1"
 export SIMULATION="1"
+export SKIP_FW_QUERY="1"
 export FINGERPRINT="HONDA CIVIC 2016"
 
 export BLOCK="camerad,loggerd,encoderd"