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