Commit Graph

339 Commits

Author SHA1 Message Date
Jason Wen 938a64620f Auto Lane Change Timer: cleaner method (#196) 2023-06-27 23:39:47 -04:00
Jason Wen 6df086aa82 Merge branch 'master' into dev-priv/master
# Conflicts:
#	panda
#	selfdrive/car/honda/interface.py
#	selfdrive/car/hyundai/hyundaican.py
#	selfdrive/car/mazda/carstate.py
#	selfdrive/car/nissan/nissancan.py
#	selfdrive/car/subaru/carcontroller.py
#	selfdrive/car/subaru/subarucan.py
#	selfdrive/car/volkswagen/mqbcan.py
#	selfdrive/car/volkswagen/pqcan.py
#	selfdrive/controls/lib/longitudinal_mpc_lib/long_mpc.py
#	selfdrive/controls/lib/longitudinal_planner.py
#	selfdrive/ui/SConscript
#	selfdrive/ui/qt/offroad/settings.cc
#	selfdrive/ui/qt/onroad.cc
#	selfdrive/ui/translations/main_de.ts
#	selfdrive/ui/translations/main_ja.ts
#	selfdrive/ui/translations/main_ko.ts
#	selfdrive/ui/translations/main_zh-CHS.ts
#	selfdrive/ui/translations/main_zh-CHT.ts
2023-06-22 15:14:15 -04:00
Jason Wen 54c4dbd49b Merge branch 'upstream/openpilot/master'
# Conflicts:
#	cereal
#	common/version.h
#	opendbc
#	panda
#	selfdrive/car/honda/carstate.py
#	selfdrive/car/honda/interface.py
#	selfdrive/car/hyundai/values.py
#	selfdrive/car/subaru/carcontroller.py
#	selfdrive/car/subaru/subarucan.py
#	selfdrive/controls/lib/longitudinal_planner.py
#	selfdrive/manager/manager.py
2023-06-22 14:52:51 -04:00
Jason Wen 879041976f Revert "Ram HD: locked Steering Ratio (#156)" (#161)
This reverts commit 8db81e9f4e.
2023-06-15 11:20:18 -04:00
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
Kacper Rączy 4eb3d54149 modeld: use any available stream as main, if there's only one (#28514)
* Use whatever stream is available as main, if there's only one

* Move logw somewhere else

* Add wideRoadCameraState to ignore_alive if its not available
2023-06-12 20:13:56 -07:00
Dean Lee 4ae0378f63 automatically detect available camera streams (#27640)
* remove WideCameraOnly

* check in set_initial_state

* no block

* remove try block

* apply reviews
2023-06-12 13:40:43 -07:00
Adeeb Shihadeh 2f117e88b7 test onroad: explicit memory leak check (#28502) 2023-06-11 14:43:25 -07:00
Adeeb Shihadeh a412cd07b1 cloudlog process not running (#28472)
* cloudlog process not running

* error
2023-06-09 15:36:15 -07: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 8a9bec3a82 Don't append immediate disable events if in park gear (#94) 2023-06-05 15:32:47 -04:00
Harald Schäfer dba437bc8d Remove INDI controller (#28366) 2023-06-01 21:05:49 -07:00
Adeeb Shihadeh cd57b340c1 test_onroad: ignore vehicleModelInvalid (#28335)
* test_onroad: ignore vehicleModelInvalid

* not for all ci
2023-06-01 10:26:08 -07: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
Shane Smiskol 715f44ff45 controls: write recalibrating offroad alert once (#28312)
* only write once

* rm read

---------

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
2023-05-26 13:07:35 -07: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
Adeeb Shihadeh dee7ced00e controlsd: check longitudinalPlan avg freq (#28200) 2023-05-24 20:46:44 -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
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 0d6d336f63 Ignore gpxd crash in manager 2023-04-01 23:16:47 -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
Jason Wen b1efbc48b2 MADS: initialize set speed when in override state (#56) 2023-03-21 14:52:08 -04: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
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 e729f5b763 Remove dashcam override param (#27509)
* remove dashcam override

* sort

* remove ford from segments
2023-03-06 15:36:39 -08:00
Adeeb Shihadeh 9d64fb2d1a improved fan malfunction detection (#27405) 2023-02-22 14:11:29 -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 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
Jason Wen 8892950697 MADS: don't allow actuation if not calibrated (#37) 2023-02-18 18:46:12 -05: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
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 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
Adeeb Shihadeh 7978901101 controlsd: revert CAN timeout threshold (#27275)
* controlsd: revert CAN timeout threshold

* dt_ctrl doesn't make sense there
2023-02-09 18:54:17 -08:00
Shane Smiskol 8f5057ff2d GM: enforce steering command message timing (#27250)
* draft

* bump opendbc

* still draft

* that's not right

* superset of the changes, 33hz

* cleanup

* this should work

* remove line

* pass it in again

* actually no need to check updated now

* now_nanos

* consistent name

* fix replay

* one line isn't that bad

switch

switch

* fix CarController tests

* Update ref_commit
2023-02-09 15:37:39 -08:00
Jason Wen 0ca23636d4 Merge branch 'master' into dev-priv/master 2023-02-05 15:16:42 -05:00
Jason Wen 2a841a7757 Lane Change Timer (#104) 2023-02-05 14:31:09 -05:00
Jason Wen 6ec1b029b9 DLP: preserves lanelines (#16)
* Revert "Remove lane planning code (#25651)"

* DLP: preserves lanelines

* MADS: cruiseEngageBlocked event

* change path now!

* Revert "change path now!"

This reverts commit 7db2af33378aa02288b6222ed722d705ca6e92ec.

* Revert "Revert "change path now!""

This reverts commit 19f50a19e98721f7b8b9018b2e788629df45137f.

* c string

* atoi instead

* does this work?

* move it move it

* move there

* Try this one

* dotted line

* looks horrible

* how about this?

* Nah let's keep it simple

* track these with cereals

* send button!

* add more

* don't need this

* and this too

* make sure it shows first

* more

* to right for now

* stock size

* different color

* move some logic around

* don't miss

* don't miss this

* check somewhere else

* oops

* not liking it

* bring back current button

* don't need to be constant

* take it out for now

* wrap for translation
2023-02-05 13:46:58 -05:00