Commit Graph

213 Commits

Author SHA1 Message Date
Jason Wen bbef8d5764 Merge branch 'master-priv' into master-dev-c3
# Conflicts:
#	panda
2024-07-07 20:39:24 -04:00
Adeeb Shihadeh d3cb0d24c4 Sync: sunnypilot/sunnypilot:master into sunnypilot/openpilot-special:master-priv 2024-07-07 10:15:50 -04:00
Jason Wen b86f7db97d Revert "remove navigation (#32773)"
This reverts commit e491c9d9
2024-07-06 22:44:27 -04:00
rav4kumar 6f9401d902 Merge remote-tracking branch 'comma/master' into sync-20240706 2024-07-06 22:18:32 -04:00
Jason Wen 67d7df43ad Merge branch 'toyota-lowspeed-override' into master-dev-c3 2024-07-02 12:04:53 -04:00
Jason Wen 5d097fa5de rename to PCM Speed Override 2024-07-02 10:57:40 -04:00
Jason Wen 67dcb68f00 Merge branch 'master-priv' into toyota-lowspeed-override
# Conflicts:
#	common/params.cc
2024-07-02 01:15:27 -04:00
Jason Wen c5e6342630 Merge branch 'master-priv' into master-dev-c3
# Conflicts:
#	cereal/custom.capnp
#	common/params.cc
#	selfdrive/controls/controlsd.py
#	selfdrive/controls/lib/longitudinal_planner.py
#	selfdrive/controls/lib/sunnypilot/accel_controller.py
#	selfdrive/ui/qt/offroad/settings.cc
#	selfdrive/ui/qt/offroad/settings.h
#	selfdrive/ui/ui.h
2024-07-02 00:51:54 -04:00
rav4 kumar e8df8fad00 Longitudinal: Acceleration Personality 2024-07-02 04:45:18 +00:00
rav4 kumar ca202c3c4a Longitudinal: Dynamic Personality 2024-07-02 04:15:20 +00:00
Jason Wen 2a3a533d2b Merge branch 'dynamic_personality' into master-dev-c3
# Conflicts:
#	cereal/custom.capnp
#	selfdrive/controls/controlsd.py
2024-07-01 16:24:36 -04:00
Jason Wen fbc556bc81 Merge branch 'accel-profile' into master-dev-c3 2024-07-01 16:23:52 -04:00
Jason Wen a7bcfcab87 Merge branch 'master-priv' into master-dev-c3
# Conflicts:
#	CHANGELOGS.md
#	panda
2024-07-01 16:23:47 -04:00
Jason Wen f0d2fd4649 Merge branch 'master-priv' into dynamic_personality 2024-07-01 16:22:24 -04:00
Jason Wen 750f9c8233 Merge branch 'master-priv' into accel-profile 2024-07-01 16:18:04 -04:00
rav4 kumar 46c1362511 Toyota: Automatic Door Locking and Unlocking 2024-07-01 20:16:40 +00:00
Jason Wen b81cdccb6c Merge branch 'master-priv' into dynamic_personality
# Conflicts:
#	selfdrive/controls/lib/longitudinal_planner.py
2024-07-01 15:47:34 -04:00
rav4 kumar 15d94a017d Toyota: Auto Brake Hold 2024-07-01 19:45:30 +00:00
Jason Wen 6743cdf5f2 Merge branch 'master-priv' into accel-profile 2024-07-01 15:09:28 -04:00
Jason Wen dd2334290e Merge branch 'master-priv' into dynamic_personality 2024-07-01 14:55:08 -04:00
rav4 kumar 9097997b76 Toyota: Enhance BSM support 2024-07-01 18:50:12 +00:00
Jason Wen 6098dd300a formatting 2024-07-01 11:21:09 -04:00
rav4kumar f809fcf0aa dynamic personality 2024-06-29 12:11:07 -07:00
rav4kumar 972951de3e accel controller 2024-06-29 11:52:15 -07:00
rav4kumar 342effe5dd toyota low speed override 2024-06-29 11:02:21 -07:00
Mauricio Alvarez Leon 7013eed50c remove timezone from timed.py (#32665)
* use timezone from tilequery mapbox api

* add timezone into cereal

* better clean

* more

* one line

* poetry lock
2024-06-19 20:34:57 -07:00
Adeeb Shihadeh e491c9d964 remove navigation (#32773)
* remove navigation

* lil more

* fix cabana

* revert for now

* fix docs

* move that over

* lock

* rm assets
2024-06-19 19:14:13 -07:00
Jason Wen 85d069044a ui: sunnypilot Terms of Service 2024-06-13 16:53:16 +00:00
Jason Wen cc48ee7dd4 Merge branch 'SP-151-sp-tos' into master-dev-c3 2024-06-13 10:40:31 -04:00
Jason Wen 252f06c5ad make sure comma's ToS is retained 2024-06-13 10:40:15 -04:00
Jason Wen 3cb8be0b94 Merge branch 'SP-151-sp-tos' into master-dev-c3 2024-06-13 02:05:25 -04:00
Jason Wen 55542d56f2 ui: sunnypilot Terms of Service 2024-06-13 02:02:58 -04:00
Jason Wen 2c0ab40c82 Controls: Customizable Pause Lateral Speed 2024-05-31 23:01:31 +00:00
Jason Wen d104beb207 Merge branch 'SP-134-pause-lateral-speed' into master-dev-c3
# Conflicts:
#	CHANGELOGS.md
2024-05-29 00:22:04 -04:00
Jason Wen daaf05e5a6 Controls: Customizable Pause Lateral Speed 2024-05-29 00:07:24 -04:00
Jason Wen 51cc39c74c Merge branch 'master-priv' into master-dev-c3 2024-05-26 23:45:42 -04:00
Jason Wen 0fb264377d Revert "SP-35: Driving Model Selector: Reset all related params if branches/remote have changed" 2024-05-27 03:45:11 +00:00
Jason Wen 1d2ff881b0 SP-35: Driving Model Selector: Reset all related params if branches/remote have changed 2024-05-24 00:16:57 -04:00
Jason Wen 407dfd0d6b Revert "SP-35: Driving Model Selector: Reset all related params if branches/remote have changed" 2024-05-24 04:13:30 +00:00
Jason Wen 9678924263 Merge branch 'master-priv' into master-dev-c3 2024-05-23 13:40:46 -04:00
Jason Wen 9d82d128ec SP-35: Driving Model Selector: Reset all related params if branches/remote have changed 2024-05-23 17:39:58 +00:00
Jason Wen 9842d68f4c ui: Force offroad from settings when the car is on 2024-05-17 06:00:29 +00: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 874e8ce8e2 Merge branch 'nnlc-lateral-jerk' into master-dev-c3-new 2024-05-16 11:02:07 -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 0fb93cec60 Merge branch 'master-priv' into nnlc-lateral-jerk
# Conflicts:
#	CHANGELOGS.md
2024-05-16 02:16:11 -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 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 9e3f57d53e Merge branch 'master' into SP-59-sync-priv-20240507 2024-05-09 15:48:29 -04:00
Miguel Fernandez 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