diff --git a/selfdrive/car/gm/values.py b/selfdrive/car/gm/values.py index a3a5e513e..ab2dc479a 100644 --- a/selfdrive/car/gm/values.py +++ b/selfdrive/car/gm/values.py @@ -42,7 +42,7 @@ class CarControllerParams: self.MAX_BRAKE = 400 # ~ -4.0 m/s^2 with regen self.BRAKE_SWITCH_MAX = self.ZERO_GAS - if CP.carFingerprint in CAMERA_ACC_CAR and CP.carFingerprint not in CC_ONLY_CAR and CP.carFingerprint != CAR.CHEVROLET_BOLT_EUV: + 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 = 8848 self.MAX_GAS_PLUS = 8848 self.MAX_ACC_REGEN = 5610 @@ -51,14 +51,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 = 8191 # Safety limit, not ACC max. Stock ACC >8192 from standstill. self.MAX_GAS_PLUS = 8191