diff --git a/panda b/panda index fcb1a5a8e2..d51dd496cb 160000 --- a/panda +++ b/panda @@ -1 +1 @@ -Subproject commit fcb1a5a8e233a8b520c42c58cf8bfaa82753ac5a +Subproject commit d51dd496cbdc8665928af40247582bc62dba1f2a diff --git a/selfdrive/car/gm/carcontroller.py b/selfdrive/car/gm/carcontroller.py index dbad355c46..f28a0f7b59 100644 --- a/selfdrive/car/gm/carcontroller.py +++ b/selfdrive/car/gm/carcontroller.py @@ -67,8 +67,8 @@ class CarController: # Gas/regen, brakes, and UI commands - all at 25Hz if self.frame % 4 == 0: if not CC.longActive: - # Stock ECU sends max regen when not enabled - self.apply_gas = self.params.MAX_ACC_REGEN + # ASCM sends max regen when not enabled + self.apply_gas = self.params.INACTIVE_REGEN self.apply_brake = 0 else: if self.CP.carFingerprint in EV_CAR: diff --git a/selfdrive/car/gm/values.py b/selfdrive/car/gm/values.py index 999dabfee3..f8f9e7f043 100644 --- a/selfdrive/car/gm/values.py +++ b/selfdrive/car/gm/values.py @@ -30,6 +30,7 @@ class CarControllerParams: ZERO_GAS = 2048 # Coasting MAX_BRAKE = 400 # ~ -4.0 m/s^2 with regen MAX_ACC_REGEN = 1404 # Max ACC regen is slightly less than max paddle regen + INACTIVE_REGEN = 1404 # Allow small margin below -3.5 m/s^2 from ISO 15622:2018 since we # perform the closed loop control, and might need some