Toyota: use universal gas pressed bit to match panda safety (#1335)
* Toyota: use universal gas pressed bit to match panda safety * update ref old-commit-hash: 928b1561aabb3683875d5c083377d5c5d894d543
This commit is contained in:
@@ -36,7 +36,7 @@ class CarState(CarStateBase):
|
||||
ret.gasPressed = ret.gas > 15
|
||||
else:
|
||||
ret.gas = cp.vl["GAS_PEDAL"]['GAS_PEDAL']
|
||||
ret.gasPressed = ret.gas > 1e-5
|
||||
ret.gasPressed = cp.vl["PCM_CRUISE"]['GAS_RELEASED'] == 0
|
||||
|
||||
ret.wheelSpeeds.fl = cp.vl["WHEEL_SPEEDS"]['WHEEL_SPEED_FL'] * CV.KPH_TO_MS
|
||||
ret.wheelSpeeds.fr = cp.vl["WHEEL_SPEEDS"]['WHEEL_SPEED_FR'] * CV.KPH_TO_MS
|
||||
@@ -130,6 +130,7 @@ class CarState(CarStateBase):
|
||||
("STEER_RATE", "STEER_ANGLE_SENSOR", 0),
|
||||
("CRUISE_ACTIVE", "PCM_CRUISE", 0),
|
||||
("CRUISE_STATE", "PCM_CRUISE", 0),
|
||||
("GAS_RELEASED", "PCM_CRUISE", 1),
|
||||
("STEER_TORQUE_DRIVER", "STEER_TORQUE_SENSOR", 0),
|
||||
("STEER_TORQUE_EPS", "STEER_TORQUE_SENSOR", 0),
|
||||
("STEER_ANGLE", "STEER_TORQUE_SENSOR", 0),
|
||||
@@ -168,11 +169,11 @@ class CarState(CarStateBase):
|
||||
signals.append(("INTERCEPTOR_GAS", "GAS_SENSOR", 0))
|
||||
signals.append(("INTERCEPTOR_GAS2", "GAS_SENSOR", 0))
|
||||
checks.append(("GAS_SENSOR", 50))
|
||||
|
||||
|
||||
if CP.carFingerprint in TSS2_CAR:
|
||||
signals += [("L_ADJACENT", "BSM", 0)]
|
||||
signals += [("R_ADJACENT", "BSM", 0)]
|
||||
|
||||
|
||||
return CANParser(DBC[CP.carFingerprint]['pt'], signals, checks, 0)
|
||||
|
||||
@staticmethod
|
||||
|
||||
@@ -1 +1 @@
|
||||
0f6c22ce8b3fbbbbb8fff59e44f49b8ec1578e90
|
||||
9b4b08487380a6741646e22e191fa5bd1615f2d3
|
||||
|
||||
Reference in New Issue
Block a user