get_car: returns just CI (#33204)

just return CI
pull/33206/head
Shane Smiskol 9 months ago committed by GitHub
parent 5a1596a322
commit d00a539830
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      selfdrive/car/car_helpers.py
  2. 3
      selfdrive/car/card.py
  3. 2
      selfdrive/test/process_replay/process_replay.py

@ -180,7 +180,7 @@ def get_car(logcan, sendcan, set_obd_multiplexing, experimental_long_allowed, nu
CP.fingerprintSource = source
CP.fuzzyFingerprint = not exact_match
return get_car_interface(CP), CP
return get_car_interface(CP)
def get_demo_car_params():

@ -63,7 +63,8 @@ class Car:
experimental_long_allowed = self.params.get_bool("ExperimentalLongitudinalEnabled")
num_pandas = len(messaging.recv_one_retry(self.sm.sock['pandaStates']).pandaStates)
cached_params = self.params.get("CarParamsCache")
self.CI, self.CP = get_car(self.can_sock, self.pm.sock['sendcan'], obd_callback(self.params), experimental_long_allowed, num_pandas, cached_params)
self.CI = get_car(self.can_sock, self.pm.sock['sendcan'], obd_callback(self.params), experimental_long_allowed, num_pandas, cached_params)
self.CP = self.CI.CP
# continue onto next fingerprinting step in pandad
self.params.put_bool("FirmwareQueryDone", True)

@ -356,7 +356,7 @@ def get_car_params_callback(rc, pm, msgs, fingerprint):
for m in canmsgs[:300]:
can.send(m.as_builder().to_bytes())
_, CP = get_car(can, sendcan, lambda obd: None, Params().get_bool("ExperimentalLongitudinalEnabled"), cached_params=cached_params)
CP = get_car(can, sendcan, lambda obd: None, Params().get_bool("ExperimentalLongitudinalEnabled"), cached_params=cached_params).CP
if not params.get_bool("DisengageOnAccelerator"):
CP.alternativeExperience |= ALTERNATIVE_EXPERIENCE.DISABLE_DISENGAGE_ON_GAS

Loading…
Cancel
Save