|
|
@ -45,16 +45,7 @@ class CarInterface(CarInterfaceBase): |
|
|
|
|
|
|
|
|
|
|
|
ret.longitudinalActuatorDelayUpperBound = 1.0 # s |
|
|
|
ret.longitudinalActuatorDelayUpperBound = 1.0 # s |
|
|
|
|
|
|
|
|
|
|
|
if candidate == CAR.SANTA_FE: |
|
|
|
if candidate in [CAR.SANTA_FE, CAR.SANTA_FE_2022]: |
|
|
|
ret.lateralTuning.pid.kf = 0.00005 |
|
|
|
|
|
|
|
ret.mass = 3982. * CV.LB_TO_KG + STD_CARGO_KG |
|
|
|
|
|
|
|
ret.wheelbase = 2.766 |
|
|
|
|
|
|
|
# Values from optimizer |
|
|
|
|
|
|
|
ret.steerRatio = 16.55 # 13.8 is spec end-to-end |
|
|
|
|
|
|
|
tire_stiffness_factor = 0.82 |
|
|
|
|
|
|
|
ret.lateralTuning.pid.kiBP, ret.lateralTuning.pid.kpBP = [[9., 22.], [9., 22.]] |
|
|
|
|
|
|
|
ret.lateralTuning.pid.kpV, ret.lateralTuning.pid.kiV = [[0.2, 0.35], [0.05, 0.09]] |
|
|
|
|
|
|
|
elif candidate == CAR.SANTA_FE_2022: |
|
|
|
|
|
|
|
ret.lateralTuning.pid.kf = 0.00005 |
|
|
|
ret.lateralTuning.pid.kf = 0.00005 |
|
|
|
ret.mass = 3982. * CV.LB_TO_KG + STD_CARGO_KG |
|
|
|
ret.mass = 3982. * CV.LB_TO_KG + STD_CARGO_KG |
|
|
|
ret.wheelbase = 2.766 |
|
|
|
ret.wheelbase = 2.766 |
|
|
@ -216,7 +207,7 @@ class CarInterface(CarInterfaceBase): |
|
|
|
ret.lateralTuning.pid.kf = 0.00005 |
|
|
|
ret.lateralTuning.pid.kf = 0.00005 |
|
|
|
ret.lateralTuning.pid.kiBP, ret.lateralTuning.pid.kpBP = [[0.], [0.]] |
|
|
|
ret.lateralTuning.pid.kiBP, ret.lateralTuning.pid.kpBP = [[0.], [0.]] |
|
|
|
ret.lateralTuning.pid.kpV, ret.lateralTuning.pid.kiV = [[0.25], [0.05]] |
|
|
|
ret.lateralTuning.pid.kpV, ret.lateralTuning.pid.kiV = [[0.25], [0.05]] |
|
|
|
elif candidate in [CAR.KIA_K5_2021]: |
|
|
|
elif candidate == CAR.KIA_K5_2021: |
|
|
|
ret.lateralTuning.pid.kf = 0.00005 |
|
|
|
ret.lateralTuning.pid.kf = 0.00005 |
|
|
|
ret.mass = 3228. * CV.LB_TO_KG |
|
|
|
ret.mass = 3228. * CV.LB_TO_KG |
|
|
|
ret.wheelbase = 2.85 |
|
|
|
ret.wheelbase = 2.85 |
|
|
|