Commit Graph

969 Commits

Author SHA1 Message Date
Jason Wen 9e00a2f066 Merge branch 'master' into sync-priv-20231108
# Conflicts:
#	panda
#	selfdrive/car/subaru/interface.py
#	selfdrive/locationd/torqued.py
2023-11-12 01:00:33 -05:00
Jason Wen 09a4536b8a Merge branch 'upstream/openpilot/master' into sync-20231112
# Conflicts:
#	panda
#	selfdrive/car/subaru/interface.py
2023-11-12 00:49:42 -05:00
Jason Wen 8a12b77748 omg we flipped the logic 2023-11-11 11:58:58 -05:00
Jason Wen 1349fa576e omg we flipped the logic 2023-11-11 11:53:05 -05:00
Vivek Aithal 2eb487c9a5 params: Remove separate CarParams from each daemon (#30405)
* remove separate previous route carparams from each daemon and add centrally to controlsd

* extract out sigint handler

* make process replay work for torqued

* don't write param if None
2023-11-08 15:25:41 -08: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
Kacper Rączy c419376bbd controlsd: reset axes in joystick mode if message is old (#30409)
Reset joystick if it wasnt received after 0.2 sec
2023-11-07 15:48:13 -08:00
Jason Wen 741237f6e2 FCR: Reset cached param to sync with upstream conflicts 2023-11-07 20:05:37 +00:00
Jason Wen 81acbe224f controlsd: Get minimum set speed in a method 2023-11-06 21:07:00 +00:00
Jason Wen 8ad8238e38 SLC: slight cleanup 2023-11-05 21:06:39 -05:00
Jason Wen 40eb5801bd Revert "SLC: slight cleanup" 2023-11-06 02:05:09 +00:00
DevTekVE f0b81d9151 ui: SLC: Expand settings 2023-11-05 19:24:25 +00:00
Jason Wen 6d11fa71d2 SLC: slight cleanup 2023-11-05 19:23:30 +00: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 590577911d DEC: Refactor toggle states 2023-10-31 01:04:23 -04:00
DevTekVE 68e1379003 Reimplement SLC 2023-10-30 18:16:23 +00:00
Jason Wen 57e135cdf9 Fix upstream conflicts (#232) 2023-10-24 00:22:58 -04:00
Jason Wen c8cefa4af1 fix with T_IDXS 2023-10-23 20:22:49 -04:00
Jason Wen c006e24599 Merge branch 'dev-priv/master-priv' into sync-priv-20231020
# Conflicts:
#	selfdrive/controls/lib/longitudinal_planner.py
2023-10-23 11:37:06 -04:00
DevTekVE 4b8109666b Revert "Refactoring the speed limit control" 2023-10-23 11:05:17 +00: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 04e21399f1 Merge remote-tracking branch 'commaai/openpilot/master' into sync-20231018
# Conflicts:
#	panda
2023-10-18 01:08:29 -04:00
Jason Wen b1f4dc6bb0 Merge remote-tracking branch 'commaai/openpilot/master' into sync-priv-20231016 2023-10-17 14:37:34 -04:00
Shane Smiskol ffeb99db54 events: fixup printing script (#30268)
* fix typing, no need for ordereddict, show priority name again

* just repr
2023-10-17 01:52:20 -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
Jason Wen 6c67abe65f Revert "Sync master-priv with public sunnypilot:master" 2023-10-16 04:53:55 +00:00
Jason Wen 71b9fe4918 Suppress panda siren if in park gear - V2 2023-10-16 02:35:08 +00:00
Adeeb Shihadeh b68cfbb332 cleanup old sm pm args (#30241)
* cleanup sm pm

* fix controlsd

* fix
2023-10-13 23:27:04 -07:00
DevTekVE f885863e1e Sync master-priv with public sunnypilot:master 2023-10-13 16:40:08 +00:00
DevTekVE 99f8adde71 Refactoring the speed limit control 2023-10-10 15:02:35 +00:00
Jason Wen fb6acf9ff1 ui: New ButtomParamControl design 2023-10-04 16:59:33 +00:00
Jason Wen 62e6d6392d V-TSC: Parse lane lines calculation fix (#326) 2023-10-02 22:54:01 -04:00
Jason Wen 48d7faf48f Dynamic Longitudinal Control (#218)
* Dynamic End to End Longitudinal

* Revert "Dynamic End to End Longitudinal"

This reverts commit cec0fa8ad23b8473b27c58f6d20ba6d4d58e726e.

* Dynamic Longitudinal Controller

* Update CHANGELOGS.md

* add to builds

* Name change

* Toggle at wrong place :p

* oops take this out for now

* ZeroDivisionError

* add mpc mode to cereal

* add mpc mode to cereal

* Add UI button, replace MEMORY with DLC status in dev UI

* small change

* Higher stop counts

* add blinker logic

* initial set normally if DLC is on

* Update CHANGELOGS.md

* Fix

* fixes

* add dlc to Feature Status

* catch AttributeError

* fix

* add btn

* Dynamic Longitudinal Control (DLC) -> Dynamic Experimental Control (DEC)

* Capitalization on ACC and Blended

* add here

* sync

* sync

* Update CHANGELOGS.md

* cleanup

* more cleanup
2023-10-01 23:59:27 -04:00
Jason Wen d0e58efaf6 Hyundai CAN Longitudinal: Only use vision-based yRel for Hyundai camera-based SCC platforms (#320) 2023-10-01 21:43:00 -04: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 823e82ec0a MADS: Remove controlsAllowedLong pandaStates to sync with stock cereal (#315)
* MADS: Remove controlsAllowedLong pandaStates to sync with stock cereal

* bump panda

* bump panda
2023-10-01 02:27:52 -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
Justin Newberry 2dd13c60cc Revert "run unit tests in a random order (#29799)" (#30116)
This reverts commit b483efe764.
2023-09-30 17:23:38 -07:00
Adeeb Shihadeh b483efe764 run unit tests in a random order (#29799)
* run unit tests in a random order by default

* bump panda

* fix startup

* re-add random order plugin

---------

Co-authored-by: Justin Newberry <justin@comma.ai>
2023-09-30 15:56:23 -07:00
Jason Wen d6a768c96f Hyundai CAN Longitudinal: Parse lead info for camera-based SCC platforms (#299)
* Hyundai CAN Longitudinal: Parse lead info for camera-based SCC platforms

* typo

* another typo

* camera SCC has them flipped

* disable `radarUnavailble`

* Missing on these platforms

* parse lateral position of lead car from vision model output

* fix CP init
2023-09-30 01:20:13 -04:00
Jason Wen 613d5b4aba Torque Lateral Control: Refactor settings (#300)
* Torque Lateral Control: Refactor settings

* don't need this

* only offroad allowed

* Don't need this

* allow when offroad

* gate them

* flipped

* handle them better

* cleaner

* remove duplicate

* toggle checks cleanup

* 2.5 second check

* trigger refresh when going offroad

* cleanup

* move toggle

* update title and description

* fix ampersand

* update live torque toggle

* live torqued every 2.5 second
2023-09-29 02:36:55 -04:00
Jason Wen c49b5c8e35 Lateral Planner: Fix Custom Offsets and Path Offset in all modes (#309)
* Lateral Planner: Fix Custom Offsets and Path Offset in all modes

* Update init values
2023-09-29 00:39:49 -04:00
Adeeb Shihadeh a4aa801fbe simplify sensor alert (#29824)
* simplify

* update proc replay
2023-09-26 16:47:21 -07:00
coffee-cake-isaac c43325fa17 joystick mode: add curvature control (#30010)
* Added curvature controls to joystick mode

* same line

---------

Co-authored-by: Shane Smiskol <shane@smiskol.com>
2023-09-22 21:53:31 -07:00
Jason Wen 31c56ca708 Merge branch 'master' into dev-priv/master
# Conflicts:
#	panda
#	selfdrive/car/hyundai/carstate.py
#	selfdrive/car/hyundai/hyundaican.py
#	selfdrive/controls/controlsd.py
#	selfdrive/manager/custom_dep.py
2023-09-23 00:06:34 -04:00
Jason Wen eb2a58185d Merge branch 'upstream/openpilot/master'
# Conflicts:
#	.pre-commit-config.yaml
#	README.md
#	cereal
#	opendbc
#	panda
#	selfdrive/car/torque_data/override.yaml
2023-09-22 23:49:13 -04:00