diff --git a/opendbc b/opendbc index e2acd0794c..d4a4614e06 160000 --- a/opendbc +++ b/opendbc @@ -1 +1 @@ -Subproject commit e2acd0794c1e4c080231a9c2f85bbbc9dc423d34 +Subproject commit d4a4614e0639d3fa79bd03377e6a61db48b57f17 diff --git a/selfdrive/car/toyota/carstate.py b/selfdrive/car/toyota/carstate.py index 133b0e0c5d..f28a61f24b 100644 --- a/selfdrive/car/toyota/carstate.py +++ b/selfdrive/car/toyota/carstate.py @@ -78,7 +78,8 @@ class CarState(CarStateBase): ret.rightBlinker = cp.vl["BLINKERS_STATE"]["TURN_SIGNALS"] == 2 ret.steeringTorque = cp.vl["STEER_TORQUE_SENSOR"]["STEER_TORQUE_DRIVER"] - ret.steeringTorqueEps = cp.vl["STEER_TORQUE_SENSOR"]["STEER_TORQUE_EPS"] + ret.steeringTorqueEps = cp.vl["STEER_TORQUE_SENSOR"]["STEER_TORQUE_EPS"] * \ + (self.CP.safetyConfigs[0].safetyParam / 100.) # we could use the override bit from dbc, but it's triggered at too high torque values ret.steeringPressed = abs(ret.steeringTorque) > STEER_THRESHOLD ret.steerWarning = cp.vl["EPS_STATUS"]["LKA_STATE"] not in (1, 5)