From 29f32bc33106a70886ce1175c69ea2f7a6b7b408 Mon Sep 17 00:00:00 2001 From: Jason Wen Date: Sun, 10 Sep 2023 22:05:10 -0400 Subject: [PATCH] Fix upstream conflicts --- selfdrive/car/honda/interface.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/selfdrive/car/honda/interface.py b/selfdrive/car/honda/interface.py index be199c85f6..7f37fe7077 100755 --- a/selfdrive/car/honda/interface.py +++ b/selfdrive/car/honda/interface.py @@ -225,7 +225,7 @@ class CarInterface(CarInterfaceBase): ret.tireStiffnessFactor = 0.677 elif candidate == CAR.ACCORD_NIDEC_4CYL: - ret.mass = 3279. * CV.LB_TO_KG + STD_CARGO_KG + ret.mass = 3279. * CV.LB_TO_KG ret.wheelbase = 2.75 ret.centerToFront = ret.wheelbase * 0.39 ret.steerRatio = 13.66 # 13.37 is spec @@ -288,7 +288,7 @@ class CarInterface(CarInterfaceBase): elif candidate == CAR.CLARITY: ret.safetyConfigs[0].safetyParam |= Panda.FLAG_HONDA_CLARITY - ret.mass = 4052. * CV.LB_TO_KG + STD_CARGO_KG + ret.mass = 4052. * CV.LB_TO_KG ret.wheelbase = 2.75 ret.centerToFront = ret.wheelbase * 0.4 ret.steerRatio = 16.50 # 12.72 is end-to-end spec