Skip to content
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.

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

Toyota: use torque control for Japanese-made 2023 RAV4 #29896

Merged
merged 32 commits into from
Sep 14, 2023
Merged

Conversation

sshane
Copy link
Contributor

@sshane sshane commented Sep 13, 2023

No description provided.

@sshane sshane marked this pull request as ready for review September 13, 2023 05:17
@sshane sshane added car port car vehicle-specific toyota labels Sep 13, 2023
@sshane
Copy link
Contributor Author

sshane commented Sep 13, 2023

Pending a few test routes, is this how you would do it @adeebshihadeh, or split it up into 4 platforms for the ICE and hybrid?

@sshane sshane changed the title Toyota: use torque control for 2023 RAV4Hs that allow it Toyota: use torque control for Japanese-made 2023 RAV4s Sep 13, 2023
@sshane sshane changed the title Toyota: use torque control for Japanese-made 2023 RAV4s Toyota: use torque control for Japanese-made 2023 RAV4 Sep 13, 2023
selfdrive/car/toyota/interface.py Outdated Show resolved Hide resolved
if fw.ecu == "eps" and not fw.fwVersion == b'8965B42371\x00\x00\x00\x00\x00\x00':
ret.steerControlType = SteerControlType.torque

if ret.steerControlType == SteerControlType.angle:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these two if's with the same condition in a row is pretty confusing. can you make this more readable?

Copy link
Contributor Author

@sshane sshane Sep 14, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Made it one if statement.

@sshane sshane merged commit 9dfd057 into master Sep 14, 2023
@sshane sshane deleted the 2023-rav4-j branch September 14, 2023 21:48
sshane added a commit that referenced this pull request Sep 19, 2023
sshane added a commit that referenced this pull request Sep 19, 2023
Revert "Toyota: use torque control for Japanese-made 2023 RAV4 (#29896)"

This reverts commit 9dfd057.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants