diff --git a/src/main/flight/pid.h b/src/main/flight/pid.h index 30ce2d5729..37a9c41110 100644 --- a/src/main/flight/pid.h +++ b/src/main/flight/pid.h @@ -214,8 +214,7 @@ bool pidAntiGravityEnabled(void); extern float axisError[XYZ_AXIS_COUNT]; void applyItermRelax(const int axis, const float iterm, const float gyroRate, float *itermErrorRate, float *currentPidSetpoint); -void applyAbsoluteControl(const int axis, const float gyroRate, const bool itermRelaxIsEnabled, - const float setpointLpf, const float setpointHpf, float *currentPidSetpoint, float *itermErrorRate); +void applyAbsoluteControl(const int axis, const float gyroRate, float *currentPidSetpoint, float *itermErrorRate); void rotateItermAndAxisError(); float pidLevel(int axis, const pidProfile_t *pidProfile, const rollAndPitchTrims_t *angleTrim, float currentPidSetpoint); diff --git a/src/test/unit/pid_unittest.cc b/src/test/unit/pid_unittest.cc index 0520a6798e..6c0dfccf78 100644 --- a/src/test/unit/pid_unittest.cc +++ b/src/test/unit/pid_unittest.cc @@ -589,8 +589,6 @@ TEST(pidControllerTest, testAbsoluteControl) { pidStabilisationState(PID_STABILISATION_ON); float gyroRate = 0; - float setpointLpf = 6; - float setpointHpf = 30; float itermErrorRate = 10; float currentPidSetpoint = 10; @@ -600,16 +598,13 @@ TEST(pidControllerTest, testAbsoluteControl) { ASSERT_NEAR(10.8, itermErrorRate, calculateTolerance(10.8)); ASSERT_NEAR(10.8, currentPidSetpoint, calculateTolerance(10.8)); - itermRelaxIsEnabled = true; - applyAbsoluteControl(FD_PITCH, gyroRate, itermRelaxIsEnabled, setpointLpf, setpointHpf, - ¤tPidSetpoint, &itermErrorRate); + applyAbsoluteControl(FD_PITCH, gyroRate, ¤tPidSetpoint, &itermErrorRate); ASSERT_NEAR(10.8, itermErrorRate, calculateTolerance(10.8)); ASSERT_NEAR(10.8, currentPidSetpoint, calculateTolerance(10.8)); gyroRate = -53; axisError[FD_PITCH] = -60; - applyAbsoluteControl(FD_PITCH, gyroRate, itermRelaxIsEnabled, setpointLpf, setpointHpf, - ¤tPidSetpoint, &itermErrorRate); + applyAbsoluteControl(FD_PITCH, gyroRate, ¤tPidSetpoint, &itermErrorRate); ASSERT_NEAR(-79.2, itermErrorRate, calculateTolerance(-79.2)); ASSERT_NEAR(-79.2, currentPidSetpoint, calculateTolerance(-79.2)); }