From 80c20399f18cf6b72d1926639c6c8b07d529c54d Mon Sep 17 00:00:00 2001
From: firestar5683 <168790843+firestar5683@users.noreply.github.com>
Date: Sun, 11 May 2025 01:13:58 -0500
Subject: [PATCH] Panda Fix?

---
 launch_chffrplus.sh           | 21 ---------------------
 selfdrive/car/gm/interface.py | 14 +++++---------
 2 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/launch_chffrplus.sh b/launch_chffrplus.sh
index 9135e14ad..714950249 100755
--- a/launch_chffrplus.sh
+++ b/launch_chffrplus.sh
@@ -5,9 +5,6 @@ if [ -z "$BASEDIR" ]; then
   BASEDIR="/data/openpilot"
 fi
 
-# One-time setup flag (reset on each overlay install)
-ONCE_FLAG_FILE="/data/openpilot/.one_time_setup_done"
-
 source "$BASEDIR/launch_env.sh"
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
@@ -35,22 +32,6 @@ function agnos_init {
   fi
 }
 
-function one_time_setup {
-  if [ ! -f "$ONCE_FLAG_FILE" ]; then
-    echo "Performing one-time setup tasks..."
-    
-    # Run once:
-    echo "Wiping old params..."
-    rm /data/params/d/DongleId
-    rm /data/params/d/StockDongleId
-    echo "Old params wiped."
-
-    touch "$ONCE_FLAG_FILE"
-  else
-    echo "One-time setup already completed. Skipping."
-  fi
-}
-
 function launch {
   # Remove orphaned git lock if it exists on boot
   [ -f "$DIR/.git/index.lock" ] && rm -f $DIR/.git/index.lock
@@ -112,6 +93,4 @@ function launch {
   while true; do sleep 1; done
 }
 
-one_time_setup
-
 launch
diff --git a/selfdrive/car/gm/interface.py b/selfdrive/car/gm/interface.py
index 07037a25b..e432af097 100644
--- a/selfdrive/car/gm/interface.py
+++ b/selfdrive/car/gm/interface.py
@@ -141,7 +141,7 @@ class CarInterface(CarInterfaceBase):
       ret.safetyConfigs[0].safetyParam |= Panda.FLAG_GM_HW_SDGM
 
     else:  # ASCM, OBD-II harness
-      ret.openpilotLongitudinalControl = not frogpilot_toggles.disable_openpilot_long
+      ret.openpilotLongitudinalControl = True
       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
@@ -203,12 +203,8 @@ class CarInterface(CarInterfaceBase):
       CarInterfaceBase.configure_torque_tune(candidate, ret.lateralTuning)
       ret.lateralTuning.torque.kp = 0.6
 
-      try:
-        disable_long = frogpilot_toggles.disable_openpilot_long
-      except AttributeError:
-        disable_long = params.get_bool("DisableOpenpilotLongitudinal")
-
-      ret.openpilotLongitudinalControl = not disable_long
+      # Always enable openpilot longitudinal control
+      ret.openpilotLongitudinalControl = True
 
       if ret.enableGasInterceptor:
         # ACC Bolts use pedal for full longitudinal control, not just sng
@@ -270,7 +266,7 @@ class CarInterface(CarInterfaceBase):
       ret.safetyConfigs[0].safetyParam |= Panda.FLAG_GM_HW_CAM
       ret.minEnableSpeed = -1
       ret.pcmCruise = False
-      ret.openpilotLongitudinalControl = not frogpilot_toggles.disable_openpilot_long
+      ret.openpilotLongitudinalControl = True
       ret.stoppingControl = True
       ret.autoResumeSng = True
 
@@ -294,7 +290,7 @@ class CarInterface(CarInterfaceBase):
       ret.radarUnavailable = True
       ret.experimentalLongitudinalAvailable = False
       ret.minEnableSpeed = 24 * CV.MPH_TO_MS
-      ret.openpilotLongitudinalControl = not frogpilot_toggles.disable_openpilot_long
+      ret.openpilotLongitudinalControl = True
       ret.pcmCruise = False
 
       if not ret.enableGasInterceptor and candidate in CC_ONLY_CAR: #redneck tuning