From 842ba8e5e6253d17d82a02d3d9994efbbbf2133e Mon Sep 17 00:00:00 2001
From: Robbe Derks <robbe.derks@gmail.com>
Date: Mon, 10 Jan 2022 13:13:52 +0100
Subject: [PATCH] C2 detection (#23439)

* two detection

* fix CI

* catch all

* gotta catch em all
---
 selfdrive/boardd/boardd.cc         |  2 ++
 selfdrive/common/params.cc         |  1 +
 selfdrive/hardware/eon/hardware.py | 11 +++++++++++
 3 files changed, 14 insertions(+)

diff --git a/selfdrive/boardd/boardd.cc b/selfdrive/boardd/boardd.cc
index 0ca943de..1178b4ca 100644
--- 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
index f0508cac..39cb4fcf 100644
--- 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
index fa275c5a..4ab9f81f 100644
--- a/selfdrive/hardware/eon/hardware.py
+++ b/selfdrive/hardware/eon/hardware.py
@@ -10,6 +10,12 @@ from typing import List, Union
 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 @@ class Android(HardwareBase):
       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):