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.

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

Jump to bottom

PlayStation® model #34133

Merged
merged 4 commits into from
Dec 3, 2024
Merged

PlayStation® model #34133

merged 4 commits into from
Dec 3, 2024

Conversation

YassineYousfi
Copy link
Contributor

No description provided.

@commaci-public
Copy link
Contributor

ref for commit e25041b: https://raw.githubusercontent.com/commaai/ci-artifacts/refs/heads/model_replay_ps-driving/2f4452b03ccb98f0|2022-12-03--13-45-30_model_tici_e25041bbda1d367cd0b60ac8aa9318d5810343f5.zst

Model Replay Differences
All Model Replay Plots

@AlexandreSato
Copy link
Contributor

I liked soo much! using in 075b133b6181e058

@Rocketboy235
Copy link

Only thing concerning is the lane changes that was reported earlier but other than that, it seems to be merge worthy! I'm also curious about handling parked cars on the side of the road situation since I reported that earlier in the null pointer driving feedback if that is also being focused on in these lateral driving models

@gomtings
Copy link

gomtings commented Dec 3, 2024

It's very stable except that you can't keep your lane at low speed.

@YassineYousfi
Copy link
Contributor Author

Yes we're merging this model soon, one more improvement coming to this branch before we merge to master.
Lane change failures are not new to this model though, we're planning to address those after a few more fixes we're working on.

@commaci-public
Copy link
Contributor

ref for commit 684aa11: https://raw.githubusercontent.com/commaai/ci-artifacts/refs/heads/model_replay_ps-driving/2f4452b03ccb98f0|2022-12-03--13-45-30_model_tici_684aa11eb759ca757ebfa3dcfe012b3c33d138ae.zst

Model Replay Differences
All Model Replay Plots

@commaci-public
Copy link
Contributor

ref for commit 4f9edfb: https://raw.githubusercontent.com/commaai/ci-artifacts/refs/heads/model_replay_ps-driving/2f4452b03ccb98f0|2022-12-03--13-45-30_model_tici_4f9edfbf9fef1f6d4ce1fe6437dda26725a9f7e5.zst

Model Replay Differences
All Model Replay Plots

@haraschax haraschax merged commit 5160bee into master Dec 3, 2024
20 checks passed
@haraschax haraschax deleted the ps-driving branch December 3, 2024 07:44
haraschax added a commit that referenced this pull request Dec 7, 2024
@haraschax
Revert "PlayStation® model (#34133)"
7a8e1ac 
This reverts commit 5160bee.
haraschax added a commit that referenced this pull request Dec 7, 2024
@haraschax
Revert "PlayStation® model (#34133)" (#34170)
7a41693 
This reverts commit 5160bee.
ccdunder pushed a commit to ccdunder/openpilot that referenced this pull request Jan 6, 2025
@devtekve @sunnyhaibin
Modular Assistive Driving System (MADS) (commaai#446)
ee5c1c4 
* 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]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
autonomy
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@YassineYousfi @commaci-public @AlexandreSato @Rocketboy235 @gomtings @haraschax