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

rav4 hybrid 2019 port #740

Closed
wants to merge 5 commits into from
Closed

Conversation

wocsor
Copy link
Contributor

@wocsor wocsor commented Jul 13, 2019

this time i actually updated the readme. waiting on cabana logs

@wocsor
Copy link
Contributor Author

wocsor commented Jul 15, 2019

it could have been 1 commit if i were more careful... fixed those typos now

@@ -178,6 +179,9 @@ def check_ecu_msgs(fingerprint, ecu):
{
36: 8, 37: 8, 166: 8, 170: 8, 180: 8, 295: 8, 296: 8, 401: 8, 426: 6, 452: 8, 466: 8, 467: 8, 550: 8, 552: 4, 560: 7, 562: 6, 581: 5, 608: 8, 610: 8, 643: 7, 658: 8, 713: 8, 728: 8, 740: 5, 742: 8, 743: 8, 744: 8, 761: 8, 764: 8, 765: 8, 800: 8, 810: 2, 812: 8, 814: 8, 818: 8, 824: 8, 829: 2, 830: 7, 835: 8, 836: 8, 863: 8, 865: 8, 869: 7, 870: 7, 871: 2, 877: 8, 881: 8, 882: 8, 885: 8, 889: 8, 896: 8, 898: 8, 900: 6, 902: 6, 905: 8, 913: 8, 918: 8, 921: 8, 933: 8, 934: 8, 935: 8, 944: 8, 945: 8, 950: 8, 951: 8, 953: 8, 955: 8, 956: 8, 971: 7, 975: 5, 987: 8, 993: 8, 998: 5, 999: 7, 1000: 8, 1001: 8, 1002: 8, 1017: 8, 1020: 8, 1041: 8, 1042: 8, 1056: 8, 1057: 8, 1059: 1, 1071: 8, 1076: 8, 1077: 8, 1082: 8, 1084: 8, 1085: 8, 1086: 8, 1114: 8, 1132: 8, 1161: 8, 1162: 8, 1163: 8, 1164: 8, 1165: 8, 1166: 8, 1167: 8, 1172: 8, 1228: 8, 1235: 8, 1264: 8, 1279: 8, 1541: 8, 1552: 8, 1553: 8, 1556: 8, 1557: 8, 1568: 8, 1570: 8, 1571: 8, 1572: 8, 1575: 8, 1592: 8, 1594: 8, 1595: 8, 1649: 8, 1696: 8, 1775: 8, 1777: 8, 1779: 8, 1786: 8, 1787: 8, 1788: 8, 1789: 8, 1904: 8, 1912: 8, 1990: 8, 1998: 8
}],
CAR.RAV4H_TSS2: [
36: 8, 37: 8, 166: 8, 170: 8, 180: 8, 295:8, 296: 8, 401: 8, 426: 6, 452: 8, 466: 8, 467: 8, 550: 8, 552: 4, 560: 7, 562: 6, 581: 5, 608: 8, 610: 8, 643: 7, 713: 8, 728: 8, 740: 5, 742: 8, 743: 8, 761: 8, 764: 8, 765: 8, 800: 8, 810: 2, 812: 8, 818: 8, 824: 8, 829: 2, 830: 7, 835: 8, 836: 8, 863: 8, 865: 8, 869: 7,870: 7, 871: 2, 877: 8, 881: 8, 882: 8, 885: 8, 889: 8, 896: 8, 898: 8, 900: 6, 902: 6, 905: 8, 921: 8, 933: 8, 934: 8, 935: 8, 944: 8, 945: 8, 950: 8, 951: 8, 953:8, 955: 8, 956: 8, 971: 7, 975: 5, 993: 8, 998: 5, 999: 7, 1000: 8, 1001: 8, 1002: 8, 1014: 8, 1017: 8, 1020:8, 1041: 8, 1042: 8, 1044: 8, 1056: 8, 1057: 8, 1059: 1, 1063: 8, 1071: 8, 1076: 8, 1077: 8, 1084: 8, 1085: 8, 1086: 8, 1114: 8, 1132: 8, 1161: 8, 1162: 8, 1163: 8,1164: 8, 1165: 8, 1166: 8, 1167: 8, 1172: 8, 1235: 8, 1237: 8, 1264: 8, 1279: 8, 1541: 8, 1552: 8, 1553: 8, 1556: 8, 1557: 8, 1568: 8, 1570: 8, 1571: 8, 1572: 8, 1592: 8, 1594: 8, 1595: 8, 1649: 8, 1745: 8, 1775: 8, 1779: 8, 1786: 8, 1787: 8, 1788: 8, 1789: 8, 1904: 8, 1912: 8, 1990: 8, 1998: 8
Copy link

Choose a reason for hiding this comment

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

Spacing on 295: 8 and 953: 8 and 1020: 8, and between 869, 870 and 1164, 1165

@rbiasini
Copy link
Contributor

rbiasini commented Jul 16, 2019

@wocsor do you have a route you can share? I've looked at dongle 76280b332ccbc474 and I've found a larger fingerprint with 132 msgs

@rbiasini
Copy link
Contributor

no worries. Unfortunately this fingerprint conflicts with some of the the Camry Hybrid. It will need to wait until VIN query, which is coming soon.

@ErichMoraga
Copy link
Contributor

ETA on that VIN query @rbiasini ??? :-)

