car interfaces: pass in if release build (#35373)

* dashcam for release

* get car

* fixes

* more fixes

* bump

* bump
pull/35374/head
Shane Smiskol 3 months ago committed by GitHub
parent 5bf81048bb
commit 1db3644a2b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      opendbc_repo
  2. 6
      selfdrive/car/card.py
  3. 2
      selfdrive/car/tests/test_car_interfaces.py
  4. 2
      selfdrive/car/tests/test_models.py
  5. 2
      selfdrive/test/process_replay/process_replay.py

@ -1 +1 @@
Subproject commit ffe9db9b7cffde1a21475d912b5145cd401d0fd4
Subproject commit d33a033a7fceaf660a1ae1e6e7d00fb4737f6745

@ -80,6 +80,8 @@ class Car:
self.can_callbacks = can_comm_callbacks(self.can_sock, self.pm.sock['sendcan'])
is_release = self.params.get_bool("IsReleaseBranch")
if CI is None:
# wait for one pandaState and one CAN packet
print("Waiting for CAN messages...")
@ -97,7 +99,7 @@ class Car:
with car.CarParams.from_bytes(cached_params_raw) as _cached_params:
cached_params = _cached_params
self.CI = get_car(*self.can_callbacks, obd_callback(self.params), alpha_long_allowed, num_pandas, cached_params)
self.CI = get_car(*self.can_callbacks, obd_callback(self.params), alpha_long_allowed, is_release, num_pandas, cached_params)
self.RI = interfaces[self.CI.CP.carFingerprint].RadarInterface(self.CI.CP)
self.CP = self.CI.CP
@ -116,7 +118,7 @@ class Car:
safety_config.safetyModel = structs.CarParams.SafetyModel.noOutput
self.CP.safetyConfigs = [safety_config]
if self.CP.secOcRequired and not self.params.get_bool("IsReleaseBranch"):
if self.CP.secOcRequired and not is_release:
# Copy user key if available
try:
with open("/cache/params/SecOCKey") as f:

@ -39,7 +39,7 @@ class TestCarInterfaces:
args = get_fuzzy_car_interface_args(data.draw)
car_params = CarInterface.get_params(car_name, args['fingerprints'], args['car_fw'],
alpha_long=args['alpha_long'], docs=False)
alpha_long=args['alpha_long'], is_release=False, docs=False)
car_params = car_params.as_reader()
car_interface = CarInterface(car_params)
assert car_params

@ -152,7 +152,7 @@ class TestCarModelBase(unittest.TestCase):
cls.openpilot_enabled = cls.car_safety_mode_frame is not None
cls.CarInterface = interfaces[cls.platform]
cls.CP = cls.CarInterface.get_params(cls.platform, cls.fingerprint, car_fw, alpha_long, docs=False)
cls.CP = cls.CarInterface.get_params(cls.platform, cls.fingerprint, car_fw, alpha_long, False, docs=False)
assert cls.CP
assert cls.CP.carFingerprint == cls.platform

@ -362,7 +362,7 @@ def get_car_params_callback(rc, pm, msgs, fingerprint):
with car.CarParams.from_bytes(cached_params_raw) as _cached_params:
cached_params = _cached_params
CP = get_car(*can_callbacks, lambda obd: None, Params().get_bool("AlphaLongitudinalEnabled"), cached_params=cached_params).CP
CP = get_car(*can_callbacks, lambda obd: None, Params().get_bool("AlphaLongitudinalEnabled"), False, cached_params=cached_params).CP
params.put("CarParams", CP.to_bytes())

Loading…
Cancel
Save