|
|
|
@ -193,24 +193,19 @@ class CarInterface(CarInterfaceBase): |
|
|
|
|
tire_stiffness_factor = 0.75 |
|
|
|
|
ret.lateralTuning.pid.kpV, ret.lateralTuning.pid.kiV = [[0.2], [0.05]] |
|
|
|
|
|
|
|
|
|
elif candidate == CAR.HRV: |
|
|
|
|
elif candidate in (CAR.HRV, CAR.HRV_2023): |
|
|
|
|
ret.mass = 3125 * CV.LB_TO_KG + STD_CARGO_KG |
|
|
|
|
ret.wheelbase = 2.61 |
|
|
|
|
ret.centerToFront = ret.wheelbase * 0.41 |
|
|
|
|
ret.steerRatio = 15.2 |
|
|
|
|
ret.lateralParams.torqueBP, ret.lateralParams.torqueV = [[0, 4096], [0, 4096]] |
|
|
|
|
tire_stiffness_factor = 0.5 |
|
|
|
|
ret.lateralTuning.pid.kpV, ret.lateralTuning.pid.kiV = [[0.16], [0.025]] |
|
|
|
|
ret.wheelSpeedFactor = 1.025 |
|
|
|
|
|
|
|
|
|
elif candidate == CAR.HRV_2023: |
|
|
|
|
ret.mass = 1305. + STD_CARGO_KG |
|
|
|
|
ret.wheelbase = 2.61 |
|
|
|
|
ret.centerToFront = ret.wheelbase * 0.41 |
|
|
|
|
ret.steerRatio = 15.38 |
|
|
|
|
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.5 |
|
|
|
|
ret.lateralTuning.pid.kpV, ret.lateralTuning.pid.kiV = [[0.8], [0.24]] |
|
|
|
|
if candidate == CAR.HRV: |
|
|
|
|
ret.steerRatio = 15.2 |
|
|
|
|
ret.lateralTuning.pid.kpV, ret.lateralTuning.pid.kiV = [[0.16], [0.025]] |
|
|
|
|
ret.wheelSpeedFactor = 1.025 |
|
|
|
|
else: |
|
|
|
|
ret.steerRatio = 14 |
|
|
|
|
ret.lateralTuning.pid.kpV, ret.lateralTuning.pid.kiV = [[0.8], [0.24]] # TODO: can probably use some tuning |
|
|
|
|
|
|
|
|
|
elif candidate == CAR.ACURA_RDX: |
|
|
|
|
ret.mass = 3935. * CV.LB_TO_KG + STD_CARGO_KG |
|
|
|
|