Skip to content

Use standard steer angle sensor in DSU-less pre-TSS2 Toyota. #751

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rbiasini merged 1 commit into from
Jul 21, 2019
Merged

Use standard steer angle sensor in DSU-less pre-TSS2 Toyota. #751

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions selfdrive/car/toyota/carstate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from selfdrive.can.parser import CANParser
from selfdrive.can.can_define import CANDefine
from selfdrive.config import Conversions as CV
from selfdrive.car.toyota.values import CAR, DBC, STEER_THRESHOLD, NO_DSU_CAR
from selfdrive.car.toyota.values import CAR, DBC, STEER_THRESHOLD, TSS2_CAR

def parse_gear_shifter(gear, vals):

Expand Down Expand Up @@ -59,7 +59,7 @@ def get_can_parser(CP):
("EPS_STATUS", 25),
]

if CP.carFingerprint in NO_DSU_CAR:
if CP.carFingerprint in TSS2_CAR:
signals += [("STEER_ANGLE", "STEER_TORQUE_SENSOR", 0)]
else:
signals += [("STEER_ANGLE", "STEER_ANGLE_SENSOR", 0)]
Expand Down Expand Up @@ -141,7 +141,7 @@ def update(self, cp):
self.a_ego = float(v_ego_x[1])
self.standstill = not v_wheel > 0.001

if self.CP.carFingerprint in NO_DSU_CAR:
if self.CP.carFingerprint in TSS2_CAR:
self.angle_steers = cp.vl["STEER_TORQUE_SENSOR"]['STEER_ANGLE']
else:
self.angle_steers = cp.vl["STEER_ANGLE_SENSOR"]['STEER_ANGLE'] + cp.vl["STEER_ANGLE_SENSOR"]['STEER_FRACTION']
Expand Down