From 1d826e032fe1a26b4ce3f725a34a2469636765b1 Mon Sep 17 00:00:00 2001
From: Jason Wen <haibin.wen3@gmail.com>
Date: Sun, 14 Sep 2025 23:39:26 -0400
Subject: [PATCH 1/2] panda: fix upstream merge conflicts (#97)

(cherry picked from commit 69ab12ee2a2958bb9825bd772ff03be6714b6c0e)
---
 python/__init__.py  | 10 +++++-----
 python/constants.py |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/python/__init__.py b/python/__init__.py
index 0bb2bc517af..db296a5f7c4 100644
--- a/python/__init__.py
+++ b/python/__init__.py
@@ -131,11 +131,11 @@ class Panda:
   HEALTH_STRUCT = struct.Struct("<IIIIIIIIBBBBBHBBBHfBBHBHHB")
   CAN_HEALTH_STRUCT = struct.Struct("<BIBBBBBBBBIIIIIIIHHBBBIIII")
 
-  F4_DEVICES = [HW_TYPE_WHITE, HW_TYPE_BLACK, HW_TYPE_DOS, ]
-  H7_DEVICES = [HW_TYPE_RED_PANDA, HW_TYPE_TRES, HW_TYPE_CUATRO]
+  F4_DEVICES = [HW_TYPE_WHITE, HW_TYPE_BLACK, HW_TYPE_UNO, HW_TYPE_DOS]
+  H7_DEVICES = [HW_TYPE_RED_PANDA, HW_TYPE_RED_PANDA_V2, HW_TYPE_TRES, HW_TYPE_CUATRO]
+  SUPPORTED_DEVICES = F4_DEVICES + H7_DEVICES
 
   INTERNAL_DEVICES = (HW_TYPE_DOS, HW_TYPE_TRES, HW_TYPE_CUATRO)
-  DEPRECATED_DEVICES = (HW_TYPE_WHITE, HW_TYPE_BLACK) + (HW_TYPE_GREY_PANDA, HW_TYPE_PEDAL, HW_TYPE_UNO, HW_TYPE_RED_PANDA_V2)
 
   MAX_FAN_RPMs = {
     HW_TYPE_DOS: 6500,
@@ -239,7 +239,7 @@ def connect(self, claim=True, wait=False):
     logger.debug("connected")
 
     hw_type = self.get_type()
-    if hw_type in Panda.DEPRECATED_DEVICES:
+    if hw_type not in self.SUPPORTED_DEVICES:
       print("WARNING: Using deprecated HW")
 
     # disable openpilot's heartbeat checks
@@ -473,7 +473,7 @@ def flash(self, fn=None, code=None, reconnect=True):
       return
 
     hw_type = self.get_type()
-    if hw_type in Panda.DEPRECATED_DEVICES:
+    if hw_type not in self.SUPPORTED_DEVICES:
       raise RuntimeError(f"HW type {hw_type.hex()} is deprecated and can no longer be flashed.")
 
     if not fn:
diff --git a/python/constants.py b/python/constants.py
index 8b095930844..28456cc4905 100644
--- a/python/constants.py
+++ b/python/constants.py
@@ -38,6 +38,7 @@ def sector_address(self, i):
   "bootstub.panda.bin",
 )
 
+
 H7Config = McuConfig(
   "STM32H7",
   0x483,

From 2a7914fa5ade03cd2c85ae2c671b140684962a80 Mon Sep 17 00:00:00 2001
From: Jason Wen <haibin.wen3@gmail.com>
Date: Thu, 9 Oct 2025 21:47:52 -0400
Subject: [PATCH 2/2] always use opendbc master-tici

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 1fa20287413..a26152394b6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -13,7 +13,7 @@ classifiers = [
 ]
 dependencies = [
   "libusb1",
-  "opendbc @ git+https://github.com/sunnypilot/opendbc.git@master#egg=opendbc",
+  "opendbc @ git+https://github.com/sunnypilot/opendbc.git@master-tici#egg=opendbc",
 ]
 
 [project.optional-dependencies]