Commit Graph

1348 Commits

Author SHA1 Message Date
Jason Wen 789fc28496 Merge branch 'hkg-mando-radar-edge' into master-dev-c3 2024-08-10 10:48:02 -04:00
Jason Wen 490787f6b9 Hyundai Longitudinal: Enable radar tracks based on availability 2024-08-10 10:47:30 -04:00
Jason Wen 721b7f6f6d Merge branch 'hkg-can-jerk' into master-dev-c3 2024-08-09 20:54:14 -04:00
Jason Wen 17d326ba69 Revert "this finna wild"
This reverts commit 20ca222d56.
2024-08-09 20:53:13 -04:00
Jason Wen 7d2396f2e6 Merge branch 'hkg-can-jerk' into master-dev-c3
# Conflicts:
#	selfdrive/car/hyundai/carcontroller.py
2024-08-09 18:03:34 -04:00
Jason Wen 20ca222d56 this finna wild 2024-08-09 18:01:53 -04:00
Jason Wen 0d303a657b Merge branch 'hkg-can-jerk' into master-dev-c3 2024-08-08 21:00:50 -04:00
Jason Wen 69be3fdb1b only ice 2024-08-08 20:59:27 -04:00
Jason Wen 48247ce8da less 2024-08-08 16:07:25 -04:00
Jason Wen 72101c51ee Merge branch 'hkg-can-jerk' into master-dev-c3 2024-08-07 13:23:53 -04:00
Jason Wen 560b6e79bc more checks 2024-08-07 13:23:40 -04:00
Jason Wen c3eec36f4f speed logic 2024-08-07 13:15:00 -04:00
Jason Wen 2bc9bce697 Merge branch 'hkg-can-jerk' into master-dev-c3 2024-08-07 11:21:31 -04:00
Jason Wen bd5228e394 check ttc 2024-08-07 11:21:11 -04:00
Jason Wen b1ac575563 Merge branch 'hkg-can-jerk' into master-dev-c3 2024-08-07 07:48:03 -04:00
Jason Wen 368a5e3eb4 oops 2024-08-07 07:47:52 -04:00
Jason Wen adb5c8ee26 Merge branch 'hkg-can-jerk' into master-dev-c3 2024-08-07 07:16:54 -04:00
Jason Wen b95ba34a9c fix 2024-08-07 07:16:47 -04:00
Jason Wen ee3885428b Merge branch 'hkg-can-jerk' into master-dev-c3 2024-08-07 00:16:28 -04:00
Jason Wen ffd42b02b8 sportier 2024-08-07 00:16:18 -04:00
Jason Wen 9dcb0d5ec3 Merge branch 'hkg-can-jerk' into master-dev-c3 2024-08-06 23:42:39 -04:00
Jason Wen bacb49d8ee fix 2024-08-06 23:42:31 -04:00
Jason Wen 1eafceb321 fix 2024-08-06 20:46:06 -04:00
Jason Wen e4c6ea8561 Merge branch 'hkg-can-jerk' into master-dev-c3 2024-08-06 20:22:20 -04:00
Jason Wen 3c168d0975 send it 2024-08-06 20:22:10 -04:00
Jason Wen f621aaf11f Merge branch 'hkg-can-jerk' into master-dev-c3 2024-08-06 18:54:59 -04:00
Jason Wen 2a383c65b8 a tad less aggressive 2024-08-06 17:26:37 -04:00
Jason Wen 78f297246d Merge branch 'hkg-can-jerk' into master-dev-c3 2024-08-06 01:05:17 -04:00
Jason Wen 8da8986135 need to stop this too 2024-08-06 01:05:07 -04:00
Jason Wen 221f2648a9 lower matches a bit more 2024-08-06 01:03:24 -04:00
Jason Wen 6f28cd27dd Merge branch 'hkg-can-jerk' into master-dev-c3 2024-08-06 00:51:15 -04:00
Jason Wen 039fd97e6e more aggro 2024-08-06 00:51:05 -04:00
Jason Wen 9f55881f9f Merge branch 'hkg-can-jerk' into master-dev-c3 2024-08-06 00:49:56 -04:00
Jason Wen db593e718f diff logic 2024-08-06 00:48:40 -04:00
Jason Wen c0fce827ea Merge branch 'hkg-can-jerk' into master-dev-c3 2024-08-05 22:52:27 -04:00
Jason Wen a5b4e1bb4b wrong place to condition 2024-08-05 22:52:18 -04:00
Jason Wen dae3648cef Merge branch 'hkg-can-jerk' into master-dev-c3 2024-08-05 19:54:45 -04:00
Jason Wen d31cde7066 hkg only 2024-08-05 19:54:34 -04:00
Jason Wen 674a19a5cf Merge branch 'hkg-can-jerk' into master-dev-c3 2024-08-05 19:38:03 -04:00
Jason Wen 1ef7574a3f try releasing stop req faster 2024-08-05 19:37:40 -04:00
Jason Wen cf867c8e24 Merge branch 'hkg-can-jerk' into master-dev-c3
# Conflicts:
#	selfdrive/controls/lib/longcontrol.py
#	selfdrive/ui/sunnypilot/qt/offroad/settings/vehicle_settings.cc
2024-08-04 11:03:19 -04:00
Jason Wen 251716a67d less aggressive start, lower stop accel, send 0 accel at standstill 2024-08-04 11:02:06 -04:00
Jason Wen 5aef30a9cd Only HKG 2024-08-04 10:21:50 -04:00
Jason Wen 5002f3fc73 only for hkg 2024-08-04 09:11:02 -04:00
Jason Wen b94543ea25 Merge branch 'master' into hkg-can-jerk
# Conflicts:
#	.gitlab-ci.yml
#	SConstruct
#	selfdrive/car/chrysler/interface.py
#	selfdrive/car/ford/interface.py
#	selfdrive/car/gm/interface.py
#	selfdrive/car/honda/interface.py
#	selfdrive/car/hyundai/carcontroller.py
#	selfdrive/car/hyundai/hyundaicanfd.py
#	selfdrive/car/hyundai/interface.py
#	selfdrive/car/interfaces.py
#	selfdrive/car/mazda/interface.py
#	selfdrive/car/subaru/interface.py
#	selfdrive/car/volkswagen/interface.py
#	selfdrive/ui/SConscript
#	selfdrive/ui/qt/onroad/annotated_camera.cc
#	selfdrive/ui/sunnypilot/SConscript
#	selfdrive/ui/sunnypilot/qt/offroad/settings/vehicle_settings.cc
#	selfdrive/ui/sunnypilot/qt/offroad/settings/visuals_settings.cc
#	system/manager/process_config.py
2024-08-04 09:08:04 -04:00
Jason Wen 6790440b24 Merge branch 'master' into master-dev-c3
# Conflicts:
#	.gitmodules
#	README.md
#	panda
#	selfdrive/car/hyundai/carcontroller.py
#	selfdrive/controls/radard.py
2024-08-03 21:41:02 -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