Move relay malfunction check to fwd hook #2087
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sshane
added a commit
that referenced
this pull request
Apr 9, 2025
royjr
added a commit
to royjr/opendbc
that referenced
this pull request
Apr 24, 2025
commit 344696d Author: royjr <royjr96@gmail.com> Date: Thu Apr 24 16:16:12 2025 -0400 fix op long commit 819fb5c Author: royjr <royjr96@gmail.com> Date: Wed Apr 23 21:58:00 2025 -0400 temp ignore cov commit dda8d2c Author: royjr <royjr96@gmail.com> Date: Wed Apr 23 21:04:10 2025 -0400 fix tests commit 1eb3c97 Author: royjr <royjr96@gmail.com> Date: Wed Apr 23 12:17:44 2025 -0400 more fixes commit 90e8f6a Author: royjr <royjr96@gmail.com> Date: Wed Apr 23 11:46:58 2025 -0400 always block messages commit 42837b7 Author: royjr <royjr96@gmail.com> Date: Wed Apr 23 01:15:08 2025 -0400 Revert "remove KIA_K5_2025" This reverts commit 4a22c30. commit 4a22c30 Author: royjr <royjr96@gmail.com> Date: Wed Apr 23 01:03:42 2025 -0400 remove KIA_K5_2025 commit 7d492ac Author: royjr <royjr96@gmail.com> Date: Tue Apr 22 23:45:50 2025 -0400 set true later? commit 50f4b5f Merge: 16fd719 7bad67a Author: royjr <royjr96@gmail.com> Date: Tue Apr 22 23:36:38 2025 -0400 Merge remote-tracking branch 'upstream/master' into ccnc-port-testing test commit 7bad67a Author: Gavin Canon-Phratsachack <37220586+gncnpk@users.noreply.github.com> Date: Sat Apr 19 13:30:03 2025 -0500 Nissan: Added ProPilot brake pressure signal (commaai#2137) * Added brake pressure signal * Add brake active signal commit 3c5eebd Author: John Nathan Wood <39569384+johnnathanwood@users.noreply.github.com> Date: Fri Apr 18 16:45:58 2025 -0500 Kona 2022 alt limit flag (commaai#2072) * updated hyundai kona 2022 platform config to add alt limits flag * fixed flag, should be _2 dude to high torque commit 4d6eb5c Author: Lukas <61192133+lukasloetkolben@users.noreply.github.com> Date: Fri Apr 18 23:45:16 2025 +0200 Rivian: add park assist dbc (commaai#2136) add park assist dbc commit 4e5ca58 Author: Lukas <61192133+lukasloetkolben@users.noreply.github.com> Date: Wed Apr 16 19:19:17 2025 +0200 Tesla: add DAS_road Signal (commaai#2133) add DAS_road commit c9fc721 Author: Trey Moen <50057480+greatgitsby@users.noreply.github.com> Date: Tue Apr 15 21:43:19 2025 -0700 feat(Tesla): add setup note pointing to wiki (commaai#2122) Co-authored-by: Shane Smiskol <shane@smiskol.com> commit 9994f73 Author: vanillagorillaa <31773928+vanillagorillaa@users.noreply.github.com> Date: Tue Apr 15 22:04:53 2025 -0500 Honda Bosch C: CAN FD Pilot 2023 (commaai#2118) * init CANFD Pilot * add back * remove * remove import for now * Update opendbc/car/honda/values.py Co-authored-by: Shane Smiskol <shane@smiskol.com> * Update opendbc/car/honda/interface.py Co-authored-by: Shane Smiskol <shane@smiskol.com> * fix * remove * fix * more * more * support both buses for buttons. no impact if we send to radar or PT accidentally * clean this up and send buttons to correct bus * remove for now * also remove * test route * add car parts! * rename to bosch canfd * nothing else is _CAR * PILOT_4G uses angled mount * cmt * re-use lines * revert this * todo * re-use Bosch interface setup code * re-use specs * todo * flip order * more clear * fix * update docs --------- Co-authored-by: Shane Smiskol <shane@smiskol.com> commit ea16bc5 Author: Shane Smiskol <shane@smiskol.com> Date: Tue Apr 15 16:16:23 2025 -0700 Honda: CarState cleanup (commaai#2132) * can do this * this instead ', CAR.'.join([str(i) for i in set(CAR) - {CAR.HONDA_ODYSSEY_CHN, CAR.HONDA_FREED, CAR.HONDA_HRV, CAR.HONDA_ACCORD, CAR.HONDA_CIVIC_BOSCH, CAR.HONDA_CIVIC_BOSCH_DIESEL, CAR.HONDA_CRV_HYBRID, CAR.HONDA_INSIGHT, CAR.ACURA_RDX_3G, CAR.HONDA_E, *HONDA_BOSCH_RADARLESS}]) * prep * revert commit 6007f17 Author: Lukas <61192133+lukasloetkolben@users.noreply.github.com> Date: Tue Apr 15 07:18:01 2025 +0200 Rivian: alternative Ignition Signal (commaai#2126) ignition signal commit 976a5c1 Author: Dmitrij Kovalevskij <kovalevskij.d@gmail.com> Date: Tue Apr 15 07:19:46 2025 +0300 Hyundai: add FW for EU version of Santa Fe (commaai#2113) Co-authored-by: Dmytro Kovalevskiy <kovalelvskij.d@gmail.com> commit 3b33a71 Author: Shane Smiskol <shane@smiskol.com> Date: Mon Apr 14 16:54:39 2025 -0700 Revert "Revert "Rename experimental long"" (commaai#2128) Revert "Revert "Rename experimental long" (commaai#2125)" This reverts commit d65fa99. commit d65fa99 Author: Shane Smiskol <shane@smiskol.com> Date: Mon Apr 14 10:55:29 2025 -0700 Revert "Rename experimental long" (commaai#2125) Revert "Rename experimental long (commaai#2114)" This reverts commit 6b9106b. commit d631299 Author: aubsw <10409668+aubsw@users.noreply.github.com> Date: Mon Apr 14 06:58:10 2025 -0400 No-op changes to make Panda happy (commaai#2076) min changes to make panda happy! commit cc3f122 Author: Shane Smiskol <shane@smiskol.com> Date: Fri Apr 11 18:50:41 2025 -0700 safety: move Honda to msg block config (commaai#2103) * do honda nidec * Do Bosch Radarless long * we don't care about blocking stock message to radar because it is disabled (0 is radar, 1 is pt which we are sending to) * same for 0xe5, and it's not on bosch radarless * rest Honda commit 6b9106b Author: Shane Smiskol <shane@smiskol.com> Date: Fri Apr 11 15:07:22 2025 -0700 Rename experimental long (commaai#2114) now alpha long commit 00e7a69 Author: ZwX1616 <zwx1616@gmail.com> Date: Fri Apr 11 14:01:55 2025 -0700 Chevrolet Bolt EUV: update lat control base values (commaai#1826) * bolt friction was too low * round2 --------- Co-authored-by: Comma Device <device@comma.ai> commit 171efe4 Author: vanillagorillaa <31773928+vanillagorillaa@users.noreply.github.com> Date: Thu Apr 10 22:27:54 2025 -0500 Honda: Bosch LKAS HUD update (commaai#2110) * docs: Scheduled auto-update CARS.md * update * comments and val * fix --------- Co-authored-by: vanillagorillaa <vanillagorillaa@users.noreply.github.com> commit 0bd2668 Author: Shane Smiskol <shane@smiskol.com> Date: Thu Apr 10 17:46:40 2025 -0700 safety: move Hyundai CAN FD to msg block config (commaai#2107) * not there yet * can remove this * and this * rm more * not here * and that! * siiiiiick commit 1a59488 Author: Yeek2 <112910414+Yeek2@users.noreply.github.com> Date: Thu Apr 10 07:59:48 2025 -0700 Ford: add F-150 2022 FW (commaai#2085) commit a96e261 Author: adeebshihadeh <adeebshihadeh@users.noreply.github.com> Date: Thu Apr 10 08:08:19 2025 +0000 docs: Scheduled auto-update CARS.md commit 01019a7 Author: Shane Smiskol <shane@smiskol.com> Date: Wed Apr 9 21:25:52 2025 -0700 safety: block all messages with static config (commaai#2095) * do toyota * fix missing code * mazda! ! * nissan * rivian * partial Subaru, LKAS only * Chrysler * VW MQB * VW PQ * do GM * subaru PG * fix * misra * revert * fix * add back removed comments commit c0048ae Author: Shane Smiskol <shane@smiskol.com> Date: Wed Apr 9 21:23:16 2025 -0700 safety: move Hyundai to msg block config (commaai#2099) * do hyundai * formatting commit 50d5ab1 Author: Shane Smiskol <shane@smiskol.com> Date: Wed Apr 9 21:03:58 2025 -0700 safety: move Subaru to msg block config (commaai#2098) * do subaru lkas * subaru is a woo * it's bus 1 so we don't fwd * rm * same pattern commit 4bac275 Author: Shane Smiskol <shane@smiskol.com> Date: Wed Apr 9 20:34:34 2025 -0700 GM ASCM safety: use disable_forwarding (commaai#2097) commit 1916974 Author: Shane Smiskol <shane@smiskol.com> Date: Wed Apr 9 19:51:14 2025 -0700 safety: move Toyota to msg block config (commaai#2096) do Toyota commit 0423a21 Author: Shane Smiskol <shane@smiskol.com> Date: Wed Apr 9 18:43:58 2025 -0700 safety: block messages with static config (commaai#2092) * ugh * oh this could work * revert back * add forwarding logic fix * yees * how about * more * match fwd blocklist to relay malfunc * remove duplicate code in ford // no coverage anymore * todo * coverage * misra * check_relay makes most sense. imagine we make it `block_msg` and then tesla does `disable_block_msg` too, makes no sense * this is now accurate * comment * fix * consistent * fix commit 8334975 Author: Shane Smiskol <shane@smiskol.com> Date: Wed Apr 9 17:00:46 2025 -0700 Hyundai Camera SCC long safety: check SCC12 relay malfunction (commaai#2094) if we're doing longitudinal, we should always check for relay malfunction commit 7a1b784 Author: Shane Smiskol <shane@smiskol.com> Date: Wed Apr 9 15:51:04 2025 -0700 safety: switch to field initializer for check_relay (commaai#2093) * specify at least one keyword in CanMsg constructor * formatting for the future * fix * forgot honda 😱 * and this! commit f246792 Author: vanillagorillaa <31773928+vanillagorillaa@users.noreply.github.com> Date: Wed Apr 9 13:31:50 2025 -0500 Honda: Support Civic Hybrids (commaai#1856) * init Civic Hybrid * more fw versions * fix * fix * add back * try * add test route commit 9358ee6 Author: Shane Smiskol <shane@smiskol.com> Date: Tue Apr 8 21:26:04 2025 -0700 Revert "Move relay malfunction check to fwd hook" (commaai#2089) Revert "Move relay malfunction check to fwd hook (commaai#2087)" This reverts commit 5a24ffe. commit 5a24ffe Author: Shane Smiskol <shane@smiskol.com> Date: Tue Apr 8 21:02:11 2025 -0700 Move relay malfunction check to fwd hook (commaai#2087) * ohhh wait a minute * fix from merge * todo * we need to test this now * we got it * fix rest * rm commit b733481 Author: Shane Smiskol <shane@smiskol.com> Date: Tue Apr 8 19:40:30 2025 -0700 safety: split relay malfunction and generic rx checks (commaai#2088) * split * fixup * whops * whopper commit 4ee3a24 Author: Shane Smiskol <shane@smiskol.com> Date: Tue Apr 8 18:27:21 2025 -0700 Fix formatting in safety_tesla.h
eli-davis
pushed a commit
to eli-davis/opendbc_reference
that referenced
this pull request
Jul 15, 2025
* ohhh wait a minute * fix from merge * todo * we need to test this now * we got it * fix rest * rm
eli-davis
pushed a commit
to eli-davis/opendbc_reference
that referenced
this pull request
Jul 15, 2025
Revert "Move relay malfunction check to fwd hook (commaai#2087)" This reverts commit d175d81.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
split from #2086
Soon
check_relaywill also meanblocked.Tesla and Honda selectively block or pass through the stock AEB message depending on a signal. Therefore we can't put it in the config to always block it and check for relay malfunctions. However, we don't expect to receive this message on bus 0, so we can't check for relay malfunctions after #1903 in the rx hook. This PR moves checking relay malfunctions to the fwd hook which still receives all messages.
This also fixes a case where we delay setting relay malfunction by a message and accidentally forward this message once. Now we check for relay malfunctions before we do any forwarding. Plus, relay malfunctions didn't affect the result of the rx check hook, so this makes more sense here.