Commit Graph

568 Commits

Author SHA1 Message Date
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 a0d162ccd9 Merge branch 'master' into dev-priv/master
# Conflicts:
#	panda
#	selfdrive/car/nissan/carcontroller.py
#	selfdrive/car/subaru/subarucan.py
#	selfdrive/controls/controlsd.py
#	selfdrive/controls/lib/lateral_planner.py
#	selfdrive/ui/qt/offroad/settings.cc
#	selfdrive/ui/qt/onroad.cc
#	selfdrive/ui/ui.cc
2023-05-25 12:39:32 -04:00
Jason Wen 6c2a58f2e9 Merge branch 'upstream/openpilot/master'
# Conflicts:
#	cereal
#	common/params.cc
#	panda
#	selfdrive/car/subaru/subarucan.py
#	selfdrive/controls/lib/lateral_planner.py
#	selfdrive/controls/lib/longitudinal_planner.py
2023-05-25 12:17:54 -04:00
Kacper Rączy 7b68a13048 lateral_planner: init missing variables (#28222)
Init missing variables in LateralPlanner constructor
2023-05-17 14:04:17 -07:00
Adeeb Shihadeh c192c92a4e calibrationd: add offroad alert when remount detected (#28073)
* calibrationd: add offroad alert for recalibration

* Update common/params.cc
2023-05-15 13:10:36 -07:00
Harald Schäfer 598343aad1 Calibrationd: make recalibrating alert (#28149)
* Initial

* fixes

* not an int anymore

* elif

* revert ref

* update ref

* fix alert text

* regen refs

* update ref

* add recalibration unit test

* set into recalibration state

* fix words

* recalib

* text

* Update selfdrive/controls/lib/events.py

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>

---------

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
2023-05-15 09:29:57 -07:00
Shane Smiskol 344064d6bd Ford: hybrids are unsupported (#28171)
* hybrid fords are dashcammed

* something like this?

* just do an alert

* good comment

* space

* bb

bb

* top

* Update selfdrive/car/ford/interface.py

* add a noEntry

* remove from release notes

* sad :(

---------

Co-authored-by: Cameron Clough <cameronjclough@gmail.com>
2023-05-11 23:35:07 -07:00
Vivek Aithal a599890fed Lateral Planner: Calibrate model speed with vEgo (#28049)
* calibrate speed in the lateral planner

* make speed err helper fn

* check if trans has values

* clip the vel_err

* update refs
2023-05-09 14:26:58 -07:00
Shane Smiskol fb29d0f3bf Ford: add alert for steering wheel angle not ready (#28140)
* add event for steering angle calibrating

* how about this

how about this

* rename

* more openpilot-y

* add comment to code

* move to top

* better wording

* more general

* fix

* ?

* above

* bump cereal to master

* add more comms
2023-05-08 22:03:30 -07:00
Jason Wen 9c84fa7434 Merge branch 'master' into dev-priv/master
# Conflicts:
#	panda
#	release/files_common
#	selfdrive/car/hyundai/carcontroller.py
#	selfdrive/car/hyundai/carstate.py
#	selfdrive/car/hyundai/hyundaicanfd.py
#	selfdrive/car/interfaces.py
#	selfdrive/car/subaru/carcontroller.py
#	selfdrive/car/subaru/subarucan.py
#	selfdrive/car/toyota/interface.py
#	selfdrive/ui/translations/main_pt-BR.ts
2023-04-25 01:42:45 -04:00
Jason Wen 8a61496937 Merge remote-tracking branch 'upstream/commaai/openpilot/master'
# Conflicts:
#	.pre-commit-config.yaml
#	cereal
#	opendbc
#	panda
#	selfdrive/car/hyundai/carstate.py
#	selfdrive/car/hyundai/interface.py
#	selfdrive/car/toyota/interface.py
2023-04-25 01:10:56 -04:00
Harald Schäfer a979a54cf9 Calibration remount detector: soft disable (#27993)
* Calibration remount detector: soft disable

* Update test_calibrationd.py
2023-04-22 00:27:20 +00:00
Jason Wen 72ba1c3e39 Merge branch 'master' into dev-priv/master
# Conflicts:
#	panda
#	selfdrive/car/honda/carcontroller.py
#	selfdrive/car/interfaces.py
#	selfdrive/ui/translations/main_de.ts
#	selfdrive/ui/translations/main_ja.ts
#	selfdrive/ui/translations/main_ko.ts
#	selfdrive/ui/translations/main_pt-BR.ts
#	selfdrive/ui/translations/main_zh-CHS.ts
#	selfdrive/ui/translations/main_zh-CHT.ts
2023-03-30 23:14:39 -04:00
Jason Wen 89e2a6ea9b Merge remote-tracking branch 'upstream/commaai/openpilot/master'
# Conflicts:
#	cereal
#	panda
2023-03-30 23:07:29 -04:00
Jason Wen 5c8db326cf small mpc fix (#68)
* small change

* use actual long engaged cereal
2023-03-30 22:57:22 -04:00
Vivek Aithal 15b880c0ea Bolt EUV: Non-linear torque function (#27696)
* add erf based ff

* silly bug; diff of nonlinear != nonlinear of diff

* add sigmoid based ff, ensure slope at 0 > 1

* reduce steer down limit and increase driver allowance

* rebase panda

* atry without friction, and with tanh nonlinear

* finalize the nonlinear function

* do not disable friction compensation in the ff

* bump panda

* bump panda

* update refs

* update refs

* resolve comments

* Add type hints

---------

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
2023-03-29 15:10:39 -07:00
Jason Wen c5f0b9ab47 Merge branch 'master' into dev-priv/master 2023-03-29 17:54:21 -04:00
Jason Wen 75fd9b1b22 Long planner: fix upstream merge conflicts (#145)
Fix upstream merge conflicts
2023-03-29 17:53:58 -04:00
Jason Young 267974e002 remove accFaultedTemp, add steerTimeLimit (#27720)
* remove accFaultedTemp

* retry CI

* bump cereal

* grab the new steerTimeLimit Event

* bump cereal to updated master
2023-03-28 16:04:14 -07:00
Jason Wen 944f066628 Merge branch 'master' into dev-priv/master 2023-03-25 10:09:46 -04:00
Jason Wen bb76d4f9e9 Block Enhanced Speed Control events on unsupported platforms (#140) 2023-03-25 10:07:52 -04: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
Shane Smiskol 3ab8645d3a uiPlan: add planned acceleration field (#27484)
* add accel

* bump cereal

* Update ref_commit

---------

Co-authored-by: Bruce Wayne <harald.the.engineer@gmail.com>
2023-03-02 20:11:24 -08:00
Jason Wen bbf530027c GAC: Gap Adjust Cruise implementation (#44)
* Gap Adjust Cruise (GAC): init

* cs: add longitudinal supported cars

* disable for Toyota for now

* send to car cluster

* more

* KrKeegan: More Aggresive Start from Standstill

* fix

* set prev button after

* init bool

* wrong var

* use common update param function

* bruh no wonder why

* lock to default distance when using exp mode

* make vw match other makes

* implement ui button

* gate ui button

* log desired_TF

* move button

* only show when cruise state available

* only allow press when cruise state available

* Revert "KrKeegan: More Aggresive Start from Standstill"

This reverts commit 20bdff34c83d5a0c248d6996155c995c8a99810f.

* unnecessary

* nothing else

* pass it through

* add toyota support

* fixup! add toyota support

* oops, necessary

* don't show ui button when using e2e long

* different signal to use

* Forgot to update

* Clean it up?

* this?

* ugh

* force int!!

* convert then round

* hide when in exp mode

* toyota: log button

* Revert "different signal to use"

This reverts commit edc64d31af527af842aabe2934e5720f73bf75cc.

* toyota flippy flippy

* wrong signal for vw

* oops
2023-02-24 17:41:52 -05:00
Adeeb Shihadeh 7a3b3e8b56 better main off alert (#27442) 2023-02-23 15:01:10 -08:00
Adeeb Shihadeh 2008332bd4 GM: revert custom Bolt torque tune (#27403)
* Revert "GM: cleanup torque feedforward function (#27347)"

This reverts commit 8c099dd4e5.

* Revert "Chevrolet Bolt: Non-linear torque tune (#27344)"

This reverts commit e49748d571.

* update refs
2023-02-21 15:27:48 -08:00
Jason Wen 0ce258612b move-fast: v-tsc fix 2023-02-20 22:48:51 -05:00
Adeeb Shihadeh ea419c5764 add 'remount device' to permanent calibration invalid alert (#27407) 2023-02-20 16:29:17 -08:00
Jason Wen 36152df5e4 Torque lateral control customization (#41)
* Torque lateral control init

* move-fast: v-tsc fix

* No need to show this

* oops

* cleaner
2023-02-20 18:19:52 -05:00
Jason Wen 9f0879a57e DLP: Auto Lane profile improvements (#43)
* DLP: laneless for curves when using Auto Lane profile

* DLP: force laneless while changing lane in Auto Lane profile
2023-02-20 10:51:55 -05:00
Jason Wen adf844eb30 move-fast: v-tsc fix (#40) 2023-02-19 22:04:35 -05:00
Jason Wen b45f62bb74 Merge branch 'master' into dev-priv/master
# Conflicts:
#	selfdrive/controls/lib/lateral_planner.py
#	selfdrive/ui/ui.cc
2023-02-19 00:05:08 -05:00
Jason Wen 4b2ce89412 Merge remote-tracking branch 'upstream/commaai/openpilot/master'
# Conflicts:
#	cereal
#	selfdrive/ui/ui.cc
2023-02-18 23:52:21 -05:00
Jason Wen 7021d2ce20 move-fast: sunnypilot specials (#32)
* UI: Debug: Tap on Ui to capture snapshot of debug data

* UI: Debug UI: Toggle to display debug UI elements & UI prerequisites

* UI: VisionTurnController Implementation

* UI: Debug UI: Toggle to display debug UI elements

* UI: LiveMapData: Implementation

* UI: SpeedLimitControl: Implementation

* UI: TurnSpeedController: Implementation

* fixup! UI: SpeedLimitControl: Implementation

* Add adjustable speed limit offset (in % or actual values)

* fix

* fix 2

* fix 3

* wrong value used

* don't need this

* needs this!

* and this?

* needs to be at the top

* has to be public

* take them off

* gotta have this

* wrong!

* update this every time

* try to update

* hmm maybe it was this

* missed this

* Revert "missed this"

This reverts commit 926b45410544e4f1bbc5174d0d7b03fafedf610f.

* Revert "hmm maybe it was this"

This reverts commit 7f75543db71d6f438f6473c66d4f94df317f16f2.

* refresh them

* update them in both places!

* make them public please

* don't forget this path

* try this refresh?

* Revert "make them public please"

This reverts commit 669a3ee1d5607c84109294db7a567ca86cb91b0f.

* revert these

* try using signals to update

* Revert "try using signals to update"

This reverts commit f3ad02bde71467aa7fc27c0b95d03748345193e6.

* update state after it's emitted

* make it public

* Revert "make it public"

This reverts commit ddf431d198133359b8bd656dde9061ec671f2312.

* Revert "update state after it's emitted"

This reverts commit aad2876166843b63d889e90830bf3d32edaa2857.

* try this out

* fixup! try this out

* fixup! try this out

* fixup! try this out

* fixup! try this out

* don't need this

* fixup! try this out

* fixup! try this out

* fixup! try this out

* fixup! try this out

* make sure we can see it

* make it float

* Try to update this way

* fixup! Try to update this way

* Revert "fixup! Try to update this way"

This reverts commit f4725bcb070cc8e8ebeb6e37afeb930694e96e22.

* Revert "Try to update this way"

This reverts commit af72af8a4a193b24e99931200fac18c6625a2431.

* new method to hide/show

* fixup! new method to hide/show

* fixup! new method to hide/show

* fixup! new method to hide/show

* fixup! new method to hide/show

* fixup! new method to hide/show

* omg it works?!

* run these at 2Hz pls

* UI: use comma speed limit design instead of move-fast

* fixup! UI: use comma speed limit design instead of move-fast

* fixup! UI: use comma speed limit design instead of move-fast

* fixup! UI: use comma speed limit design instead of move-fast

* UI: use comma speed limit design instead of move-fast

* fixup! UI: use comma speed limit design instead of move-fast

* fixup! UI: use comma speed limit design instead of move-fast

* fixup! UI: use comma speed limit design instead of move-fast

* garbage collection

* redundant

* gc attempt?

* Revert "garbage collection"

This reverts commit 127fc8bd9d1eaea7725cf775dc7034ac6aaf09f4.

* garbage collection

* catch exceptions

* ignore mapd if crashed

* copy dependencies after first download

* changed dir

* oops

* proper termination before exiting

* same class

* Revert "same class"

This reverts commit dda695477371bf259b89aae726210dfe9d5f913e.

* Revert "proper termination before exiting"

This reverts commit 95c039dac86a389c0be043aadf2a3e8cbd4515c8.

* don't let accelerator press to re-engage SLC when NDOG is off

* can we free them up?

* Revert "can we free them up?"

This reverts commit d7736524645376ffb43acb77678086f6ae3c4e0b.

* fixup! don't let accelerator press to re-engage SLC when NDOG is off

* introduce navInstruction speed limits into SLC

* nuke UI for now - memory test

* do this instead

* Overpass: does not exist

* Revert "nuke UI for now - memory test"

This reverts commit fd81ffde0443917580ec4ad71095c178173883fe.

* meh
2023-02-18 23:22:07 -05:00
Harald Schäfer eb8bdc0026 MPC path in UI (#27380)
* 10s lat

* Full length MPC

* redfine N

* Leave controls the same for now

* Updates

* use long plan in lat plan

* interp plan

* simplergit add selfdrive/controls/plannerd.py selfdrive/controls/

* expand to 10s

* revert this

* fix linter

* vizualize

* fix long test

* typo

* cleanup

* compiles

* unused

* unused

* bump cereal

* bump cereal

* use model if no uiplanm

* update replay

* update ref commit

* bump cereal to master
2023-02-17 19:58:30 -08:00
Harald Schäfer 04fe6c4ec7 Expand lateral MPC to 10s (#27343)
* 10s lat

* Full length MPC

* redfine N

* Leave controls the same for now

* Updates

* use long plan in lat plan

* interp plan

* add new interp

* simplergit add selfdrive/controls/plannerd.py selfdrive/controls/

* expand to 10s

* revert this

* fix linter

* Update sconscripts

* fix test

* fix test

* fix test

* Revert "Update sconscripts"

This reverts commit 6e23c69dcebd5ed003e37e01921f6af7c31de0db.

* Dont import drive helpers

* better compile deps

* fix compile

* comment

* update replay

* Update plannerd time
2023-02-17 15:28:26 -08:00
Jason Wen ef32bcd0b1 Merge branch 'master' into dev-priv/master
# Conflicts:
#	selfdrive/car/chrysler/interface.py
#	selfdrive/car/hyundai/carcontroller.py
2023-02-14 20:44:48 -05:00
Jason Wen 75a00af955 Merge remote-tracking branch 'upstream/commaai/openpilot/master'
# Conflicts:
#	cereal
#	opendbc
#	panda
2023-02-14 20:42:02 -05:00
Vivek Aithal e49748d571 Chevrolet Bolt: Non-linear torque tune (#27344)
* add non linear tune

* update refs

* rerun tests
2023-02-14 16:20:28 -08:00
Adeeb Shihadeh 5af5f02ba8 better min enable speed alert (#27317) 2023-02-14 13:29:23 -08:00
Jason Wen 5feb4fa001 Merge branch 'master' into dev-priv/master
# Conflicts:
#	selfdrive/controls/lib/longitudinal_planner.py
#	selfdrive/controls/plannerd.py
#	selfdrive/ui/ui.cc
2023-02-13 11:41:38 -05:00
Jason Wen bf659453aa move-fast: mapd, Speed Limit Control, Vision & Map Turn Speed Control (#111)
* move-fast: Hands on wheel monitoring: Implementation according to r079r4e regulation

* move-fast: VisionTurnController Implementation & UI prerequisites

* move-fast: LiveMapData: Implementation & UI prerequisites

* add dependencies

* move-fast: SpeedLimitControl: Implementation & UI prerequisites

* move-fast: TurnSpeedController: Implementation & UI prerequisites

* move-fast: Debug: Tap on Ui to capture snapshot of debug data & UI prerequisites

* Debug UI: Toggle to display debug UI elements & UI prerequisites
2023-02-13 11:38:11 -05:00
Shane Smiskol 4f2134468f events: reword ESP off alert (#27304)
* Rename event

* rename to Control

* rename to disabled
2023-02-10 23:46:48 -08:00
Jason Wen 92f16cbbac Merge branch 'master' into dev-priv/master
# Conflicts:
#	selfdrive/controls/controlsd.py
2023-02-11 02:28:54 -05:00
Jason Wen 6ad79d3e81 Longitudinal: Reverse ACC Change (#110) 2023-02-11 02:26:50 -05:00
Jason Wen a42d9e238d DLP: don't delay on checking status (#31) 2023-02-11 01:31:20 -05:00
Jason Wen 4d65697c07 Merge branch 'master' into dev-priv/master
# Conflicts:
#	selfdrive/car/hyundai/carcontroller.py
#	selfdrive/car/nissan/carcontroller.py
#	selfdrive/controls/controlsd.py
2023-02-11 01:26:08 -05:00
Jason Wen eb591e3015 Merge remote-tracking branch 'upstream/commaai/openpilot/master'
# Conflicts:
#	opendbc
2023-02-11 01:23:43 -05:00
Adeeb Shihadeh 5ab2d35f7b controlsd: higher default set speed in experimental mode (#27279)
* controlsd: higher default set speed in experimental mode

* update tests

* update tests
2023-02-09 19:27:51 -08:00