From 08e1ee83ae795791a98267383df7066e8b102c29 Mon Sep 17 00:00:00 2001
From: firestar5683 <168790843+firestar5683@users.noreply.github.com>
Date: Sat, 13 Dec 2025 22:57:55 -0600
Subject: [PATCH] Revert "Gas"

This reverts commit 43818e0d48df6a0abc21835f497c4a32c3f23e84.
---
 panda/board/obj/bootstub.panda.bin    | Bin 14876 -> 14876 bytes
 panda/board/obj/bootstub.panda_h7.bin | Bin 16944 -> 16944 bytes
 panda/board/obj/panda.bin.signed      | Bin 60680 -> 60680 bytes
 panda/board/obj/panda_h7.bin.signed   | Bin 69512 -> 69512 bytes
 panda/board/safety/safety_gm.h        |   4 ++--
 selfdrive/car/gm/values.py            |  12 ++----------
 6 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/panda/board/obj/bootstub.panda.bin b/panda/board/obj/bootstub.panda.bin
index 8ff046882865ac5b18c2f8ee2dbb3e5b02b38366..8efaaee503d8c3f44441be575eeec3877567dc07 100755
GIT binary patch
delta 21
ccmbPJGN)w2En^PjBtr}HG(*$PkBqI@0AaER?*IS*

delta 21
ccmbPJGN)w2En^OgG)oghLo@TukBqI@0AQpC$N&HU

diff --git a/panda/board/obj/bootstub.panda_h7.bin b/panda/board/obj/bootstub.panda_h7.bin
index 2ed656a52c9d4ee63ae661b731f49b117179a53b..2bc4c10dc7bb6d944e33bbd89466e4ce1ce96436 100755
GIT binary patch
delta 23
dcmdnc!ngs5X4!BUCmC9prx}`VUS!k93IJz72p#|c

delta 23
dcmdnc!ngs5X4!C9q*<C68k(7JUS!k93IJv@2loH~

diff --git a/panda/board/obj/panda.bin.signed b/panda/board/obj/panda.bin.signed
index 1a28efa33960232f6a107aca95e4a4a5dab09ee5..1877c532a0272feb49fb63463bde3e5fcc9385e6 100644
GIT binary patch
delta 183
zcmV;o07(Cc+5?E%1F(RW4FDVf0DKhy0DKhy0FaZxo*R>}ngjw!9kZ^M8VLw9Vlg;3
zW-&Fh(4V+Wf3AF;*t)1+D~Lh(P%K8ek#@m39;WC?+(N<WQ*AA@h(WApnvEXe0<j0W
z@h|X(f)-+?R2W>6&%F>Aqt>t9-SVPb8Q6JYW~X0@kFL<CMzb8&nRU6aKz-3wMToId
lx0uZ2Lnzmg)t&pY<ju{?Z`#JW&qxva<>n+g)yniF0YZh{SquOG

