Commit Graph

13834 Commits

Author SHA1 Message Date
Jason Wen ab3c8dc294 Merge branch 'SP-123-hkg-can-long-radar-tracks-all' into master-dev-c3 2024-05-17 03:15:43 -04:00
Jason Wen 7f9f461942 Merge branch 'master-priv' into master-dev-c3
# Conflicts:
#	CHANGELOGS.md
2024-05-17 03:15:38 -04:00
Jason Wen e234b72aa6 Hyundai CAN Longitudinal: Auto-enable radar tracks on platforms with Mando radar 2024-05-17 03:14:25 -04:00
Jason Wen 9842d68f4c ui: Force offroad from settings when the car is on 2024-05-17 06:00:29 +00:00
Jason Wen 7a286d2f52 Controlsd: Remove unused code and leadDistanceBar parsing with SP values 2024-05-17 04:57:44 +00:00
Jason Wen 363f9c03f6 Merge branch 'master-priv' into master-dev-c3
# Conflicts:
#	CHANGELOGS.md
#	selfdrive/car/hyundai/interface.py
2024-05-17 00:50:18 -04:00
Jason Wen 0b8262175f Hyundai CAN-FD Longitudinal: Parse lead info for camera-based SCC platforms 2024-05-17 04:48:46 +00:00
Jason Wen 0f8661b434 Merge branch 'upstream-fixes' into master-dev-c3 2024-05-17 00:27:47 -04:00
Jason Wen 304311e078 Unused 2024-05-17 00:27:35 -04:00
Jason Wen 1428bb4cce Merge branch 'upstream-fixes' into master-dev-c3 2024-05-17 00:24:44 -04:00
Jason Wen cab8c62e96 Controlsd: Fix edge_toggle variable and leadDistanceBar parsing with SP values 2024-05-17 00:24:28 -04:00
Jason Wen f106b2ca9c Merge branch 'SP-121-upstream-platform-fixes' into master-dev-c3 2024-05-16 23:41:38 -04:00
Jason Wen 0d6c95dadc SP-121: Platforms: Update old platform names referenced in different features 2024-05-16 23:41:04 -04:00
Jason Wen 0954a0191e Merge branch 'master-priv-ford-traffic-signs' into master-dev-c3 2024-05-16 23:27:49 -04:00
Jason Wen 25b4ef7833 int flag fix 2024-05-16 23:27:40 -04:00
Jason Wen 01439b2ad1 Merge branch 'master-priv' into master-dev-c3 2024-05-16 23:06:01 -04:00
Jason Wen 8261a71d67 Update CHANGELOGS.md 2024-05-16 23:05:50 -04:00
Jason Wen 24c331a6eb Merge branch 'cslc-hkg-fix' into master-dev-c3 2024-05-16 22:22:38 -04:00
Jason Wen bb41d2e386 CSLC: Hyundai: Fix upstream conflicts 2024-05-16 22:22:21 -04:00
Jason Wen 3c18f2babb Merge branch 'no-dcam-loggerd-ram' into master-dev-c3 2024-05-16 13:04:00 -04:00
Jason Wen 6a05e2267d dcam: do not log dcam-related things for unofficial devices with no dcam 2024-05-16 13:03:50 -04:00
Jason Wen 2188a915b6 Merge branch 'master-priv' into master-dev-c3 2024-05-16 12:45:35 -04:00
Jason Wen 0a6bc53fc2 Revert "Longitudinal: Use upstream button timer to toggle between Chill & Experimental Mode"
This reverts commit d959c43284.
2024-05-16 12:45:05 -04:00
Jason Wen 2efb958727 Merge branch 'ford-q3-radar' into master-dev-c3-new 2024-05-16 11:05:14 -04:00
Jason Wen 6c50176787 Flipped platform 2024-05-16 11:04:36 -04:00
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 21571e99c5 Merge branch 'master-priv-ford' into ford-q3-radar 2024-05-16 10:47:34 -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