From 7bfd2b81e19c75587c965b53278f995ee2ee8a80 Mon Sep 17 00:00:00 2001
From: Jason Wen <haibin.wen3@gmail.com>
Date: Thu, 7 Mar 2024 15:31:46 -0500
Subject: [PATCH] Toyota: Fix upstream merge conflicts

---
 selfdrive/car/toyota/interface.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/selfdrive/car/toyota/interface.py b/selfdrive/car/toyota/interface.py
index e3bc7ead5f..6160c4bf2d 100644
--- a/selfdrive/car/toyota/interface.py
+++ b/selfdrive/car/toyota/interface.py
@@ -269,6 +269,9 @@ class CarInterface(CarInterfaceBase):
     if ret.enableGasInterceptor:
       ret.safetyConfigs[0].safetyParam |= Panda.FLAG_TOYOTA_GAS_INTERCEPTOR
 
+    if candidate in UNSUPPORTED_DSU_CAR:
+      ret.safetyConfigs[0].safetyParam |= Panda.FLAG_TOYOTA_UNSUPPORTED_DSU_CAR
+
     # min speed to enable ACC. if car can do stop and go, then set enabling speed
     # to a negative value, so it won't matter.
     ret.minEnableSpeed = -1. if (stop_and_go or ret.enableGasInterceptor) else MIN_ACC_SPEED