delta 183
zcmV;o07(Cc+5?E%1F(RW4gVhi0DKhy0DKhy0FaZxo*R>(mIMNjBD1cR8VLwEW;rx5
zF*Y}|(4V+Wf1~PaCa4hP6;>7E@D|E<+1wTb$7(6qfp{@t6XACuW|xS@CoEGYNW3i#
z2BnlIVcwqzd=^DxXRLT5LO^^j-iY&DSzIoVV|?xmXPMPF$Uuh>Xt(B9U<08k(3p#1
l^g<IA5Xxa`rFzapq=cl2a{cKpAM@n=21(x5zcGNc0o{u9Pg?*0

diff --git a/panda/board/obj/panda_h7.bin.signed b/panda/board/obj/panda_h7.bin.signed
index 99011df363c82780e21ca0b9b706ef6f4cdf6b2e..9065a076fd7c0e6e3822405d96f1a08954e47447 100644
GIT binary patch
delta 180
zcmV;l089Ufp9F}X1h9mr0stJ7hNdbCNF4wG>J<P05*Cw=rWUi%rf>@gGh#6~H)b(4
zvq-YQTz^LwFkmg)l_|beg+LqzUU7?>vo{Dz?d?kbo~S&v!H<~nEyEBl*%sK}U3-Xz
z?rII{Wy{Q!z*xogI^AfyW=KomZl4QWX$?0m*d6iJn<Khk_0*e;-j4!)I*HJ1?b?qm
iW5kA9y%o{gZ&~FMvAF7(eU_rTrUan<YpD_M)B)A)!Br6e

delta 180
zcmV;l089Ufp9F}X1h9mr0{<VAhNdbCkRkv8>J<P05*Cw=rWUi%rf>@gIA%FCF)=nb
zvq-YQTz_qqS>WhW`86M`6>oU_V1L@RX0(B4FCqi0b<aamyYab-AtI$@Ekic&F`MpI
z)xp5j&!Jsh#|eO&nvqnR(9DcoDCrKA%fpWD;<oAwjpXemr}FC}i9E>J=N;11xh1m%
iKbr4-hGp8d?kK=1DcZkxV(TgHFvFhC0Ea9BVgZZm`&Xv`

diff --git a/panda/board/safety/safety_gm.h b/panda/board/safety/safety_gm.h
index 1e0ebb326..be2cb7adc 100644
--- a/panda/board/safety/safety_gm.h
+++ b/panda/board/safety/safety_gm.h
@@ -10,14 +10,14 @@ const SteeringLimits GM_STEERING_LIMITS = {
 };
 
 const LongitudinalLimits GM_ASCM_LONG_LIMITS = {
-  .max_gas = 8191,
+  .max_gas = 7168,
   .min_gas = 5500,
   .inactive_gas = 5500,
   .max_brake = 400,
 };
 
 const LongitudinalLimits GM_CAM_LONG_LIMITS = {
-  .max_gas = 8848,
+  .max_gas = 7496,
   .min_gas = 5610,
   .inactive_gas = 5650,
   .max_brake = 400,
diff --git a/selfdrive/car/gm/values.py b/selfdrive/car/gm/values.py
index b5dfddf91..6626630ca 100644
--- a/selfdrive/car/gm/values.py
+++ b/selfdrive/car/gm/values.py
@@ -41,8 +41,8 @@ class CarControllerParams:
     self.ZERO_GAS = 6150  # Coasting
     self.MAX_BRAKE = 400  # ~ -4.0 m/s^2 with regen
 
-    if CP.carFingerprint in CAMERA_ACC_CAR and CP.carFingerprint not in CC_ONLY_CAR and CP.carFingerprint != CAR.CHEVROLET_BOLT_EUV:
-      self.MAX_GAS = 8848
+    if CP.carFingerprint in (CAMERA_ACC_CAR | SDGM_CAR) and CP.carFingerprint not in CC_ONLY_CAR and CP.carFingerprint != CAR.CHEVROLET_BOLT_EUV:
+      self.MAX_GAS = 7496
       self.MAX_GAS_PLUS = 8848
       self.MAX_ACC_REGEN = 5610
       self.INACTIVE_REGEN = 5650
@@ -50,14 +50,6 @@ class CarControllerParams:
       # Camera transitions to MAX_ACC_REGEN from ZERO_GAS and uses friction brakes instantly
       self.max_regen_acceleration = 0.
 
-    elif CP.carFingerprint in SDGM_CAR and CP.carFingerprint not in CC_ONLY_CAR and CP.carFingerprint != CAR.CHEVROLET_BOLT_EUV:
-      self.MAX_GAS = 8191
-      self.MAX_GAS_PLUS = 8191
-      self.MAX_ACC_REGEN = 5500
-      self.INACTIVE_REGEN = 5500
-      # SDGM integrations match the ASCM longitudinal envelope
-      self.max_regen_acceleration = 0.
-
     else:
       self.MAX_GAS = 7168  # Safety limit, not ACC max. Stock ACC >8192 from standstill.
       self.MAX_GAS_PLUS = 8191 # 8292 uses new bit, possible but not tested. Matches Twilsonco tw-main max