Commit Graph

474 Commits

Author SHA1 Message Date
Jason Wen e36dbe97b5 Merge branch 'master' into SP-147-sync-priv-2024
# Conflicts:
#	common/api/__init__.py
#	panda
#	release/build_release.sh
#	release/files_common
#	selfdrive/car/card.py
#	selfdrive/car/toyota/carcontroller.py
#	selfdrive/controls/controlsd.py
#	selfdrive/controls/radard.py
#	selfdrive/ui/qt/api.cc
#	selfdrive/ui/qt/maps/map.cc
#	selfdrive/ui/ui.cc
#	system/athena/manage_athenad.py
#	system/athena/manage_sunnylinkd.py
#	system/athena/sunnylinkd.py
#	system/manager/gitlab_runner.sh
#	system/manager/manager.py
#	system/manager/mapd_installer.py
#	system/manager/process_config.py
#	system/manager/sunnylink.py
#	system/sentry.py
2024-06-10 21:24:23 -04:00
Jason Wen 1ffc59f65a Merge branch 'upstream/openpilot/master' into sync-20240608
# Conflicts:
#    cereal
#    opendbc
#    panda
#    release/files_common
#    selfdrive/monitoring/dmonitoringd.py
#    selfdrive/ui/translations/main_zh-CHS.ts
#    selfdrive/ui/translations/main_zh-CHT.ts
2024-06-08 23:08:33 -04:00
Jason Wen d8595b63e8 Auto Lane Change: Add option to disable lane change 2024-05-30 02:42:11 +00:00
DevTekVE e78ae2c140 Driving Model Selector: Introduce ModelCapabilities class for model feature handling 2024-05-23 21:39:28 +00:00
ZwX1616 fa2d5bca57 controlsd: explicitly ignore camera states in process replay (#32515)
* explicitly ignore

* Update selfdrive/controls/controlsd.py

Co-authored-by: Shane Smiskol <shane@smiskol.com>

---------

Co-authored-by: Shane Smiskol <shane@smiskol.com>
2024-05-22 15:18:06 -07:00
Shane Smiskol 9fa92c2225 card: only exit ELM once done with ECU knock outs (#32505)
* only exit elm once done with knock outs

* comments!
2024-05-21 21:23:14 -07:00
Shane Smiskol 71f5c441fe card: process that abstracts car interface and CAN (#32380)
* format card

* standalone process

* no class member CS, there's no point

also can be confusing; what else could be using this?

* rename CoS

* Update selfdrive/controls/controlsd.py

* never works first time :D

* canRcvTimeout is bool

* hack

* add cpu

* see what testing closet comes up with

* first

* some clean up

* support passable CI, fix test models

* fix startup alert

* process replay changes

* test_fuzzy

* gate carOutput valid on carControl valid

* we should publish after we update carOutput

* controlsd was using actuatorsOutput from 2 frames ago for torque, not the most up to date

* check all checks for carControl in case controlsd dies

* log more timestamps

* more generic latency logger; needs some clean up

latency_logger.py was difficult to understand and modify

* card polls on can and carControl to get latest carControl possible

* temp try to send earlier

* add log

* remove latencylogger

* no mpld3!

* old loop

* detect first event

* normal send

* revert "card polls on can and carControl to get latest carControl possible"

how it was is best

* sheesh! update should be first

* first timestamp

* temp comment ( timestamp is slow :( )

* more final ordering, and make polling on/off test repeatable

* Received can

* new plot timestamps

* clean up

* no poll

* add controllers (draft)

* Revert "add controllers (draft)"

This reverts commit e2c3f01b2fadcff74347bac90c8a5cc1ef4e27b3.

* fix that

* conventions

* just use CS

* consider controlsd state machine in card: not fully done

* hmm it's just becoming controlsd

* rm debugging

* Revert "hmm it's just becoming controlsd"

This reverts commit 534a357ee95bec4ed070667186af55d59421bbc7.

* Revert "just use CS"

This reverts commit 9fa7406f30c86200f20457f7b9ff95e731201bf9.

* add vCruise

* migrate car state

* Revert "migrate car state"

This reverts commit 4ae86ca163c6920070f410f608f7644ab632850b.

* Revert "add vCruise"

This reverts commit af247a8da41c3626ada4231b98042da1a1ae4633.

* simple state machine in card (doesn't work as is)

* Revert "simple state machine in card (doesn't work as is)"

This reverts commit b4af8a9b0a2e17fdfc89d344c64678ef51305c24.

* poll carState without conflate

* bump

* remove state transition

* fix

* update refs

* ignore cumLagMs and don't ignore valid

* fix controls mismatch; controlsd used to set alt exp

* controlsd_config_callback not needed for card

* revert ref temp

* update refs

* no poll

* not builder!

* test fix

* need to migrate initialized

* CC will be a reader

* more as_reader!

* fix None

* init after publish like before - no real difference

* controlsd clean up

* remove redundant check and check passive for init

* stash

* flip

* migrate missing carOutput for controlsd

* Update ref_commit

* bump cereal

* comment

* no class params

* no class

* Revert "no class"

This reverts commit 5499b83c2dcb5462070626f8523e3aec6f4c209d.

* add todo

* regen and update refs

* fix

* update refs

* and fix that

* should be controlsstate

* remove controlsState migration

CoS.initialized isn't needed yet

* fix

* flip!

* bump

* fix that

* update refs

* fix

* if canValid goes false, controlsd would still send

* bump

* rm diff

* need to be very careful with initializing

* update refs
2024-05-21 01:18:10 -07:00
Shane Smiskol 220fcc1675 process replay: regen routes (#32464)
* regen

* regen

* update

* undo

* update refs

* fix

* real fix

* test

* test2

* test3

* stash

* Revert "stash"

This reverts commit bf6765f526b48426f49a4b29c4042097f57fc4b0.

* rk.lagging can not be trusted. BODY segment has radarFault while modelV2 is not valid, causing radarState to not be valid

* order

* update refs again

* we never logged carOutput!

* bump

* add back checks
2024-05-19 01:07:12 -07:00
Jason Wen 7a286d2f52 Controlsd: Remove unused code and leadDistanceBar parsing with SP values 2024-05-17 04:57:44 +00:00
Jason Wen 0a6bc53fc2 Revert "Longitudinal: Use upstream button timer to toggle between Chill & Experimental Mode"
This reverts commit d959c43284.
2024-05-16 12:45:05 -04:00
Jason Wen d959c43284 Longitudinal: Use upstream button timer to toggle between Chill & Experimental Mode 2024-05-16 00:12:17 -04:00
Shane Smiskol 407791113d Revert "card: move all car events (#32427)" (#32439)
* Revert "card: move all car events (#32427)"

This reverts commit 8f46028bd4.

* keep the event here

* oops

* Revert "oops"

This reverts commit ea99a2768fbeb7a6123dd755585157b530e7a2a1.

* Revert "keep the event here"

This reverts commit ec089b4e1afdf09b2e6b184de8f23584ef931601.
2024-05-15 14:32:52 -07:00
Jason Wen 250afef443 Merge branch 'master' into SP-59-sync-priv-20240507
# Conflicts:
#	panda
#	release/build_release.sh
#	selfdrive/car/volkswagen/interface.py
2024-05-15 16:04:19 -04:00
Shane Smiskol 8f46028bd4 card: move all car events (#32427)
* move last event over

* fix
2024-05-14 15:20:03 -07:00
Shane Smiskol 6f3cd143ef controlsd: use already initialized params (#32429) 2024-05-14 14:01:38 -07:00
Shane Smiskol d0d44a51a0 card: create pedal pressed event (#32417)
* card: create pedal pressed event (#32393)

* move pedalPressed to card

* rm

* needs to be a builder

* move these

* clean up

* reader later

* Update ref_commit

* moved to card
2024-05-13 16:18:55 -07:00
Shane Smiskol 9287a69624 Revert "card: create pedal pressed event" (#32414)
Revert "card: create pedal pressed event (#32393)"

This reverts commit d18da895d3.
2024-05-13 14:25:22 -07:00
Shane Smiskol d18da895d3 card: create pedal pressed event (#32393)
* move pedalPressed to card

* rm

* needs to be a builder

* move these

* clean up

* reader later

* Update ref_commit
2024-05-13 14:15:26 -07:00
Shane Smiskol 3dfb6d7931 CarInterface: move stateless, common car events to car interface (#32394)
* move stateless, common car events to car interface

* try to reduce process replay diff a bit

* Revert "try to reduce process replay diff a bit"

This reverts commit b12798deabea67c5a636d6e70e80a3c21c7225ff.

* update refs
2024-05-13 12:50:42 -07:00
Shane Smiskol d28624fe5b card: more final structure 2024-05-10 23:18:48 -07:00
Shane Smiskol ef1693433f controlsd: use latest actuatorsOutput (#32390)
use current actuatorsOutput
2024-05-10 21:00:01 -07:00
Jason Wen 9e3f57d53e Merge branch 'master' into SP-59-sync-priv-20240507 2024-05-09 15:48:29 -04:00
Miguel Fernandez b2d5edcdb5 Merge remote-tracking branch 'refs/remotes/openpilot/master' into small-sync
# Conflicts:
#	cereal
#	opendbc
#	panda
#	selfdrive/car/__init__.py
#	selfdrive/monitoring/dmonitoringd.py
2024-05-09 15:13:00 +02:00
Shane Smiskol 2e6b2ef3c9 card: preparation (#32382)
* card prep

* also format
2024-05-08 23:54:20 -07:00
Jason Wen abb18380a1 Merge branch 'upstream/openpilot/master' into sync-20240502
# Conflicts:
#	cereal
#	common/params.cc
#	opendbc
#	panda
#	selfdrive/car/chrysler/carcontroller.py
#	selfdrive/car/honda/carstate.py
#	selfdrive/car/honda/fingerprints.py
#	selfdrive/car/honda/hondacan.py
#	selfdrive/car/honda/interface.py
#	selfdrive/car/honda/values.py
#	selfdrive/car/hyundai/carcontroller.py
#	selfdrive/car/hyundai/carstate.py
#	selfdrive/car/hyundai/hyundaican.py
#	selfdrive/car/hyundai/interface.py
#	selfdrive/car/hyundai/values.py
#	selfdrive/car/subaru/carstate.py
#	selfdrive/car/subaru/interface.py
#	selfdrive/car/torque_data/override.toml
#	selfdrive/car/torque_data/params.toml
#	selfdrive/car/toyota/carcontroller.py
#	selfdrive/car/toyota/carstate.py
#	selfdrive/car/toyota/interface.py
#	selfdrive/car/toyota/toyotacan.py
#	selfdrive/controls/lib/longitudinal_planner.py
#	selfdrive/modeld/modeld.py
#	selfdrive/monitoring/dmonitoringd.py
#	selfdrive/ui/qt/onroad/annotated_camera.cc
Revert "remove STM32F2 sources (#1873)"

This reverts commit 7bfba5ef
2024-05-04 23:49:28 -04:00
Adeeb Shihadeh 6ef95f7a91 adjust gps alert 2024-05-01 11:35:20 -07:00
Armand du Parc Locmaria adabd108e2 commabody: ignore fcw alerts (#32301)
* ignore modelV2 and longitudinalPlan on the body to avoid fcw alerts

* move joystick_mode up because ignore depends on it

* revert and ignore fcw itself instead
2024-04-26 20:04:10 -07:00
Justin Newberry 4ecbaa41fa controlsd: fix steer saturation premature warning (#31909)
fix last actuators
2024-03-21 18:31:22 -07:00
Justin Newberry 4fbc8a3896 move git commands to common/git.py (#31921)
move git into common/git.py
2024-03-19 12:39:09 -07:00
Justin Newberry 1ecbbef46b controlsd: fix saturation warning (#31869)
fix saturation
2024-03-14 18:03:39 -07:00
Shane Smiskol 3d63c7093a longitudinal personality: change via steering wheel distance button (#31792)
* start at param

* start by sending personality

* change to personality

* POC: button changes personality

* what's wrong with this?

* fix

* not really possible but fuzzy test catches this

* there's always a typo

* dang, we're dropping messages

* clean up

* no comment

* bump

* rename

* not all cars yet

* works but at what cost

* clean up

* inside settings

* write param so we save the distance button changes

* setChecked activates buttonToggled and already writes param!

* don't need this, we update from longitudinalPlan on changes

* some clean up

* more

* ui

* allow some time for ui to receive and write param

* plannerd: only track changes in case no ui

* Revert "plannerd: only track changes in case no ui"

This reverts commit 2b081aa6ceb92c67a621b74592b2292756d29871.

* write in plannerd as well, I assume this is atomic?

* don't write when setting checked (only user clicks)

* better nane

* more

* Update selfdrive/controls/lib/longitudinal_planner.py

Co-authored-by: Cameron Clough <cameronjclough@gmail.com>

* doesn't write param now

* ParamWatcher is nice

* no debug

* Update translations

* fix

* odd drain sock proc replay behavior

* vanish

* Revert "odd drain sock proc replay behavior"

This reverts commit 29b70b39413e1852bb512155af6b6a94a5bd9454.

* add GM

* only if OP long

* move personality to controlsState, since eventually it won't be exclusive to long planner

more

bump

* diff without translations

* fix

* put nonblocking

* CS should start at up to date personality always (no ui flicker)

* update toggle on cereal message change

* fix

* fix that

* ubmp

* mypy doesn't know this is an int :(

* update translations

* fix the tests

---------

Co-authored-by: Cameron Clough <cameronjclough@gmail.com>
2024-03-13 01:05:02 -07:00
Shane Smiskol 29e55f99a5 Move personality to controlsState (#31855)
* start at param

* start by sending personality

* change to personality

* POC: button changes personality

* what's wrong with this?

* fix

* not really possible but fuzzy test catches this

* there's always a typo

* dang, we're dropping messages

* clean up

* no comment

* bump

* rename

* not all cars yet

* works but at what cost

* clean up

* inside settings

* write param so we save the distance button changes

* setChecked activates buttonToggled and already writes param!

* don't need this, we update from longitudinalPlan on changes

* some clean up

* more

* ui

* allow some time for ui to receive and write param

* plannerd: only track changes in case no ui

* Revert "plannerd: only track changes in case no ui"

This reverts commit 2b081aa6ceb92c67a621b74592b2292756d29871.

* write in plannerd as well, I assume this is atomic?

* don't write when setting checked (only user clicks)

* better nane

* more

* Update selfdrive/controls/lib/longitudinal_planner.py

Co-authored-by: Cameron Clough <cameronjclough@gmail.com>

* doesn't write param now

* ParamWatcher is nice

* no debug

* Update translations

* fix

* odd drain sock proc replay behavior

* vanish

* Revert "odd drain sock proc replay behavior"

This reverts commit 29b70b39413e1852bb512155af6b6a94a5bd9454.

* add GM

* only if OP long

* move personality to controlsState, since eventually it won't be exclusive to long planner

more

bump

* diff without translations

* fix

* put nonblocking

* CS should start at up to date personality always (no ui flicker)

* update toggle on cereal message change

* fix

* fix that

* ubmp

* mypy doesn't know this is an int :(

* update translations

* fix the tests

* revert ui

* not here

* migrate controlsState

* Revert "migrate controlsState" - i see no reason we need to test with
any specific personality

This reverts commit 6063508f2df1a5623f113cda34dcd59a1f4b2ac9.

* Update ref_commit

---------

Co-authored-by: Cameron Clough <cameronjclough@gmail.com>
2024-03-13 00:57:57 -07:00
Shane Smiskol 2c353a25a4 longitudinal personality: display in Toyota instrument cluster (#31760)
* start at param

* start by sending personality

* change to personality

* POC: button changes personality

* what's wrong with this?

* fix

* not really possible but fuzzy test catches this

* there's always a typo

* dang, we're dropping messages

* clean up

* no comment

* bump

* rename

* revert longplan

* revert this

* Fix check

* more appropriate up here

* consistenet

* Update selfdrive/car/toyota/carstate.py

* Update ref_commit
2024-03-08 23:26:01 -08:00
Justin Newberry bc2407abeb move card to selfdrive/car/card (#31693)
* more obivous dif

* release
2024-03-04 10:45:32 -08:00
Justin Newberry 8ec0d87de0 card: prepare for separate process (#31660)
* Card

* update ref

* bump cpu

* sub to caroutput

* update ref
2024-03-04 09:53:42 -08:00
Jason Wen 8eb043ec7d Merge branch 'master' into sync-priv-20240220
# Conflicts:
#	CHANGELOGS.md
#	panda
#	selfdrive/car/toyota/interface.py
#	selfdrive/controls/controlsd.py
#	selfdrive/manager/manager.py
#	selfdrive/modeld/fill_model_msg.py
#	selfdrive/modeld/modeld.py
2024-02-24 09:35:16 -05:00
Jason Wen 8945fffab0 Merge branch 'upstream/openpilot/master' into sync-20240220
# Conflicts:
#	cereal
#	common/version.h
#	selfdrive/controls/controlsd.py
#	selfdrive/thermald/power_monitoring.py
2024-02-24 09:14:42 -05:00
Adeeb Shihadeh d8ce15a869 controlsd: increase initializing timeout (#31535) 2024-02-21 16:23:43 -08:00
Justin Newberry 00315325a3 controlsd: move carParams management to card (#31534)
* card-manage

* fix

* init params

* reversed that

* can be in the init
2024-02-21 16:11:00 -08:00
Justin Newberry 837b811f9c Split out can control into new "card" class (#31529)
* card v1

* fix car events

* fix proc replay

* lets keep that the same

* no extra space here

* move can recv timeouts to card

* organize imports

* organize imports

* slightly bump cpu

* not a card!
2024-02-21 13:18:43 -08:00
Justin Newberry 0eba392cf2 controlsd: sort imports (#31531)
sort imports
2024-02-21 11:58:04 -08:00
Jason Wen bbbca41296 Merge branch 'upstream/openpilot/master' into sync-20240220
# Conflicts:
#	cereal
#	opendbc
#	panda
#	selfdrive/car/honda/carstate.py
2024-02-20 11:05:51 -05:00
Jason Wen 5e16cba5bb MADS: Enforce pedalPressed when MADS is disabled 2024-02-20 14:22:26 +00:00
Adeeb Shihadeh b28daef34a controlsd: allow mismatch while boardd reads back mode (#31505)
* controlsd: allow mismatch while boardd reads back mode

* self
2024-02-18 14:43:42 -08:00
Adeeb Shihadeh b218abcaa3 controlsd: increase initializing timeout 2024-02-16 13:35:45 -08:00
Jason Wen 47caf0e0a4 Merge branch 'master' into sync-priv-20240216
# Conflicts:
#	panda
#	release/files_common
#	selfdrive/car/hyundai/interface.py
#	selfdrive/controls/controlsd.py
#	selfdrive/controls/plannerd.py
#	selfdrive/sentry.py
#	system/version.py
2024-02-16 08:47:13 -05:00
Jason Wen fd11bc1d7d Merge branch 'upstream/openpilot/master' into sync-20240216
# Conflicts:
#	cereal
#	opendbc
#	panda
#	selfdrive/car/hyundai/interface.py
#	selfdrive/controls/controlsd.py
#	selfdrive/monitoring/dmonitoringd.py
2024-02-16 08:27:39 -05:00
Jason Wen 0a737ba343 MADS: Display pre-enable events with MADS engaged 2024-02-16 12:41:07 +00:00
Adeeb Shihadeh d31269f663 fix no GPS alert when driving slowly in a tunnel (#31483) 2024-02-15 11:52:57 -08:00
Adeeb Shihadeh 194bd85905 log all startups 2024-02-14 11:44:19 -08:00