From bd63bea94cc83c3dfada31c2a98445a0ada2a1d5 Mon Sep 17 00:00:00 2001
From: Shane Smiskol <shane@smiskol.com>
Date: Thu, 29 Feb 2024 01:48:39 -0800
Subject: [PATCH] more clean up

---
 selfdrive/car/toyota/interface.py | 24 ------------------------
 selfdrive/car/toyota/values.py    |  5 +----
 2 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/selfdrive/car/toyota/interface.py b/selfdrive/car/toyota/interface.py
index 488fa23686..7cee901072 100644
--- a/selfdrive/car/toyota/interface.py
+++ b/selfdrive/car/toyota/interface.py
@@ -58,10 +58,6 @@ class CarInterface(CarInterfaceBase):
 
     elif candidate == CAR.PRIUS_V:
       stop_and_go = True
-      ret.wheelbase = 2.78
-      ret.steerRatio = 17.4
-      ret.tireStiffnessFactor = 0.5533
-      ret.mass = 3340. * CV.LB_TO_KG
 
     elif candidate in (CAR.RAV4, CAR.RAV4H):
       stop_and_go = True if (candidate in CAR.RAV4H) else False
@@ -80,17 +76,9 @@ class CarInterface(CarInterfaceBase):
 
     elif candidate in (CAR.CHR, CAR.CHR_TSS2):
       stop_and_go = True
-      ret.wheelbase = 2.63906
-      ret.steerRatio = 13.6
-      ret.tireStiffnessFactor = 0.7933
-      ret.mass = 3300. * CV.LB_TO_KG
 
     elif candidate in (CAR.CAMRY, CAR.CAMRY_TSS2):
       stop_and_go = True
-      ret.wheelbase = 2.82448
-      ret.steerRatio = 13.7
-      ret.tireStiffnessFactor = 0.7933
-      ret.mass = 3400. * CV.LB_TO_KG  # mean between normal and hybrid
 
     elif candidate in (CAR.HIGHLANDER, CAR.HIGHLANDER_TSS2):
       # TODO: TSS-P models can do stop and go, but unclear if it requires sDSU or unplugging DSU
@@ -132,17 +120,9 @@ class CarInterface(CarInterfaceBase):
 
     elif candidate == CAR.SIENNA:
       stop_and_go = True
-      ret.wheelbase = 3.03
-      ret.steerRatio = 15.5
-      ret.tireStiffnessFactor = 0.444
-      ret.mass = 4590. * CV.LB_TO_KG
 
     elif candidate == CAR.LEXUS_CTH:
       stop_and_go = True
-      ret.wheelbase = 2.60
-      ret.steerRatio = 18.6
-      ret.tireStiffnessFactor = 0.517
-      ret.mass = 3108 * CV.LB_TO_KG  # mean between min and max
 
     elif candidate in (CAR.LEXUS_NX, CAR.LEXUS_NX_TSS2):
       stop_and_go = True
@@ -153,10 +133,6 @@ class CarInterface(CarInterfaceBase):
 
     elif candidate == CAR.MIRAI:
       stop_and_go = True
-      ret.wheelbase = 2.91
-      ret.steerRatio = 14.8
-      ret.tireStiffnessFactor = 0.8
-      ret.mass = 4300. * CV.LB_TO_KG
 
     ret.centerToFront = ret.wheelbase * 0.44
 
diff --git a/selfdrive/car/toyota/values.py b/selfdrive/car/toyota/values.py
index f32d546393..453d8e1977 100644
--- a/selfdrive/car/toyota/values.py
+++ b/selfdrive/car/toyota/values.py
@@ -591,10 +591,7 @@ STEER_THRESHOLD = 100
 EPS_SCALE = defaultdict(lambda: 73, {CAR.PRIUS: 66, CAR.COROLLA: 88, CAR.LEXUS_IS: 77, CAR.LEXUS_RC: 77, CAR.LEXUS_CTH: 100, CAR.PRIUS_V: 100})
 
 # Toyota/Lexus Safety Sense 2.0 and 2.5
-TSS2_CAR = {CAR.RAV4_TSS2, CAR.RAV4_TSS2_2022, CAR.RAV4_TSS2_2023, CAR.COROLLA_TSS2, CAR.LEXUS_ES_TSS2,
-            CAR.LEXUS_RX_TSS2, CAR.HIGHLANDER_TSS2, CAR.PRIUS_TSS2, CAR.CAMRY_TSS2, CAR.LEXUS_IS_TSS2,
-            CAR.MIRAI, CAR.LEXUS_NX_TSS2, CAR.LEXUS_LC_TSS2, CAR.ALPHARD_TSS2, CAR.AVALON_TSS2,
-            CAR.CHR_TSS2}
+TSS2_CAR = CAR.with_flags(ToyotaFlags.TSS2)
 
 NO_DSU_CAR = CAR.with_flags(ToyotaFlags.NO_DSU)