|
|
@ -63,7 +63,7 @@ class CarState(CarStateBase): |
|
|
|
ret.genericToggle = cp.vl["STEERING_LEVERS"]["HIGH_BEAM_PRESSED"] == 1 |
|
|
|
ret.genericToggle = cp.vl["STEERING_LEVERS"]["HIGH_BEAM_PRESSED"] == 1 |
|
|
|
|
|
|
|
|
|
|
|
# steering wheel |
|
|
|
# steering wheel |
|
|
|
ret.steeringAngleDeg = cp.vl["STEERING"]["STEER_ANGLE"] |
|
|
|
ret.steeringAngleDeg = cp.vl["STEERING"]["STEERING_ANGLE"] + cp.vl["STEERING"]["STEERING_ANGLE_HP"] |
|
|
|
ret.steeringRateDeg = cp.vl["STEERING"]["STEERING_RATE"] |
|
|
|
ret.steeringRateDeg = cp.vl["STEERING"]["STEERING_RATE"] |
|
|
|
ret.steeringTorque = cp.vl["EPS_2"]["COLUMN_TORQUE"] |
|
|
|
ret.steeringTorque = cp.vl["EPS_2"]["COLUMN_TORQUE"] |
|
|
|
ret.steeringTorqueEps = cp.vl["EPS_2"]["EPS_TORQUE_MOTOR"] |
|
|
|
ret.steeringTorqueEps = cp.vl["EPS_2"]["EPS_TORQUE_MOTOR"] |
|
|
@ -126,7 +126,8 @@ class CarState(CarStateBase): |
|
|
|
("WHEEL_SPEED_RR", "ESP_6"), |
|
|
|
("WHEEL_SPEED_RR", "ESP_6"), |
|
|
|
("WHEEL_SPEED_RL", "ESP_6"), |
|
|
|
("WHEEL_SPEED_RL", "ESP_6"), |
|
|
|
("WHEEL_SPEED_FR", "ESP_6"), |
|
|
|
("WHEEL_SPEED_FR", "ESP_6"), |
|
|
|
("STEER_ANGLE", "STEERING"), |
|
|
|
("STEERING_ANGLE", "STEERING"), |
|
|
|
|
|
|
|
("STEERING_ANGLE_HP", "STEERING"), |
|
|
|
("STEERING_RATE", "STEERING"), |
|
|
|
("STEERING_RATE", "STEERING"), |
|
|
|
("TURN_SIGNALS", "STEERING_LEVERS"), |
|
|
|
("TURN_SIGNALS", "STEERING_LEVERS"), |
|
|
|
("HIGH_BEAM_PRESSED", "STEERING_LEVERS"), |
|
|
|
("HIGH_BEAM_PRESSED", "STEERING_LEVERS"), |
|
|
|