mawei/sunnypilot
1
0
Fork 0
mirror of https://github.com/sunnypilot/sunnypilot.git synced 2026-09-30 14:53:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into sync-priv-20231108

Browse Source 
# 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
parent 8a12b77748 4a9bd576e5
commit 9e00a2f066
25 changed files with 109 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/test/process_replay/process_replay.py
+5 -3
View File
@@ -594,10 +594,13 @@ def get_custom_params_from_lr(lr: LogIterable, initial_state: str = "first") ->
assert initial_state in ["first", "last"]
msg_index = 0 if initial_state == "first" else -1
assert len(car_params) > 0, "carParams required for initial state of liveParameters and liveTorqueCarParams"
assert len(car_params) > 0, "carParams required for initial state of liveParameters and CarParamsPrevRoute"
CP = car_params[msg_index].carParams
custom_params = {}
custom_params = {
"CarParamsPrevRoute": CP.as_builder().to_bytes()
}
if len(live_calibration) > 0:
custom_params["CalibrationParams"] = live_calibration[msg_index].as_builder().to_bytes()
if len(live_parameters) > 0:
@@ -605,7 +608,6 @@ def get_custom_params_from_lr(lr: LogIterable, initial_state: str = "first") ->
lp_dict["carFingerprint"] = CP.carFingerprint
custom_params["LiveParameters"] = json.dumps(lp_dict)
if len(live_torque_parameters) > 0:
custom_params["LiveTorqueCarParams"] = CP.as_builder().to_bytes()
custom_params["LiveTorqueParameters"] = live_torque_parameters[msg_index].as_builder().to_bytes()
return custom_params