From a84adbbeacb86a40391b941aba506a7f246d586a Mon Sep 17 00:00:00 2001 From: firestar5683 <168790843+firestar5683@users.noreply.github.com> Date: Mon, 12 May 2025 13:24:14 -0500 Subject: [PATCH] Revert "Update interface.py" This reverts commit 6b82ff72e66f1cf7d959d6fbccf9f2baf79c5afe. --- selfdrive/car/gm/interface.py | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/selfdrive/car/gm/interface.py b/selfdrive/car/gm/interface.py index 3998c698f..7b96b7d2c 100644 --- a/selfdrive/car/gm/interface.py +++ b/selfdrive/car/gm/interface.py @@ -133,10 +133,6 @@ class CarInterface(CarInterfaceBase): ret.openpilotLongitudinalControl = True ret.safetyConfigs[0].safetyParam |= Panda.FLAG_GM_HW_CAM_LONG - # CAM_LONG flag only if camera-capable and conditional_experimental_mode enabled - if candidate in CAMERA_ACC_CAR and getattr(frogpilot_toggles, "conditional_experimental_mode", False): - ret.safetyConfigs[0].safetyParam |= Panda.FLAG_GM_HW_CAM_LONG - elif candidate in SDGM_CAR: ret.longitudinalTuning.kiV = [0., 0.] # TODO: tuning ret.experimentalLongitudinalAvailable = False @@ -148,12 +144,7 @@ class CarInterface(CarInterfaceBase): ret.safetyConfigs[0].safetyParam |= Panda.FLAG_GM_HW_SDGM else: # ASCM, OBD-II harness - try: - disable_long = frogpilot_toggles.disable_openpilot_long - except AttributeError: - disable_long = params.get_bool("DisableOpenpilotLongitudinal") - - ret.openpilotLongitudinalControl = not disable_long + ret.openpilotLongitudinalControl = not frogpilot_toggles.disable_openpilot_long ret.networkLocation = NetworkLocation.gateway ret.radarUnavailable = RADAR_HEADER_MSG not in fingerprint[CanBus.OBSTACLE] and not docs ret.pcmCruise = False # stock non-adaptive cruise control is kept off @@ -295,15 +286,14 @@ class CarInterface(CarInterfaceBase): elif candidate in CC_ONLY_CAR: ret.flags |= GMFlags.CC_LONG.value + ret.safetyConfigs[0].safetyParam |= Panda.FLAG_GM_CC_LONG ret.radarUnavailable = True ret.experimentalLongitudinalAvailable = False ret.minEnableSpeed = 24 * CV.MPH_TO_MS ret.openpilotLongitudinalControl = not frogpilot_toggles.disable_openpilot_long ret.pcmCruise = False - if not ret.enableGasInterceptor: - ret.safetyConfigs[0].safetyParam |= Panda.FLAG_GM_CC_LONG - + if not ret.enableGasInterceptor and candidate in CC_ONLY_CAR: ret.longitudinalTuning.kpBP = [10.7, 10.8, 28.] # 10.7 m/s == 24 mph ret.longitudinalTuning.kpV = [0., 20., 20.] # set lower end to 0 since we can't drive below that speed ret.longitudinalTuning.deadzoneBP = [0.]