Commit Graph

143 Commits

Author SHA1 Message Date
HaraldSchafer ef41004968 Latcontrol torque: max_torque rename (#24265)
old-commit-hash: 506650bab66ae1d28f76526ffcb73470b755c170
2022-04-20 11:26:24 -07:00
HaraldSchafer 2174005f05 Lateral torque-based control with roll on TSS2 corolla and TSSP rav4 (#24260)
* Initial commit

* Fix bugs

* Need more torque rate

* Cleanup cray cray control

* Write nicely

* Chiiil

* Not relevant for cray cray control

* Do some logging

* Seems like it has more torque than I thought

* Bit more feedforward

* Tune change

* Retune

* Retune

* Little more chill

* Add coroll

* Add corolla

* Give craycray a good name

* Update to proper logging

* D to the PI

* Should be in radians

* Add d

* Start oscillations

* Add D term

* Only change torque rate limits for new tune

* Add d logging

* Should be enough

* Wrong sign in D

* Downtune a little

* Needed to prevent faults

* Add lqr rav4 to tune

* Try derivative again

* Data based retune

* Data based retune

* add friction compensation

* Doesnt need too much P with friction comp

* remove lqr

* Remove kd

* Fix tests

* fix tests

* Too much error

* Get roll induced error under 1cm/deg

* Too much jitter

* Do roll comp

* Add ki

* Final update

* Update refs

* Cleanup latcontrol_torque a little more
old-commit-hash: fe0bcdaef6b1fd3fc9d855aefeba755b35dfc222
2022-04-19 19:34:31 -07:00
Adeeb Shihadeh 3789587df1 add alert for CAN bus timeout (#24162)
* add alert for CAN bus timeout

* add alert

* set in interface

* cleanup

* cleanup

* add event

* fix mock

* bump

* bump opendbc

* update refs

* return reader
old-commit-hash: 49c2164814e07c1243ef2b979957760d64c9eb35
2022-04-12 22:58:34 -07:00
Shane Smiskol 8a88db322e Support Toyota Alphard Hybrid 2021 (#24003)
* add 2021 Alphard Hybrid

revert

* fix fp name

* run docs generator

* Add to releases

* test route

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
old-commit-hash: 15368ec3d1cb41a71856fb8e3f2b89320b087053
2022-03-20 16:40:25 -07:00
Shane Smiskol ce4fd26e58 Toyota: Support Avalon Hybrid 2022 (TSS2.5) (#23892)
* Add Avalon Hybrid 2022

* update docs

* set a tune

* add test route

* uploaded route
old-commit-hash: 247b66f4a801d3621575edf5a247c54e275d2826
2022-03-19 13:14:04 -07:00
Shane Smiskol 2f0f77a4f7 Toyota: clean up CarInterface apply function (#23714)
* clean up CarController with intermediate variables only accessed once or twice

* format

* fixes and move frame to CarController
old-commit-hash: facf6c109d00be7fb15aa5ba35cc3df4b8046ce8
2022-03-16 20:06:17 -07:00
Adeeb Shihadeh 3327348aeb don't read params in car interfaces (#23978)
old-commit-hash: bae78dd46b817bea26c6de05322eed5cab0bfba8
2022-03-16 15:17:47 -07:00
Adeeb Shihadeh ec47e0fef0 break up selfdrive.config (#23959)
* break up selfdrive.config

* add to release files

* fix import order
old-commit-hash: 5c3f3e44bc7b25c9ce502419bcd0261c12ec2b0d
2022-03-13 21:42:39 -07:00
Shane Smiskol 3e61c7e6ae carControl: add long and lat active fields (#23859)
* proof of concept

* actuators packet describes which actuators are active

* bump cereal

* fixes

* not needed for this PR

* Do Toyota

* add back controlsState.active

* bump cereal

* rest of cars

* in actuators

* add active back

* which

* use controlsState.active for now

* will make an issue

* Update selfdrive/controls/controlsd.py

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

* move local lat_active checks into CC.latActive

* remove redundant checks

* move comment

move comment

* fix joystick mode

* get enabled from carcontrol

* do standstill check in controlsd

* make sure we consider the gas press case for GM

* use CC.actuators

* fix

* capitalization

* Bump cereal

Bump cereal

* make intermediate actuators

* similar convention to before

* clean that up

* update refs

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
old-commit-hash: 629399a44925080b2c35b6dde35c093cc2e32035
2022-03-13 20:58:44 -07:00
Shane Smiskol b823d94018 2019+ Avalon: allow stop and go (#23952)
* Avalon actually has SNG

* update readme

* Revert "update readme"

This reverts commit 076561a0578bcc626fd6710bc411330ef13334d4.

* update readme

* fix

* variants as it includes hybrids
old-commit-hash: 156337475e51156739dc443ff6d15c9f9960c4bb
2022-03-11 19:45:30 -08:00
Adeeb Shihadeh 30b63dc0d4 Toyota: fix flaky EV detection (#23825)
old-commit-hash: 0965155a5bf93bc5c0f14f437d9bc7d505f32a91
2022-02-22 16:15:09 -08:00
Shane Smiskol 3bcd3e2b81 Toyota: merge Lexus ESH params into similar vehicles (#23673)
* merge LEXUS_ESH

* min and max of all variants
old-commit-hash: 31af75f2e35572dc0592bb87c190c9abb00e1c17
2022-01-31 17:30:48 -08:00
Adeeb Shihadeh 73b4613abf Toyota: merge IS and RC params
old-commit-hash: fe5056ffd8dfb6a8ecb1b008a8c77c2b3b2e7511
2022-01-27 16:20:57 -08:00
【TIM】 64ebc3b4fd Toyota: Prius V fixups (#23640)
* Fine tune Prius-V control parameter

* Adjust DBC file and enable SNG support

*Adjust the DBC file to CT200H, the parameters of this model are closer to PRIUS V
*Add PRIUS V to NO_STOP_TIMER_CAR list to enable SNG support

* Update interface.py

remove spaces

* Update values.py

Mod DBC to toyota_rav4_2017_pt_generated

* Update values.py

The file has been updated to resolve the conflict and can be directly merged

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
old-commit-hash: eaebf01e581b910763eb23ed3e15af1559e84dc6
2022-01-27 15:33:18 -08:00
Adeeb Shihadeh ed3eef90b1 Toyota: Prius V 2017 support (#23636)
* Add Toyota Prius Alpha support

* Fix opendbc link

* Update interface.py

* v

* revert opendbc

Co-authored-by: CT921 <tim.chen242@gmail.com>
Co-authored-by: 【TIM】 <90225659+CT921@users.noreply.github.com>
old-commit-hash: 2240b802be8f781d52b7c00da54a577612d67330
2022-01-26 22:57:26 -08:00
Shane Smiskol 589d720b30 Toyota: Move EPS torque factor to openpilot (#23635)
* use scaling

* or we can do it this way

* define default in one place

* just specify

* Revert "just specify"

This reverts commit 40b7b28f8416497cd1337784d336c1dd4f5dd6e3.
old-commit-hash: 3c62d9da0952dc28fa7315e2ff5beb8e5942089f
2022-01-26 22:08:04 -08:00
Adeeb Shihadeh badf4dff4f Toyota: move gas pedal definitions into common DBC (#23582)
* Toyota: move gas pedal definitions into common DBC

* add rest of cars

* auto detection

* cleanup

* update refs
old-commit-hash: b18c4eeb82f94a655c46e50750debcb37b49a598
2022-01-24 15:43:10 -08:00
Adeeb Shihadeh 70f1418256 remove community features toggle (#23214)
* remove community features toggle

* bump cereal

* little more

* update refs
old-commit-hash: 3e9cb7fa12b5f686fdcf6122ef5979d01c41f0a3
2022-01-24 14:49:47 -08:00
Shane Smiskol 1749e94ab6 Toyota: Support Avalon 2022 (TSS2.5) (#23381)
* Add AVALON_TSS2

* Is TSS2 now!

* Add Avalon to CARS.md

* add to test_routes

add to test_routes
old-commit-hash: eb9f35946de0cad03eb7de99a8c837f60fb5d52c
2022-01-12 09:41:07 -08:00
Dean Lee 98de810849 check in tuple instead of list (#23477)
* check in tuple instead of list

* Update selfdrive/car/toyota/carcontroller.py

Co-authored-by: Willem Melching <willem.melching@gmail.com>

* Update selfdrive/car/mazda/interface.py

Co-authored-by: Willem Melching <willem.melching@gmail.com>

Co-authored-by: Willem Melching <willem.melching@gmail.com>
old-commit-hash: a653461dec18b1313148905172ba54bac9f5fdfd
2022-01-10 16:36:51 +01:00
Shane Smiskol d05c173fe6 Longcontrol: remove starting state (#23328)
* remove starting state

* new ref

* ready for merge

* try this

* cereal now on master

Co-authored-by: Harald Schafer <harald.the.engineer@gmail.com>
old-commit-hash: cf9792dc536db343447cfa64edecc72565c4eefd
2022-01-04 15:40:39 -08:00
HaraldSchafer d706b3d8d4 Move over all tss2 long tunes (#23108)
* add all rest

* just commit to all TSS2

* forgot this line
old-commit-hash: 7257f717397ba98b5fa2c298f40fe04f692fd8e6
2022-01-04 13:51:05 -08:00
Dean Lee 0a762c27ce interfaces/apply: follow capnp best practices (#23371)
old-commit-hash: 05b905d140cc920f25cf654c81371ede997892d1
2022-01-04 11:34:49 +01:00
Adeeb Shihadeh 7e0e258a3e Toyota: merge Lexus RX params (#23374)
* Toyota: merge Lexus RX params

* pick tuning

* add those back
old-commit-hash: 24c741ea3da8efef533c3b7664064bce743d14fd
2022-01-03 14:11:34 -08:00
Willem Melching 7b3e330def Log actuators after applying rate limits in CarController (#23230)
* return actuators from carcontroller

* log it

* pass to latcontrol

* chrysler

* gm

* honda

* more brands

* rest of the brands

* gm cleanup

* hyundai cleanup

* update ref

* rename field

* fix subaru

* add types

* more subaru fixes #23240

* consistent whitespace

* bump cereal
old-commit-hash: 4f1eb4278a83a3abebebef67a081961e27594d90
2021-12-16 13:08:20 +01:00
Harald Schafer 37d577d399 Add TSS2 prius to TSS2 long tunes
old-commit-hash: 16bf562806b3204053697ace86b0a01dacbf5661
2021-12-07 16:06:43 -08:00
Willem Melching b8ab21bd64 add CarParams.wheelSpeedFactor (#23079)
* add CarParams.wheelSpeedFactor

* Fudge speed for Lexus RX

* should have been the TSS2 model

* bump cereal

* refactor into function

* update refs
old-commit-hash: e6180738fdc4c55ba913905e6591de5435966eb1
2021-12-03 14:57:53 +01:00
HaraldSchafer 84fb21842b add tss2 highlander to tss2 tune (#23107)
old-commit-hash: 316a10bb6b32b75bf76f7c73d9247d7220a02298
2021-12-02 14:01:17 -08:00
Erich Moraga 6464875954 Fix comment typo: steerRation -> steerRatio (#23058)
old-commit-hash: 5abe293f614479071f016fbbc2c4d1bdc3d6ddbe
2021-11-28 19:15:36 -08:00
Erich Moraga 821ddf785f Add Lexus RC support (#22941)
* Add f/w firmware for Lexus RC under LEXUS_IS

`@ph33rl355#0529`  2020 Lexus RC F Track Edition  DongleID/route 32696cea52831b02|2021-11-16--23-12-02

Doesn't seem to need a full port, per user feedback...
https://discord.com/channels/469524606043160576/524327905937850394/910400788319326229

* Update CARS.md

* Separated Lexus RC from IS... still using IS DBC

* match lexus IS for now

* Update wheelbase to match published specs

I'm hesitant to touch `mass`, even though I know it's different from the IS.

* Add TOYOTA.LEXUS_RC test route

Co-authored-by: Willem Melching <willem.melching@gmail.com>
Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
old-commit-hash: d630ec9092f039cb5e51c5dd6d92fc47b91407e4
2021-11-22 14:22:28 -08:00
HaraldSchafer eb40939df1 Cleanup toyota tuning (#22859)
* start cleanup

* start lateral

* finish lateral

* add file

* typo

* add enu

* remove whitespace

* cleanup safetyparam

* typo
old-commit-hash: 06844821c5b605c2018cdda6d7bee5f68b7e1408
2021-11-17 12:06:39 +01:00
Adeeb Shihadeh e08be1e178 pedal: only send command while actuators active (#22942)
old-commit-hash: 70c1f19304cf6c81baddee2f67d64e48b7891d3f
2021-11-16 22:38:23 -08:00
cydia2020 8f824f3b16 Toyota: gate enableDsu on no smartDSU (#22711)
old-commit-hash: 944578ad0944cbcada4d69d0534475a525a365dd
2021-10-27 11:29:34 -07:00
Robbe Derks 58c99158a1 Make pandaState and safetyMode a list (#22454)
* wip: move to pandaStates

* bump cereal

* wip: SafetyMode struct

* move to safetyMode

* fix typo

* this can be None

* fix potential empty pandaStates list

* fix thermald

* fix controlsd

* rename safetyModes to safetyConfigs

* update process_replay

* fix test_models

* bump cereal
old-commit-hash: 91987f38d425e2a5dc61d09571933cffb9536113
2021-10-08 17:54:34 +02:00
Willem Melching b079219b93 Use CP.vEgoStopping and clean up CP.startAccel (#22199)
* use CP.vEgoStopping and clean up

* update ref
old-commit-hash: 1e62b09e5dd70cae6721d2da9f7bcef59aa87c10
2021-09-11 17:13:30 -07:00
Willem Melching 6f5c9d5ad1 Clean up PID controller ACCEL_MIN/ACCEL_MAX (#22148)
* use ISO 15622:2018 limits in PID controller

* allow more for nidec

* limit PID inputs

* CP is not needed

* add GM

* not used

* update ref

* fix honda bosch
old-commit-hash: f941111dcdc9d651fe7169044fb7f52fd70f94ab
2021-09-06 17:29:32 -07:00
HaraldSchafer a73a820338 Change car controller interface from gas/brake to acceleration (#21911)
* retune civic

* seems smooth

* back to normal

* new ref

* fix conflict

* runs

* rm

* accel scale is 4

* toyota should be good

* more cleanup

* fixup

* better naming

* update ref

* deprecated

* sending brake when not enable causes a fault

* rm gas and brake

* unused

* update ref

* acura logic is no more

* wrong before

* revert tuning cleanup

* adress comments

* update ref

* already on master

Co-authored-by: Willem Melching <willem.melching@gmail.com>
old-commit-hash: 1ac89f14aa7c45c56049e8dbb0d6c5bb83a0fc6b
2021-08-30 09:32:52 -07:00
Adeeb Shihadeh f992ea8d81 Revert lateral tuning change for some TSS2 Rav4 (#21715)
old-commit-hash: c47b646b844696bccc6c1a1da4f728f30abfaaa7
2021-07-25 13:46:48 -07:00
Adeeb Shihadeh 691ea8553f deprecate CP.enableCamera (#21509)
* deprecate CP.enableCamera

* more removal

* one more

* update refs
old-commit-hash: c72d163e142d90edac5086892c0cd297bdc636fe
2021-07-07 14:59:18 -07:00
Ross Fisher 824db68273 Rav4 TSS2 has two different steering racks (#21429)
Split tuning on eps fwVersion \x02 only. See https://github.com/commaai/openpilot/pull/21429#issuecomment-873652891 for findings.

Unify Rav4 & Rav4 Hybrid

Average mass between ICE & Hybrid

Co-Authored-By: Willem Melching <willem.melching@gmail.com>

Co-authored-by: Willem Melching <willem.melching@gmail.com>
old-commit-hash: f40e75edf83e3e0e224583cd9b6cf865c1cb4a2d
2021-07-06 19:48:04 +02:00
John Belmonte 9944b6d98d Car port: Toyota Alphard (#21382)
old-commit-hash: 6d2069b76258c0a4db8548a9824f532b24d67fdd
2021-06-24 12:10:19 -07:00
Greg Hogan d0e5f3fb92 default carParams.stoppingControl to True (#21248)
* hyundai has full brake control

* set default stoppingControl to True

* update ref

Co-authored-by: Willem Melching <willem.melching@gmail.com>
old-commit-hash: 8071111f59371c9aee16dee3d6fb87f42464894b
2021-06-15 14:00:57 +02:00
ShaneSmiskol a830c71a03 Toyota: Only use gas interceptor under 19 mph (#21101)
* pedal improvements

* pedal tuning under 19 mph, stock tuning above

* Correctly set tuning, and a temporary reference script

* looking good

* use minEnableSpeed

* minEnableSpeed will always be -1 if pedal since it's used for lockout

* add hysteresis around 19 mph for enabling pedal use

* parameterize minAccSpeed (enable speed is -1 when stop and go to allow engage, acc is min limit for acc commands)

* fix Prius later, 5 mph gap around switch speed

* define min_acc_speed in interface and CC

* use pedal gains up to 22 mph, and correctly use hysteresis above the switch speed

* only check this if pedal

* consolidate comment

* Change BP to switch tuning at 19 mph, define global constant

* Start at interceptor status

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

* update releases

* typo

* transition tuning from 19 to +3 mph

* change cmd names and update tuning comment

* Update RELEASES.md

* calculate new pedal gains

* little more clear

* even clearer

* same comment convention and hardcode new pedal tune

* bump cereal

* weird, got added in with the rebase

* three possible long tunings: pedal, improved non-pedal, and default non-pedal

* update refs

* future note: don't add submodules when rebasing!

* update refs

* update refs

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
old-commit-hash: ebc294296aa17a5aabeb9d1bb6f9cc38970173ba
2021-06-03 15:11:10 -07:00
Adeeb Shihadeh c774eb6b64 fix missing semicolon
old-commit-hash: 21835822168d82dfdc82873bc488c0cfa89bae5b
2021-06-01 15:58:26 -07:00
Robert Hanna f7a928ace3 Add LEXUS_ESH_TSS2 to improved longitudinal tune (#21016)
Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
old-commit-hash: 6d8c9858013e65758e1641b7c52c22d307fbc704
2021-06-01 15:52:16 -07:00
Adeeb Shihadeh 7ac7ec2094 Merge Lexus UXH into TSS2 Corolla Hybrid (#21100)
old-commit-hash: 2680537b4bf8f169b0233b88525e9fa8ee85a70f
2021-06-01 14:56:53 -07:00
jbates9011 7bf71a3e3d Car Port: Toyota Avalon Hybrid 2019 (#21082)
* Add 2019 Avalon Hybrid

* Rename variable

* Update values.py

Remove AVALONH fingerprint due to pending deprecation

* Add Avalon Hybrid 2019

* Add Avalon Hybrid 2019

* Update test_routes.py for Avalon Hybrid 2019

Co-authored-by: ShaneSmiskol <shane@smiskol.com>
Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
old-commit-hash: 909b848fa3a60322112ed5c96fc4b0e0aa15088e
2021-06-01 14:51:28 -07:00
ShaneSmiskol 1735252c7d Split Avalon 2016-18 and Avalon 2019+ (#21058)
* start to separate Avalon 2019+

* reverts #20824 (2020)...

and removes fw from a 2020 avalon

* revert 2020 fw from #20241

* revert 2021 fw from #19790

* bump opendbc, add smartDsu

* Add only removed fw from listed PRs above and from jryan's 2020

* bump opendbc to master

* comment out any non-original avalon fw

* new fw

* these 2016 (5 byte EPS_STATUS msg) Avalon fws are correct. comment out any 2019+ fw I haven't seen yet

* Add to release files

* these are good too

* nothing on 7e0 yet

* both have their engines on one address

* validated remaining fws! some from adeeb's, chris's, and kumar's PRs

* Add test route for Avalon 2019

* horrible

* Duplicate

* use nodsu dbc. Only difference is the addition of some signals that don't work, and max of BRAKE_PRESSURE is different

* Enablem 2019 Avalon test route
old-commit-hash: 07e4129edc5ebb870037c1a44d8a33a2faf8a98a
2021-06-01 12:41:24 -07:00
brianhaugen2 d36b821247 Car port: LEXUS UX 2019 (#20998)
* adding port for 2019 lexus ux 250h

* update README

* added route to test_routes

* added CAR.LEXUS_UXH_TSS2 to IGNORED_FINGERPRINTS
changed test route to a complete route (that will be uploaded)

* unused

* add fw

* forgot h

Co-authored-by: Brian Haugen <brian.haugen@toyota.com>
Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
old-commit-hash: 6089c95a35ed7fcbc93c6f0532c14aa36105fa00
2021-05-23 14:53:29 -07:00
Goesreallyfast 4b26364439 LEXUS NX 300 2020 Car Port (#20769)
old-commit-hash: 68e2c65b1aff2aa45ac26d62dc1c420202b3d508
2021-04-28 19:28:29 -07:00