C2 detection (commaai#23439)

* two detection * fix CI * catch all * gotta catch em all
budney · Jan 10, 2022 · 842ba8e · 842ba8e
1 parent 67af095
commit 842ba8e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/selfdrive/boardd/boardd.cc b/selfdrive/boardd/boardd.cc
@@ -658,6 +658,8 @@ int main(int argc, char *argv[]) {
     Panda *peripheral_panda = pandas[0];
     std::vector<std::thread> threads;
 
+    Params().put("LastPeripheralPandaType", std::to_string((int) peripheral_panda->get_hw_type()));
+
     threads.emplace_back(panda_state_thread, &pm, pandas, getenv("STARTED") != nullptr);
     threads.emplace_back(peripheral_control_thread, peripheral_panda);
     threads.emplace_back(pigeon_thread, peripheral_panda);

diff --git a/selfdrive/common/params.cc b/selfdrive/common/params.cc
@@ -131,6 +131,7 @@ std::unordered_map<std::string, uint32_t> keys = {
     {"JoystickDebugMode", CLEAR_ON_MANAGER_START | CLEAR_ON_IGNITION_OFF},
     {"LastAthenaPingTime", CLEAR_ON_MANAGER_START},
     {"LastGPSPosition", PERSISTENT},
+    {"LastPeripheralPandaType", PERSISTENT},
     {"LastPowerDropDetected", CLEAR_ON_MANAGER_START},
     {"LastUpdateException", PERSISTENT},
     {"LastUpdateTime", PERSISTENT},

diff --git a/selfdrive/hardware/eon/hardware.py b/selfdrive/hardware/eon/hardware.py
@@ -10,6 +10,12 @@
 from cereal import log
 from selfdrive.hardware.base import HardwareBase, ThermalConfig
 
+try:
+  from common.params import Params
+except Exception:
+  # openpilot is not built yet
+  Params = None
+
 NetworkType = log.DeviceState.NetworkType
 NetworkStrength = log.DeviceState.NetworkStrength
 
@@ -70,6 +76,11 @@ def get_os_version(self):
       return f.read().strip()
 
   def get_device_type(self):
+    try:
+      if int(Params().get("LastPeripheralPandaType")) == log.PandaState.PandaType.uno:
+        return "two"
+    except Exception:
+      pass
     return "eon"
 
   def get_sound_card_online(self):