Commit Graph

84 Commits

Author SHA1 Message Date
Jason Wen d35cdb510d Sync: commaai/msgq:master into sunnypilot/msgq:master
Sync: `commaai/opendbc:master` into `sunnypilot/opendbc:master`

Sync: `commaai/panda:master` into `sunnypilot/panda:master`
2024-08-03 21:22:09 -04:00
Dean Lee 12d729a0a0 CarParams: set no traversal limit (#32929)
* Increase traversal_limit_in_words to Fix Traversal Limit Errors

* just use log_from_bytes

* come on pycharm

* no free lunch

---------

Co-authored-by: Shane Smiskol <shane@smiskol.com>
2024-07-08 13:50:31 -07:00
Jason Wen b5227c0a06 Driving Model Selector v5 2024-07-07 17:53:26 -04:00
Jason Wen de8da6f41f Driving Personality: Use controlsStateSP properly 2024-07-01 15:42:29 -04:00
Jason Wen 6c429dca06 Sync: sunnypilot/sunnypilot:master into sunnypilot/openpilot-special:master-priv 2024-06-24 16:29:37 -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
Shane Smiskol 684209e077 remove uiPlan (#32721)
* remove uiPlan from ui

* remove publishing

* Update log.capnp

* Update services.py

* no uiPlan here

* Update ref_commit
2024-06-11 21:31:10 -07:00
DevTekVE e78ae2c140 Driving Model Selector: Introduce ModelCapabilities class for model feature handling 2024-05-23 21:39:28 +00: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
Adeeb Shihadeh 279d2c3b23 SubMaster: improve service aliveness checks (#31391)
* bump cereal

* fix

* fixes

* single poll

* bump

* bump

---------

Co-authored-by: Comma Device <device@comma.ai>
2024-02-12 10:11:37 -08:00
Jason Wen d6abb30453 Driving Model Selector: Fix lag? 2024-02-12 00:26:10 -05:00
Jason Wen 8dda347bf2 Driving Model Selector: Try converting to int 2024-02-09 15:36:58 -05:00
Jason Wen 3d4edc7289 Driving Model Selector: Handle nav models dynamically 2024-02-09 13:27:01 -05:00
Jason Wen 1e5fdf3d1a Driving Model Selector: Model generation support 2024-02-09 09:54:10 -05:00
Jason Wen e7d7189d21 Lateral Planner: Use new variable for useLaneLines 2024-02-08 12:05:01 -05:00
Jason Wen 75b38db870 Merge branch 'sync-20240201' into sync-priv-20240201 2024-02-07 22:49:01 -05:00
Jason Wen daae551ea8 Merge remote-tracking branch 'commaai/openpilot/master' into sync-20240201 2024-02-05 11:41:19 -05:00
Jason Wen fbabd5700f MSPA: lateralPlanSP legacy support (#274)
* MSPA: `lateralPlanSP` legacy support

* bump cereal
2024-02-01 23:02:03 -05:00
Jason Wen 72dba20a60 Enhanced Speed Control: Remove legacy implementation (#271)
Remove outdated Enhanced Speed Control
2024-02-01 20:59:27 -05:00
Harald Schäfer e6c97c3846 Delete lat planner (#31089)
* Initial commit

* Fixup

* typo

* ignore lateral plan

* Update cereal

* Remove lateralPlan

* Fix release build

* Fix release build

* give car params

* Add carParams to include_all_types

* Write car param in powerdraw test

* add demo mode

* Update model regf

* proc replay ref commit

* Try

* Move enum definition

* Update cereal

* typo

* Write car param for modeld test

* Update ref

* Update model ref again

---------

Co-authored-by: Kacper Rączy <gfw.kra@gmail.com>
2024-01-21 12:09:48 -08:00
Adeeb Shihadeh 35f819c823 swaglog.py goes in common/ (#30631)
* swaglog.py goes in common/

* all of these go in release

* we'll even include the pyx
2023-12-06 17:27:51 -08:00
Jason Wen 8a12b77748 omg we flipped the logic 2023-11-11 11:58:58 -05:00
Jason Wen 783267ec29 Merge branch 'master' into sync-priv-20231108
# Conflicts:
#	panda
#	selfdrive/car/subaru/carcontroller.py
#	selfdrive/car/subaru/interface.py
#	selfdrive/controls/lib/lateral_planner.py
2023-11-08 16:41:32 -05:00
Jason Wen a667364b59 Merge remote-tracking branch 'commaai/openpilot/master' into sync-20231108
# Conflicts:
#	cereal
#	panda
2023-11-08 15:58:35 -05:00
YassineYousfi 4c2bd853e4 (New) Lemon Pie Model 🍋 (#30209)
* 6f6e3749-1b7c-42e8-a33b-03929b7fc476/700

* oops deleted too much

* 1b4308b7-a659-4ebd-b4c6-c81c1c3890f8/700

* 1be192f3-f407-4217-9757-78b9ad92750a/700

* remove some todos

* more cleanup in lat planner

* vego > min_speed

* regen and update process replay refs

* update model replay ref

* update model replay ref commit again

* Revert "update model replay ref commit again"

This reverts commit 922cb796b8dfe264b0cce7a18206bb898b18bcb3.

* update again

* bump cereal
2023-11-02 14:01:00 -07:00
Jason Wen 80da209baf Merge branch 'master' into sync-priv-20231020
# Conflicts:
#	selfdrive/car/toyota/carstate.py
#	selfdrive/controls/lib/longitudinal_planner.py
2023-10-20 16:59:04 -04:00
Jason Wen 1ee8df2d28 Merge remote-tracking branch 'commaai/openpilot/master' into sync-20231020
# Conflicts:
#	selfdrive/car/chrysler/interface.py
2023-10-20 16:53:09 -04:00
YassineYousfi cad17b1255 modeld: parsing and publishing in python (#30273)
* WIP try modeld all in python

* fix plan

* add lane lines stds

* fix lane lines prob

* add lead prob

* add meta

* simplify plan parsing

* add hard brake pred

* add confidence

* fix desire state and desire pred

* check this file for now

* rm prints

* rm debug

* add todos

* add plan_t_idxs

* same as cpp

* removed cython

* add wfd width - rm cpp code

* add new files rm old files

* get metadata at compile time

* forgot this file

* now uses more CPU

* not used

* update readme

* lint

* copy this too

* simplify disengage probs

* update model replay ref commit

* update again

* confidence: remove if statemens

* use publish_state.enqueue

* Revert "use publish_state.enqueue"

This reverts commit d8807c8348338a1f773a8de00fd796abb8181404.

* confidence: better shape defs

* use ModelConstants class

* fix confidence

* Parser

* slightly more power too

* no inline ifs :(

* confidence: just use if statements
2023-10-19 14:23:51 -07:00
Jason Wen ccfb7ff153 Merge branch 'master' into sync-priv-20231016
# Conflicts:
#	panda
#	selfdrive/car/chrysler/values.py
#	selfdrive/car/ford/values.py
#	selfdrive/car/hyundai/hyundaican.py
#	selfdrive/car/hyundai/interface.py
#	selfdrive/car/toyota/interface.py
#	selfdrive/car/toyota/values.py
#	selfdrive/controls/controlsd.py
#	selfdrive/controls/plannerd.py
#	selfdrive/sentry.py
#	selfdrive/ui/qt/offroad/settings.cc
2023-10-16 11:52:39 -04:00
Jason Wen cfeba34d5d Merge branch 'upstream/openpilot/master-20231016-sync' into master-20231016
# Conflicts:
#	cereal
#	panda
#	selfdrive/car/hyundai/interface.py
#	selfdrive/car/hyundai/values.py
#	selfdrive/car/subaru/values.py
#	selfdrive/controls/controlsd.py
#	selfdrive/controls/plannerd.py
#	selfdrive/monitoring/dmonitoringd.py
2023-10-16 11:03:27 -04:00
Adeeb Shihadeh b68cfbb332 cleanup old sm pm args (#30241)
* cleanup sm pm

* fix controlsd

* fix
2023-10-13 23:27:04 -07:00
Jason Wen cc47228363 Cereal: Use custom reserved structs (aka MSPA) (#316)
* Cereal: Use custom reserved structs

* bump cereal

* fix dmonitoring

* pandaStateSP & controlsStateSP

* LongitudinalPlanSP

* LateralPlanSP

* LiveMapDataSP

* E2eLongStateSP

* fixup! LongitudinalPlanSP

* fix

* LongitudinalPersonality fix

* sync with upstream

* bump cereal

* LongitudinalPersonalitySP fixed

* LongitudinalPlanSP fix

* no need

* bump cereal

* bump panda

* no longer logs controlsAllowedLong

* bump cereal

* bump cereal

* fix

* LiveMapDataSP fix

* MSPA (#217)

* Cereal: Use custom reserved structs

* fix dmonitoring

* sync with upstream

* bump cereal

* bump cereal

* fix

* bump cereal

* fix

* unused

* check sm valid

* bump cereal

* MSPA: Unused service (#218)

* bump panda

* bump panda

* bump panda
2023-10-01 03:13:14 -04:00
Jason Wen c8debe77db MSPA (#217)
* Cereal: Use custom reserved structs

* fix dmonitoring

* sync with upstream

* bump cereal

* bump cereal

* fix

* bump cereal

* fix

* unused

* check sm valid
2023-10-01 02:05:05 -04:00
Jason Wen 9219b7966c Merge branch 'master' into dev-priv/master-test
# Conflicts:
#	panda
#	release/build_release.sh
#	selfdrive/car/car_helpers.py
#	selfdrive/car/chrysler/carcontroller.py
#	selfdrive/car/chrysler/carstate.py
#	selfdrive/car/chrysler/interface.py
#	selfdrive/car/ford/carstate.py
#	selfdrive/car/ford/interface.py
#	selfdrive/car/gm/carcontroller.py
#	selfdrive/car/gm/carstate.py
#	selfdrive/car/gm/interface.py
#	selfdrive/car/honda/carcontroller.py
#	selfdrive/car/honda/interface.py
#	selfdrive/car/hyundai/carcontroller.py
#	selfdrive/car/hyundai/carstate.py
#	selfdrive/car/hyundai/hyundaican.py
#	selfdrive/car/hyundai/interface.py
#	selfdrive/car/interfaces.py
#	selfdrive/car/mazda/carcontroller.py
#	selfdrive/car/mazda/carstate.py
#	selfdrive/car/mazda/interface.py
#	selfdrive/car/nissan/carcontroller.py
#	selfdrive/car/nissan/interface.py
#	selfdrive/car/subaru/carstate.py
#	selfdrive/car/subaru/interface.py
#	selfdrive/car/subaru/subarucan.py
#	selfdrive/car/toyota/carcontroller.py
#	selfdrive/car/toyota/carstate.py
#	selfdrive/car/toyota/interface.py
#	selfdrive/car/toyota/toyotacan.py
#	selfdrive/car/volkswagen/carcontroller.py
#	selfdrive/car/volkswagen/carstate.py
#	selfdrive/car/volkswagen/interface.py
#	selfdrive/controls/controlsd.py
#	selfdrive/controls/lib/latcontrol_torque.py
#	selfdrive/controls/lib/lateral_planner.py
#	selfdrive/controls/lib/longitudinal_mpc_lib/long_mpc.py
#	selfdrive/controls/lib/longitudinal_planner.py
#	selfdrive/locationd/paramsd.py
#	selfdrive/manager/manager.py
#	selfdrive/manager/process.py
#	selfdrive/manager/process_config.py
#	selfdrive/sentry.py
#	selfdrive/ui/SConscript
#	selfdrive/ui/qt/home.cc
#	selfdrive/ui/qt/maps/map_settings.cc
#	selfdrive/ui/qt/maps/map_settings.h
#	selfdrive/ui/qt/offroad/settings.cc
#	selfdrive/ui/qt/onroad.cc
#	selfdrive/ui/qt/onroad.h
#	selfdrive/ui/qt/util.cc
#	selfdrive/ui/qt/util.h
#	selfdrive/ui/soundd/sound.h
#	selfdrive/ui/ui.h
#	system/version.py
2023-09-05 20:17:19 -04:00
Jason Wen 9bc73b85ff Merge remote-tracking branch 'commaai/openpilot/master'
# Conflicts:
#	.github/workflows/selfdrive_tests.yaml
#	.pre-commit-config.yaml
#	README.md
#	cereal
#	common/version.h
#	opendbc
#	panda
#	selfdrive/car/chrysler/carcontroller.py
#	selfdrive/car/chrysler/carstate.py
#	selfdrive/car/chrysler/interface.py
#	selfdrive/car/gm/carstate.py
#	selfdrive/car/honda/carstate.py
#	selfdrive/car/hyundai/carcontroller.py
#	selfdrive/car/hyundai/carstate.py
#	selfdrive/car/hyundai/hyundaican.py
#	selfdrive/car/hyundai/interface.py
#	selfdrive/car/hyundai/radar_interface.py
#	selfdrive/car/hyundai/values.py
#	selfdrive/car/interfaces.py
#	selfdrive/car/subaru/carcontroller.py
#	selfdrive/car/subaru/carstate.py
#	selfdrive/car/subaru/interface.py
#	selfdrive/car/subaru/subarucan.py
#	selfdrive/car/torque_data/override.yaml
#	selfdrive/car/toyota/carcontroller.py
#	selfdrive/car/toyota/carstate.py
#	selfdrive/car/toyota/interface.py
#	selfdrive/car/toyota/toyotacan.py
#	selfdrive/car/volkswagen/carstate.py
#	selfdrive/controls/lib/desire_helper.py
#	selfdrive/controls/lib/longitudinal_planner.py
#	selfdrive/monitoring/dmonitoringd.py
#	selfdrive/thermald/power_monitoring.py
#	system/loggerd/uploader.py
2023-09-05 11:50:47 -04:00
Adeeb Shihadeh a9626f95b6 add openpilot prefix to imports (#29498)
* add openpilot prefix to imports

* more

* more

* fix docs

* fix linter

* bump submodules

* fix patched tests

* update dynamic imports

* debug

* Revert "debug"

This reverts commit db5e13b9911cc74438bee123bc3430da6c31b24b.

* fix pm test
2023-08-20 20:49:55 -07:00
Jason Wen 31b29bc094 Merge branch 'master' into dev-priv/master 2023-08-02 12:58:28 -04:00
Jason Wen 8498b1a1c3 Merge branch 'upstream/openpilot/master' 2023-08-01 23:03:54 -04:00
Adeeb Shihadeh 1945c356c2 agnos 8 (#28843)
* agnos 8

* update to python 3.11.4 (#27452)

* rebase

* optional

* lower cython

* TEMP don't pull cl to use python3.11

* Revert "lower cython"

This reverts commit c5132f8a2727c212bdfc01e77aa53e50a17ead9d.

* fix cython

* remove tensorrt

* carla + opencv

* macos

* update timm and smp

* pynvc

* https

* downgrade numpy

* pin scipy

---------

Co-authored-by: Maxime Desroches <desroches.maxime@gmail.com>
Co-authored-by: Yassine <yassine.y10@gmail.com>

* revert that

* fix linter

---------

Co-authored-by: Maxime Desroches <desroches.maxime@gmail.com>
Co-authored-by: Yassine <yassine.y10@gmail.com>
2023-07-20 21:56:57 -07:00
Adeeb Shihadeh 9c307f2550 Revert "Update pycapnp and Cython (#29021)"
This reverts commit 76ef1b9b9f.
2023-07-18 18:47:35 -07:00
Maxime Desroches 76ef1b9b9f Update pycapnp and Cython (#29021)
* cython + pycapnp

* from_bytes with context

* poetry lock

* limit numpy

* force build

* Revert "force build"

This reverts commit 8c7cb00421da9d0f1b7da2c94f75e9c43733f840.

---------

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
2023-07-18 16:40:36 -07:00
Jason Wen 7dd66a22c6 fix upstream conflict 2023-06-22 20:43:01 -04:00
Kacper Rączy 83d6552a15 lateral_planner: expose solverState, solverCost in debug mode (#28577)
* Update cereal

* Add xs, ys, solverCost support in lat planner

* Update cereal

* Add support for debug mode. Add solverState

* Read debug mode from env

* Update cereal
2023-06-16 19:51:37 -07:00
Jason Wen 0372bf8e11 UI: E2E longitudinal status icon and prompt chime (#23)
* UI: Display E2E Longitudinal status icon

* don't forget init

* take these out

* and this

* can't leave this

* spam the event

* publish here instead

* try this now

* expose the toggle

* Spam all the time!!!

* Spam all the time with this!

* see if this works

* new way to trigger

* fix

* another one

* more to it

* more of that

* move to car controls instead

* no longer needed

* 20 hz

* unnecessary

* send like this pls

* move to long planner

* let's see what it looks like first

* don't alert yet lol

* re-enable and try out prompt!

* move chime event to longitudinal_planner

* AlertStatus to userPrompt

* Add more reset conditions

* less conditions to test first

* louder sound

* permanent alert

* LOUDER SON!

* use stock prompt

* Revert "less conditions to test first"

This reverts commit b24a096e65e80f303f7d92072cdf273a30dd37e2.

* remove lead car take off alert (in separate PR)

* cleanup

* longer

* Nicki Minaj Model (#28218)

* New model: 2ff7490f-8a2f-4c0d-87a8-b0fa3a4a6a71

* Updated model_replay_ref_commit

(cherry picked from commit 328b5d9d47)

* use the event

* move logic to c++

* cleanup

* no prompt border

* use brake light from car state

* lead car take off event

* lead car take off event

* always reset last distance

* show border when prompted

* remove lead car take off alert (in separate PR)

* don't prompt when lead car detected

* Revert "Nicki Minaj Model (#28218)"

This reverts commit b25e96c9d8fe0ac3a93c97eec2e91064c12a5649.

* bad sounds

* simpler

---------

Co-authored-by: Mitchell Goff <mitchellgoffpc@gmail.com>
2023-05-27 13:32:05 -04:00
Jason Wen ee0dfacb93 Merge branch 'master' into dev-priv/master
# Conflicts:
#	panda
#	selfdrive/car/car_helpers.py
#	selfdrive/car/toyota/interface.py
#	selfdrive/ui/ui.cc
2023-03-24 15:24:05 -04:00
Jason Wen 18a5cf0277 Merge remote-tracking branch 'upstream/commaai/openpilot/master'
# Conflicts:
#	cereal
#	opendbc
#	panda
#	selfdrive/ui/ui.cc
2023-03-24 15:05:42 -04:00
Adeeb Shihadeh 17b71b477e plannerd: add frameId to uiPlan (#27573)
* plannerd: add frameId to uiPlan

* update refs
2023-03-13 15:30:38 -07:00
Jason Wen 27bd70f64b Merge branch 'master' into dev-priv/master
# Conflicts:
#	panda
#	selfdrive/car/gm/interface.py
#	selfdrive/ui/translations/main_zh-CHT.ts
2023-03-12 14:59:46 -04:00
Jason Wen b475e28087 Merge remote-tracking branch 'upstream/commaai/openpilot/master'
# Conflicts:
#	cereal
#	panda
#	selfdrive/car/hyundai/interface.py
#	selfdrive/car/toyota/carcontroller.py
2023-03-12 14:52:12 -04:00