From f8f1ffd0d6401dbc9b865b8b5d0de23b557784f1 Mon Sep 17 00:00:00 2001
From: vanillagorillaa <31773928+vanillagorillaa@users.noreply.github.com>
Date: Thu, 27 Jan 2022 20:16:13 -0800
Subject: [PATCH] Honda: Merge Passport interface (#23651)

old-commit-hash: 06541abddcd84a6a6f6b4dbe51f036090e725351
---
 selfdrive/car/honda/interface.py | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/selfdrive/car/honda/interface.py b/selfdrive/car/honda/interface.py
index ee2c860924..94e4305909 100755
--- a/selfdrive/car/honda/interface.py
+++ b/selfdrive/car/honda/interface.py
@@ -249,17 +249,7 @@ class CarInterface(CarInterfaceBase):
       tire_stiffness_factor = 0.82
       ret.lateralTuning.pid.kpV, ret.lateralTuning.pid.kiV = [[0.28], [0.08]]
 
-    elif candidate == CAR.PILOT:
-      stop_and_go = False
-      ret.mass = 4204. * CV.LB_TO_KG + STD_CARGO_KG  # average weight
-      ret.wheelbase = 2.82
-      ret.centerToFront = ret.wheelbase * 0.428
-      ret.steerRatio = 17.25  # as spec
-      ret.lateralParams.torqueBP, ret.lateralParams.torqueV = [[0, 4096], [0, 4096]]  # TODO: determine if there is a dead zone at the top end
-      tire_stiffness_factor = 0.444
-      ret.lateralTuning.pid.kpV, ret.lateralTuning.pid.kiV = [[0.38], [0.11]]
-
-    elif candidate == CAR.PASSPORT:
+    elif candidate in (CAR.PILOT, CAR.PASSPORT):
       stop_and_go = False
       ret.mass = 4204. * CV.LB_TO_KG + STD_CARGO_KG  # average weight
       ret.wheelbase = 2.82