|
|
@ -9,7 +9,6 @@ STOPPING_TARGET_SPEED_OFFSET = 0.01 |
|
|
|
STARTING_TARGET_SPEED = 0.5 |
|
|
|
STARTING_TARGET_SPEED = 0.5 |
|
|
|
BRAKE_THRESHOLD_TO_PID = 0.2 |
|
|
|
BRAKE_THRESHOLD_TO_PID = 0.2 |
|
|
|
|
|
|
|
|
|
|
|
STOPPING_BRAKE_RATE = 0.2 # brake_travel/s while trying to stop |
|
|
|
|
|
|
|
STARTING_BRAKE_RATE = 0.8 # brake_travel/s while releasing on restart |
|
|
|
STARTING_BRAKE_RATE = 0.8 # brake_travel/s while releasing on restart |
|
|
|
BRAKE_STOPPING_TARGET = 0.5 # apply at least this amount of brake to maintain the vehicle stationary |
|
|
|
BRAKE_STOPPING_TARGET = 0.5 # apply at least this amount of brake to maintain the vehicle stationary |
|
|
|
|
|
|
|
|
|
|
@ -106,7 +105,7 @@ class LongControl(): |
|
|
|
elif self.long_control_state == LongCtrlState.stopping: |
|
|
|
elif self.long_control_state == LongCtrlState.stopping: |
|
|
|
# Keep applying brakes until the car is stopped |
|
|
|
# Keep applying brakes until the car is stopped |
|
|
|
if not CS.standstill or output_gb > -BRAKE_STOPPING_TARGET: |
|
|
|
if not CS.standstill or output_gb > -BRAKE_STOPPING_TARGET: |
|
|
|
output_gb -= STOPPING_BRAKE_RATE / RATE |
|
|
|
output_gb -= CP.stoppingBrakeRate / RATE |
|
|
|
output_gb = clip(output_gb, -brake_max, gas_max) |
|
|
|
output_gb = clip(output_gb, -brake_max, gas_max) |
|
|
|
|
|
|
|
|
|
|
|
self.reset(CS.vEgo) |
|
|
|
self.reset(CS.vEgo) |
|
|
|