|
|
@ -13,7 +13,7 @@ from opendbc.car.gm.values import GMSafetyFlags |
|
|
|
from openpilot.selfdrive.modeld.constants import ModelConstants |
|
|
|
from openpilot.selfdrive.modeld.constants import ModelConstants |
|
|
|
from openpilot.selfdrive.modeld.fill_model_msg import fill_xyz_poly, fill_lane_line_meta |
|
|
|
from openpilot.selfdrive.modeld.fill_model_msg import fill_xyz_poly, fill_lane_line_meta |
|
|
|
from openpilot.selfdrive.test.process_replay.vision_meta import meta_from_encode_index |
|
|
|
from openpilot.selfdrive.test.process_replay.vision_meta import meta_from_encode_index |
|
|
|
from openpilot.selfdrive.controls.lib.longitudinal_planner import get_accel_from_plan |
|
|
|
from openpilot.selfdrive.controls.lib.longitudinal_planner import get_accel_from_plan, CONTROL_N_T_IDX |
|
|
|
from openpilot.system.manager.process_config import managed_processes |
|
|
|
from openpilot.system.manager.process_config import managed_processes |
|
|
|
from openpilot.tools.lib.logreader import LogIterable |
|
|
|
from openpilot.tools.lib.logreader import LogIterable |
|
|
|
|
|
|
|
|
|
|
@ -109,7 +109,7 @@ def migrate_longitudinalPlan(msgs): |
|
|
|
if msg.which() != 'longitudinalPlan': |
|
|
|
if msg.which() != 'longitudinalPlan': |
|
|
|
continue |
|
|
|
continue |
|
|
|
new_msg = msg.as_builder() |
|
|
|
new_msg = msg.as_builder() |
|
|
|
a_target, should_stop = get_accel_from_plan(msg.longitudinalPlan.speeds, msg.longitudinalPlan.accels) |
|
|
|
a_target, should_stop = get_accel_from_plan(msg.longitudinalPlan.speeds, msg.longitudinalPlan.accels, CONTROL_N_T_IDX) |
|
|
|
new_msg.longitudinalPlan.aTarget, new_msg.longitudinalPlan.shouldStop = float(a_target), bool(should_stop) |
|
|
|
new_msg.longitudinalPlan.aTarget, new_msg.longitudinalPlan.shouldStop = float(a_target), bool(should_stop) |
|
|
|
ops.append((index, new_msg.as_reader())) |
|
|
|
ops.append((index, new_msg.as_reader())) |
|
|
|
return ops, [], [] |
|
|
|
return ops, [], [] |
|
|
|