Merge branch 'master' into sync-priv-20231108

# Conflicts:
#	panda
#	selfdrive/car/subaru/interface.py
#	selfdrive/locationd/torqued.py
This commit is contained in:
Jason Wen
2023-11-12 01:00:33 -05:00
25 changed files with 109 additions and 62 deletions
+5
View File
@@ -142,6 +142,11 @@ class Controls:
safety_config.safetyModel = car.CarParams.SafetyModel.noOutput
self.CP.safetyConfigs = [safety_config]
# Write previous route's CarParams
prev_cp = self.params.get("CarParamsPersistent")
if prev_cp is not None:
self.params.put("CarParamsPrevRoute", prev_cp)
# Write CarParams for radard
cp_bytes = self.CP.to_bytes()
self.params.put("CarParams", cp_bytes)