Commit Graph

13806 Commits

Author SHA1 Message Date
Jason Wen ffa4744cbe Merge branch 'SP-64-ui-force-offroad' into master-dev-c3-new
# Conflicts:
#	CHANGELOGS.md
2024-05-16 11:03:00 -04:00
Jason Wen fae405317e Merge branch 'master-priv-sunnylink-sidebar-status' into master-dev-c3-new
# Conflicts:
#	CHANGELOGS.md
2024-05-16 11:02:44 -04:00
Jason Wen 94f8f5a92c Merge branch 'mapd-update-1.9.0' into master-dev-c3-new 2024-05-16 11:02:22 -04:00
Jason Wen a9da225e80 Merge branch 'disable-on-screen-recorder' into master-dev-c3-new 2024-05-16 11:02:15 -04:00
Jason Wen 874e8ce8e2 Merge branch 'nnlc-lateral-jerk' into master-dev-c3-new 2024-05-16 11:02:07 -04:00
Jason Wen 54e97eec07 Merge branch 'master-priv-ford-lat' into master-dev-c3-new
# Conflicts:
#	panda
#	selfdrive/car/ford/interface.py
2024-05-16 11:01:54 -04:00
Jason Wen bab98e9c56 Merge branch 'master-priv-ford-traffic-signs' into master-dev-c3-new
# Conflicts:
#	CHANGELOGS.md
2024-05-16 11:01:23 -04:00
Jason Wen e69a687ae3 Merge branch 'master-priv-ford' into master-dev-c3-new
# Conflicts:
#	panda
2024-05-16 11:01:01 -04:00
Jason Wen 2b1e79565c Merge branch 'custom-stock-long-planner-speed-allow-experiemtnal' into master-dev-c3-new 2024-05-16 11:00:36 -04:00
Jason Wen 31a7b6c329 Merge branch 'custom-stock-long-planner-speed' into custom-stock-long-planner-speed-allow-experiemtnal 2024-05-16 11:00:04 -04:00
Jason Wen bafd4fe913 Merge branch 'hkg-canfd-camera-scc-long-lead' into master-dev-c3-new
# Conflicts:
#	CHANGELOGS.md
#	selfdrive/car/hyundai/interface.py
2024-05-16 10:59:17 -04:00
Jason Wen 298da42918 Update CHANGELOGS.md 2024-05-16 10:58:25 -04:00
Jason Wen 600c1d06f7 Merge branch 'custom-stock-long-planner-speed' into master-dev-c3-new 2024-05-16 10:54:44 -04:00
Jason Wen 0758881350 Merge branch 'hkg-canfd-all-long' into master-dev-c3-new
# Conflicts:
#	panda
2024-05-16 10:54:32 -04:00
Jason Wen 9d322662ef Merge branch 'ev6-taco' into master-dev-c3-new
# Conflicts:
#	panda
2024-05-16 10:54:17 -04:00
Jason Wen bba16d6822 Merge branch 'subaru-gen2-torque-increase' into master-dev-c3-new 2024-05-16 10:51:47 -04:00
Jason Wen 1dec79083d Merge branch 'master-priv' into SP-64-ui-force-offroad
# Conflicts:
#	CHANGELOGS.md
#	selfdrive/ui/qt/offroad/settings.cc
#	selfdrive/ui/qt/offroad/settings.h
2024-05-16 02:28:17 -04:00
Jason Wen a76a1f98ec Merge branch 'master-priv' into master-priv-sunnylink-sidebar-status 2024-05-16 02:18:35 -04:00
Jason Wen 83666c79fa Merge branch 'master-priv' into mapd-update-1.9.0
# Conflicts:
#	CHANGELOGS.md
2024-05-16 02:17:51 -04:00
Jason Wen ac921c6ee6 Merge branch 'master-priv' into disable-on-screen-recorder 2024-05-16 02:16:58 -04:00
Jason Wen 0fb93cec60 Merge branch 'master-priv' into nnlc-lateral-jerk
# Conflicts:
#	CHANGELOGS.md
2024-05-16 02:16:11 -04:00
Jason Wen 17b7f0bdba before flag is set 2024-05-16 02:10:40 -04:00
Jason Wen b01d6d423a update flag 2024-05-16 02:09:32 -04:00
Jason Wen a2b0275e37 bump panda 2024-05-16 02:07:31 -04:00
Jason Wen 08fa5159f6 Merge branch 'master-priv' into master-priv-ford-lat
# Conflicts:
#	selfdrive/car/ford/carcontroller.py
#	selfdrive/car/ford/interface.py
#	selfdrive/car/ford/values.py
2024-05-16 02:07:00 -04:00
Jason Wen 79252b6b5a Update CHANGELOGS.md 2024-05-16 02:03:17 -04:00
Jason Wen cdf0bdfe15 Merge branch 'master-priv' into master-priv-ford-traffic-signs
# Conflicts:
#	selfdrive/car/ford/carstate.py
2024-05-16 02:02:55 -04:00
Jason Wen 2833cf9d48 Update CHANGELOGS.md 2024-05-16 02:01:34 -04:00
Jason Wen d852e4a4f0 FCR: sync with upstream supported car platforms 2024-05-16 02:00:38 -04:00
Jason Wen f35a76dc14 Merge branch 'master-priv' into master-priv-ford
# Conflicts:
#	panda
#	selfdrive/car/ford/interface.py
#	selfdrive/car/ford/values.py
#	selfdrive/car/sunnypilot_carname.json
#	selfdrive/car/tests/routes.py
2024-05-16 01:59:30 -04:00
Jason Wen b1715b470a Merge branch 'master-priv' into hkg-canfd-camera-scc-long-lead
# Conflicts:
#	CHANGELOGS.md
#	opendbc
2024-05-16 01:44:19 -04:00
Jason Wen c8c4f2296d Merge branch 'master-priv' into custom-stock-long-planner-speed
# Conflicts:
#	common/params.cc
#	selfdrive/controls/controlsd.py
#	selfdrive/ui/qt/onroad/annotated_camera.cc
2024-05-16 01:40:56 -04:00
Jason Wen 8b20794fe3 Update CHANGELOGS.md 2024-05-16 01:37:49 -04:00
Jason Wen 95fc2810c7 Merge branch 'master-priv' into hkg-canfd-all-long
# Conflicts:
#	CHANGELOGS.md
2024-05-16 01:35:26 -04:00
Jason Wen 2f9e9faea5 Merge branch 'master-priv' into ev6-taco
# Conflicts:
#	CHANGELOGS.md
2024-05-16 01:34:46 -04:00
Jason Wen e23e925d1a Merge branch 'master-priv' into subaru-gen2-torque-increase
# Conflicts:
#	CHANGELOGS.md
2024-05-16 01:34:07 -04:00
Jason Wen 2efdba4daf Update CHANGELOGS.md 2024-05-16 01:31:44 -04:00
Jason Wen 836e7d5c6d Merge branch 'SP-59-sync-priv-20240507' into hkg-canfd-all-long
# Conflicts:
#	panda
2024-05-16 01:27:46 -04:00
Jason Wen 18f62b1c5b Merge branch 'SP-59-sync-priv-20240507' into ev6-taco
# Conflicts:
#	panda
#	selfdrive/car/hyundai/interface.py
#	selfdrive/car/hyundai/values.py
2024-05-16 01:26:37 -04:00
Jason Wen 2db0a9cffa bump to 1600 2024-05-16 01:24:53 -04:00
Jason Wen 8f37e795c9 Merge branch 'SP-59-sync-priv-20240507' into subaru-gen2-torque-increase
# Conflicts:
#	panda
#	selfdrive/car/subaru/values.py
2024-05-16 01:24:17 -04:00
Jason Wen d0761ddcd4 Update CHANGELOGS.md 2024-05-16 00:37:40 -04:00
Jason Wen d959c43284 Longitudinal: Use upstream button timer to toggle between Chill & Experimental Mode 2024-05-16 00:12:17 -04:00
Jason Wen 755c39b2fd Revert "[$100 bounty] mapsd: switch to static render mode (#32118)"
This reverts commit 3c69fcddc8.
2024-05-15 22:25:53 -04:00
DevTekVE 1c0bf18084 Refactor manage_athenad to make it more generic 2024-05-15 22:25:45 -04:00
Jason Wen e1e26c6b4f NNLC: Rename to new platform names and remove EPS-specific fits for now 2024-05-15 22:25:42 -04:00
Jason Wen bbc79f1798 Merge branch 'master' into SP-59-sync-priv-20240507 2024-05-15 22:25:40 -04:00
Jason Wen 250afef443 Merge branch 'master' into SP-59-sync-priv-20240507
# Conflicts:
#	panda
#	release/build_release.sh
#	selfdrive/car/volkswagen/interface.py
2024-05-15 16:04:19 -04:00
Jason Wen d7715899cb Bump submodules (#332) 2024-05-11 15:27:27 -04:00
Jason Wen 003d5ccf73 Bump submodules (#331) 2024-05-09 16:31:52 -04:00