Commit Graph

78 Commits

Author SHA1 Message Date
Shane Smiskol 94433bb818 Toyota: add unsupported DSU car list (#26336)
* note for dsu cars

* don't hardcode dsu footnote (1/2)

* test

* revert the experimental long toggle

* another day:(

* DSU doesn't have to be toyota specific, it's a generic carParam!

* this is safe, just make sure it's unknown

* these cars do not have OP long for some reason

* UNSUPPORTED_DSU_CAR

* forgot this

* .

* .

* revert

* revert

* smaller diff
old-commit-hash: b0656f2c751df64fb3974c66423470b7a59bc1e6
2022-11-02 20:12:35 -07:00
cydia2020 d5b436d592 Toyota: go into standstill if interceptor detected (#25024)
* Toyota: go into standstill if interceptor detected

* or
old-commit-hash: 407448bbfb79ad9d9d235bc3d098887ea0d045fb
2022-09-16 23:28:05 -07:00
Shane Smiskol 99de612d67 Toyota: fix permanent LKAS faults (#25620)
* Fix permanent LKAS Toyota faults

* comment and global variable

* EPS

* comments

* move up

* comment
old-commit-hash: c5dc10bd2f063e2233795a66e45b6f17dffbd5c1
2022-09-07 00:18:01 -07:00
Shane Smiskol db668c9a3a Toyota: remove 100°/sec steering lockout (#24067)
* try a method to kill those faults

* cut torque for 1 frame

* sign doesn't seem to matter

* clean up

* better name

* Toyota allows you to keep your apply_steer, better control

* the logic was wrong entire time?

* cut steer for two frames

* Revert "cut steer for two frames"

This reverts commit 13a68ecc568fe1c0cd1f6f0b5f7ff6560efaf9e0.

* better variable names and comments

better variable names and comments

* should be good

* add safety

* actual number of frames

* constant

* bump panda

* bump panda

* bump panda

* bump panda

* bump panda

* bump panda

* bump panda

* fix to use min valid frames

* rm line

* simplify check

* bump panda

* bump panda to master
old-commit-hash: 50d117ed9a0c75a7374e76ec6e42d1a603bb11b0
2022-09-06 19:30:34 -07:00
Shane Smiskol ddcc417303 Toyota: don't send ACC_HUD on Prius V (#25539)
* Prius v also doesn't send ACC_HUD

* common
old-commit-hash: fb99766323d3f4090c2671332b2f8c0ae57f723e
2022-08-25 12:24:35 -07:00
cydia2020 63cd100780 Toyota: Send ACC_HUD immediately on fcw (#25348)
* Send ACC_HUD immediately on fcw

* update refs

Co-authored-by: Shane Smiskol <shane@smiskol.com>
old-commit-hash: 88e034a2a30cc0dfd46f41b85ddfe9497fb11d0e
2022-08-04 23:24:20 -07:00
Adeeb Shihadeh 5263356958 remove CS.steeringRateLimited (#25251)
* remove CS.steeringRateLimited

* bump cereal

* update refs
old-commit-hash: d462a08056d54a957084d594286626a2509c94aa
2022-07-24 14:56:55 -07:00
Adeeb Shihadeh 04af978260 let can packer handle counter (#25240)
* let can packer handle counter

* diff is expected

* update refs

* clean that up

* bump opendbc

* fix sim
old-commit-hash: 0ca62bf7df0fe81829c744fd8689c9b97cb6a36b
2022-07-21 20:54:53 -07:00
cydia2020 8a4bbac798 Toyota: don't send UI on Prius V (#25036)
* Toyota: don't send UI on Prius V

* Update selfdrive/car/toyota/carcontroller.py

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
old-commit-hash: 98676fb3b05630bf6e62b0a1fbfc8804948a578c
2022-07-14 11:34:27 -07:00
Shane Smiskol 188a2eea94 Toyota: fill steerFaultPermanent (#24410)
* Toyota: fill steerFaultPermanent

* same behavior as before, 0 is also fault (0 is most likely initializing)

* think this was just wrong (2 or 10 would mean we think it's a fault)
old-commit-hash: c955e273d40dfd5c07a8505dbaf7b34766eee42f
2022-05-06 16:56:40 -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
Shane Smiskol 5a9c45b6e3 Clean up CarInterface.apply and CarControllers (#24060)
* do tesla

* parentheses

* Do Chrysler

* Make sure Hyundai long never actuates when long inactive

.

* clean up Hyundai

* more clear

* formatting

* Stock sets these to zero

* fix params

* move jerk logic into CC

clean up
old-commit-hash: c8f5b217443036333bc18c29085a1c8ae8bd39f3
2022-04-05 23:38:45 -07:00
Adeeb Shihadeh b74dac6080 cars: cleanup CS usage (#23957)
old-commit-hash: 2219cb44782550f05d58640d18e67a4f288bfc73
2022-03-18 15:39:22 -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
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
Adeeb Shihadeh 71da8d1250 No actuation while in pre-enabled state (#23658)
* No actuation while in pre-enabled state

* update refs
old-commit-hash: 72e00a07686fa112dde7928fa48ab4a56ed7a7f5
2022-01-28 16:03:44 -08:00
Cameron Clough c8b79d56f5 Toyota: fix typo (#23548)
old-commit-hash: a6e8d316020a4052ccf2ea10aaf0a45a50efc95d
2022-01-16 09:35:53 -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
cydia2020 733a139646 Toyota: only send gas interceptor message when openpilot controls longitudinal (#23357)
* Toyota: gate enableGasInterceptor behind openpilotLongitudinalControl

* fix carcontroller typo

* Revert "Toyota: gate enableGasInterceptor behind openpilotLongitudinalControl"

This reverts commit a974e8f8cfb4040d0fe12e285154c6fff4cb9825.

* put condition in carcontroller

* gate building can messages

Co-authored-by: Willem Melching <willem.melching@gmail.com>
old-commit-hash: a6aa09446176e11364f0244e87757e27e992ffbd
2022-01-04 16:02:53 +01: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
Kevin Robert Keegan 7a55ba0175 Toyota: Display Blue Barriers When Engaged, Matches OEM Design (#23150)
old-commit-hash: 245b4d910c287d75f0c26eeed3a135683699b9f9
2021-12-14 16:42:31 -08:00
cydia2020 21bad1adc6 Toyota: remove unused ACCEL_HYST_GAP (#23121)
* fix typo in comments

* remove hyst gap from values.py
old-commit-hash: b8c42d01ebe5e69a63d3e48edcd973e030c05fec
2021-12-03 22:56:11 -08:00
HaraldSchafer 4d9d215996 Toyota pedal rewrite (#23067)
* pedal redo

* add offset to compensate for creep and windbrake

* offset in standard units

* wrong size

* better creep values

* update ref
old-commit-hash: eda69930430da564251581814fd3962ca7af0372
2021-11-30 10:50:06 -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
Adeeb Shihadeh 5e6608b67e comma pedal: rename create_gas_command -> create_gas_interceptor_command
old-commit-hash: b07ddad6ed62f9b0002ce7aa73db932dd2d7a73e
2021-11-20 20:13:58 -08:00
Adeeb Shihadeh e08be1e178 pedal: only send command while actuators active (#22942)
old-commit-hash: 70c1f19304cf6c81baddee2f67d64e48b7891d3f
2021-11-16 22:38:23 -08:00
Adeeb Shihadeh a4194021bd controls: only send cruise cancel while cruise is enabled (#22359)
* controls: only send cruise cancel while cruise is enabled

* cleanup

* might actually do something

* update refs

* update refs again

* update refs
old-commit-hash: 3b8fa4b7fdc9bdd262faca457c478e9d388eae38
2021-09-28 12:30:50 -07:00
Willem Melching c0c308b34e toyota: clean up accel command (#22145)
* toyota: clean up accel command

* revert comment

* fix HYST_GAP
old-commit-hash: ec71aa0458d7f655be1204e1fa7f3060c5d264d3
2021-09-06 16:12:58 -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
sshane 21103f8835 Toyota: handle models with permanent low speed lockout (#21512)
* ignore permanent low speed lockout

* should always check in case not seen

* use cp_cam

* not bus 0

* change signal name according to ref dbc

* bump

* we don't rely on this

* bump

* Revert "Toyota: debug logging for low speed lockout (#21526)"

This reverts commit c0d4c7e69a29e58a13573dab5a88792559b965b6.

* add back

* always add

* pass acc_type through

* Update selfdrive/car/toyota/carstate.py

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

* Update selfdrive/car/toyota/carstate.py

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

* only update acc_type if not enableDsu

* only add when using

* only for openpilot long cars

* only seen TSS2

* add todo

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
old-commit-hash: 16e4f432bf592ad74dcd6085e55c01570d642757
2021-07-09 22:55:47 -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
CrispinFlowerday 4f02e178db Subaru: show LDW on dash for correct lane (#20934)
* Emit correct alerts for LDW Left & Right on Subarus

This change switches the ldw event to use VisualAlert.ldw and
alters all cars to use the prior behaviour for that alert, except
global subarus - they emit the correct warning to the dash

* Remove whitespace, and add comment about not overwriting stock alerts

Co-authored-by: Crispin Flowerday <crispin@theflowerdays.com>
old-commit-hash: 7458e143e3c0123a95680b0b2db6c7a1f94405fa
2021-06-07 15:06:28 -07: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 3e620dfc5b Send LTA msg on TSS2+ Toyotas (#19731)
* send blank lta msg on tss2+

* bump panda
old-commit-hash: a99a55ce2bbeb0ee5c3cee86f1bb4b3a6070ce49
2021-04-06 17:13:33 -07:00
Adeeb Shihadeh 05eb44115e cereal cleanup part 2 (#20092)
* car stuff

* thermal

* Revert "car stuff"

This reverts commit 77fd1c65ebd01abfa8493ae12c9e6b14f7ada976.

* panda state

* camera stuff

* start deg

* most is building

* builds

* planner + controls run

* fix up paramsd

* cleanup

* process replay passes

* fix webcam build

* camerad

* no more frame

* thermald

* ui

* paramsd

* camera replay

* fix long tests

* fix camerad tests

* maxSteeringAngle

* bump cereal

* more frame

* cereal master
old-commit-hash: 312b681a46b8153314a8420611b6479dd6f70dfc
2021-02-16 21:39:32 -08:00
Willem Melching 4daa6f05cf Move all CarControllerParams into values.py (#19663)
* toyota

* use scale from values.py

* nissan

* subaru

* honda

* gm

* toyota combine into CarControllerParams

* nissan refactor

* chrysler refactor

* mazda refactor

* hyundai refactor

* subaru refactor
old-commit-hash: e4cf43c6fcc2f442318df815fdc38fb26a74bdb7
2021-01-06 11:20:44 +01:00
Igor c1a73f6836 Fix TSS2 creep issue, no need to send standstill request (#2716)
* Fix TSS2 creep issue, no need to send standstill request

* Forgot to add import

* Changed set to look in from TSS2_CAR to NO_STOP_TIMER_CAR
old-commit-hash: d93f07f5e6d550731b024521a2bda33325bcc640
2020-12-16 17:40:52 -08:00
Shane Smiskol aa326065b8 don't wait for 4 seconds before it starts steering again after steering fault (#19520)
old-commit-hash: 89a600884138c59397670f2513bc5d0ba0ebc2b1
2020-12-16 12:24:42 -08:00
Adeeb Shihadeh 68a3061c9d enable E261 in flake8: two spaces before inline comment
old-commit-hash: 27754a277c36b82ef4040e536cc918ba8ad77bec
2020-05-31 14:07:29 -07:00
Adeeb 5e857427ba Enable more flake8 checks (#1602)
* enable some more flake8 checks

* some more quick ones

* bump opendbc

* e401

* e711 e712

* e115 e116

* e222

* e301

* remove that

* e129

* e701 e702

* e125 e131

* e227

* e306

* e262

* W503

* e713

* e704

* e731

* bump opendbc

* fix some e722
old-commit-hash: d9bf9f0a4036f55411f6dfbb438990a5eb7f4930
2020-05-30 20:14:58 -07:00
Willem Melching c83dabd8e2 Add code to steer using TSS2 LTA message (#1507)
* try again with toyota LTA

* Fix dbc and send at 50Hz

* Add commented code

* Remove unused import

* Remove that
old-commit-hash: 49dd37b81b05c8d77d801c4a027d27d7b1b8094c
2020-05-13 19:09:51 -07:00
Shane Smiskol eb99eae1f6 remove redundant ret.steerControlType line, fix indentation in toyota/carcontroller.py (#1442)
old-commit-hash: e7ae7b98501d4061efcf0d9161535d029d3c3c64
2020-04-30 14:11:31 -07:00
Adeeb 15916d03f4 Abstract pcmEnable and pcmDisable events (#1350)
* don't need individual prev state vars since whole CS is copied

* don't need a whole function since toyota alerts were simplified

* better here

* abstract pcmEnable/pcmDisable events

* the flippening came to NEOS

* delete

* unused

* Revert "the flippening came to NEOS"

This reverts commit 91cfb73b2914f637863335f4e5f5952620b3e977.
old-commit-hash: 8d791d78dd4fbc973eb61ccd9df2ed4cf9bbbcd5
2020-04-10 16:12:58 -07:00
rbiasini f25442a4ee removing ipas steering control option from toyota (#1193)
* removing ipas steering control from toyota

old-commit-hash: a984da1f9ce4c42dab38138baeff2a9809498262
2020-03-04 10:42:36 -08:00
Adeeb 0468c42f22 Abstract CarInterface init (#1131)
* abstract CarInterface init

* unused

* subaru

* gm cleanup

* vw

* typo

* carcontroller

* more cleanup

* fix vw

old-commit-hash: 13f60eae91764a2cdc7405e323381dcf971b11c3
2020-02-19 20:37:07 -08:00
rbiasini 6209ad5120 Carstate returns capnp struct (#1115)
* Before abstraction, adding speed init from VW as well

* strting to abstract carstate class

* fix bug and update lock?

* revert pipfile change

* another bug

* fix linter

* bug fix

* remove a bunch of diplicated kf code

* better to not have class vars. will abstract __init__ anyway later

* abstract common instance vars in carstate init and a generic gear parser static method

* abstract gear parser for chrysler

* abstract gm gear parser too

* remove unnecessary random vars

* Chrysler: carstate returns capnp struct directly

* revert ref commit

* test ref

* WIP

* more WIP

* ops, missed this conflict

* ford as well

* not sure why this got deleted

* no need to copy

* remove copy

* remove copy import

* remove unnecessary intermediate variable

* remove obsolete comments

* GM: have carstate returning capnp struct directly

* Honda carstate also outputing capnp struct

* hyundai too now returns capnp from carstate

* ops, not meant this

* Subaru carstate also returning capnp

* Toyota: capnp struct as output of carstate

* fix bool

* minor simplififcation in Honda

* no need to negate

* VW carstate returning capnp struct (#1118)

* VW carstate also returning capnp struct

* fixed typo

* Remove unused blinker button (#1119)

* remove unused blinker button

* ops, this wasn't meant

* remove blinker button for VW as well

* update ref

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

old-commit-hash: 0c67143c925f3ead6c3e88675e4fcfa4fa3f9c28
2020-02-18 15:28:15 -08:00
Arne Schwarck 0533095476 TARGET_IDS not used since 0.5 (#1071)
The function to send these values has been removed long ago and no other function is using them.
So it is time to remove them.
old-commit-hash: 85f7064ca644eb7286cd2d6a117bd006eebf3201
2020-02-10 11:19:20 -08:00
Adeeb cf26bb52b5 Clean up ECU redundancy in selfdrive/car/* (#963)
* clean up ecu redundancy in selfdrive/car

* clean up gear parsing

old-commit-hash: dafdb79db2
2020-01-18 23:35:10 -08:00
George Hotz 9ef085076b selfdrive/car
old-commit-hash: 71ead9adea
2020-01-17 10:58:43 -08:00
George Hotz 81dd5a50cf root commit
old-commit-hash: 6c33a5c1f3
2020-01-17 10:02:52 -08:00