From 0eeb69a5d0f2009a38bf4ebdf18e0e143ff7d5f2 Mon Sep 17 00:00:00 2001
From: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Date: Wed, 1 Feb 2023 19:50:48 -0800
Subject: [PATCH] boardd: enable fingerprinting with both multiplexed modes
 (#27159)

Co-authored-by: Shane Smiskol <shane@smiskol.com>
---
 common/params.cc             |  1 +
 selfdrive/boardd/boardd.cc   | 15 ++++++---------
 selfdrive/car/car_helpers.py |  5 ++++-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/common/params.cc b/common/params.cc
index 35ceecfdc..7dd0fbcb4 100644
--- a/common/params.cc
+++ b/common/params.cc
@@ -111,6 +111,7 @@ std::unordered_map<std::string, uint32_t> keys = {
     {"DoReboot", CLEAR_ON_MANAGER_START},
     {"DoShutdown", CLEAR_ON_MANAGER_START},
     {"DoUninstall", CLEAR_ON_MANAGER_START},
+    {"FirmwareObdQueryDone", CLEAR_ON_MANAGER_START | CLEAR_ON_IGNITION_ON},
     {"ForcePowerDown", CLEAR_ON_MANAGER_START},
     {"GitBranch", PERSISTENT},
     {"GitCommit", PERSISTENT},
diff --git a/selfdrive/boardd/boardd.cc b/selfdrive/boardd/boardd.cc
index 5ef49d4b2..0473d3488 100644
--- a/selfdrive/boardd/boardd.cc
+++ b/selfdrive/boardd/boardd.cc
@@ -106,6 +106,8 @@ void sync_time(Panda *panda, SyncTimeDir dir) {
 bool safety_setter_thread(std::vector<Panda *> pandas) {
   LOGD("Starting safety setter thread");
 
+  Params p;
+
   // there should be at least one panda connected
   if (pandas.size() == 0) {
     return false;
@@ -117,25 +119,20 @@ bool safety_setter_thread(std::vector<Panda *> pandas) {
     pandas[i]->set_safety_model(cereal::CarParams::SafetyModel::ELM327, safety_param);
   }
 
-  Params p = Params();
-
-  // wait for VIN to be read
+  // wait for FW query at OBD port to finish
   while (true) {
     if (do_exit || !check_all_connected(pandas) || !ignition) {
       return false;
     }
 
-    std::string value_vin = p.get("CarVin");
-    if (value_vin.size() > 0) {
-      // sanity check VIN format
-      assert(value_vin.size() == 17);
-      LOGW("got CarVin %s", value_vin.c_str());
+    if (p.getBool("FirmwareObdQueryDone")) {
+      LOGW("finished FW query at OBD port");
       break;
     }
     util::sleep_for(20);
   }
 
-  // set to ELM327 for ECU knockouts
+  // set to ELM327 to finish fingerprinting and for potential ECU knockouts
   for (Panda *panda : pandas) {
     panda->set_safety_model(cereal::CarParams::SafetyModel::ELM327, 1U);
   }
diff --git a/selfdrive/car/car_helpers.py b/selfdrive/car/car_helpers.py
index e32620909..4ccce979d 100644
--- a/selfdrive/car/car_helpers.py
+++ b/selfdrive/car/car_helpers.py
@@ -113,7 +113,10 @@ def fingerprint(logcan, sendcan, num_pandas):
     cloudlog.event("Malformed VIN", vin=vin, error=True)
     vin = VIN_UNKNOWN
   cloudlog.warning("VIN %s", vin)
-  Params().put("CarVin", vin)
+
+  params = Params()
+  params.put("CarVin", vin)
+  params.put_bool("FirmwareObdQueryDone", True)
 
   finger = gen_empty_fingerprint()
   candidate_cars = {i: all_legacy_fingerprint_cars() for i in [0, 1]}  # attempt fingerprint on both bus 0 and 1