From 09725ef72d371630a234d7b08298b5c698c42787 Mon Sep 17 00:00:00 2001
From: firestar5683 <168790843+firestar5683@users.noreply.github.com>
Date: Mon, 12 May 2025 13:22:54 -0500
Subject: [PATCH] Revert "Update interface.py"

This reverts commit acba330a0fdfc6d5dd31dd96033b44e6466f438e.
---
 selfdrive/car/gm/interface.py | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/selfdrive/car/gm/interface.py b/selfdrive/car/gm/interface.py
index eac23113ad..e59860003b 100644
--- a/selfdrive/car/gm/interface.py
+++ b/selfdrive/car/gm/interface.py
@@ -137,17 +137,8 @@ class CarInterface(CarInterfaceBase):
           ret.safetyConfigs[0].safetyParam |= Panda.FLAG_FORCE_BRAKE_C9
           ret.flags |= GMFlags.FORCE_BRAKE_C9.value
 
-      # 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
-
     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
@@ -299,12 +290,7 @@ class CarInterface(CarInterfaceBase):
       ret.radarUnavailable = True
       ret.experimentalLongitudinalAvailable = False
       ret.minEnableSpeed = 24 * CV.MPH_TO_MS
-      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.pcmCruise = False
 
       ret.stoppingDecelRate = 11.18  # == 25 mph/s (.04 rate)