Commit Graph

523 Commits

Author SHA1 Message Date
Jason Wen bbef8d5764 Merge branch 'master-priv' into master-dev-c3
# Conflicts:
#	panda
2024-07-07 20:39:24 -04:00
Jason Wen b5227c0a06 Driving Model Selector v5 2024-07-07 17:53:26 -04:00
Adeeb Shihadeh d3cb0d24c4 Sync: sunnypilot/sunnypilot:master into sunnypilot/openpilot-special:master-priv 2024-07-07 10:15:50 -04:00
rav4kumar 6f9401d902 Merge remote-tracking branch 'comma/master' into sync-20240706 2024-07-06 22:18:32 -04:00
Shane Smiskol c95b58401a controlsd: no mutable carParams (#32381)
* no as builder

* fix car int test

* more
2024-07-02 13:27:45 -07:00
Jason Wen 67d7df43ad Merge branch 'toyota-lowspeed-override' into master-dev-c3 2024-07-02 12:04:53 -04:00
Jason Wen 5d097fa5de rename to PCM Speed Override 2024-07-02 10:57:40 -04:00
Jason Wen 59d960addf housekeeping 2024-07-02 10:46:32 -04:00
Jason Wen 67dcb68f00 Merge branch 'master-priv' into toyota-lowspeed-override
# Conflicts:
#	common/params.cc
2024-07-02 01:15:27 -04:00
Jason Wen c5e6342630 Merge branch 'master-priv' into master-dev-c3
# Conflicts:
#	cereal/custom.capnp
#	common/params.cc
#	selfdrive/controls/controlsd.py
#	selfdrive/controls/lib/longitudinal_planner.py
#	selfdrive/controls/lib/sunnypilot/accel_controller.py
#	selfdrive/ui/qt/offroad/settings.cc
#	selfdrive/ui/qt/offroad/settings.h
#	selfdrive/ui/ui.h
2024-07-02 00:51:54 -04:00
rav4 kumar e8df8fad00 Longitudinal: Acceleration Personality 2024-07-02 04:45:18 +00:00
rav4 kumar ca202c3c4a Longitudinal: Dynamic Personality 2024-07-02 04:15:20 +00:00
Jason Wen 2a3a533d2b Merge branch 'dynamic_personality' into master-dev-c3
# Conflicts:
#	cereal/custom.capnp
#	selfdrive/controls/controlsd.py
2024-07-01 16:24:36 -04:00
Jason Wen fbc556bc81 Merge branch 'accel-profile' into master-dev-c3 2024-07-01 16:23:52 -04:00
Jason Wen 4bf4f627bd use cereal 2024-07-01 15:05:50 -04:00
Jason Wen 6afa49be91 use custom cereal 2024-07-01 12:31:48 -04:00
rav4kumar 342effe5dd toyota low speed override 2024-06-29 11:02:21 -07:00
Jason Wen 6c429dca06 Sync: sunnypilot/sunnypilot:master into sunnypilot/openpilot-special:master-priv 2024-06-24 16:29:37 -04:00
DevTekVE 3f5dc2f418 Merge remote-tracking branch 'origin/SP-157-sync-priv-20240614' into master-dev-c3
# Conflicts:
#	selfdrive/car/ford/interface.py
#	selfdrive/car/hyundai/interface.py
2024-06-22 13:36:11 +02:00
Jason Wen 27fbb3a67b Merge branch 'SP-157-sync-20240614' into SP-157-sync-priv-20240614 2024-06-19 15:25:25 -04:00
Jason Wen 8de2399680 Merge branch 'upstream/openpilot/master' into SP-157-sync-20240614
# Conflicts:
#	cereal/services.py
#	msgq_repo
#	selfdrive/car/hyundai/interface.py
#	selfdrive/car/toyota/interface.py
#	selfdrive/controls/lib/longcontrol.py
#	selfdrive/controls/plannerd.py
2024-06-16 22:34:35 -04:00
Harald Schäfer bc303df6a0 long control: new API (#32706)
* Simplify long control

* Seperate

* Rename

* Try new api for toyota

* rm v_pid everywhere

* No speed in reset

* 0 is better default

* unassigned variable

* Update other cars

* Update gm

* SIMPLIFY

* simplify more

* fix API boundry

* Fix stopping bug

* Small fixes

* Update ref
2024-06-14 00:08:58 -07:00
Jason Wen c9332cde8c Merge branch 'SP-150-sync-priv-20240612' into master-dev-c3
# Conflicts:
#	CHANGELOGS.md
#	panda
#	release/build_release.sh
#	release/release_files.py
2024-06-12 22:28:16 -04:00
Jason Wen c55d11a865 Sync: sunnypilot/sunnypilot:master into sunnypilot/openpilot-special:master-priv 2024-06-12 21:43:05 -04:00
Jason Wen 9e63be9ba2 Sync: commaai/opendbc:master into sunnypilot/opendbc:master
Sync: `commaai/panda:master` into `sunnypilot/panda:master`
2024-06-12 21:09:05 -04:00
Shane Smiskol 7dbf60b4bc controlsd: exit on any exception (#32730)
* exit on any exception

* finally so we don't catch
2024-06-12 17:16:30 -07:00
Jason Wen 524d7b73f9 Sync: sunnypilot/panda:master into sunnypilot/panda-special:master-priv 2024-06-12 16:21:36 -04:00
Jason Wen 69abbd94ec Merge branch 'SP-147-sync-priv-2024' into master-dev-c3
# Conflicts:
#	CHANGELOGS.md
#	panda
#	release/files_common
2024-06-12 16:08:20 -04:00
Jason Wen 211ff21af0 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-12 14:28:20 -04:00
DevTekVE a42398646b Merge branch 'refs/heads/SP-147-sync-priv-2024' into master-dev-c3-snapshot
# Conflicts:
#	CHANGELOGS.md
#	panda
2024-06-11 10:45:58 +02:00
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
Adeeb Shihadeh a7ed190df4 controlsd: remove last mention of CAN (#32646) 2024-06-06 16:46:27 -07:00
Harald Schäfer e71ec4e8d7 Split cereal into cereal/msgq (#32631)
* squash

* fix doc

* compile device

* compile device

* Update ref

* add msgq to precommit exclusions

* No service ports

* fix compile

* address comments

* More comments

* Delete logger

* Update opendbc

* Linting

* bump msgq
2024-06-06 14:31:56 -07:00
Adeeb Shihadeh 34e329649d boardd is pandad (#32628)
* boardd is pandad

* rename tests
2024-06-04 19:16:55 -07:00
Jason Wen d8595b63e8 Auto Lane Change: Add option to disable lane change 2024-05-30 02:42:11 +00:00
Jason Wen 91fcd5a632 Merge branch 'SP-133-disable-lane-change' into master-dev-c3 2024-05-29 08:43:21 -04:00
Jason Wen bf41202cab Auto Lane Change: Add option to disable lane change 2024-05-29 08:43:12 -04:00
DevTekVE e78ae2c140 Driving Model Selector: Introduce ModelCapabilities class for model feature handling 2024-05-23 21:39:28 +00:00
Jason Wen 5eccc47203 Merge branch 'improved-model-cabapilities-check' into master-dev-c3 2024-05-23 13:58:20 -04: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
DevTekVE 8904cf731a Introduce ModelCapabilities class for model feature handling
This commit introduces a new class, ModelCapabilities, to manage model features. It changes initializations and conditional statements to use this new class, improving code readability and simplicity. The new class provides an easier and clearer way to check which features are enabled, reducing the complexity associated with generation-dependent feature handling.
2024-05-18 22:29:11 +02:00
Jason Wen 7a286d2f52 Controlsd: Remove unused code and leadDistanceBar parsing with SP values 2024-05-17 04:57:44 +00:00
Jason Wen 0f8661b434 Merge branch 'upstream-fixes' into master-dev-c3 2024-05-17 00:27:47 -04:00
Jason Wen 304311e078 Unused 2024-05-17 00:27:35 -04:00
Jason Wen 1428bb4cce Merge branch 'upstream-fixes' into master-dev-c3 2024-05-17 00:24:44 -04:00
Jason Wen cab8c62e96 Controlsd: Fix edge_toggle variable and leadDistanceBar parsing with SP values 2024-05-17 00:24:28 -04:00