@wocsor
Copy link
Contributor Author

wocsor commented Aug 9, 2019

funny story on that, over the past week a friend and I did a lot of under the hood work on openpilot and found that there is a working VIN query in car helpers, but if a valid VIN is written to params boardd will change the safety to nooutput. after commenting that out it then only writes the first message per bus in sendcan. we haven't gone any further but we suspect another blocker in boardd is the issue

@ErichMoraga
Copy link
Contributor

:crying:

@illumiN8i
Copy link
Contributor

illumiN8i commented Aug 20, 2019

Assisted sideplugmike on Discord with getting this working on 2019 Rav4 Hybrid XSE. Rebased on 0.6.3 devel.
Dongle ID 689f254b15632b32

Stock Drive: https://my.comma.ai/cabana/?route=689f254b15632b32%7C2019-08-20--09-38-35&max=11&url=https%3A%2F%2Fchffrprivate-vzn.azureedge.net%2Fchffrprivate3%2Fv2%2F689f254b15632b32%2Fa22611d366b256d72767078c4bb8a25a_2019-08-20--09-38-35

Camry Hybrid fingerprints had to be commented out to resolve conflict.

2019 Rav4 Hybrid XSE Fingerprint: 36: 8, 37: 8, 166: 8, 170: 8, 180: 8, 295: 8, 296: 8, 401: 8, 426: 6, 452: 8, 466: 8, 467: 8, 550: 8, 552: 4, 560: 7, 562: 6, 581: 5, 608: 8, 610: 8, 643: 7, 658: 8, 713: 8, 728: 8, 740: 5, 742: 8, 743: 8, 761: 8, 764: 8, 765: 8, 800: 8, 810: 2, 812: 8, 814: 8, 818: 8, 824: 8, 829: 2, 830: 7, 835: 8, 836: 8, 863: 8, 865: 8, 869: 7, 870: 7, 871: 2, 877: 8, 881: 8, 882: 8, 885: 8, 889: 8, 896: 8, 898: 8, 900: 6, 902: 6, 905: 8, 918: 8, 921: 8, 933: 8, 934: 8, 935: 8, 944: 8, 945: 8, 950: 8, 951: 8, 953: 8, 955: 8, 956: 8, 971: 7, 975: 5, 987: 8, 993: 8, 998: 5, 999: 7, 1000: 8, 1001: 8, 1002: 8, 1014: 8, 1017: 8, 1020: 8, 1041: 8, 1042: 8, 1044: 8, 1056: 8, 1057: 8, 1059: 1, 1063: 8, 1071: 8, 1076: 8, 1077: 8, 1082: 8, 1084: 8, 1085: 8, 1086: 8, 1114: 8, 1132: 8, 1161: 8, 1162: 8, 1163: 8, 1164: 8, 1165: 8, 1166: 8, 1167: 8, 1172: 8, 1228: 8, 1235: 8, 1237: 8, 1264: 8, 1279: 8, 1541: 8, 1552: 8, 1553: 8, 1556: 8, 1557: 8, 1568: 8, 1570: 8, 1571: 8, 1572: 8, 1592: 8, 1594: 8, 1595: 8, 1649: 8, 1745: 8, 1775: 8, 1779: 8, 1786: 8, 1787: 8, 1788: 8, 1789: 8, 1990: 8, 1998: 8

