Revert "Ram HD: locked Steering Ratio (#156)" (#161)

This reverts commit 8db81e9f4e.
This commit is contained in:
Jason Wen
2023-06-15 11:20:18 -04:00
committed by GitHub
parent ea903ccff7
commit 879041976f
4 changed files with 4 additions and 10 deletions
-1
View File
@@ -82,7 +82,6 @@ class CarInterface(CarInterfaceBase):
ret.mass = 3405. + STD_CARGO_KG
ret.minSteerSpeed = 16
CarInterfaceBase.configure_torque_tune(candidate, ret.lateralTuning, 1.0, False)
ret.flags |= ChryslerFlags.SP_RAM_HD_FIXED_STEERING_RATIO.value
else:
raise ValueError(f"Unsupported car: {candidate}")
-2
View File
@@ -14,8 +14,6 @@ Ecu = car.CarParams.Ecu
class ChryslerFlags(IntFlag):
HIGHER_MIN_STEERING_SPEED = 1
SP_RAM_HD_FIXED_STEERING_RATIO = 2
class CAR:
# Chrysler
+1 -1
View File
@@ -606,7 +606,7 @@ class Controls:
lp = self.sm['liveParameters']
x = max(lp.stiffnessFactor, 0.1)
sr = max(lp.steerRatio, 0.1)
self.VM.update_params(x, sr, self.CP)
self.VM.update_params(x, sr)
# Update Torque Params
if self.CP.lateralTuning.which() == 'torque':
+3 -6
View File
@@ -19,8 +19,6 @@ from numpy.linalg import solve
from cereal import car
from selfdrive.car.chrysler.values import ChryslerFlags
ACCELERATION_DUE_TO_GRAVITY = 9.8
@@ -40,14 +38,13 @@ class VehicleModel:
self.cF_orig: float = CP.tireStiffnessFront
self.cR_orig: float = CP.tireStiffnessRear
self.chrysler_ram_hd: bool = (CP.carName == "chrysler") and CP.flags & ChryslerFlags.SP_RAM_HD_FIXED_STEERING_RATIO.value
self.update_params(1.0, CP.steerRatio, CP)
self.update_params(1.0, CP.steerRatio)
def update_params(self, stiffness_factor: float, steer_ratio: float, CP: car.CarParams) -> None:
def update_params(self, stiffness_factor: float, steer_ratio: float) -> None:
"""Update the vehicle model with a new stiffness factor and steer ratio"""
self.cF: float = stiffness_factor * self.cF_orig
self.cR: float = stiffness_factor * self.cR_orig
self.sR: float = CP.steerRatio if self.chrysler_ram_hd else steer_ratio
self.sR: float = steer_ratio
def steady_state_sol(self, sa: float, u: float, roll: float) -> np.ndarray:
"""Returns the steady state solution.