diff --git a/selfdrive/debug/format_fingerprints.py b/selfdrive/debug/format_fingerprints.py index 2e7c0348a1..ac4cef0ccc 100755 --- a/selfdrive/debug/format_fingerprints.py +++ b/selfdrive/debug/format_fingerprints.py @@ -14,7 +14,7 @@ FINGERPRINTS_PY_TEMPLATE = jinja2.Template(""" # ruff: noqa: E501 {% endif %} {% if FW_VERSIONS[brand] %} -from openpilot.selfdrive.car.data_structures import CarParams +from openpilot.selfdrive.car.structs import CarParams {% endif %} from openpilot.selfdrive.car.{{brand}}.values import CAR {% if FW_VERSIONS[brand] %} diff --git a/selfdrive/test/process_replay/process_replay.py b/selfdrive/test/process_replay/process_replay.py index 661a85cdd5..2b12777e14 100755 --- a/selfdrive/test/process_replay/process_replay.py +++ b/selfdrive/test/process_replay/process_replay.py @@ -24,7 +24,7 @@ from openpilot.common.realtime import DT_CTRL from panda.python import ALTERNATIVE_EXPERIENCE from openpilot.selfdrive.car.card import can_comm_callbacks, convert_to_capnp from openpilot.selfdrive.car.car_helpers import get_car, interfaces -from openpilot.selfdrive.car.data_structures import CarParams +from openpilot.selfdrive.car import structs from openpilot.system.manager.process_config import managed_processes from openpilot.selfdrive.test.process_replay.vision_meta import meta_from_camera_state, available_streams from openpilot.selfdrive.test.process_replay.migration import migrate_all @@ -364,7 +364,7 @@ def get_car_params_callback(rc, pm, msgs, fingerprint): if has_cached_cp: with car.CarParams.from_bytes(cached_params_raw) as _cached_params: # TODO: even more generic? - cached_params = CarParams(carName=_cached_params.carName, carFw=_cached_params.carFw, carVin=_cached_params.carVin) + cached_params = structs.CarParams(carName=_cached_params.carName, carFw=_cached_params.carFw, carVin=_cached_params.carVin) CP = get_car(*can_callbacks, lambda obd: None, Params().get_bool("ExperimentalLongitudinalEnabled"), cached_params=cached_params).CP if not params.get_bool("DisengageOnAccelerator"):