Commit Graph

813 Commits

Author SHA1 Message Date
Jason Wen 8db81e9f4e Ram HD: locked Steering Ratio (#156)
* Ram HD: locked SR

* gate to only ram hd

* attribute error

* gotta init first

* define type
2023-06-14 23:48:11 -04:00
Jason Wen 7927c72076 Auto Lane Change: Delay execution if lane change was blocked by BSM (#153)
* Auto Lane Change: Delay execution if lane change was blocked by BSM

* add toggle

* add changelogs

* flipped

* show/hide toggles with param updates

* fix docs

* 1 second instead
2023-06-14 07:26:40 -04:00
Jason Wen cfaef14f05 Green Traffic Light Chime: alert status = normal (#151) 2023-06-13 13:43:11 -04:00
Jason Wen f3c86bd9dd CSLC: handle FCA resume button differently (#144) 2023-06-12 23:10:55 -04:00
Jason Wen 9cdb838557 Controls: Custom Stock Longitudinal Control (#61)
* Custom Stock Longitudinal Control - base

* HKG

* simpler

* expose toggle

* allow events and engagements

* gate hysteresis for now

* screen tap SLC logic

* Honda

* update with submaster

* Revert "simpler"

This reverts commit 61b9a02faec721d4460c50c6e3f81b7d459d506b.

* send to cereal

* handle new pcm cruise engagement on HKG

* small cleanup

* define vehicle-specific lowest set speed

* not fitting

* new logic to help with weird rapid spam

* comment

* gaspressed don't override

* slow down button send when 2 values away

* less complex

* round them up

* Revert "less complex"

This reverts commit d850c404cccca5940f4e861c5df0317a38a4ab6b.

* gotta convert

* only slow down for slc and normal

* gaspress allow override

* no delay

* gate behind custom stock long

* add hysteresis to curve speed button sends

* remove limiting for Honda

* Revert "remove limiting for Honda"

This reverts commit b50f6199508e313fa1a30e1ab74970c507d89d78.

* 20/4 hz

* 25 times, just like old times

* god damn slow it down

* faster

* a tad bit faster

* slower at the end

* Volkswagen

* more checks

* log vw customs stock long

* change it up

* change it up for vw checks

* oops

* make sure it sends 10 times before changing to another button sets

* unnecessary

* use different count

* better logic

* bring back speed_diff

* vw: faster

* chrysler support

* mazda support

* fixup! chrysler support

* bump panda

* bump panda

* fix upstream merge

* Enable for Mazda

* initial and lowest set speed for all supported brands

* use buttonEvents from carstate for FCA and Mazda

* gate this behind non PCM only

* lower calls

* fix counter in button send

* log FCA and Mazda

* format

* just send one copy

* FCA: make SET+ set instead of resume

* Nicki Minaj Model (#28218)

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

* Updated model_replay_ref_commit

(cherry picked from commit 328b5d9d47)

* Revert "FCA: make SET+ set instead of resume"

This reverts commit 523a0537b728e8243e9cecb47169799d519aac3f.

* try this out

* try to match jvepilot's logic

* send with extra incrementing counts

* Revert "Revert "FCA: make SET+ set instead of resume""

This reverts commit f414a51e784b040d0f04881adcfc78d7faacda2a.

* have to block it

* lower send at 4 Hz

* can't be int

* 10 Hz max, 1 copy

* mazda send at 10 Hz

* chrysler at 10 hz

* send at 10 Hz

* remove this check for vw for now

* hkg can-fd go back to 4Hz, 1 copy

* hkg can-fd go back to 5Hz, 1 copy

* vw: different send freq logic

* Set cruise button every frame for FCA and HKG

* Set cruise button every frame for Mazda

* Revert "Set cruise button every frame for HKG"

* can't use brackets

* FCA: only send if counter has changed

* HKG CAN-FD: only send if counter has changed

* only up button frame if needed

* Revert "Set cruise button every frame for FCA"

* HKG CAN-FD: fix name

* FCA: handle resume button press engage cruisestate enabled

* FCA: separate RAM and non-RAM

* bump panda (test CAN Bus Disconnected bad commit)

* bump panda

* bump panda

* Revert "Nicki Minaj Model (#28218)"

This reverts commit 348f68b68c0bd2fcb6fdd6269e911d63ada968b4.

* gate behind customStockLong

---------

Co-authored-by: Mitchell Goff <mitchellgoffpc@gmail.com>
2023-06-08 23:10:48 -04:00
Jason Wen 869573d282 GAC: new implementation and jerk changes (#95)
* GAC: Harald's method

* unused

* match harald's

* Revert "match harald's"

This reverts commit f2015eb2d8ffe80f8e02ffb92bd1d244dbfdb38c.

* try this

* Revert "try this"

This reverts commit 993adce26f594c5d2da1752657fe3af21c17cd27.

* do this instead

* fix

* cleanup

* align with harald's method

* fix init at 0

* use cereal

* unused

* maniac, aggro, stock

* unused

* fake lead when no lead

* print desired following distance from lead_0

* default at 3

* update carstate obj

* clip this

* use actual profiles

* cleanup

* scale maniac text smaller

* should be 1
2023-06-08 11:22:26 -04:00
Jason Wen 199aabb476 Merge branch 'master' into dev-priv/master 2023-06-06 21:01:50 -04:00
Jason Wen bf0411be00 Enhanced Speed Control: accelerator press state handling (#170)
Enhanced Speed Control: accelerator press state handling
2023-06-06 21:00:21 -04:00
Jason Wen 65de8af740 GAC: allow profile changes in Experimental Mode (#99) 2023-06-06 16:51:24 -04:00
Jason Wen 955926a80e Block Enhanced Speed Control events on unsupported platforms (#98) 2023-06-06 14:45:41 -04:00
Jason Wen 8a9bec3a82 Don't append immediate disable events if in park gear (#94) 2023-06-05 15:32:47 -04:00
Jason Wen 8179a56926 Add toggle for Road Edge Detection (#85) 2023-05-31 13:25:05 -04:00
Jason Wen b6a5f0e6b9 Road Edge Detection (#75)
* don't initialize lane change if road edge detected

* add event

* use frog's method

* sync name

* unused

* Only block during preLaneChange

* change it up
2023-05-29 21:47:56 -04:00
Jason Wen 30328c50a4 Don't trigger CAN bus timeout if in park gear 2023-05-28 23:04:54 -04: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 4d3a97a5d5 fix upstream conflict 2023-05-25 13:35:01 -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 e889e09513 controlsd: check for self lagging in radar alert 2023-05-15 13:57:11 -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
Kacper Rączy e08952acc8 controlsd: disable controlsdLagging event during process replay (#28177)
Disable controlsdLagging event during process replay
2023-05-12 11:33:48 -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
Adeeb Shihadeh 154a42dcbd gate no gps alert on valid localizer inputs (#28135) 2023-05-08 15:09:00 -07:00
Adeeb Shihadeh c4501e4bc1 controlsd: remove procs from ignore list (#26848)
* trim list

* check for file
2023-05-07 15:43:45 -07:00
Shane Smiskol 4e951e4524 Lane Departure Warning: fix desire index bug (#28119)
don't subtract 1
2023-05-06 03:03:28 -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 0d6d336f63 Ignore gpxd crash in manager 2023-04-01 23:16:47 -04: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
Jason Wen b1c12dedc7 MADS: enforce longitudinal allowed check on auto-resume (#66)
* bump panda

* MADS: enforce long allowed on auto-resume
2023-03-29 21:28:43 -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 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
Shane Smiskol 42449b482d boardd: ability to switch between ELM safety params (#27656)
* indecisive

* rename to generic FW query

* remove code and update comment

* we need this to start off, unless we set multiplexing immediately

* draft

* draft 2

* try that

* can't do this either, boardd might read Enabled after removing, but before setting new Request param

* this should work

* use one less param

* fix params

* match behavior (set all pandas to safety param of 1, disabling multiplexing for fingerprinting

* clean up (some tests may temp break)

* fix param name and sort

* time it

* yes it does matter

* add to hyundai's bus 5 query

* remove hyundai for now

* this should work

* clean up

* clean up

* flip argument around, clean up

* fix test_startup

* some clean up

* rm line

* comment makes more sense

* required typing

* clean up common type

* comments

* Update selfdrive/car/car_helpers.py

* line

* whoops, need to set before vin!

* fix debug

* annoying

* more debugging

* bug fix (needs both keys always)

* debuGG

debuGG

* Revert "debuGG"

This reverts commit 55b2f429324c0b92d5cfb2cabf8b20db1e166248.

* Revert "more debugging"

This reverts commit 02934c3403ad5270f03093508b704c151d1ccb2a.

* Revert "annoying"

This reverts commit 8b4e5e09989f9a0217e3ec1c0ba68735929b7366.

* clean that up

* bumpback

* bumpback

* every second write param

* flip

* stuff

* move up?

* fix timing out in CI

* rm
2023-03-23 00:14:31 -07:00
Jason Wen b1efbc48b2 MADS: initialize set speed when in override state (#56) 2023-03-21 14:52:08 -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 d124f62078 ui: developer ui (#48)
* Hide 2nd row dev UI when map is visible

* Dev UI init

* fixup! Dev UI init

* fixup! Dev UI init

* fixup! Dev UI init

* fixup! Dev UI init

* fixup! Dev UI init

* fixup! Dev UI init

* Disable lateraState for now?

* Revert "Disable lateraState for now?"

This reverts commit ff669862e9ab7cfe421a0266dfc503b3b190143a.

* add cs.laterelState

* should be bool

* bruh

* change dm icon too

* Bruh should be y

* don't draw border

* bolded text

* bring back memory usage

* angleSteer status color

* move it higher

* higher

* lower

* closer together

* Move this button too

* fixup! Move this button too

* Move this text?

* to the left

* left and down

* missed an argument

* move them a bit

* readjust bottom row positioning

* test position

* revert to this

* wider!

* proper space reference

* unused

* other method

* fix

* shorter

* more spaces

* wider

* do it like this

* should be width

* add on top

* wider

* lineup right

* align this right

* different one

* try this

* fix

* align right!

* make unit strings standalone

* Try this out

* adjust

* align to unit strings

* adjust!

* adjust!

* Revert "adjust!"

This reverts commit 748b74c21a986b4ed62acdcceb83226ff523e5ce.

* Revert "adjust!"

This reverts commit 4f5373b0de503203098c5fd495e72227f4525be4.

* more adjust

* final adjust?

* final adjust?

* wider

* keep left

* Try this out

* more together

* hmm

* adjust

* align differently

* adjust final

* adjust more

* adjust more

* Try this out

* last

* Try this

* Try that

* wider

* only check when starting

* comment

* remove second column and second row; change settings to 5 or 10 metrics; implement in future PRs

* fixup! remove second column and second row; change settings to 5 or 10 metrics; implement in future PRs

* fixup! remove second column and second row; change settings to 5 or 10 metrics; implement in future PRs
2023-03-12 16:23:00 -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