Commit Graph

220 Commits

Author SHA1 Message Date
Jason Wen c2405c76ac Merge branch 'hkg-can-jerk' into master-dev-c3
# Conflicts:
#	selfdrive/ui/sunnypilot/qt/offroad/settings/vehicle_settings.cc
2024-08-01 06:16:15 -04:00
Jason Wen fcca72af9f add new toggle, remove old toggle 2024-08-01 06:13:34 -04:00
Jason Wen 2734aa7eb7 Merge branch 'master' into master-dev-c3
# Conflicts:
#	.gitlab-ci.yml
#	CHANGELOGS.md
#	SConstruct
#	panda
#	selfdrive/car/ford/carstate.py
#	selfdrive/car/ford/interface.py
#	selfdrive/car/ford/values.py
#	selfdrive/car/gm/interface.py
#	selfdrive/car/hyundai/interface.py
#	selfdrive/ui/qt/api.h
#	selfdrive/ui/qt/home.cc
#	selfdrive/ui/qt/home.h
#	selfdrive/ui/qt/offroad/settings.cc
#	selfdrive/ui/qt/offroad_home.cc
#	selfdrive/ui/qt/offroad_home.h
#	selfdrive/ui/qt/onroad/buttons.cc
#	selfdrive/ui/qt/onroad/buttons.h
#	selfdrive/ui/qt/onroad/onroad_home.h
#	selfdrive/ui/qt/request_repeater.cc
#	selfdrive/ui/qt/request_repeater.h
#	selfdrive/ui/qt/sidebar.h
#	selfdrive/ui/qt/widgets/toggle.h
#	selfdrive/ui/qt/window.h
#	selfdrive/ui/sunnypilot/qt/api.cc
#	selfdrive/ui/sunnypilot/qt/api.h
#	selfdrive/ui/sunnypilot/qt/common/json_fetcher.h
#	selfdrive/ui/sunnypilot/qt/home.cc
#	selfdrive/ui/sunnypilot/qt/home.h
#	selfdrive/ui/sunnypilot/qt/maps/map.cc
#	selfdrive/ui/sunnypilot/qt/maps/map.h
#	selfdrive/ui/sunnypilot/qt/maps/map_helpers.h
#	selfdrive/ui/sunnypilot/qt/network/networking.cc
#	selfdrive/ui/sunnypilot/qt/network/networking.h
#	selfdrive/ui/sunnypilot/qt/network/sunnylink/models/role_model.h
#	selfdrive/ui/sunnypilot/qt/network/sunnylink/models/sponsor_role_model.h
#	selfdrive/ui/sunnypilot/qt/network/sunnylink/models/user_model.h
#	selfdrive/ui/sunnypilot/qt/network/sunnylink/services/base_device_service.cc
#	selfdrive/ui/sunnypilot/qt/network/sunnylink/services/base_device_service.h
#	selfdrive/ui/sunnypilot/qt/network/sunnylink/services/role_service.cc
#	selfdrive/ui/sunnypilot/qt/network/sunnylink/services/role_service.h
#	selfdrive/ui/sunnypilot/qt/network/sunnylink/services/user_service.cc
#	selfdrive/ui/sunnypilot/qt/network/sunnylink/services/user_service.h
#	selfdrive/ui/sunnypilot/qt/network/sunnylink/sunnylink_client.cc
#	selfdrive/ui/sunnypilot/qt/network/sunnylink/sunnylink_client.h
#	selfdrive/ui/sunnypilot/qt/offroad/settings/device_panel.cc
#	selfdrive/ui/sunnypilot/qt/offroad/settings/device_panel.h
#	selfdrive/ui/sunnypilot/qt/offroad/settings/display_settings.cc
#	selfdrive/ui/sunnypilot/qt/offroad/settings/display_settings.h
#	selfdrive/ui/sunnypilot/qt/offroad/settings/monitoring_settings.cc
#	selfdrive/ui/sunnypilot/qt/offroad/settings/monitoring_settings.h
#	selfdrive/ui/sunnypilot/qt/offroad/settings/onboarding.cc
#	selfdrive/ui/sunnypilot/qt/offroad/settings/onboarding.h
#	selfdrive/ui/sunnypilot/qt/offroad/settings/osm/models_fetcher.cc
#	selfdrive/ui/sunnypilot/qt/offroad/settings/osm_settings.cc
#	selfdrive/ui/sunnypilot/qt/offroad/settings/osm_settings.h
#	selfdrive/ui/sunnypilot/qt/offroad/settings/settings.cc
#	selfdrive/ui/sunnypilot/qt/offroad/settings/settings.h
#	selfdrive/ui/sunnypilot/qt/offroad/settings/software_settings.cc
#	selfdrive/ui/sunnypilot/qt/offroad/settings/software_settings.h
#	selfdrive/ui/sunnypilot/qt/offroad/settings/sunnylink_settings.cc
#	selfdrive/ui/sunnypilot/qt/offroad/settings/sunnylink_settings.h
#	selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/custom_offsets_settings.cc
#	selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/custom_offsets_settings.h
#	selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/lane_change_settings.cc
#	selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/lane_change_settings.h
#	selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/mads_settings.cc
#	selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/mads_settings.h
#	selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/speed_limit_control_settings.cc
#	selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/speed_limit_policy_settings.cc
#	selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/speed_limit_warning_settings.cc
#	selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot_settings.cc
#	selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot_settings.h
#	selfdrive/ui/sunnypilot/qt/offroad/settings/trips_settings.cc
#	selfdrive/ui/sunnypilot/qt/offroad/settings/trips_settings.h
#	selfdrive/ui/sunnypilot/qt/offroad/settings/vehicle_settings.cc
#	selfdrive/ui/sunnypilot/qt/offroad/settings/vehicle_settings.h
#	selfdrive/ui/sunnypilot/qt/offroad/settings/visuals_settings.cc
#	selfdrive/ui/sunnypilot/qt/offroad/settings/visuals_settings.h
#	selfdrive/ui/sunnypilot/qt/offroad_home.cc
#	selfdrive/ui/sunnypilot/qt/offroad_home.h
#	selfdrive/ui/sunnypilot/qt/onroad/annotated_camera.cc
#	selfdrive/ui/sunnypilot/qt/onroad/annotated_camera.h
#	selfdrive/ui/sunnypilot/qt/onroad/buttons.cc
#	selfdrive/ui/sunnypilot/qt/onroad/buttons.h
#	selfdrive/ui/sunnypilot/qt/onroad/developer_ui/developer_ui.cc
#	selfdrive/ui/sunnypilot/qt/onroad/developer_ui/developer_ui.h
#	selfdrive/ui/sunnypilot/qt/onroad/developer_ui/ui_elements.h
#	selfdrive/ui/sunnypilot/qt/onroad/onroad_home.cc
#	selfdrive/ui/sunnypilot/qt/onroad/onroad_home.h
#	selfdrive/ui/sunnypilot/qt/onroad/onroad_settings.cc
#	selfdrive/ui/sunnypilot/qt/onroad/onroad_settings_panel.cc
#	selfdrive/ui/sunnypilot/qt/onroad/onroad_settings_panel.h
#	selfdrive/ui/sunnypilot/qt/request_repeater.cc
#	selfdrive/ui/sunnypilot/qt/request_repeater.h
#	selfdrive/ui/sunnypilot/qt/sidebar.cc
#	selfdrive/ui/sunnypilot/qt/sidebar.h
#	selfdrive/ui/sunnypilot/qt/text.cc
#	selfdrive/ui/sunnypilot/qt/ui_scene.h
#	selfdrive/ui/sunnypilot/qt/util.cc
#	selfdrive/ui/sunnypilot/qt/util.h
#	selfdrive/ui/sunnypilot/qt/widgets/controls.cc
#	selfdrive/ui/sunnypilot/qt/widgets/controls.h
#	selfdrive/ui/sunnypilot/qt/widgets/drive_stats.cc
#	selfdrive/ui/sunnypilot/qt/widgets/drive_stats.h
#	selfdrive/ui/sunnypilot/qt/widgets/scrollview.cc
#	selfdrive/ui/sunnypilot/qt/widgets/scrollview.h
#	selfdrive/ui/sunnypilot/qt/widgets/toggle.cc
#	selfdrive/ui/sunnypilot/qt/widgets/toggle.h
#	selfdrive/ui/sunnypilot/qt/window.cc
#	selfdrive/ui/sunnypilot/qt/window.h
#	selfdrive/ui/sunnypilot/sunnypilot_main.h
#	selfdrive/ui/sunnypilot/ui.cc
#	selfdrive/ui/sunnypilot/ui.h
#	selfdrive/ui/translations/main_ar.ts
#	selfdrive/ui/translations/main_de.ts
#	selfdrive/ui/translations/main_es.ts
#	selfdrive/ui/translations/main_fr.ts
#	selfdrive/ui/translations/main_ja.ts
#	selfdrive/ui/translations/main_ko.ts
#	selfdrive/ui/translations/main_pt-BR.ts
#	selfdrive/ui/translations/main_th.ts
#	selfdrive/ui/translations/main_tr.ts
#	selfdrive/ui/translations/main_zh-CHS.ts
#	selfdrive/ui/translations/main_zh-CHT.ts
#	selfdrive/ui/ui.h
2024-07-29 15:12:27 -04:00
Jason Wen be72a8ed06 Revert "Toyota: Auto Brake Hold"
This reverts commit 15d94a01
2024-07-29 06:40:34 -04:00
DevTekVE c26fd9d7c0 Add new parameters for enabling GitLab runner and Sunnylink uploader 2024-07-29 06:21:01 -04:00
DevTekVE f532ced4c8 Merge branch 'refs/heads/master-priv' into master-dev-c3 2024-07-26 11:25:23 +02:00
DevTekVE 7b8a03b5f2 Add new parameters for enabling GitLab runner and Sunnylink uploader 2024-07-26 09:24:27 +00:00
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