a07bb99d0c
Merge branch 'hkg-can-jerk' into lt
...
# Conflicts:
# selfdrive/controls/lib/longitudinal_mpc_lib/long_mpc.py
# selfdrive/controls/lib/longitudinal_planner.py
2024-08-06 23:45:29 -04:00
3c168d0975
send it
2024-08-06 20:22:10 -04:00
cae49279e5
Merge remote-tracking branch 'origin/master-dev-c3' into lt
2024-08-06 07:37:56 -07:00
ca5fa0e6d9
Merge branch 'hkg-can-jerk' into lt
2024-08-04 09:11:32 -04:00
b94543ea25
Merge branch 'master' into hkg-can-jerk
...
# Conflicts:
# .gitlab-ci.yml
# SConstruct
# selfdrive/car/chrysler/interface.py
# selfdrive/car/ford/interface.py
# selfdrive/car/gm/interface.py
# selfdrive/car/honda/interface.py
# selfdrive/car/hyundai/carcontroller.py
# selfdrive/car/hyundai/hyundaicanfd.py
# selfdrive/car/hyundai/interface.py
# selfdrive/car/interfaces.py
# selfdrive/car/mazda/interface.py
# selfdrive/car/subaru/interface.py
# selfdrive/car/volkswagen/interface.py
# selfdrive/ui/SConscript
# selfdrive/ui/qt/onroad/annotated_camera.cc
# selfdrive/ui/sunnypilot/SConscript
# selfdrive/ui/sunnypilot/qt/offroad/settings/vehicle_settings.cc
# selfdrive/ui/sunnypilot/qt/offroad/settings/visuals_settings.cc
# system/manager/process_config.py
2024-08-04 09:08:04 -04:00
147742568b
Merge branch 'hkg-cruise-main-default' into master-dev-c3
...
# Conflicts:
# common/params.cc
# selfdrive/ui/sunnypilot/qt/offroad/settings/vehicle_settings.cc
2024-08-04 08:33:19 -04:00
8955d1b043
okay, toggle per @devtekve xD
2024-08-04 08:32:31 -04:00
2e15f519bc
Reapply "Toyota: Auto Brake Hold"
...
This reverts commit be72a8ed06
2024-08-03 21:19:27 -07:00
d35cdb510d
Sync: commaai/msgq:master into sunnypilot/msgq:master
...
Sync: `commaai/opendbc:master` into `sunnypilot/opendbc:master`
Sync: `commaai/panda:master` into `sunnypilot/panda:master`
2024-08-03 21:22:09 -04:00
758449a12b
Merge branch 'sync-20240803' into master-dev-c3
...
# Conflicts:
# cereal/messaging/__init__.py
# panda
2024-08-03 15:42:50 -04:00
7b294d9763
Merge remote-tracking branch 'commaai/openpilot/master' into sync-20240802
...
# Conflicts:
# .gitmodules
# README.md
# cereal/services.py
# msgq_repo
# opendbc~HEAD
# opendbc~commaai_openpilot_master
# panda
# selfdrive/car/__init__.py
# selfdrive/car/chrysler/carcontroller.py
# selfdrive/car/honda/carcontroller.py
# selfdrive/car/hyundai/carcontroller.py
# selfdrive/car/hyundai/hyundaican.py
# selfdrive/car/interfaces.py
# selfdrive/car/toyota/carcontroller.py
# selfdrive/car/volkswagen/carcontroller.py
# selfdrive/controls/lib/drive_helpers.py
# selfdrive/controls/radard.py
# selfdrive/locationd/paramsd.py
# selfdrive/locationd/torqued.py
# selfdrive/ui/translations/main_es.ts
# system/athena/athenad.py
Merge branch 'upstream/opendbc/master' into sync-20240802
# Conflicts:
# opendbc/dbc/generator/honda/_dual_nidec_common.dbc
# opendbc/dbc/generator/honda/honda_accord_touring_2016_can.dbc
# opendbc/dbc/generator/honda/honda_accord_touring_V6_2016_can.dbc
# opendbc/dbc/generator/honda/honda_accord_touring_hybrid_2017_can.dbc
# opendbc/dbc/generator/toyota/_sp_debug_toyota.dbc
2024-08-03 10:26:13 -04:00
ea5ee29ebd
params: wrap fsync and close in HANDLE_EINTR for robustness ( #33154 )
...
Wrap fsync and close in HANDLE_EINTR for Robustness
2024-08-02 12:16:24 -07:00
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
fcca72af9f
add new toggle, remove old toggle
2024-08-01 06:13:34 -04:00
3ccc63deec
camerad: use os binning ( #33161 )
...
* all
* right sz
* what is this
* Revert "what is this"
This reverts commit 3ff771926f109452a055dfb61cee06b34e498164.
* ok
* big
* update intrs
* fl
* more specifuc
* fish
* revert
* revert
---------
Co-authored-by: Comma Device <device@comma.ai >
2024-07-31 19:10:44 -07:00
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
be72a8ed06
Revert "Toyota: Auto Brake Hold"
...
This reverts commit 15d94a01
2024-07-29 06:40:34 -04:00
c26fd9d7c0
Add new parameters for enabling GitLab runner and Sunnylink uploader
2024-07-29 06:21:01 -04:00
f532ced4c8
Merge branch 'refs/heads/master-priv' into master-dev-c3
2024-07-26 11:25:23 +02:00
7b8a03b5f2
Add new parameters for enabling GitLab runner and Sunnylink uploader
2024-07-26 09:24:27 +00:00
bbef8d5764
Merge branch 'master-priv' into master-dev-c3
...
# Conflicts:
# panda
2024-07-07 20:39:24 -04:00
b33f8f33ca
Models: Update default name
2024-07-07 17:53:26 -04:00
d3cb0d24c4
Sync: sunnypilot/sunnypilot:master into sunnypilot/openpilot-special:master-priv
2024-07-07 10:15:50 -04:00
b86f7db97d
Revert "remove navigation ( #32773 )"
...
This reverts commit e491c9d9
2024-07-06 22:44:27 -04:00
6f9401d902
Merge remote-tracking branch 'comma/master' into sync-20240706
2024-07-06 22:18:32 -04:00
67d7df43ad
Merge branch 'toyota-lowspeed-override' into master-dev-c3
2024-07-02 12:04:53 -04:00
5d097fa5de
rename to PCM Speed Override
2024-07-02 10:57:40 -04:00
67dcb68f00
Merge branch 'master-priv' into toyota-lowspeed-override
...
# Conflicts:
# common/params.cc
2024-07-02 01:15:27 -04:00
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
e8df8fad00
Longitudinal: Acceleration Personality
2024-07-02 04:45:18 +00:00
ca202c3c4a
Longitudinal: Dynamic Personality
2024-07-02 04:15:20 +00:00
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
fbc556bc81
Merge branch 'accel-profile' into master-dev-c3
2024-07-01 16:23:52 -04:00
a7bcfcab87
Merge branch 'master-priv' into master-dev-c3
...
# Conflicts:
# CHANGELOGS.md
# panda
2024-07-01 16:23:47 -04:00
f0d2fd4649
Merge branch 'master-priv' into dynamic_personality
2024-07-01 16:22:24 -04:00
750f9c8233
Merge branch 'master-priv' into accel-profile
2024-07-01 16:18:04 -04:00
46c1362511
Toyota: Automatic Door Locking and Unlocking
2024-07-01 20:16:40 +00:00
b81cdccb6c
Merge branch 'master-priv' into dynamic_personality
...
# Conflicts:
# selfdrive/controls/lib/longitudinal_planner.py
2024-07-01 15:47:34 -04:00
15d94a017d
Toyota: Auto Brake Hold
2024-07-01 19:45:30 +00:00
6743cdf5f2
Merge branch 'master-priv' into accel-profile
2024-07-01 15:09:28 -04:00
dd2334290e
Merge branch 'master-priv' into dynamic_personality
2024-07-01 14:55:08 -04:00
9097997b76
Toyota: Enhance BSM support
2024-07-01 18:50:12 +00:00
6098dd300a
formatting
2024-07-01 11:21:09 -04:00
f809fcf0aa
dynamic personality
2024-06-29 12:11:07 -07:00
972951de3e
accel controller
2024-06-29 11:52:15 -07:00
342effe5dd
toyota low speed override
2024-06-29 11:02:21 -07:00
2e39c96496
[Sunnylink] hotfix for boot registration
2024-06-28 23:35:10 +00:00
8094a9cd01
Merge branch 'sunnylink-hotfix-boot' into master-dev-c3
2024-06-29 01:10:22 +02:00
0668513d13
Remove unused SunnylinkApi and improve error handling
...
Removed the SunnylinkApi call from the registration process as it was no longer in use. Improved error logging by adding directory checks and more descriptive exception handling in the sunnylink API.
2024-06-29 01:04:27 +02:00
6c429dca06
Sync: sunnypilot/sunnypilot:master into sunnypilot/openpilot-special:master-priv
2024-06-24 16:29:37 -04:00
Jason Wen