V are the same

selfdrive/car/gm/carcontroller.py

@@ -69,8 +69,8 @@ class CarController:
           self.apply_brake = 0
         else:
           if self.CP.carFingerprint in EV_CAR:
-            self.apply_gas = int(round(interp(actuators.accel, self.params.EV_GAS_LOOKUP_BP, self.params.EV_GAS_LOOKUP_V)))
-            self.apply_brake = int(round(interp(actuators.accel, self.params.EV_BRAKE_LOOKUP_BP, self.params.EV_BRAKE_LOOKUP_V)))
+            self.apply_gas = int(round(interp(actuators.accel, self.params.EV_GAS_LOOKUP_BP, self.params.GAS_LOOKUP_V)))
+            self.apply_brake = int(round(interp(actuators.accel, self.params.EV_BRAKE_LOOKUP_BP, self.params.BRAKE_LOOKUP_V)))
           else:
             self.apply_gas = int(round(interp(actuators.accel, self.params.GAS_LOOKUP_BP, self.params.GAS_LOOKUP_V)))
             self.apply_brake = int(round(interp(actuators.accel, self.params.BRAKE_LOOKUP_BP, self.params.BRAKE_LOOKUP_V)))

selfdrive/car/gm/values.py

@@ -38,20 +38,18 @@ class CarControllerParams:
   # -3.5 m/s^2 as per planner limits
   ACCEL_MAX = 2.  # m/s^2
   ACCEL_MIN = -4.  # m/s^2
-  EV_GAS_BRAKE_THRESHOLD_ACCEL = -1.1
-  ICE_GAS_BRAKE_THRESHOLD_ACCEL = -0.1 # much less engine braking force compared to regen in an EV
 
-  GAS_LOOKUP_BP = [ICE_GAS_BRAKE_THRESHOLD_ACCEL, 0., ACCEL_MAX]
+  # much less engine braking force compared to regen in an EV
+  GAS_LOOKUP_BP = [-0.1, 0., ACCEL_MAX]
+  EV_GAS_LOOKUP_BP = [-1.1, 0., ACCEL_MAX]
+
+  BRAKE_LOOKUP_BP = [ACCEL_MIN, -0.1]
+  EV_BRAKE_LOOKUP_BP = [ACCEL_MIN, -1.1]
+
   GAS_LOOKUP_V = [MAX_ACC_REGEN, ZERO_GAS, MAX_GAS]
-  BRAKE_LOOKUP_BP = [ACCEL_MIN, ICE_GAS_BRAKE_THRESHOLD_ACCEL]
   BRAKE_LOOKUP_V = [MAX_BRAKE, 0.]
 
-  EV_GAS_LOOKUP_BP = [EV_GAS_BRAKE_THRESHOLD_ACCEL, 0., ACCEL_MAX]
-  EV_GAS_LOOKUP_V = [MAX_ACC_REGEN, ZERO_GAS, MAX_GAS]
-  EV_BRAKE_LOOKUP_BP = [ACCEL_MIN, EV_GAS_BRAKE_THRESHOLD_ACCEL]
-  EV_BRAKE_LOOKUP_V = [MAX_BRAKE, 0.]
 
-STEER_THRESHOLD = 1.0
 class CAR:
   HOLDEN_ASTRA = "HOLDEN ASTRA RS-V BK 2017"
   VOLT = "CHEVROLET VOLT PREMIER 2017"
@@ -61,7 +59,10 @@ class CAR:
   BUICK_REGAL = "BUICK REGAL ESSENCE 2018"
   ESCALADE_ESV = "CADILLAC ESCALADE ESV 2016"
 
+
 EV_CAR = {CAR.VOLT}
+STEER_THRESHOLD = 1.0
+
 
 class Footnote(Enum):
   OBD_II = CarFootnote(