diff --git a/selfdrive/car/car_helpers.py b/selfdrive/car/car_helpers.py index 38f994ecb7..832967b39f 100644 --- a/selfdrive/car/car_helpers.py +++ b/selfdrive/car/car_helpers.py @@ -159,8 +159,8 @@ def fingerprint(logcan, sendcan, num_pandas): source = car.CarParams.FingerprintSource.fixed carlog.error({"event": "fingerprinted", "car_fingerprint": car_fingerprint, "source": source, "fuzzy": not exact_match, - "cached": cached, "fw_count": len(car_fw), "ecu_responses": list(ecu_rx_addrs), "vin_rx_addr": vin_rx_addr, - "vin_rx_bus": vin_rx_bus, "fingerprints": repr(finger), "fw_query_time": fw_query_time}) + "cached": cached, "fw_count": len(car_fw), "ecu_responses": list(ecu_rx_addrs), "vin_rx_addr": vin_rx_addr, + "vin_rx_bus": vin_rx_bus, "fingerprints": repr(finger), "fw_query_time": fw_query_time}) return car_fingerprint, finger, vin, car_fw, source, exact_match @@ -186,11 +186,6 @@ def get_car(logcan, sendcan, experimental_long_allowed, num_pandas=1): return get_car_interface(CP), CP -def write_car_param(platform=MOCK.MOCK): - params = Params() - CarInterface, _, _ = interfaces[platform] - CP = CarInterface.get_non_essential_params(platform) - params.put("CarParams", CP.to_bytes()) def get_demo_car_params(): platform = MOCK.MOCK diff --git a/selfdrive/modeld/tests/test_modeld.py b/selfdrive/modeld/tests/test_modeld.py index 1e19a591bf..03c08fd034 100644 --- a/selfdrive/modeld/tests/test_modeld.py +++ b/selfdrive/modeld/tests/test_modeld.py @@ -3,9 +3,10 @@ import random import cereal.messaging as messaging from msgq.visionipc import VisionIpcServer, VisionStreamType +from openpilot.common.params import Params from openpilot.common.transformations.camera import DEVICE_CAMERAS from openpilot.common.realtime import DT_MDL -from openpilot.selfdrive.car.car_helpers import write_car_param +from openpilot.selfdrive.car.car_helpers import get_demo_car_params from openpilot.system.manager.process_config import managed_processes from openpilot.selfdrive.test.process_replay.vision_meta import meta_from_camera_state @@ -22,7 +23,7 @@ class TestModeld: self.vipc_server.create_buffers(VisionStreamType.VISION_STREAM_DRIVER, 40, False, CAM.width, CAM.height) self.vipc_server.create_buffers(VisionStreamType.VISION_STREAM_WIDE_ROAD, 40, False, CAM.width, CAM.height) self.vipc_server.start_listener() - write_car_param() + Params().put("CarParams", get_demo_car_params().to_bytes()) self.sm = messaging.SubMaster(['modelV2', 'cameraOdometry']) self.pm = messaging.PubMaster(['roadCameraState', 'wideRoadCameraState', 'liveCalibration']) diff --git a/system/hardware/tici/tests/test_power_draw.py b/system/hardware/tici/tests/test_power_draw.py index 866f7d1188..aa297269d1 100644 --- a/system/hardware/tici/tests/test_power_draw.py +++ b/system/hardware/tici/tests/test_power_draw.py @@ -8,7 +8,8 @@ from tabulate import tabulate import cereal.messaging as messaging from cereal.services import SERVICE_LIST from openpilot.common.mock import mock_messages -from openpilot.selfdrive.car.car_helpers import write_car_param +from openpilot.common.params import Params +from openpilot.selfdrive.car.car_helpers import get_demo_car_params from openpilot.system.hardware.tici.power_monitor import get_power from openpilot.system.manager.process_config import managed_processes from openpilot.system.manager.manager import manager_cleanup @@ -41,7 +42,7 @@ PROCS = [ class TestPowerDraw: def setup_method(self): - write_car_param() + Params().put("CarParams", get_demo_car_params().to_bytes()) # wait a bit for power save to disable time.sleep(5)