better ordering

comment

comment
pull/25354/head
Shane Smiskol 3 years ago
parent 683ae5effe
commit 992e165e46
  1. 1
      selfdrive/car/gm/carcontroller.py
  2. 4
      selfdrive/car/gm/values.py

@ -68,6 +68,7 @@ class CarController:
self.apply_gas = self.params.MAX_ACC_REGEN self.apply_gas = self.params.MAX_ACC_REGEN
self.apply_brake = 0 self.apply_brake = 0
else: else:
# ICE has less engine braking force, adjust thresholds to remove braking deadzone
if self.CP.carFingerprint in EV_CAR: if self.CP.carFingerprint in EV_CAR:
self.apply_gas = int(round(interp(actuators.accel, self.params.EV_GAS_LOOKUP_BP, self.params.GAS_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))) self.apply_brake = int(round(interp(actuators.accel, self.params.EV_BRAKE_LOOKUP_BP, self.params.BRAKE_LOOKUP_V)))

@ -41,9 +41,9 @@ class CarControllerParams:
# much less engine braking force compared to regen in an EV # much less engine braking force compared to regen in an EV
GAS_LOOKUP_BP = [-0.1, 0., ACCEL_MAX] GAS_LOOKUP_BP = [-0.1, 0., ACCEL_MAX]
EV_GAS_LOOKUP_BP = [-1.1, 0., ACCEL_MAX]
BRAKE_LOOKUP_BP = [ACCEL_MIN, -0.1] BRAKE_LOOKUP_BP = [ACCEL_MIN, -0.1]
EV_GAS_LOOKUP_BP = [-1.1, 0., ACCEL_MAX]
EV_BRAKE_LOOKUP_BP = [ACCEL_MIN, -1.1] EV_BRAKE_LOOKUP_BP = [ACCEL_MIN, -1.1]
GAS_LOOKUP_V = [MAX_ACC_REGEN, ZERO_GAS, MAX_GAS] GAS_LOOKUP_V = [MAX_ACC_REGEN, ZERO_GAS, MAX_GAS]

Loading…
Cancel
Save