-
Notifications
You must be signed in to change notification settings - Fork 9.5k
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
Merge new 2019 Civic and existing 2017-18 Civic Hatch #446
Conversation
looks good @csouers . before merging, maybe better to consider the civic '19 a separate model, as tehre seem to be dbc changes |
Ok. We'll re-pull fingerprints and do some more testing. |
@csouers, cool. Let me know when you have a chance to test. Would love to merge this. |
@csouers, is this good to go? |
Negative. Still working with two users on this. Will update again here when it is. |
Worked on this again tonight with our 2019 Civic user (our 2018 Hatchback Touring user no longer has his car). Fingerprints didn't change. We tested splitting the cars. The new civic never fingerprints (more than 1 choice; it's also in the hatchback fingerprint). Hatchback always fingerprinted fine because it has frames that the new car doesn't. Any idea on this or should we just merge as per this PR? I'm waiting to verify lower speed dropout on these new cars ~3-4 mph. Will check the drive once I have it and update here. Hopefully tomorrow. |
@csouers we should just use the hatchback fingerprint and I think we are good. |
looks good. thanks @csouers |
0696730 Toyota: add missing offset from speed signal (#469) 5b1a8dc Filtering LKAS HUD messages (#468) 99050f4 test_spam_can_buses was missing from Nissan 0f21b19 Cleanup pedal nomenclature (#467) ceff91d Standardize brake safety tests (#465) 04809e1 Hyundai brake check (#464) 74c8ee0 Subaru brake check (#463) 4ecc6b3 Cleanup: avoid unnecessary bus checks in rx hooks c7d0d5f Volkswagen safety updates: Phase 3 (#462) 4368748 WIP: Toyota brake check. (#459) 2ef996f fix addr frequencies e063b26 Second test fix tentative 88e2593 This should fix the test replay ebb8866 Added NISSAN replay test b2dbb50 remove toyota ipas safety code and tests (#460) a379faf White Panda's Wi-Fi setup instructions (#457) 11ef24b Improve tests (#456) fb02390 Subaru checksum counter (#455) 9a44499 Fix Subaru Legacy Torque driver bug (#454) dfa6b07 separating subary legacy safety mode from global (#452) dad5858 Chrysler: add brakepress cancellation (#451) db94a5b Added Nissan safety (#244) d7f1195 Chrysler Checksum/counter (#450) 96e535e abstract crc function (#448) 1b49d3e Hyundai: add gas disengage and tests (#447) 598074c Volkswagen safety updates: Phase 2 (#445) b2ffaae Chrysler: disengage on gas press (#442) 2ebbe36 Subaru: disengage on gas press (#446) ccf75c4 Volkswagen safety updates: Phase 1 (#444) git-subtree-dir: panda git-subtree-split: 0696730
0696730 Toyota: add missing offset from speed signal (#469) 5b1a8dc Filtering LKAS HUD messages (#468) 99050f4 test_spam_can_buses was missing from Nissan 0f21b19 Cleanup pedal nomenclature (#467) ceff91d Standardize brake safety tests (#465) 04809e1 Hyundai brake check (#464) 74c8ee0 Subaru brake check (#463) 4ecc6b3 Cleanup: avoid unnecessary bus checks in rx hooks c7d0d5f Volkswagen safety updates: Phase 3 (#462) 4368748 WIP: Toyota brake check. (#459) 2ef996f fix addr frequencies e063b26 Second test fix tentative 88e2593 This should fix the test replay ebb8866 Added NISSAN replay test b2dbb50 remove toyota ipas safety code and tests (#460) a379faf White Panda's Wi-Fi setup instructions (#457) 11ef24b Improve tests (#456) fb02390 Subaru checksum counter (#455) 9a44499 Fix Subaru Legacy Torque driver bug (#454) dfa6b07 separating subary legacy safety mode from global (#452) dad5858 Chrysler: add brakepress cancellation (#451) db94a5b Added Nissan safety (#244) d7f1195 Chrysler Checksum/counter (#450) 96e535e abstract crc function (#448) 1b49d3e Hyundai: add gas disengage and tests (#447) 598074c Volkswagen safety updates: Phase 2 (#445) b2ffaae Chrysler: disengage on gas press (#442) 2ebbe36 Subaru: disengage on gas press (#446) ccf75c4 Volkswagen safety updates: Phase 1 (#444) git-subtree-dir: panda git-subtree-split: 0696730
0696730 Toyota: add missing offset from speed signal (#469) 5b1a8dc Filtering LKAS HUD messages (#468) 99050f4 test_spam_can_buses was missing from Nissan 0f21b19 Cleanup pedal nomenclature (#467) ceff91d Standardize brake safety tests (#465) 04809e1 Hyundai brake check (#464) 74c8ee0 Subaru brake check (#463) 4ecc6b3 Cleanup: avoid unnecessary bus checks in rx hooks c7d0d5f Volkswagen safety updates: Phase 3 (#462) 4368748 WIP: Toyota brake check. (#459) 2ef996f fix addr frequencies e063b26 Second test fix tentative 88e2593 This should fix the test replay ebb8866 Added NISSAN replay test b2dbb50 remove toyota ipas safety code and tests (#460) a379faf White Panda's Wi-Fi setup instructions (#457) 11ef24b Improve tests (#456) fb02390 Subaru checksum counter (#455) 9a44499 Fix Subaru Legacy Torque driver bug (#454) dfa6b07 separating subary legacy safety mode from global (#452) dad5858 Chrysler: add brakepress cancellation (#451) db94a5b Added Nissan safety (#244) d7f1195 Chrysler Checksum/counter (#450) 96e535e abstract crc function (#448) 1b49d3e Hyundai: add gas disengage and tests (#447) 598074c Volkswagen safety updates: Phase 2 (#445) b2ffaae Chrysler: disengage on gas press (#442) 2ebbe36 Subaru: disengage on gas press (#446) ccf75c4 Volkswagen safety updates: Phase 1 (#444) git-subtree-dir: panda git-subtree-split: 0696730
0696730 Toyota: add missing offset from speed signal (#469) 5b1a8dc Filtering LKAS HUD messages (#468) 99050f4 test_spam_can_buses was missing from Nissan 0f21b19 Cleanup pedal nomenclature (#467) ceff91d Standardize brake safety tests (#465) 04809e1 Hyundai brake check (#464) 74c8ee0 Subaru brake check (#463) 4ecc6b3 Cleanup: avoid unnecessary bus checks in rx hooks c7d0d5f Volkswagen safety updates: Phase 3 (#462) 4368748 WIP: Toyota brake check. (#459) 2ef996f fix addr frequencies e063b26 Second test fix tentative 88e2593 This should fix the test replay ebb8866 Added NISSAN replay test b2dbb50 remove toyota ipas safety code and tests (#460) a379faf White Panda's Wi-Fi setup instructions (#457) 11ef24b Improve tests (#456) fb02390 Subaru checksum counter (#455) 9a44499 Fix Subaru Legacy Torque driver bug (#454) dfa6b07 separating subary legacy safety mode from global (#452) dad5858 Chrysler: add brakepress cancellation (#451) db94a5b Added Nissan safety (#244) d7f1195 Chrysler Checksum/counter (#450) 96e535e abstract crc function (#448) 1b49d3e Hyundai: add gas disengage and tests (#447) 598074c Volkswagen safety updates: Phase 2 (#445) b2ffaae Chrysler: disengage on gas press (#442) 2ebbe36 Subaru: disengage on gas press (#446) ccf75c4 Volkswagen safety updates: Phase 1 (#444) git-subtree-dir: panda git-subtree-split: 0696730
0696730 Toyota: add missing offset from speed signal (#469) 5b1a8dc Filtering LKAS HUD messages (#468) 99050f4 test_spam_can_buses was missing from Nissan 0f21b19 Cleanup pedal nomenclature (#467) ceff91d Standardize brake safety tests (#465) 04809e1 Hyundai brake check (#464) 74c8ee0 Subaru brake check (#463) 4ecc6b3 Cleanup: avoid unnecessary bus checks in rx hooks c7d0d5f Volkswagen safety updates: Phase 3 (#462) 4368748 WIP: Toyota brake check. (#459) 2ef996f fix addr frequencies e063b26 Second test fix tentative 88e2593 This should fix the test replay ebb8866 Added NISSAN replay test b2dbb50 remove toyota ipas safety code and tests (#460) a379faf White Panda's Wi-Fi setup instructions (#457) 11ef24b Improve tests (#456) fb02390 Subaru checksum counter (#455) 9a44499 Fix Subaru Legacy Torque driver bug (#454) dfa6b07 separating subary legacy safety mode from global (#452) dad5858 Chrysler: add brakepress cancellation (#451) db94a5b Added Nissan safety (#244) d7f1195 Chrysler Checksum/counter (#450) 96e535e abstract crc function (#448) 1b49d3e Hyundai: add gas disengage and tests (#447) 598074c Volkswagen safety updates: Phase 2 (#445) b2ffaae Chrysler: disengage on gas press (#442) 2ebbe36 Subaru: disengage on gas press (#446) ccf75c4 Volkswagen safety updates: Phase 1 (#444) git-subtree-dir: panda git-subtree-split: 0696730
0696730 Toyota: add missing offset from speed signal (#469) 5b1a8dc Filtering LKAS HUD messages (#468) 99050f4 test_spam_can_buses was missing from Nissan 0f21b19 Cleanup pedal nomenclature (#467) ceff91d Standardize brake safety tests (#465) 04809e1 Hyundai brake check (#464) 74c8ee0 Subaru brake check (#463) 4ecc6b3 Cleanup: avoid unnecessary bus checks in rx hooks c7d0d5f Volkswagen safety updates: Phase 3 (#462) 4368748 WIP: Toyota brake check. (#459) 2ef996f fix addr frequencies e063b26 Second test fix tentative 88e2593 This should fix the test replay ebb8866 Added NISSAN replay test b2dbb50 remove toyota ipas safety code and tests (#460) a379faf White Panda's Wi-Fi setup instructions (#457) 11ef24b Improve tests (#456) fb02390 Subaru checksum counter (#455) 9a44499 Fix Subaru Legacy Torque driver bug (#454) dfa6b07 separating subary legacy safety mode from global (#452) dad5858 Chrysler: add brakepress cancellation (#451) db94a5b Added Nissan safety (#244) d7f1195 Chrysler Checksum/counter (#450) 96e535e abstract crc function (#448) 1b49d3e Hyundai: add gas disengage and tests (#447) 598074c Volkswagen safety updates: Phase 2 (#445) b2ffaae Chrysler: disengage on gas press (#442) 2ebbe36 Subaru: disengage on gas press (#446) ccf75c4 Volkswagen safety updates: Phase 1 (#444) git-subtree-dir: panda git-subtree-split: 0696730
0696730 Toyota: add missing offset from speed signal (#469) 5b1a8dc Filtering LKAS HUD messages (#468) 99050f4 test_spam_can_buses was missing from Nissan 0f21b19 Cleanup pedal nomenclature (#467) ceff91d Standardize brake safety tests (#465) 04809e1 Hyundai brake check (#464) 74c8ee0 Subaru brake check (#463) 4ecc6b3 Cleanup: avoid unnecessary bus checks in rx hooks c7d0d5f Volkswagen safety updates: Phase 3 (#462) 4368748 WIP: Toyota brake check. (#459) 2ef996f fix addr frequencies e063b26 Second test fix tentative 88e2593 This should fix the test replay ebb8866 Added NISSAN replay test b2dbb50 remove toyota ipas safety code and tests (#460) a379faf White Panda's Wi-Fi setup instructions (#457) 11ef24b Improve tests (#456) fb02390 Subaru checksum counter (#455) 9a44499 Fix Subaru Legacy Torque driver bug (#454) dfa6b07 separating subary legacy safety mode from global (#452) dad5858 Chrysler: add brakepress cancellation (#451) db94a5b Added Nissan safety (#244) d7f1195 Chrysler Checksum/counter (#450) 96e535e abstract crc function (#448) 1b49d3e Hyundai: add gas disengage and tests (#447) 598074c Volkswagen safety updates: Phase 2 (#445) b2ffaae Chrysler: disengage on gas press (#442) 2ebbe36 Subaru: disengage on gas press (#446) ccf75c4 Volkswagen safety updates: Phase 1 (#444) git-subtree-dir: panda git-subtree-split: 0696730
0696730 Toyota: add missing offset from speed signal (#469) 5b1a8dc Filtering LKAS HUD messages (#468) 99050f4 test_spam_can_buses was missing from Nissan 0f21b19 Cleanup pedal nomenclature (#467) ceff91d Standardize brake safety tests (#465) 04809e1 Hyundai brake check (#464) 74c8ee0 Subaru brake check (#463) 4ecc6b3 Cleanup: avoid unnecessary bus checks in rx hooks c7d0d5f Volkswagen safety updates: Phase 3 (#462) 4368748 WIP: Toyota brake check. (#459) 2ef996f fix addr frequencies e063b26 Second test fix tentative 88e2593 This should fix the test replay ebb8866 Added NISSAN replay test b2dbb50 remove toyota ipas safety code and tests (#460) a379faf White Panda's Wi-Fi setup instructions (#457) 11ef24b Improve tests (#456) fb02390 Subaru checksum counter (#455) 9a44499 Fix Subaru Legacy Torque driver bug (#454) dfa6b07 separating subary legacy safety mode from global (#452) dad5858 Chrysler: add brakepress cancellation (#451) db94a5b Added Nissan safety (#244) d7f1195 Chrysler Checksum/counter (#450) 96e535e abstract crc function (#448) 1b49d3e Hyundai: add gas disengage and tests (#447) 598074c Volkswagen safety updates: Phase 2 (#445) b2ffaae Chrysler: disengage on gas press (#442) 2ebbe36 Subaru: disengage on gas press (#446) ccf75c4 Volkswagen safety updates: Phase 1 (#444) git-subtree-dir: panda git-subtree-split: 0696730
* fingerprint and new car * you know the drill * fix * mod civic hatch to work for now * try to merge hatch and other bosch * fix * fixed spaces * comma (heh) * make mass civic * Add to readme. Need to confirm speed * steering dropout at ~3.3 kph * Remove additional fingerprint * combined comment. fixed formatting to match
* Subaru: check for gas pressed * added tests * rx freq check on throttle * also support for the not yet supported pre-global platform
d32345dd Removed prints that were used for test, but cannot be compiled for the target ba74138 Added BMW safety tests. Updated safety to limit maximum commanded target delta. Fixed safety bugs with speed scaling and other type bugs. d3cde431 Testing helpers c4c8cce7 Added dummy state to gmlan testing 9a2e2d6c Reduced repeated code e1aef2e1 Made compatible with d301a59 ed075850 Merge branch 'master' of https://github.com/commaai/panda 437d7ac2 BMW hooks. Number commaai#12 used for safety. 74c8ee0 Subaru brake check (commaai#463) 4ecc6b3 Cleanup: avoid unnecessary bus checks in rx hooks c7d0d5f Volkswagen safety updates: Phase 3 (commaai#462) 4368748 WIP: Toyota brake check. (commaai#459) 2ef996f fix addr frequencies e063b26 Second test fix tentative 88e2593 This should fix the test replay ebb8866 Added NISSAN replay test b2dbb50 remove toyota ipas safety code and tests (commaai#460) a379faf White Panda's Wi-Fi setup instructions (commaai#457) 11ef24b Improve tests (commaai#456) fb02390 Subaru checksum counter (commaai#455) 9a44499 Fix Subaru Legacy Torque driver bug (commaai#454) dfa6b07 separating subary legacy safety mode from global (commaai#452) dad5858 Chrysler: add brakepress cancellation (commaai#451) db94a5b Added Nissan safety (commaai#244) f88af30e Merge remote-tracking branch 'remotes/Comma/master' d7f1195 Chrysler Checksum/counter (commaai#450) 96e535e abstract crc function (commaai#448) 1b49d3e Hyundai: add gas disengage and tests (commaai#447) 598074c Volkswagen safety updates: Phase 2 (commaai#445) b2ffaae Chrysler: disengage on gas press (commaai#442) 2ebbe36 Subaru: disengage on gas press (commaai#446) ccf75c4 Volkswagen safety updates: Phase 1 (commaai#444) d686a2ce Fixed GMLAN switch tickle interrupt git-subtree-dir: panda git-subtree-split: d32345ddcf9f70872b54886fc6c949c20dcc8650
d32345dd Removed prints that were used for test, but cannot be compiled for the target ba74138 Added BMW safety tests. Updated safety to limit maximum commanded target delta. Fixed safety bugs with speed scaling and other type bugs. d3cde431 Testing helpers c4c8cce7 Added dummy state to gmlan testing 9a2e2d6c Reduced repeated code e1aef2e1 Made compatible with d301a59 ed075850 Merge branch 'master' of https://github.com/commaai/panda 437d7ac2 BMW hooks. Number commaai#12 used for safety. 74c8ee0 Subaru brake check (commaai#463) 4ecc6b3 Cleanup: avoid unnecessary bus checks in rx hooks c7d0d5f Volkswagen safety updates: Phase 3 (commaai#462) 4368748 WIP: Toyota brake check. (commaai#459) 2ef996f fix addr frequencies e063b26 Second test fix tentative 88e2593 This should fix the test replay ebb8866 Added NISSAN replay test b2dbb50 remove toyota ipas safety code and tests (commaai#460) a379faf White Panda's Wi-Fi setup instructions (commaai#457) 11ef24b Improve tests (commaai#456) fb02390 Subaru checksum counter (commaai#455) 9a44499 Fix Subaru Legacy Torque driver bug (commaai#454) dfa6b07 separating subary legacy safety mode from global (commaai#452) dad5858 Chrysler: add brakepress cancellation (commaai#451) db94a5b Added Nissan safety (commaai#244) f88af30e Merge remote-tracking branch 'remotes/Comma/master' d7f1195 Chrysler Checksum/counter (commaai#450) 96e535e abstract crc function (commaai#448) 1b49d3e Hyundai: add gas disengage and tests (commaai#447) 598074c Volkswagen safety updates: Phase 2 (commaai#445) b2ffaae Chrysler: disengage on gas press (commaai#442) 2ebbe36 Subaru: disengage on gas press (commaai#446) ccf75c4 Volkswagen safety updates: Phase 1 (commaai#444) d686a2ce Fixed GMLAN switch tickle interrupt git-subtree-dir: panda git-subtree-split: d32345ddcf9f70872b54886fc6c949c20dcc8650
* allow re-regage * bump opendbc * bump panda * apply pause/resume fix for hyundai (should do this in a separate PR) * bump opendbc * fix * rename * Fix? * make sure to disengage for allow always cars * fix * combine * more fix * not needed * check if engagement is from openpilot's state machine * Rename * fix panda safety * fix * no fake lfa button for @devtekve ;) * fix non drive gear re-engage * fix settings * combine * add replace method * use replace * remoev already checks if it exists * fix * group * add todo * reserve events * cleaner * hyundai: only allow for cars with lfa button * sunnyParams * make sure it's car only * Move car-specific changes to opendbc * no need * bump opendbc * more fixes * no more available * more! * final? * always emit user disable * no longer needed * move unit test * add sunnypilot to unit tests * bump opendbc * use new cereal * bump opendbc * static analysis * no unittest * no need available * UI border update * show MADS updates * Add TODO * no longer needed * fix changed events * fix cluster enabled * don't add pre enable if not long * should use enabled * enabled <-> active * better format * bump opendbc * static analysis * static analysis * Rename test as collector was dying * Show our overriding * Revert "show MADS updates" This reverts commit daf0ad62 Revert "fix changed events" This reverts commit 31d8c97f * ignoring reserved events * adjusting creation delays * back to stock removing allow_cancel * should be enabled * revert * silent lkas disable * no need * user disable tests * just warning * MUST REMOVE test process replay * fix no entry * fixme * bump opendbc * need this check * cleanup * allow entering paused state if no entry from disabled * brake hold should apply to all * in lists * update unit test * simpler * unused * same thing * fix * only mads in enabled state and long in disabled state * unify silent enable * do this for dlob * bump submodules * fix * bump submodules * bump opendbc * less frequent * more events * fix * allow no entry to paused for non-drive gears * fix * use cereal * Revert "allow no entry to paused for non-drive gears" This reverts commit 6d64a4dd9c6de5ad14ef1e88dbc3b6ad174232d8. * allow in all * Revert "allow in all" This reverts commit 6375f1489176dc6c69cb7fa388676e482713f80a. * should not be all! * rename for clarity * silent park brake * flipped * bump submodules * Bump to latest mads-new panda * bump panda * more nissan * bump panda * bump msgq * bump panda * bump submodules * bump opendbc * bump opendbc * improving the state * Revert "PlayStation® model (commaai#34133)" This reverts commit 5160bee. * should be none * bump panda * bump opendbc * Apply suggestions from code review * bump panda * bump ref panda * add todo-sp * bump panda ref * bump more panda * changing refs * nuke nuke nuke * use sunny's newer states * bump with new panda * bump panda * Parse more flags from alt exp, more tests, hyundai main cruise allowed * Parse more flags from alt exp, more tests, hyundai main cruise allowed * missed * mutation for controls allowed rising edge * ford mutation * license * remove * unused * bump submodules * use always allowed mads button alt exp * fix * whitelist jason's lastname to codespell * test_processes: update ref logs to 82c0278 * bump submodules * bump submodules * bump submodules * bump panda * add controls mismatch lateral event * Simplify lateral disengagement logic for MADS configuration Reversed the conditional to align the logic with the `disengage_lateral_on_brake` parameter. This ensures that lateral disengagement behavior is more intuitive and matches the expected configuration. Improves code readability and reduces potential misconfigurations. * remove unified engagement mode in panda * controls allow should be allowed at all times * squash! treat MADS button as user entry * heartbeat for mads * heartbeat mismatch exit control * remove always allow mads button from alt * move to safety_mads * remove main cruise allowed from alt * bump panda * heartbeat engaged mads mismatch mutation test * bump panda * use mads the third panda * ignore pre enable with mads * only force exit if actually actuating * use brake signal instead of pedal events when dlob is active * fix tests * fix panda tests * bump panda * new events to retain long blocks * format * uem: do not engage mads if long is engaged * bump submodules * fix not allowed engaged bug * block uem from engaging * flipped * use different heartbeat check if dlob * hard code to skip heartbeat check * remove toyota lta status for lkas, causes weird behaviors * block tesla * bump panda * bump to merged panda * bump opendbc * bump opendbc * bump opendbc * bump opendbc * Apply suggestions from code review * code ignore spells * needs to be in carstate * Bump opendbc * Update MADS toggle descriptions for clarity. Added notes to clarify behavior of the "MadsMainCruiseAllowed" setting, particularly its impact on vehicles without LFA/LKAS buttons. This ensures users are informed about potential implications when disabling this feature. * Updating translations + Adding spanish * Disengage Lateral on Brake -> Pause Lateral on Brake * test_processes: update ref logs to dd41005 * Apply suggestions from code review * fix mads button not allowed * bump submodules * bump submodule * test_processes: update ref logs to 0a0b998 * has multiple lists * Revert "has multiple lists" This reverts commit a37c1d26feac02f63bfb86a08f9b6fb06b095cf1. * base * Reapply "has multiple lists" This reverts commit d1cd8dcc815721a4113b26ab98ee2571c071e225. * migrate mads toggles to sp panel * this is why it keeps crashing * house keeping * more housekeeping * more housekeeping * don't show description by default (yet) * reset to main panel when clicked away * more * some more with interactions * don't stretch cause it looks weird with descriptions * simpler to handle offroad transition * some are toggleable while onroad * remove unused event * slight cleanup * default to true for HKG main cruise toggle * append to list after * add Customize MADS to UI preview * simpler * move to sp list * how tf was this removed * update mads settings button on show event * test_processes: update ref logs to efa9c32 --------- Co-authored-by: Jason Wen <[email protected]>
Hi. I have a user in Canada with a 2019 Civic Sedan Touring that's now working. Out of the box, it fingerprinted as 2017 hatchback. Only difference I've noticed in this car is a lack of DOORS_STATUS at 0x405 (still looking for this if it moved). Right now, we're using self.standstill and self.door_all_closed like on Accord as the only major changes. Only remaining complaint is improper reporting of set speed as he uses Metric on the EON (to be expected AFAIK).
As both cars will fingerprint as Hatchback EX, we could potentially merge these. We have a user with hatchback touring if we want to replace the EX print with that. Vehicle weights are obviously slightly different. DBC file is unchanged as it used as-is from the 2017 car. Note: early stages of testing on this, but initial impressions are its working fine.