nah card shouldn't become bloated

pull/35700/head
Shane Smiskol 1 month ago
parent 4be22e72af
commit b6921c74ac
  1. 8
      selfdrive/car/card.py
  2. 2
      selfdrive/controls/controlsd.py
  3. 2
      selfdrive/test/process_replay/process_replay.py

@ -16,7 +16,7 @@ from opendbc.car.can_definitions import CanData, CanRecvCallable, CanSendCallabl
from opendbc.car.carlog import carlog from opendbc.car.carlog import carlog
from opendbc.car.fw_versions import ObdCallback from opendbc.car.fw_versions import ObdCallback
from opendbc.car.car_helpers import get_car, interfaces from opendbc.car.car_helpers import get_car, interfaces
from opendbc.car.interfaces import CarInterfaceBase, RadarInterfaceBase from opendbc.car.interfaces import ISO_LATERAL_ACCEL, ISO_LATERAL_JERK, CarInterfaceBase, RadarInterfaceBase
from openpilot.selfdrive.pandad import can_capnp_to_list, can_list_to_can_capnp from openpilot.selfdrive.pandad import can_capnp_to_list, can_list_to_can_capnp
from openpilot.selfdrive.car.cruise import VCruiseHelper from openpilot.selfdrive.car.cruise import VCruiseHelper
from openpilot.selfdrive.car.car_specific import MockCarState from openpilot.selfdrive.car.car_specific import MockCarState
@ -29,6 +29,10 @@ EventName = log.OnroadEvent.EventName
carlog.addHandler(ForwardingHandler(cloudlog)) carlog.addHandler(ForwardingHandler(cloudlog))
def check_lateral_iso_violation(sm: messaging.SubMaster) -> bool:
return False
def obd_callback(params: Params) -> ObdCallback: def obd_callback(params: Params) -> ObdCallback:
def set_obd_multiplexing(obd_multiplexing: bool): def set_obd_multiplexing(obd_multiplexing: bool):
if params.get_bool("ObdMultiplexingEnabled") != obd_multiplexing: if params.get_bool("ObdMultiplexingEnabled") != obd_multiplexing:
@ -65,7 +69,7 @@ class Car:
def __init__(self, CI=None, RI=None) -> None: def __init__(self, CI=None, RI=None) -> None:
self.can_sock = messaging.sub_sock('can', timeout=20) self.can_sock = messaging.sub_sock('can', timeout=20)
self.sm = messaging.SubMaster(['pandaStates', 'carControl', 'onroadEvents']) self.sm = messaging.SubMaster(['pandaStates', 'carControl', 'onroadEvents', 'controlsState', 'liveParameters'])
self.pm = messaging.PubMaster(['sendcan', 'carState', 'carParams', 'carOutput', 'liveTracks']) self.pm = messaging.PubMaster(['sendcan', 'carState', 'carParams', 'carOutput', 'liveTracks'])
self.can_rcv_cum_timeout_counter = 0 self.can_rcv_cum_timeout_counter = 0

@ -26,8 +26,6 @@ LaneChangeDirection = log.LaneChangeDirection
ACTUATOR_FIELDS = tuple(car.CarControl.Actuators.schema.fields.keys()) ACTUATOR_FIELDS = tuple(car.CarControl.Actuators.schema.fields.keys())
def check_lateral_iso_violation(sm: messaging.SubMaster) -> bool:
class Controls: class Controls:

@ -485,7 +485,7 @@ CONFIGS = [
), ),
ProcessConfig( ProcessConfig(
proc_name="card", proc_name="card",
pubs=["pandaStates", "carControl", "onroadEvents", "can"], pubs=["pandaStates", "carControl", "onroadEvents", "can", "controlsState", "liveParameters"],
subs=["sendcan", "carState", "carParams", "carOutput", "liveTracks"], subs=["sendcan", "carState", "carParams", "carOutput", "liveTracks"],
ignore=["logMonoTime", "carState.cumLagMs"], ignore=["logMonoTime", "carState.cumLagMs"],
init_callback=card_fingerprint_callback, init_callback=card_fingerprint_callback,

Loading…
Cancel
Save