remove unnecessary debugging function from car_helpers.py (#33199)

* format

* better better

* huh
old-commit-hash: 5c1e111d8a
pull/33302/head
Shane Smiskol 9 months ago committed by GitHub
parent c45e72dd2f
commit 9e4a7484be
  1. 9
      selfdrive/car/car_helpers.py
  2. 5
      selfdrive/modeld/tests/test_modeld.py
  3. 5
      system/hardware/tici/tests/test_power_draw.py

@ -159,8 +159,8 @@ def fingerprint(logcan, sendcan, num_pandas):
source = car.CarParams.FingerprintSource.fixed source = car.CarParams.FingerprintSource.fixed
carlog.error({"event": "fingerprinted", "car_fingerprint": car_fingerprint, "source": source, "fuzzy": not exact_match, 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, "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}) "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 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 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(): def get_demo_car_params():
platform = MOCK.MOCK platform = MOCK.MOCK

@ -3,9 +3,10 @@ import random
import cereal.messaging as messaging import cereal.messaging as messaging
from msgq.visionipc import VisionIpcServer, VisionStreamType from msgq.visionipc import VisionIpcServer, VisionStreamType
from openpilot.common.params import Params
from openpilot.common.transformations.camera import DEVICE_CAMERAS from openpilot.common.transformations.camera import DEVICE_CAMERAS
from openpilot.common.realtime import DT_MDL 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.system.manager.process_config import managed_processes
from openpilot.selfdrive.test.process_replay.vision_meta import meta_from_camera_state 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_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.create_buffers(VisionStreamType.VISION_STREAM_WIDE_ROAD, 40, False, CAM.width, CAM.height)
self.vipc_server.start_listener() self.vipc_server.start_listener()
write_car_param() Params().put("CarParams", get_demo_car_params().to_bytes())
self.sm = messaging.SubMaster(['modelV2', 'cameraOdometry']) self.sm = messaging.SubMaster(['modelV2', 'cameraOdometry'])
self.pm = messaging.PubMaster(['roadCameraState', 'wideRoadCameraState', 'liveCalibration']) self.pm = messaging.PubMaster(['roadCameraState', 'wideRoadCameraState', 'liveCalibration'])

@ -8,7 +8,8 @@ from tabulate import tabulate
import cereal.messaging as messaging import cereal.messaging as messaging
from cereal.services import SERVICE_LIST from cereal.services import SERVICE_LIST
from openpilot.common.mock import mock_messages 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.hardware.tici.power_monitor import get_power
from openpilot.system.manager.process_config import managed_processes from openpilot.system.manager.process_config import managed_processes
from openpilot.system.manager.manager import manager_cleanup from openpilot.system.manager.manager import manager_cleanup
@ -41,7 +42,7 @@ PROCS = [
class TestPowerDraw: class TestPowerDraw:
def setup_method(self): def setup_method(self):
write_car_param() Params().put("CarParams", get_demo_car_params().to_bytes())
# wait a bit for power save to disable # wait a bit for power save to disable
time.sleep(5) time.sleep(5)

Loading…
Cancel
Save