|
|
|
@ -100,7 +100,8 @@ class CarState(CarStateBase): |
|
|
|
|
ret.parkingBrake = pt_cp.vl["VehicleIgnitionAlt"]["ParkBrake"] == 1 |
|
|
|
|
ret.cruiseState.available = pt_cp.vl["ECMEngineStatus"]["CruiseMainOn"] != 0 |
|
|
|
|
ret.espDisabled = pt_cp.vl["ESPStatus"]["TractionControlOn"] != 1 |
|
|
|
|
ret.accFaulted = pt_cp.vl["AcceleratorPedal2"]["CruiseState"] == AccState.FAULTED |
|
|
|
|
ret.accFaulted = (pt_cp.vl["AcceleratorPedal2"]["CruiseState"] == AccState.FAULTED or |
|
|
|
|
pt_cp.vl["EBCMFrictionBrakeStatus"]["FrictionBrakeUnavailable"] == 1) |
|
|
|
|
|
|
|
|
|
ret.cruiseState.enabled = pt_cp.vl["AcceleratorPedal2"]["CruiseState"] != AccState.OFF |
|
|
|
|
ret.cruiseState.standstill = pt_cp.vl["AcceleratorPedal2"]["CruiseState"] == AccState.STANDSTILL |
|
|
|
@ -155,6 +156,7 @@ class CarState(CarStateBase): |
|
|
|
|
("RLWheelSpd", "EBCMWheelSpdRear"), |
|
|
|
|
("RRWheelSpd", "EBCMWheelSpdRear"), |
|
|
|
|
("MovingBackward", "EBCMWheelSpdRear"), |
|
|
|
|
("FrictionBrakeUnavailable", "EBCMFrictionBrakeStatus"), |
|
|
|
|
("PRNDL2", "ECMPRDNL2"), |
|
|
|
|
("ManualMode", "ECMPRDNL2"), |
|
|
|
|
("LKADriverAppldTrq", "PSCMStatus"), |
|
|
|
@ -180,6 +182,7 @@ class CarState(CarStateBase): |
|
|
|
|
("VehicleIgnitionAlt", 10), |
|
|
|
|
("EBCMWheelSpdFront", 20), |
|
|
|
|
("EBCMWheelSpdRear", 20), |
|
|
|
|
("EBCMFrictionBrakeStatus", 20), |
|
|
|
|
("AcceleratorPedal2", 33), |
|
|
|
|
("ASCMSteeringButton", 33), |
|
|
|
|
("ECMEngineStatus", 100), |
|
|
|
|