Commit Graph

329 Commits

Author SHA1 Message Date
Jason Wen 4fcd982225 Merge remote-tracking branch 'sunnypilot/sunnypilot/master' into master-dev-c3
# Conflicts:
#	selfdrive/car/chrysler/interface.py
#	selfdrive/car/ford/interface.py
#	selfdrive/car/gm/interface.py
#	selfdrive/car/honda/interface.py
#	selfdrive/car/hyundai/interface.py
#	selfdrive/car/interfaces.py
#	selfdrive/car/mazda/interface.py
#	selfdrive/car/nissan/interface.py
#	selfdrive/car/subaru/interface.py
#	selfdrive/car/toyota/interface.py
#	selfdrive/car/volkswagen/interface.py
#	selfdrive/controls/controlsd.py
#	selfdrive/controls/lib/drive_helpers.py
#	system/manager/manager.py
2024-08-13 19:15:33 -04:00
Jason Wen b2cdfc09ae Longitudinal: Refactor Experimental Mode toggle with distance button hold (#409)
* init

* deprecated

* in controlsd directly

* update

* unused

* combine

* only once

* fix

* better

* cleanup

* more

* Update CHANGELOGS.md
2024-08-13 16:16:40 -04:00
Jason Wen 5b674d2231 car: Interface cleanup (#396)
* deprecated

* cruise main state

* v cruise non pcm state

* acc mads combo

* cancel cruise state

* sp common state

* sp event

* custom stock long

* started mads

* v cruise non pcm state old

* acc mads old

* started mads old
2024-08-13 15:57:27 -04:00
Jason Wen 2344718941 Merge branch 'exp-hold-fix' into master-dev-c3 2024-08-13 01:07:22 -04:00
Jason Wen 0ced91c982 better 2024-08-13 01:05:16 -04:00
Jason Wen b1cd16f1e0 Merge branch 'exp-hold-fix' into master-dev-c3 2024-08-12 18:48:40 -04:00
Jason Wen 224c0457d8 deprecated 2024-08-12 17:36:27 -04:00
Jason Wen 3a1eba95bf Merge branch 'car-interface-cleanup' into master-dev-c3
# Conflicts:
#	selfdrive/car/hyundai/interface.py
2024-08-11 17:54:55 -04:00
Jason Wen b3543efcb3 started mads 2024-08-05 17:58:52 -04:00
Jason Wen c607d8aa04 custom stock long 2024-08-05 17:44:53 -04:00
Jason Wen 7408ea04d4 sp event 2024-08-05 17:38:27 -04:00
Jason Wen 5cf9cd7888 sp common state 2024-08-05 17:34:32 -04:00
Jason Wen 6dc9f288bd cancel cruise state 2024-08-05 17:26:46 -04:00
Jason Wen c2c80a0c1a acc mads combo 2024-08-05 17:24:06 -04:00
Jason Wen 5ac2ec83aa v cruise non pcm state 2024-08-05 17:20:22 -04:00
Jason Wen d321805ca4 cruise main state 2024-08-05 17:16:03 -04:00
Jason Wen d35cdb510d Sync: commaai/msgq:master into sunnypilot/msgq:master
Sync: `commaai/opendbc:master` into `sunnypilot/opendbc:master`

Sync: `commaai/panda:master` into `sunnypilot/panda:master`
2024-08-03 21:22:09 -04:00
Jason Wen 758449a12b Merge branch 'sync-20240803' into master-dev-c3
# Conflicts:
#	cereal/messaging/__init__.py
#	panda
2024-08-03 15:42:50 -04:00
Jason Wen 7b294d9763 Merge remote-tracking branch 'commaai/openpilot/master' into sync-20240802
# Conflicts:
#	.gitmodules
#	README.md
#	cereal/services.py
#	msgq_repo
#	opendbc~HEAD
#	opendbc~commaai_openpilot_master
#	panda
#	selfdrive/car/__init__.py
#	selfdrive/car/chrysler/carcontroller.py
#	selfdrive/car/honda/carcontroller.py
#	selfdrive/car/hyundai/carcontroller.py
#	selfdrive/car/hyundai/hyundaican.py
#	selfdrive/car/interfaces.py
#	selfdrive/car/toyota/carcontroller.py
#	selfdrive/car/volkswagen/carcontroller.py
#	selfdrive/controls/lib/drive_helpers.py
#	selfdrive/controls/radard.py
#	selfdrive/locationd/paramsd.py
#	selfdrive/locationd/torqued.py
#	selfdrive/ui/translations/main_es.ts
#	system/athena/athenad.py
Merge branch 'upstream/opendbc/master' into sync-20240802

# Conflicts:
#	opendbc/dbc/generator/honda/_dual_nidec_common.dbc
#	opendbc/dbc/generator/honda/honda_accord_touring_2016_can.dbc
#	opendbc/dbc/generator/honda/honda_accord_touring_V6_2016_can.dbc
#	opendbc/dbc/generator/honda/honda_accord_touring_hybrid_2017_can.dbc
#	opendbc/dbc/generator/toyota/_sp_debug_toyota.dbc
2024-08-03 10:26:13 -04:00
Jason Wen 09d1604b84 MADS: Honda: Fix PCM ACC disengage fault (#363)
* MADS: Honda: Fix PCM ACC disengage fault

* try this out

* honda only
2024-08-02 11:41:20 -04:00
Jason Wen 9be3925ee1 MADS: Hyundai: Independent control with LFA button (#362)
* MADS: HKG CAN-FD: Disallow cruise buttons to engage when pcmCruiseSpeed is off

* handle states properly

* this is better

* make sure main button is pressed

* oops flipped main

* same behavior

* handle cruise main button universally

* both

* not needed

* oops

* wtf how did i miss
2024-08-01 23:34:35 -04:00
Jason Wen 8d760272c7 car: Move all live param checks to ParamManger (#378)
car: Move all live param checks to ParamManger
2024-08-01 23:23:00 -04:00
Jason Wen c8556f340e Merge branch 'car-all-params' into master-dev-c3 2024-08-01 19:11:26 -04:00
Jason Wen 6e381f02ba car: Move all live param checks to ParamManger 2024-08-01 18:47:14 -04:00
Jason Wen 08afbd7cb5 car: Check params before car state is updated (#364)
* car: Check params before car state is updated

* read params in a thread instead

* initialize list

* Do this instead

* type hint

* ParamManager

* make them internal
2024-08-01 18:12:27 -04:00
Jason Wen 2de756f1dc Merge branch 'car-params-check' into master-dev-c3 2024-08-01 07:47:13 -04:00
Jason Wen 29bf1cc294 ParamManager 2024-08-01 07:46:57 -04:00
Jason Wen 92500628ad Merge branch 'car-params-check' into master-dev-c3 2024-07-31 20:38:35 -04:00
Jason Wen 544531ab91 Do this instead 2024-07-31 20:38:28 -04:00
Shane Smiskol 7c112341c3 Reapply "update to new opendbc API (#32009)" (#33151)
This reverts commit ac130001cc.
2024-07-31 15:37:39 -07:00
Shane Smiskol ebff7cab1a get_fw_versions: test the full stack (#33156)
* add the test

fix

* bump

* not sure why mypy didn't catch this
2024-07-31 14:53:13 -07:00
Shane Smiskol ac130001cc Revert "update to new opendbc API (#32009)"
This reverts commit 0dddc97dca.
2024-07-31 02:38:44 -07:00
Dean Lee 0dddc97dca update to new opendbc API (#32009)
* use new opendbc api

* export pandad_python

* merge master

* merge master

* bump opendbc

* bump opendbc

* improve func

* keep interface unchanged

* fix test_car_interfaces

* bump opendbc

* bump opendbc

* fix test_models

* the interface now has to convert from can capnp to list, so we should include this time

* goes from ~210 to ~240 mean ms real time

* remoe busTime

* lowercase sendcan

* consistent msgtype

* bump

* bump

* not used in lat_mpc

* space

* bump to master

---------

Co-authored-by: Shane Smiskol <shane@smiskol.com>
2024-07-31 00:24:46 -07:00
Shane Smiskol 1b6ac2d876 CarController: call to super's init (#33148)
* this should be common

* super!

* bump

* and frame is common

* bump
2024-07-30 23:55:23 -07:00
Jason Wen 9c02257bcf Merge branch 'pcm-long-disengage' into master-dev-c3 2024-07-30 23:57:13 -04:00
Jason Wen 03722f9090 try this out 2024-07-30 23:57:04 -04:00
Jason Wen 7da934c2c0 Merge branch 'car-params-check' into master-dev-c3 2024-07-30 23:06:18 -04:00
Jason Wen afb0c3fe42 read params in a thread instead 2024-07-30 22:59:47 -04:00
Jason Wen b2ba2aaab1 car: Check params before car state is updated 2024-07-30 17:49:49 -04:00
Shane Smiskol 0739d79a51 cars: remove some external imports (#33133)
* ford and gm

* clean that up

* also this

* honda

* temp fix

* move into selfdrive.car

* clean up

* more
2024-07-30 14:27:27 -07:00
Jason Wen ca8c74bc0d MADS: Use modern button events parsing 2024-07-29 06:21:01 -04:00
Jason Wen 4aa7d25c9a add them back 2024-07-21 08:56:45 -04:00
Jason Wen f5b1b4c73e Revert "encapsulate in method"
This reverts commit 5facba22
2024-07-20 22:40:45 -04:00
Jason Wen 38697b1f4c Revert "encapsulate in a class"
This reverts commit b95079bf7a.
2024-07-20 22:40:20 -04:00
Jason Wen cd09b47936 Revert "pre-commit: Apply mypy and ruff check fixes"
This reverts commit 17b8c6ab4e.
2024-07-20 22:40:20 -04:00
Jason Wen 0ff60c8adf Merge branch 'hooks-fix' into master-dev-c3 2024-07-20 19:48:40 -04:00
Jason Wen 17b8c6ab4e pre-commit: Apply mypy and ruff check fixes 2024-07-20 19:48:19 -04:00
Jason Wen 7938ed408f Merge branch 'mads-button-event-modern' into master-dev-c3
# Conflicts:
#	selfdrive/car/gm/interface.py
#	selfdrive/car/hyundai/interface.py
2024-07-20 18:56:37 -04:00
Jason Wen b95079bf7a encapsulate in a class 2024-07-20 18:48:07 -04:00
Jason Wen 5facba229a encapsulate in method 2024-07-20 18:23:38 -04:00