Skip to content

Commit

Permalink
Disable long derivative if eager accel is enabled (same thing)
Browse files Browse the repository at this point in the history
  • Loading branch information
sshane committed Apr 20, 2021
1 parent ed7127b commit dc785ce
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion selfdrive/controls/lib/pid.py
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,9 @@ def update(self, setpoint, measurement, speed=0.0, check_saturation=True, overri
not freeze_integrator:
self.id = i

if self.op_params.get('enable_long_derivative'):
enable_deriv = self.op_params.get('enable_long_derivative')
using_eager_accel = self.op_params.get('eager_accel') in [1, 2]
if enable_deriv and not using_eager_accel:
if abs(setpoint - self.last_setpoint) / self.rate < self.max_accel_d: # if setpoint isn't changing much
d = self.k_d * (error - self.last_error)
if (self.id > 0 and self.id + d >= 0) or (self.id < 0 and self.id + d <= 0): # if changing integral doesn't make it cross zero
Expand Down

0 comments on commit dc785ce

Please sign in to comment.