Merge pull request #6911 from jflyper/bfdev-move-USE_ITERM_RELAX-to-include-USE_ABSOLUTE_CONTROL
Move USE_ITERM_RELAX up to prevent unused warning of applyAbsoluteControl
This commit is contained in:
commit
7566f81d38
|
@ -919,6 +919,7 @@ void FAST_CODE applySmartFeedforward(int axis)
|
||||||
}
|
}
|
||||||
#endif // USE_SMART_FEEDFORWARD
|
#endif // USE_SMART_FEEDFORWARD
|
||||||
|
|
||||||
|
#if defined(USE_ITERM_RELAX)
|
||||||
#if defined(USE_ABSOLUTE_CONTROL)
|
#if defined(USE_ABSOLUTE_CONTROL)
|
||||||
STATIC_UNIT_TESTED void applyAbsoluteControl(const int axis, const float gyroRate, const bool itermRelaxIsEnabled,
|
STATIC_UNIT_TESTED void applyAbsoluteControl(const int axis, const float gyroRate, const bool itermRelaxIsEnabled,
|
||||||
const float setpointLpf, const float setpointHpf,
|
const float setpointLpf, const float setpointHpf,
|
||||||
|
@ -961,7 +962,6 @@ STATIC_UNIT_TESTED void applyAbsoluteControl(const int axis, const float gyroRat
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(USE_ITERM_RELAX)
|
|
||||||
STATIC_UNIT_TESTED void applyItermRelax(const int axis, const float iterm,
|
STATIC_UNIT_TESTED void applyItermRelax(const int axis, const float iterm,
|
||||||
const float gyroRate, float *itermErrorRate, float *currentPidSetpoint)
|
const float gyroRate, float *itermErrorRate, float *currentPidSetpoint)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue