|  |  |  | @ -55,7 +55,7 @@ class CarInterface(CarInterfaceBase): | 
			
		
	
		
			
				
					|  |  |  |  |     ret.stopAccel = 0.0 | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |     ret.longitudinalActuatorDelayUpperBound = 1.0  # s | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |     torque_params = CarInterfaceBase.get_torque_params(candidate) | 
			
		
	
		
			
				
					|  |  |  |  |     if candidate in (CAR.SANTA_FE, CAR.SANTA_FE_2022, CAR.SANTA_FE_HEV_2022, CAR.SANTA_FE_PHEV_2022): | 
			
		
	
		
			
				
					|  |  |  |  |       ret.lateralTuning.pid.kf = 0.00005 | 
			
		
	
		
			
				
					|  |  |  |  |       ret.mass = 3982. * CV.LB_TO_KG + STD_CARGO_KG | 
			
		
	
	
		
			
				
					|  |  |  | @ -66,13 +66,11 @@ class CarInterface(CarInterfaceBase): | 
			
		
	
		
			
				
					|  |  |  |  |       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 in (CAR.SONATA, CAR.SONATA_HYBRID): | 
			
		
	
		
			
				
					|  |  |  |  |       ret.lateralTuning.pid.kf = 0.00005 | 
			
		
	
		
			
				
					|  |  |  |  |       ret.mass = 1513. + STD_CARGO_KG | 
			
		
	
		
			
				
					|  |  |  |  |       ret.wheelbase = 2.84 | 
			
		
	
		
			
				
					|  |  |  |  |       ret.steerRatio = 13.27 * 1.15   # 15% higher at the center seems reasonable | 
			
		
	
		
			
				
					|  |  |  |  |       tire_stiffness_factor = 0.65 | 
			
		
	
		
			
				
					|  |  |  |  |       ret.lateralTuning.pid.kiBP, ret.lateralTuning.pid.kpBP = [[0.], [0.]] | 
			
		
	
		
			
				
					|  |  |  |  |       ret.lateralTuning.pid.kpV, ret.lateralTuning.pid.kiV = [[0.25], [0.05]] | 
			
		
	
		
			
				
					|  |  |  |  |       set_torque_tune(ret.lateralTuning, torque_params['LAT_ACCEL_FACTOR'], torque_params['FRICTION']) | 
			
		
	
		
			
				
					|  |  |  |  |     elif candidate == CAR.SONATA_LF: | 
			
		
	
		
			
				
					|  |  |  |  |       ret.lateralTuning.pid.kf = 0.00005 | 
			
		
	
		
			
				
					|  |  |  |  |       ret.mass = 4497. * CV.LB_TO_KG | 
			
		
	
	
		
			
				
					|  |  |  | @ -98,21 +96,17 @@ class CarInterface(CarInterfaceBase): | 
			
		
	
		
			
				
					|  |  |  |  |       ret.lateralTuning.pid.kpV, ret.lateralTuning.pid.kiV = [[0.25], [0.05]] | 
			
		
	
		
			
				
					|  |  |  |  |       ret.minSteerSpeed = 32 * CV.MPH_TO_MS | 
			
		
	
		
			
				
					|  |  |  |  |     elif candidate == CAR.ELANTRA_2021: | 
			
		
	
		
			
				
					|  |  |  |  |       ret.lateralTuning.pid.kf = 0.00005 | 
			
		
	
		
			
				
					|  |  |  |  |       ret.mass = (2800. * CV.LB_TO_KG) + STD_CARGO_KG | 
			
		
	
		
			
				
					|  |  |  |  |       ret.wheelbase = 2.72 | 
			
		
	
		
			
				
					|  |  |  |  |       ret.steerRatio = 12.9 | 
			
		
	
		
			
				
					|  |  |  |  |       tire_stiffness_factor = 0.65 | 
			
		
	
		
			
				
					|  |  |  |  |       ret.lateralTuning.pid.kiBP, ret.lateralTuning.pid.kpBP = [[0.], [0.]] | 
			
		
	
		
			
				
					|  |  |  |  |       ret.lateralTuning.pid.kpV, ret.lateralTuning.pid.kiV = [[0.25], [0.05]] | 
			
		
	
		
			
				
					|  |  |  |  |       set_torque_tune(ret.lateralTuning, torque_params['LAT_ACCEL_FACTOR'], torque_params['FRICTION']) | 
			
		
	
		
			
				
					|  |  |  |  |     elif candidate == CAR.ELANTRA_HEV_2021: | 
			
		
	
		
			
				
					|  |  |  |  |       ret.lateralTuning.pid.kf = 0.00005 | 
			
		
	
		
			
				
					|  |  |  |  |       ret.mass = (3017. * CV.LB_TO_KG) + STD_CARGO_KG | 
			
		
	
		
			
				
					|  |  |  |  |       ret.wheelbase = 2.72 | 
			
		
	
		
			
				
					|  |  |  |  |       ret.steerRatio = 12.9 | 
			
		
	
		
			
				
					|  |  |  |  |       tire_stiffness_factor = 0.65 | 
			
		
	
		
			
				
					|  |  |  |  |       ret.lateralTuning.pid.kiBP, ret.lateralTuning.pid.kpBP = [[0.], [0.]] | 
			
		
	
		
			
				
					|  |  |  |  |       ret.lateralTuning.pid.kpV, ret.lateralTuning.pid.kiV = [[0.25], [0.05]] | 
			
		
	
		
			
				
					|  |  |  |  |       set_torque_tune(ret.lateralTuning, torque_params['LAT_ACCEL_FACTOR'], torque_params['FRICTION']) | 
			
		
	
		
			
				
					|  |  |  |  |     elif candidate == CAR.HYUNDAI_GENESIS: | 
			
		
	
		
			
				
					|  |  |  |  |       ret.lateralTuning.pid.kf = 0.00005 | 
			
		
	
		
			
				
					|  |  |  |  |       ret.mass = 2060. + STD_CARGO_KG | 
			
		
	
	
		
			
				
					|  |  |  | @ -210,13 +204,12 @@ class CarInterface(CarInterfaceBase): | 
			
		
	
		
			
				
					|  |  |  |  |       ret.lateralTuning.indi.actuatorEffectivenessBP = [0.] | 
			
		
	
		
			
				
					|  |  |  |  |       ret.lateralTuning.indi.actuatorEffectivenessV = [1.8] | 
			
		
	
		
			
				
					|  |  |  |  |     elif candidate in (CAR.KIA_OPTIMA, CAR.KIA_OPTIMA_H): | 
			
		
	
		
			
				
					|  |  |  |  |       ret.lateralTuning.pid.kf = 0.00005 | 
			
		
	
		
			
				
					|  |  |  |  |       ret.mass = 3558. * CV.LB_TO_KG | 
			
		
	
		
			
				
					|  |  |  |  |       ret.wheelbase = 2.80 | 
			
		
	
		
			
				
					|  |  |  |  |       ret.steerRatio = 13.75 | 
			
		
	
		
			
				
					|  |  |  |  |       tire_stiffness_factor = 0.5 | 
			
		
	
		
			
				
					|  |  |  |  |       ret.lateralTuning.pid.kiBP, ret.lateralTuning.pid.kpBP = [[0.], [0.]] | 
			
		
	
		
			
				
					|  |  |  |  |       ret.lateralTuning.pid.kpV, ret.lateralTuning.pid.kiV = [[0.25], [0.05]] | 
			
		
	
		
			
				
					|  |  |  |  |       torque_params = CarInterfaceBase.get_torque_params(CAR.KIA_OPTIMA) | 
			
		
	
		
			
				
					|  |  |  |  |       set_torque_tune(ret.lateralTuning, torque_params['LAT_ACCEL_FACTOR'], torque_params['FRICTION']) | 
			
		
	
		
			
				
					|  |  |  |  |     elif candidate == CAR.KIA_STINGER: | 
			
		
	
		
			
				
					|  |  |  |  |       ret.lateralTuning.pid.kf = 0.00005 | 
			
		
	
		
			
				
					|  |  |  |  |       ret.mass = 1825. + STD_CARGO_KG | 
			
		
	
	
		
			
				
					|  |  |  | @ -258,7 +251,8 @@ class CarInterface(CarInterfaceBase): | 
			
		
	
		
			
				
					|  |  |  |  |       tire_stiffness_factor = 0.65 | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |       ret.maxLateralAccel = 2. | 
			
		
	
		
			
				
					|  |  |  |  |       set_torque_tune(ret.lateralTuning, ret.maxLateralAccel, 0.01) | 
			
		
	
		
			
				
					|  |  |  |  |       # TODO override until there is more data | 
			
		
	
		
			
				
					|  |  |  |  |       set_torque_tune(ret.lateralTuning, 2.0, 0.05) | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |     # Genesis | 
			
		
	
		
			
				
					|  |  |  |  |     elif candidate == CAR.GENESIS_G70: | 
			
		
	
	
		
			
				
					|  |  |  | 
 |