Merge branch 'master' into sync-priv-20231020

# Conflicts:
#	selfdrive/car/toyota/carstate.py
#	selfdrive/controls/lib/longitudinal_planner.py
This commit is contained in:
Jason Wen
2023-10-20 16:59:04 -04:00
39 changed files with 1067 additions and 1221 deletions
+3 -2
View File
@@ -390,6 +390,9 @@ selfdrive/modeld/.gitignore
selfdrive/modeld/__init__.py
selfdrive/modeld/SConscript
selfdrive/modeld/modeld.py
selfdrive/modeld/parse_model_outputs.py
selfdrive/modeld/fill_model_msg.py
selfdrive/modeld/get_model_metadata.py
selfdrive/modeld/navmodeld.py
selfdrive/modeld/dmonitoringmodeld.py
selfdrive/modeld/constants.py
@@ -402,8 +405,6 @@ selfdrive/modeld/models/*.pyx
selfdrive/modeld/models/commonmodel.cc
selfdrive/modeld/models/commonmodel.h
selfdrive/modeld/models/driving.cc
selfdrive/modeld/models/driving.h
selfdrive/modeld/models/supercombo.onnx
selfdrive/modeld/models/dmonitoring_model_q.dlc