@illumiN8i
Copy link
Contributor

Could fingerprint conflict ports be upstreamed without the fingerprint for now so forks don't have to be maintained with each release?

@rbiasini
Copy link
Contributor

@illumiN8i , yes, I'm fine merging in with no fingeprint. Btw, Rerunning the fingerprint conflict checker script now (selfdrive/test/test_fingerprints.py) does not show conflicts anymore. Not sure why it showed red flags before. Are you saying that the CarmyH fingerprint had to be commented out though to have OP working on sideplugmike's car?

@illumiN8i
Copy link
Contributor

@rbiasini Correct, sideplugmike's car didn't work until I commented out the CamryH fingerprints. @wocsor Can you rebase and comment out the RAV4H_TSS2 fingerprint?

@wocsor wocsor closed this Dec 17, 2019
@wocsor
Copy link
Contributor Author

wocsor commented Dec 17, 2019

@illumiN8i has another port which does not have conflicts.

illumiN8i added a commit to illumiN8i/openpilot that referenced this pull request Dec 17, 2019
illumiN8i added a commit to illumiN8i/openpilot that referenced this pull request Jan 2, 2020
illumiN8i added a commit to illumiN8i/openpilot that referenced this pull request Jan 18, 2020
illumiN8i added a commit to illumiN8i/openpilot that referenced this pull request Jan 23, 2020
From wocsor's PR commaai#740

cleanup fingerprint

2020 rav4 hybrid confirmed working
pd0wm pushed a commit that referenced this pull request Jan 24, 2020
* merge wocsor RAV4_HYBRID_TSS2 branch

From wocsor's PR #740

cleanup fingerprint

2020 rav4 hybrid confirmed working

* 2019 RAV4 Hybrid Limited

Adds additional messages for Limited trim. XSE and XLE still contained within this longer Limited fingerprint.

* Support Swiss 2019 RAV4 Hybrid XLE

Adds 913:8 value from discord user RDuke

* Separated RAV4 ICE and Hybrid

* Add route to test_car_models.py

* Revert "Toyota Corolla Hatchback Hybrid 2019 Excite (Israel)"

This reverts commit f1d6f68.
otaku pushed a commit to otaku/openpilot that referenced this pull request Jan 24, 2020
* merge wocsor RAV4_HYBRID_TSS2 branch

From wocsor's PR commaai#740

cleanup fingerprint

2020 rav4 hybrid confirmed working

* 2019 RAV4 Hybrid Limited

Adds additional messages for Limited trim. XSE and XLE still contained within this longer Limited fingerprint.

* Support Swiss 2019 RAV4 Hybrid XLE

Adds 913:8 value from discord user RDuke

* Separated RAV4 ICE and Hybrid

* Add route to test_car_models.py

* Revert "Toyota Corolla Hatchback Hybrid 2019 Excite (Israel)"

This reverts commit f1d6f68.
debugged-tech pushed a commit to debugged-tech/DebuggedPilot that referenced this pull request Nov 29, 2020
* move e2e button out of arne182.capnp

* duplicate

* fixes
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.

5 participants