mirror of
https://github.com/sunnypilot/sunnypilot.git
synced 2026-06-20 09:12:05 +08:00
7b294d9763
# 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