|
|
@ -19,6 +19,8 @@ class CarState(CarStateBase): |
|
|
|
def update(self, cp, cp_cam, cp_body): |
|
|
|
def update(self, cp, cp_cam, cp_body): |
|
|
|
ret = car.CarState.new_message() |
|
|
|
ret = car.CarState.new_message() |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
cp_es_distance = cp_body if self.car_fingerprint in (GLOBAL_GEN2 | HYBRID_CARS) else cp_cam |
|
|
|
|
|
|
|
|
|
|
|
throttle_msg = cp.vl["Throttle"] if self.car_fingerprint not in HYBRID_CARS else cp_body.vl["Throttle_Hybrid"] |
|
|
|
throttle_msg = cp.vl["Throttle"] if self.car_fingerprint not in HYBRID_CARS else cp_body.vl["Throttle_Hybrid"] |
|
|
|
ret.gas = throttle_msg["Throttle_Pedal"] / 255. |
|
|
|
ret.gas = throttle_msg["Throttle_Pedal"] / 255. |
|
|
|
|
|
|
|
|
|
|
@ -29,6 +31,14 @@ class CarState(CarStateBase): |
|
|
|
cp_brakes = cp_body if self.car_fingerprint in GLOBAL_GEN2 else cp |
|
|
|
cp_brakes = cp_body if self.car_fingerprint in GLOBAL_GEN2 else cp |
|
|
|
ret.brakePressed = cp_brakes.vl["Brake_Status"]["Brake"] == 1 |
|
|
|
ret.brakePressed = cp_brakes.vl["Brake_Status"]["Brake"] == 1 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if self.car_fingerprint not in HYBRID_CARS: |
|
|
|
|
|
|
|
eyesight_fault = bool(cp_es_distance.vl["ES_Distance"]["Cruise_Fault"]) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if self.CP.openpilotLongitudinalControl: |
|
|
|
|
|
|
|
ret.carFaultedNonCritical = eyesight_fault |
|
|
|
|
|
|
|
else: |
|
|
|
|
|
|
|
ret.accFaulted = eyesight_fault # if openpilot isn't controlling long, an eyesight fault is an acc fault |
|
|
|
|
|
|
|
|
|
|
|
cp_wheels = cp_body if self.car_fingerprint in GLOBAL_GEN2 else cp |
|
|
|
cp_wheels = cp_body if self.car_fingerprint in GLOBAL_GEN2 else cp |
|
|
|
ret.wheelSpeeds = self.get_wheel_speeds( |
|
|
|
ret.wheelSpeeds = self.get_wheel_speeds( |
|
|
|
cp_wheels.vl["Wheel_Speeds"]["FL"], |
|
|
|
cp_wheels.vl["Wheel_Speeds"]["FL"], |
|
|
@ -84,7 +94,6 @@ class CarState(CarStateBase): |
|
|
|
cp.vl["BodyInfo"]["DOOR_OPEN_FL"]]) |
|
|
|
cp.vl["BodyInfo"]["DOOR_OPEN_FL"]]) |
|
|
|
ret.steerFaultPermanent = cp.vl["Steering_Torque"]["Steer_Error_1"] == 1 |
|
|
|
ret.steerFaultPermanent = cp.vl["Steering_Torque"]["Steer_Error_1"] == 1 |
|
|
|
|
|
|
|
|
|
|
|
cp_es_distance = cp_body if self.car_fingerprint in (GLOBAL_GEN2 | HYBRID_CARS) else cp_cam |
|
|
|
|
|
|
|
if self.car_fingerprint in PREGLOBAL_CARS: |
|
|
|
if self.car_fingerprint in PREGLOBAL_CARS: |
|
|
|
self.cruise_button = cp_cam.vl["ES_Distance"]["Cruise_Button"] |
|
|
|
self.cruise_button = cp_cam.vl["ES_Distance"]["Cruise_Button"] |
|
|
|
self.ready = not cp_cam.vl["ES_DashStatus"]["Not_Ready_Startup"] |
|
|
|
self.ready = not cp_cam.vl["ES_DashStatus"]["Not_Ready_Startup"] |
|
|
|