Commit Graph

157 Commits

Author SHA1 Message Date
HaraldSchafer bc679f735d Misc torque control fixes (#24801)
* Fiction compensation should be based on error

* Update refs

* Add deadzone

* update ref
old-commit-hash: 843e59f6f0be33e6c51a35ef8912f5b7c4b58ca5
2022-06-10 22:52:48 -07:00
HaraldSchafer f7edd5f3d3 Car interface: set max lateral torque from table (#24789)
* json

* better naem

* Read from table

* formatting and default to nan

* Generate docs

* Read from table

* this should be the same

* Prius v is full

* test we always set the tunes correctly

add to release files

* Set for all cars

Set for all cars

* Revert tuning changes

Revert tuning changes

* remove that

* fixes

* update ref commit for new maxLateralAccels

Co-authored-by: Shane Smiskol <shane@smiskol.com>
old-commit-hash: 3066ad81a8b2f89a22ddfc86a879395c573ce0f5
2022-06-10 17:57:23 -07:00
AlexandreSato db9d0e3bd6 Lexus: NX Hybrid 2020 support (#24796)
* LEXUS: Missing esp and engine FW versions in values.py

DongleId: 09ae96064ed85a14  | testRoute: 09ae96064ed85a14|2022-01-10--01-57-37 |

* Make a new platform for NX Hybrid TSS2

* Update releases

Co-authored-by: Shane Smiskol <shane@smiskol.com>
old-commit-hash: 074f614f880fa85a56596cd2917c07d8f39961f1
2022-06-09 12:01:31 -07:00
Shane Smiskol 1a2bf8412c Car documentation: set steering torque star using car interface (#24709)
* Set good torque using torque controller tuning

* should be equal to

* save lateral accel to car params

* use maxLateralAccel

* always

* same convention

* nan will always evaluate to false

* The great good torque purge

* adjust default friction

* Add data for more cars

* adjust name

* Welcome back, guys. Only adjust good torque if maxLatAccel is set

* Update refs (1.7 is 1.7000001...)
old-commit-hash: c6bc03311c04bec31677170782d5f3e1f404c2a7
2022-06-03 17:41:20 -07:00
ntegan1 44ae448563 TSS-P Corolla: use torque lateral control (#24291)
use torque controller for tssp corolla

Co-authored-by: ntegan <nick.egan.gg>
old-commit-hash: 7115f1f7c8e43a4e97fcb7bfb51f84b45eaedc6f
2022-05-27 15:11:16 -07:00
HaraldSchafer f5a6a6dc77 Tssp prius torque control (#24669)
* use llk

* use steering sensor at low speed stil

* Try more simple

* rm prius tune

* updated ref
old-commit-hash: d708a134bdff9db5cc65491dd9129a709e30ad34
2022-05-27 10:21:02 -07:00
HaraldSchafer 39886246c9 Rerevert torque control (#24649)
* Revert "Revert torque control (#24565)"

This reverts commit 93f434d047a92366c4ccefeece86fe101ed98d02.

* Move tune out of car specific stuff

* Update ref commit
old-commit-hash: d9289721503976cd99ac90216c502a841988c1a6
2022-05-24 17:52:33 -07:00
Shane Smiskol 077a70d80d Support RAV4 2022 with stock longitudinal (#24367)
* support for ICE 2022 RAV4

* add to releases

* swap

* add fingerprints from a5c341bb250ca2f0

* update test route

* update docs

* add test for rav4

* values.py is a comma file
old-commit-hash: bdaf17415422ce16a1b2c412a89e099e552135a9
2022-05-18 19:04:11 -07:00
HaraldSchafer efa559f9be Revert torque control (#24565)
* torque reversal start

* Fix carmodel tests

* Update ref

* update ref

* Elif is better than if
old-commit-hash: 9f8b03753dbdb131fac7bdc021e841cb30b3bf2c
2022-05-17 19:00:57 -07:00
cydia2020 e6f1d751b9 Toyota: correct weight for the Prius V (#24499)
* correct weight for the Prius V 

https://www.toyotacertified.com/content/dam/tcuv/sections/brochures/en/prius-v/2017_priusv_ebrochure.pdf

* Remove comment

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

* Extra whitespace

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
old-commit-hash: 3f5afa158a96a0855b37c1a4f55a99949fe20444
2022-05-11 21:02:47 -07:00
Shane Smiskol 70c8bc4cd3 Camry TSS2: use torque controller (#24268)
* use measurements from harald

* update from table

* average of hybrid and non-hybrid
old-commit-hash: 191fbd4f67e7f878b518effd14411779b9435339
2022-05-07 21:34:17 -07:00
HaraldSchafer a5ed9358a5 Latcontrol torque: update tuning (#24357)
* Little more chill

* Update ref

* Update refs
old-commit-hash: 8cdeaf9aee158bf11869132f82863bec4489e4f9
2022-05-02 14:42:18 -07:00
Shane Smiskol 754b93997a Support RAV4 Hybrid 2022 with stock longitudinal (#23969)
* add panda flag for toyota stock long with camera

* clean up

* Add 2022 RAV4 Hybrid from Philly

* fix wrong fw in interface, did this ever work?

* Must be a hybrid

* no radar parsing

* fix can error

* move to own platform

* generate docs

* fix

* Add 2022 Rav4 XSE Australia fingerprint parameters (#24303)

* Update values.py

Add 2022 Rav4 XSE Australia

* add commas

Co-authored-by: Shane Smiskol <shane@smiskol.com>

* bump panda

* wait, the camera doesn't even send 0x343, right?

* use a set instead, more obvious

* don't test without a parser

* bump panda

* flip panda flag

* bump panda

* add commas

* regen and update refs

* set to none by default

* revert parenthesis

* update comment

* bump panda

* regen and update refs

* add test models and update readme

* bump to master

Co-authored-by: BrettLynch123 <34538435+BrettLynch123@users.noreply.github.com>
old-commit-hash: c1caca104f8553d485334e33446bd7b8ec1fb8ca
2022-04-28 22:37:46 -07:00
Adeeb Shihadeh 211fc8fc68 Toyota: add safety param flag for alt brake message (#24341)
* Toyota: add safety param flag for alt brake message

* update refs

* update refs

* bump panda
old-commit-hash: 3e098c9ba5fd8f6958f38dc500c357db34e83ffe
2022-04-27 12:08:11 -07:00
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