Commit Graph

93 Commits

Author SHA1 Message Date
Harald Schäfer 47d5601d8a long control: new API (#32706)
* Simplify long control

* Seperate

* Rename

* Try new api for toyota

* rm v_pid everywhere

* No speed in reset

* 0 is better default

* unassigned variable

* Update other cars

* Update gm

* SIMPLIFY

* simplify more

* fix API boundry

* Fix stopping bug

* Small fixes

* Update ref
old-commit-hash: bc303df6a0a4a9d52a2e92e5976b6c7aa5138b95
2024-06-14 00:08:58 -07:00
Shane Smiskol 0aae777597 Reapply "Ford: detect missing LKAS from EPS configuration (#31821)" (#32518)
* Reapply "Ford: detect missing LKAS from EPS configuration (#31821)"

This reverts commit 79247ab507d239c2e80bc0ecbf08e654af0c0c5b.

* catch

* now fix

* clean up
old-commit-hash: 7a6818da7edc888ab51f5631775af1eb452375c7
2024-05-22 17:27:22 -07:00
Shane Smiskol e3af6d23de Revert "Ford: detect missing LKAS from EPS configuration (#31821)"
This reverts commit 0a46b076a3b8f52e9a7aa5cc87acf1e3d8b64a0e.

old-commit-hash: ffb34e558fe369bb5a5d6d7ff476c3b8e601f6db
2024-05-21 23:21:31 -07:00
Cameron Clough 513f571afc Ford: detect missing LKAS from EPS configuration (#31821)
* debug: disable FW cache

* Ford: detect missing TJA/LCA config and disable LKAS

* set dashcamOnly

* revert

* clean up

* clean up

* some CAN FD do not have 0x01 block for PSCM

* bump cereal (fork)

* remove confusing comment

* add flags/event

* remove duplicate from events

* copy can be next pr

* dashcamOnly if no config comes back either (this shouldn't happen)

* flipped

* can do this

* Revert "can do this"

This reverts commit c3d311b2ffb7bbc346c7f702ac5c1934bc495c65.

* Revert "flipped"

This reverts commit 75c01fb4c5f7fdc9222ea13b8901f76b5b419c99.

* Revert "dashcamOnly if no config comes back either (this shouldn't happen)"

This reverts commit f82624a0eb28bf683660f86b3ddfd44717a6915f.

---------

Co-authored-by: Shane Smiskol <shane@smiskol.com>
old-commit-hash: 9f327aeb4824576497a57f077fe9b8243b95e8c0
2024-05-21 17:01:04 -07:00
Adeeb Shihadeh cd74ed0489 Abstract out common CarInterface.apply (#31924)
old-commit-hash: 3a7582d9a624ab7b43fd6cf98a19657252b11850
2024-03-19 13:46:31 -07:00
Cameron Clough 1ed0a0e1cb Ford: parse distance button (#31733)
Ford: parse ACC gap toggle button

Use the ACC gap toggle button signal from the SCCM. There are two other
signals for "increase" and "decrease" gap buttons, but no supported car
has these buttons.
old-commit-hash: 98a491b1f2f20f6ece847f4ad57369bc429b7e93
2024-03-07 01:54:33 -08:00
Cameron Clough d02888ce23 Ford: use flags for CANFD (#31664)
old-commit-hash: 341b81c0a5c5f378f749a8ba07514f48f0f9faa5
2024-03-01 12:18:03 -05:00
Cameron Clough bf6a9e54af Ford: move to PlatformConfig (#31554)
* Ford: move to PlatformConfig

* Align Aviator model years with Explorer

* Add CarSpecs to PlatformConfig

---------

Co-authored-by: justin <justin@comma.ai>
old-commit-hash: 8e03cdfc2ae72ea09208ce41ddc8f7a118c3b973
2024-02-25 17:55:42 -08:00
Shane Smiskol ce4784925e Ford: support hybrid Q3 platforms (#31568)
* bump

* ford: remove dynamic dashcam lockout for hybrids

* releases?

* Revert "releases?"

This reverts commit 88d950043d79b8c00535f48ed84b854bc2ab2557.

* bump

* Reapply "releases?"

This reverts commit db5079dc3f1a6bce70bd04430be45704d8604e76.

* 097
old-commit-hash: 378ba114f9d4852374d76c7ebc0318a80cd29c43
2024-02-23 21:22:34 -08:00
Harald Schäfer dfed3c1b5b Ford long control improvements (#31123)
* Ford updates

* back to normal

* Small fixes

* Try max

* Does pred matter

* ref commit

* Update ref
old-commit-hash: feaf52dd4c1f1b406b068e195fa48f3daf0b67ed
2024-01-30 11:40:52 -08:00
Isaac d5b4ba8239 Ford: Add Mach-E (#30691)
* Update interface.py

* Update values.py

* Update routes.py

* Update override.yaml

* Update selfdrive/car/ford/values.py

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

* Update interface.py

* order

* only have dongles for these

42f08a29af3699f4
83a4e056c7072678

from https://github.com/commaai/openpilot/pull/30444

---------

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Co-authored-by: Shane Smiskol <shane@smiskol.com>
old-commit-hash: 26a67641d2e4a4b908239996c7a9b580c3813d4b
2023-12-13 09:05:41 -08:00
Shane Smiskol eb642a1704 Ford: consolidate comments about unsupported hybrid platforms (#30709)
* fix typo, move comments to one place

* -appear

* Update selfdrive/car/ford/carstate.py
old-commit-hash: 77066a226068ea933b565b9521c26a99c72e7a6a
2023-12-12 20:37:37 -08:00
Isaac 390e75b3bd Ford: Add F-150 Lightning (#30692)
* Update interface.py

* Update values.py

* Update routes.py

* Update override.yaml

* Update values.py

* Update interface.py

* Update selfdrive/car/ford/interface.py

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

---------

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
old-commit-hash: 2192cc170c3231186704b0929e1ee81d318e940e
2023-12-12 20:07:59 -08:00
Justin Newberry 3b91610c0b Precommit: ensure executable bit is set (#29784)
* precommit ensure executable

* exclude tinygrad

* bump submodules

* exclude tinygrad globally
old-commit-hash: 4e69937d0d3fbdc7d1d42cbc18d7ccf8ddb115f1
2023-09-05 16:33:26 -07:00
Adeeb Shihadeh 16ec56398c add openpilot prefix to imports (#29498)
* add openpilot prefix to imports

* more

* more

* fix docs

* fix linter

* bump submodules

* fix patched tests

* update dynamic imports

* debug

* Revert "debug"

This reverts commit db5e13b9911cc74438bee123bc3430da6c31b24b.

* fix pm test
old-commit-hash: a9626f95b69af19306143fc4def02fb5769405d2
2023-08-20 20:49:55 -07:00
Jason Young ac83f87b36 interfaces: add common STD_CARGO_KG to mass (#29416)
* cleanup std_cargo_kg

* fix Sonata mass

* remove snowflake construct

---------

Co-authored-by: Shane Smiskol <shane@smiskol.com>
old-commit-hash: f76ffbdbbcef50ba201edc0349f777e4e372b515
2023-08-17 21:06:07 -07:00
Cameron Clough 9741ecfe0f Ford: align car groups with convention
no plural

old-commit-hash: e7c858d590f84c4f476ec0a01eae67f49f7a114b
2023-07-18 11:42:15 +01:00
Cameron Clough 381a6a35fd Ford: add F-150 2023 support (dashcam only) (#28974)
old-commit-hash: 17e71cdf4476d0d1b90b6e5e7c5be433e93d50c5
2023-07-17 16:16:28 +01:00
Cameron Clough 645479775d Ford: set CAN FD safety param (#28979)
old-commit-hash: d0e6076059e534874148ad5aecaea683dea35ec6
2023-07-16 13:00:42 -07:00
Cameron Clough 7e9f1e1b79 Ford: remove Focus Mk4 from dashcam only (#28551)
old-commit-hash: 78bb6379937aae489dff501ec10694ff3aac17df
2023-06-17 15:16:59 +01:00
Cameron Clough 1befc68287 Ford: detect auxiliary panda (#28491)
old-commit-hash: 30c12e45575d94563ae85a79e19823e9120ef76b
2023-06-10 23:22:12 -07:00
Cameron Clough f5563f9049 Ford: longitudinal behind alpha toggle (#28196)
* bump panda

* set safety config/configure experimental longitudinal

* send inactive signals

* bump

* just calculate in function

* already in the variable

* clean that up

* add comment, on ford stock long, prchg seems to be set from the possible future accel

* comment

* this signal didn't have an impact on engaging

* add comment and fix

* worst case while AEB

* and kill ACCDATAs

* this could be dangerous

* need to test this too

* Revert "need to test this too"

This reverts commit 09bba75950fa55d90a82f0109e3138ffe5a1d08c.

* Revert "this could be dangerous"

This reverts commit 323143e84727f1a780bbb600be5f7ceb763516b1.

* Revert "and kill ACCDATAs"

This reverts commit 15f6804bf64d01145daf57a592c2f3fd44ceba27.

* Revert "worst case while AEB"

This reverts commit 85e1aaa8e1af90373c688d1973dbfbb07b1fb8b2.

* bump panda

* Update selfdrive/car/ford/fordcan.py

* move around

* was already here

* rm

* use variable

* update docs

* Update ref_commit

---------

Co-authored-by: Shane Smiskol <shane@smiskol.com>
old-commit-hash: d4dec3ba5e7c68c57c137e15c0a51c903737b8b7
2023-05-18 15:25:24 -07:00
Cameron Clough fa70b20daf Ford: add Maverick test route (#28181)
* Ford: add Maverick test route

* docs

* bump
old-commit-hash: 202751a796580b6697f0e87f6e501fa909b679e0
2023-05-13 23:38:28 +01:00
Shane Smiskol 298e7466f5 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>
old-commit-hash: 344064d6bd45b6d0f54e1eedfc73b87a856efe3e
2023-05-11 23:35:07 -07:00
Shane Smiskol da12bfb021 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
old-commit-hash: fb29d0f3bfe69c83f73e3af09235bd4c8287aaac
2023-05-08 22:03:30 -07:00
Cameron Clough d2881d6f48 Ford: add Escape test route and remove dashcam only (#28113)
* Ford: add Escape Mk4 test route

* generate docs

* remove from non_tested

* fix model years

* clearer packages for EU

* docs

* 2020 hybrid

26b2cace68e36212

1FMCU9DZ9LUA82589

* 2021 phev

1FMCU0LZXMUA80767

f8eaaccd2a90aef8

* add this too

* more docs
old-commit-hash: a0d2e4e711b5ca4f8e5267d6bf7c8f2e32765692
2023-05-04 17:21:36 -07:00
Shane Smiskol e56c2f6ee4 Ford: remove from dashcam (#28103)
* no dashcam 🎉

* update docs

* not these

* update refs

* bump panda
old-commit-hash: d05d9dac045221baeda9c6db398a182f304c8ea6
2023-05-04 06:55:09 +00:00
Cameron Clough 56c85d2c7b Ford: fix minEnableSpeed for docs flag
old-commit-hash: 48ff8fa734e5d0acdf940f9afa54f1b208eeafca
2023-04-26 00:57:26 -07:00
Shane Smiskol d916e0ed2d Car docs: pass docs flag to car interfaces (#27311)
* docs

* docs

* docs

* docs

* use docs in gm
old-commit-hash: 5aebdb0ad0e7e527f5deb553ffd193abea02a357
2023-04-18 12:22:22 -07:00
Shane Smiskol acc8e38111 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
old-commit-hash: 8f5057ff2dbea4ebc85bc8f55bc7a37e4d5969b6
2023-02-09 15:37:39 -08:00
Adeeb Shihadeh 20fbb0a8fd rename carState.radarOffCan to radarUnavailable (#27187)
* rename carState.radarOffCan to radarUnavailable

* bump cereal
old-commit-hash: 6fa9b555a435cc9639193cca516b78a22189356c
2023-02-02 11:38:09 -08:00
Shane Smiskol a398c05c97 Ford: set radarOffCan (#27120)
Fix
old-commit-hash: 60f73657def5aefdae7e1ceb6d32ae9b0cc3b880
2023-01-27 13:44:37 -08:00
Shane Smiskol dfc26b418f Ford: lower lateral actuator delay (#27113)
Update interface.py
old-commit-hash: 226d80964d4586392266fd2e711e6b6c003602de
2023-01-26 23:14:05 -08:00
Cameron Clough 60cc30a574 Ford: params fixup (#27097)
* reduce steer actuator delay to 0.25s

* update steer ratio
old-commit-hash: c7790d0e071255ca304638877e0f45edd6a9d372
2023-01-25 22:03:00 -08:00
Cameron Clough eabca921b1 Ford: add Maverick 2022 (#27093)
* Ford: add Maverick 2022

VIN: 3FTTW8E36NRA74219

a6427650bff6b419|2022-09-19--10-51-30

* Ford: add missing Maverick 2022 FW

VIN: 3FTTW8F98NRA75889

c845bd8c366e6f3d|2022-12-03--18-57-00--0

* steer ratio
old-commit-hash: cf69653440a308c6e7abb7d56847b389b64c819f
2023-01-25 21:18:35 -08:00
Cameron Clough 7ce54c355d Ford: add Bronco Sport 2021-22 (#27092)
* cleanup

* add Ford Bronco Sport 2021 fw

VIN: 3FMCR9B61MRA17853

62241b0c7fea4589|2022-10-25--13-40-05--0

* add test route

* add Ford Bronco Sport 2022 fw

VIN: 3FMCR9B69NRD15990

54827bf84c38b14f|2023-01-23--14-58-23--0
old-commit-hash: d410206f14fc7a0207464905a1ff2f684bd3ed39
2023-01-25 20:56:03 -08:00
Cameron Clough 71f40532f0 Ford cleanup (#27090)
* fordcan cleanup

Co-authored-by: Cameron Clough <cameronjclough@gmail.com>

* no fordcan

Co-authored-by: Cameron Clough <cameronjclough@gmail.com>

* more

Co-authored-by: Cameron Clough <cameronjclough@gmail.com>

* these weren't even used in CS, follow rest of the brands

* we won't use this

* rename to more standard powertrain can bus

* no arguments for lka anymore

* Revert "rename to more standard powertrain can bus"

This reverts commit 0bc3f79f9bad2218c48a350bbf5ec6f726e0a028.

Co-authored-by: Shane Smiskol <shane@smiskol.com>
old-commit-hash: 3cd60a47244905c069de8bf0aa7a20b38b7ccb62
2023-01-25 20:21:14 -08:00
Shane Smiskol d6f6b0de91 Car interface: set tire stiffness in common function (#26625)
* common stiffness

* GM uses factors
old-commit-hash: 712b9014d708ce77e87e2d1bb4dfe2d7665a8414
2022-11-29 12:50:27 -08:00
Shane Smiskol 8aadc8dda6 Car interface: set common params after port (#26613)
* remove pylint exception, _get_params takes no defaults

* clean up

* mock uses it too

* unused

* unused

* fix that

* bump

* Update selfdrive/car/interfaces.py
old-commit-hash: 860f441e2f122173c5034656aeed5706fd41e38f
2022-11-29 11:49:13 -08:00
Cameron Clough 0defa2774f Ford: cleanup and fix button press (#26033)
* cleanup

* use Veh_V_ActlBrk for vEgoRaw

* remove unused CarState.yaw_data

* less resume spam

* set steering ramp rate

* match DBC range

* add LCA/TJA notes
old-commit-hash: 80259f377f8b1aa3a337cccbc3b00bd41898cf44
2022-10-12 14:23:12 -07:00
Adeeb Shihadeh 9d640eecd0 Ford Explorer 2020-21 (#25614)
* add model years

* update Focus steer ratio

* Ford: add EU label to Focus Mk4

* add packages

* add Ford Explorer 2020

Package: Co-Pilot 360 Assist+

Optional on XLT
Standard on Limited, Limited Hybrid, ST and Platinum

https://cdn.dealereprocess.org/cdn/brochures/ford/2020-explorer.pdf

* Ford: steering control with path angle

* Ford: add TJA toggle to buttons

* add Ford Explorer 2021

`62241b0c7fea4589|2022-08-30--11-58-24--0`

Package: Co-Pilot 360 Assist+

Optional on XLT
Standard on Limited, Limited Hybrid, ST and Platinum (same as 2020)

https://cdn.dealereprocess.org/cdn/brochures/ford/2021-explorer.pdf

* Ford: add shiftByWire ECU fw

* angle/steer refactor

* try always stop and go for US models

* no dashcam

* car info

* send resume button

* skip explorer

* escape and focus back in dashcam

* passthru buttons

* fordcan set bus for button message

* toggle off stock traffic jam assist so camera does not enforce driver presence checks

* not used

* update ramp rate/precision notes

* cleanup

* bump steering pressed torque to 0.8 Nm

* add standstill

* bump steer ratio

* try increasing delay?

* fix docs

* add kuga car info

* maybe fix tja toggle?

* compensate for ford roll compensation??

* oops

* better ui

* block non-adaptive

* add note on ui warning for hands on wheel

* try only checking/toggling TJA every 2 seconds

* add car test route

* dashcam only again

* send buttons to camera

* add process replay segment

* cleanup

* bump panda

* add extra FW

Co-authored-by: Cameron Clough <cameronjclough@gmail.com>
old-commit-hash: 9241de221099f6c65fd7ed5ed87d6296c17f668d
2022-09-08 15:49:51 -07:00
Adeeb Shihadeh e4f9781c17 single longitudinal toggle for e2e and disable radar (#25688)
* single longitudinal toggle for e2e and disable radar

* write disable radar param

* rename

* better param name

* clean that up

* update refs

* update translations

* not live for experimental

* write it out

* vanish
old-commit-hash: 655a64b60318ce44ef0271e03de16e8b135b5268
2022-09-07 17:12:49 -07:00
Cameron Clough 92d21da552 Ford: fix gear parsing (#25267)
* Ford: fix gear shifter state

* Ford: manumatic is drive

* add full gear names to CarStateBase

* fix for unrecognised gears

* Update interfaces.py

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
old-commit-hash: 2351ae48b932eb7942178954811695b1a98e66e1
2022-07-25 13:02:27 -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
Shane Smiskol 0d83812f86 Clean up CarControllers (#25008)
* do VW

* Do the rest

* unused

* ford cc formatting

* final clean ups

* also just return update output
old-commit-hash: d2c2154a32db0876036f4f6b61b912de0c90fc5a
2022-06-30 17:23:12 -07:00
HaraldSchafer b0b1aff5cc Rocket league model (#24869)
* dd9a502d-c8e2-4831-b365-804b0ae0739d/600 80041070-d276-4fed-bdb9-0075e5442908/420

* no elementwise op

* 9dabf0fe-2e60-44bf-8d3a-d20a74aca072/600 ae746590-0bb5-4a16-80db-15f02d314f03/300 c4663a12-b499-4c9b-90dd-b169e3948cb1/60

* explicit slice

* some copies are useful

* 1456d261-d232-4654-8885-4d9fde883894/440 c06eba55-1931-4e00-9d63-acad00161be0/700 af2eb6ba-1935-4318-aaf8-868db81a4932/425

* 154f663e-d3e9-4020-ad49-0e640588ebbe/399 badb5e69-504f-4544-a99e-ba75ed204b74/800 08330327-7663-4874-af7a-dcbd2c994ba7/800

* set steer rate cost to 1.0

* smaller temporal size

* Update model reg

* update model ref again

* This did upload somehow

* Update steer rate cost

Co-authored-by: Yassine Yousfi <yyousfi1@binghamton.edu>
old-commit-hash: 9283040d847b120fdf7759d5bd12000863e12f73
2022-06-15 15:29:42 -07:00
Cameron Clough 0830dc0277 Ford: Support for LCA vehicles (#23331)
* Ford: add Focus Mk4

Also removes support for the Ford Fusion.

* Ford: LKAS/LCA steering and UI CAN commands

* Ford: implement CarController w/ steering and lanes ui

* Ford: FPv2 firmware request

* Ford: Add FW for 2018 Ford Focus

* Ford: add Escape Mk4

* bump panda

* cleanup

* add that back

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
old-commit-hash: acd455ed3ae0ffbb82fe36dd6d9a1f4d16279823
2022-04-14 14:32:03 -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
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