|
|
@ -132,20 +132,12 @@ class CarInterface(CarInterfaceBase): |
|
|
|
ret.mass = 3060. * CV.LB_TO_KG + STD_CARGO_KG |
|
|
|
ret.mass = 3060. * CV.LB_TO_KG + STD_CARGO_KG |
|
|
|
set_lat_tune(ret.lateralTuning, LatTunes.PID_D) |
|
|
|
set_lat_tune(ret.lateralTuning, LatTunes.PID_D) |
|
|
|
|
|
|
|
|
|
|
|
elif candidate in (CAR.LEXUS_ES_TSS2, CAR.LEXUS_ESH_TSS2): |
|
|
|
elif candidate in (CAR.LEXUS_ES_TSS2, CAR.LEXUS_ESH_TSS2, CAR.LEXUS_ESH): |
|
|
|
stop_and_go = True |
|
|
|
stop_and_go = True |
|
|
|
ret.wheelbase = 2.8702 |
|
|
|
ret.wheelbase = 2.8702 |
|
|
|
ret.steerRatio = 16.0 # not optimized |
|
|
|
ret.steerRatio = 16.0 # not optimized |
|
|
|
tire_stiffness_factor = 0.444 # not optimized yet |
|
|
|
tire_stiffness_factor = 0.444 # not optimized yet |
|
|
|
ret.mass = 3704. * CV.LB_TO_KG + STD_CARGO_KG |
|
|
|
ret.mass = 3677. * CV.LB_TO_KG + STD_CARGO_KG # mean between min and max |
|
|
|
set_lat_tune(ret.lateralTuning, LatTunes.PID_D) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
elif candidate == CAR.LEXUS_ESH: |
|
|
|
|
|
|
|
stop_and_go = True |
|
|
|
|
|
|
|
ret.wheelbase = 2.8190 |
|
|
|
|
|
|
|
ret.steerRatio = 16.06 |
|
|
|
|
|
|
|
tire_stiffness_factor = 0.444 # not optimized yet |
|
|
|
|
|
|
|
ret.mass = 3682. * CV.LB_TO_KG + STD_CARGO_KG |
|
|
|
|
|
|
|
set_lat_tune(ret.lateralTuning, LatTunes.PID_D) |
|
|
|
set_lat_tune(ret.lateralTuning, LatTunes.PID_D) |
|
|
|
|
|
|
|
|
|
|
|
elif candidate == CAR.SIENNA: |
|
|
|
elif candidate == CAR.SIENNA: |
|
|
|