24c331a6eb
Merge branch 'cslc-hkg-fix' into master-dev-c3
2024-05-16 22:22:38 -04:00
bb41d2e386
CSLC: Hyundai: Fix upstream conflicts
2024-05-16 22:22:21 -04:00
2188a915b6
Merge branch 'master-priv' into master-dev-c3
2024-05-16 12:45:35 -04:00
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
2efb958727
Merge branch 'ford-q3-radar' into master-dev-c3-new
2024-05-16 11:05:14 -04:00
6c50176787
Flipped platform
2024-05-16 11:04:36 -04:00
ffa4744cbe
Merge branch 'SP-64-ui-force-offroad' into master-dev-c3-new
...
# Conflicts:
# CHANGELOGS.md
2024-05-16 11:03:00 -04:00
fae405317e
Merge branch 'master-priv-sunnylink-sidebar-status' into master-dev-c3-new
...
# Conflicts:
# CHANGELOGS.md
2024-05-16 11:02:44 -04:00
94f8f5a92c
Merge branch 'mapd-update-1.9.0' into master-dev-c3-new
2024-05-16 11:02:22 -04:00
a9da225e80
Merge branch 'disable-on-screen-recorder' into master-dev-c3-new
2024-05-16 11:02:15 -04:00
874e8ce8e2
Merge branch 'nnlc-lateral-jerk' into master-dev-c3-new
2024-05-16 11:02:07 -04:00
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
bab98e9c56
Merge branch 'master-priv-ford-traffic-signs' into master-dev-c3-new
...
# Conflicts:
# CHANGELOGS.md
2024-05-16 11:01:23 -04:00
e69a687ae3
Merge branch 'master-priv-ford' into master-dev-c3-new
...
# Conflicts:
# panda
2024-05-16 11:01:01 -04:00
2b1e79565c
Merge branch 'custom-stock-long-planner-speed-allow-experiemtnal' into master-dev-c3-new
2024-05-16 11:00:36 -04:00
31a7b6c329
Merge branch 'custom-stock-long-planner-speed' into custom-stock-long-planner-speed-allow-experiemtnal
2024-05-16 11:00:04 -04:00
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
600c1d06f7
Merge branch 'custom-stock-long-planner-speed' into master-dev-c3-new
2024-05-16 10:54:44 -04:00
0758881350
Merge branch 'hkg-canfd-all-long' into master-dev-c3-new
...
# Conflicts:
# panda
2024-05-16 10:54:32 -04:00
9d322662ef
Merge branch 'ev6-taco' into master-dev-c3-new
...
# Conflicts:
# panda
2024-05-16 10:54:17 -04:00
21571e99c5
Merge branch 'master-priv-ford' into ford-q3-radar
2024-05-16 10:47:34 -04:00
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
a76a1f98ec
Merge branch 'master-priv' into master-priv-sunnylink-sidebar-status
2024-05-16 02:18:35 -04:00
83666c79fa
Merge branch 'master-priv' into mapd-update-1.9.0
...
# Conflicts:
# CHANGELOGS.md
2024-05-16 02:17:51 -04:00
ac921c6ee6
Merge branch 'master-priv' into disable-on-screen-recorder
2024-05-16 02:16:58 -04:00
0fb93cec60
Merge branch 'master-priv' into nnlc-lateral-jerk
...
# Conflicts:
# CHANGELOGS.md
2024-05-16 02:16:11 -04:00
17b7f0bdba
before flag is set
2024-05-16 02:10:40 -04:00
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
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
d852e4a4f0
FCR: sync with upstream supported car platforms
2024-05-16 02:00:38 -04:00
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
b1715b470a
Merge branch 'master-priv' into hkg-canfd-camera-scc-long-lead
...
# Conflicts:
# CHANGELOGS.md
# opendbc
2024-05-16 01:44:19 -04:00
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
836e7d5c6d
Merge branch 'SP-59-sync-priv-20240507' into hkg-canfd-all-long
...
# Conflicts:
# panda
2024-05-16 01:27:46 -04:00
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
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
d959c43284
Longitudinal: Use upstream button timer to toggle between Chill & Experimental Mode
2024-05-16 00:12:17 -04:00
755c39b2fd
Revert "[$100 bounty] mapsd: switch to static render mode ( #32118 )"
...
This reverts commit 3c69fcddc8
2024-05-15 22:25:53 -04:00
1c0bf18084
Refactor manage_athenad to make it more generic
2024-05-15 22:25:45 -04:00
e1e26c6b4f
NNLC: Rename to new platform names and remove EPS-specific fits for now
2024-05-15 22:25:42 -04:00
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
9e3f57d53e
Merge branch 'master' into SP-59-sync-priv-20240507
2024-05-09 15:48:29 -04:00
ae6ef196e7
Add QStackedLayout to onroad_home.cc
...
Added QStackedLayout to the includes in onroad_home.cc file. Not sure how it was compiling for others, but it wasn't working for me on m1
2024-05-09 15:40:26 +02:00
b2d5edcdb5
Merge remote-tracking branch 'refs/remotes/openpilot/master' into small-sync
...
# Conflicts:
# cereal
# opendbc
# panda
# selfdrive/car/__init__.py
# selfdrive/monitoring/dmonitoringd.py
2024-05-09 15:13:00 +02:00
2e6b2ef3c9
card: preparation ( #32382 )
...
* card prep
* also format
2024-05-08 23:54:20 -07:00
273a4f5ca9
Always-on DM: no audible alert at low speeds / block engagement if alert present ( #32379 )
...
* min speed
* cmments
* no entry?
* comment
2024-05-08 20:05:03 -07:00
a83b182c55
Volkswagen: improve fuzzy fingerprinting ( #32378 )
...
* improve VW fuzzy FP matching
* annotate
* Revert "annotate"
This reverts commit 09cbb150e91f5093849c22d95e31152fb8d4d1a9.
* hmm
2024-05-08 17:17:08 -07:00
fe4c7f1499
VW MQB: Add FW for 2022 CUPRA Ateca ( #32318 )
...
* VW MQB: Add FW for 2022 SEAT Ateca
* extend Ateca supported model-years
* CUPRA Ateca available from 2018
* regen CARS.md
* wrong model year format
2024-05-08 15:34:16 -07:00
451a38ddee
Honda: add missing FW for Civic Hatchback 2020 (Type R Japanese model) ( #32305 )
...
* Update fingerprints.py
* format
---------
Co-authored-by: Shane Smiskol <shane@smiskol.com >
2024-05-08 15:19:06 -07:00
93fa207c5c
VW: raise minimum steering speed to fix a fault ( #31450 )
...
* VW: Steer to zero, for large values of zero
* ah, the joy of floating point
* comment, style
* actually fix floating point issue
* follow PlatformConfig refactor
* this check is not useful after PlatformConfig
* don't really need that
* work around docs assert
* little better
* one comment
* update refs
---------
Co-authored-by: Shane Smiskol <shane@smiskol.com >
2024-05-08 14:38:08 -07:00
Jason Wen