|
|
|
@ -17,7 +17,6 @@ from cereal import car |
|
|
|
|
from cereal.services import SERVICE_LIST |
|
|
|
|
from msgq.visionipc import VisionIpcServer, get_endpoint_name as vipc_get_endpoint_name |
|
|
|
|
from opendbc.car.car_helpers import get_car, interfaces |
|
|
|
|
from opendbc.safety import ALTERNATIVE_EXPERIENCE |
|
|
|
|
from openpilot.common.params import Params |
|
|
|
|
from openpilot.common.prefix import OpenpilotPrefix |
|
|
|
|
from openpilot.common.timeout import Timeout |
|
|
|
@ -365,9 +364,6 @@ def get_car_params_callback(rc, pm, msgs, fingerprint): |
|
|
|
|
|
|
|
|
|
CP = get_car(*can_callbacks, lambda obd: None, Params().get_bool("AlphaLongitudinalEnabled"), cached_params=cached_params).CP |
|
|
|
|
|
|
|
|
|
if not params.get_bool("DisengageOnAccelerator"): |
|
|
|
|
CP.alternativeExperience |= ALTERNATIVE_EXPERIENCE.DISABLE_DISENGAGE_ON_GAS |
|
|
|
|
|
|
|
|
|
params.put("CarParams", CP.to_bytes()) |
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -769,9 +765,6 @@ def generate_params_config(lr=None, CP=None, fingerprint=None, custom_params=Non |
|
|
|
|
params_dict["IsRhdDetected"] = is_rhd |
|
|
|
|
|
|
|
|
|
if CP is not None: |
|
|
|
|
if CP.alternativeExperience == ALTERNATIVE_EXPERIENCE.DISABLE_DISENGAGE_ON_GAS: |
|
|
|
|
params_dict["DisengageOnAccelerator"] = False |
|
|
|
|
|
|
|
|
|
if fingerprint is None: |
|
|
|
|
if CP.fingerprintSource == "fw": |
|
|
|
|
params_dict["CarParamsCache"] = CP.as_builder().to_bytes() |
|
|
|
|