Merge remote-tracking branch 'upstream/master' into toyota-exp

commaai · Jan 25, 2025 · c26dfc5 · c26dfc5
2 parents 1649818 + b949b43
commit c26dfc5
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/opendbc/car/toyota/carcontroller.py b/opendbc/car/toyota/carcontroller.py
@@ -221,14 +221,15 @@ def update(self, CC, CS, now_nanos):
         future_t = float(np.interp(CS.out.vEgo, [0., 5.], [0.25, 0.5]))
         a_ego_future = a_ego_blended + j_ego * future_t
 
-        if actuators.longControlState == LongCtrlState.pid:
+        if CC.longActive:
           # constantly slowly unwind integral to recover from large temporary errors
           self.long_pid.i -= ACCEL_PID_UNWIND * float(np.sign(self.long_pid.i))
 
           error_future = pcm_accel_cmd - a_ego_future
           pcm_accel_cmd = self.long_pid.update(error_future,
                                                speed=CS.out.vEgo,
-                                               feedforward=pcm_accel_cmd)
+                                               feedforward=pcm_accel_cmd,
+                                               freeze_integrator=actuators.longControlState != LongCtrlState.pid)
         else:
           self.long_pid.reset()