Commit Graph

24 Commits

Author SHA1 Message Date
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
Shane Smiskol 4cf0ce33d5 steer limits: rename common dist to meas function (#27453)
* rename function

* make a wrapper function (ford uses dynamic up/down limits

* make two functions consistent

* make torque function convert to int
old-commit-hash: 581fd62d2642629b23ac111112245a963202143f
2023-02-26 17:32:52 -08: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
Shane Smiskol ec9060c7ba CarController: log steer sent to the car (#26743)
* log value sent to the car

* rename

* bump

* Update ref_commit
old-commit-hash: f36a3664b056a3500b68f4b5d7955b13bc8d0e4c
2022-12-10 02:03:40 -08: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 9bc945c428 Stock longitudinal: spam resume button when lead starts moving (#24873)
* always log leads, we hide them in ui

* only spam resume when future is > vEgoStarting

* do rest but vw

* vw

* remove comments

* rename to resume

* maintain original button msg rate

* mazda: ensure no resume if cancelling

* same for non-HDA2

* Always run planner if not opLong

* try 0.2

* 0.1 should be pretty safe

* add test for resuming

* fix test

* stricter test, speeds[-1] is 0.14 when starting here

* no walrus

* fixup mazda cc

* remove extra import
old-commit-hash: fd2de54172b4a76f2ab8ac5d8f8eca5c41739351
2022-07-07 00:24:03 -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
Shane Smiskol 4c1b0696c0 Mazda: fix resume spam at standstill (#24876)
* Fix Mazda resume spam at standstill

* one line

* Revert "one line"

This reverts commit 30c6504ed36adb92991acd6ebf42ffd6fe6c3b8c.
old-commit-hash: 5aaf5be54c544a822483ad3e7c354fdb89cae45c
2022-06-16 01:47:29 -07:00
Adeeb Shihadeh b74dac6080 cars: cleanup CS usage (#23957)
old-commit-hash: 2219cb44782550f05d58640d18e67a4f288bfc73
2022-03-18 15:39:22 -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 eabc0b5289 cars: remove duplicated cancel logic (#23956)
old-commit-hash: b9484a6a99b4abe3a0c60d83a0ad1b43926cba45
2022-03-13 20:22:49 -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
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
Jafar Al-Gharaibeh 29528bdcb0 Mazda: fix occasional main cruise disable (#22807)
Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>
old-commit-hash: b18661a3a66979d2c12a8bbde109cb7e50f00e1a
2021-11-10 21:25:41 -08:00
Jafar Al-Gharaibeh 6c74dc1366 Mazda: disable hud alerts until we find a way to silence audible alerts (#22808)
* Mazda: disable hud alerts for now until we find a way to silence audible warnings

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* Mazda: add hud alert for steer lockout

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* show when above min steer speed

* update refs

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
old-commit-hash: 2621e5301da0e10a70a68672db5052ea5037db9b
2021-11-09 15:24:18 -08:00
Adeeb Shihadeh 3f94d894a1 Mazda: fix up cruise cancellation (#22750)
* also cancel on cruiseControl.cancel

* set counter in button msg
old-commit-hash: 40b7962b93834dd2bc624ecb6d2508fc7251d442
2021-10-30 13:37:52 -07:00
Adeeb Shihadeh 7a777b2b49 Mazda: send dash alerts (#22730)
* Mazda: send dash alerts

* no actuators

* ldw

* send alerts

* test

* use cam parser

* add generic toggle

* wip

* revert some stuff

* try that

* steer required works

* cleanup

* bump panda

* little more cleanup

* no lane lines

Co-authored-by: Comma Device <device@comma.ai>
old-commit-hash: 1848fed6e2a586f10f5d59a1472477b474ebda70
2021-10-30 10:56:30 -07:00
Jafar Al-Gharaibeh b17b840093 Mazda: fix disabling cruise main on after cancelling cruise (#22193)
On some disengagement events (brake/gas/etc) OP may occasionally
ends up disabling the main cruise control where the driver has
to press the main cruise button before they can engage ACC again.
Try to detect this situation and automatically turn on cruise
when that happens.

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>
old-commit-hash: c89893942374c207cc2b2473984e0700a7de7ec4
2021-10-10 14:24:57 -07:00
Jafar Al-Gharaibeh c5484e5f6f Mazda 3 2014 Fingerprint (#20735)
* mazda: don't passthrough unused signals

Some older models do have these, newer models don't.
Either way, they all work just fine if set to zero.

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* mazda: improve auto resume after full stop. Thanks number1pete

Auto resume doesn't always work after a full stop.
sending RES presses at a higher rate fixes the issue.

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* Add Mazda 3 2014 fingerprint

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* Merge mazda 3 fingerprints

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>
old-commit-hash: 426faa02f02a6b778035fada27242dbf4594272c
2021-04-23 17:25:58 -07: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
Jafar Al-Gharaibeh 80a6d76ce5 Mazda: Slower rate for ACC cancel msg to avoid cruise disable (#1615)
* Slower rate for ACC cancel msg to avoid cruise disable

 Sending ACC cancel message at 10hz may end up disabling
main cruise state. That is because stoc ACC use the same
signal for both functions. If cruise is already enabled
the signal canceles it, otherwise cruise is disabled.
10hz seems to be still fast in some cases not allowing
the state to sync up between OP and the Stock state.
5hz avoids that issue. Also, the resume message was also
updated to 5hz as that seems to work better as well.

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* Round up 27.96 to 28mph

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>
old-commit-hash: 41fbce59067569d370b38f40cd1ef09b61c08df2
2020-06-01 02:04:47 -07:00
Adeeb Shihadeh 9823f1164c enable flake8 E303: too many blank lines
old-commit-hash: f3dcf861c73b47c52b5dd77a8f1f8858005ae18b
2020-05-31 17:21:11 -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
Jafar Al-Gharaibeh a476d51333 Bounty: Mazda (#988)
* Mazda Port

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* Update checksum to account for steer angle signal used in some cars

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* Add test drive/segment ID to pass CI tests

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* Process gear and brake signals, add new fingerprints

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* Refactor some car interface code

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* Drop redundant call, use Ecu, move warning to carstate, fix cruise speed

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* Drop unused variables, cleanup handsoff tracking

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* Update to steerError and steeringRate

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* Refactor parse gear, update lkas signals from the new dbc

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* Better tracking of engage and warning events

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* remove commented lines, update speed_kph to match panda

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* Steer Error

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* Set lkas enable speed to 52 kph

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* Drop block signal use, fix LGTM alerts

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* When gas is pressed OP will disengage, sync local state with it

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* Use car's speed signal instead of wheel speed

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* Tidy up disengage events

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* Rebase/Refactor with upstream

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* Sync stock ACC state with OP

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* mazda dbc file renamed

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* Improve acc stock and go by removing the 3 seconds limit

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* Dashcam

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* PR Feedback

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* Send ACC cancel only if we are sure cruise is enabled

Otherwise we run the risk of disabling main cruise

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* updated route

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* no process replay for now

* add to release files

* Revert "updated route"

This reverts commit 233db4f1bc2d8eefaa86488be4f6f88360d20793.

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
old-commit-hash: 34b9b5e849fcd192bbd8c3060ce725ef61d725ab
2020-05-28 22:15:19 -07:00