Revert "Gas"

This reverts commit 43818e0d48.

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,

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