Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-18 13:55:18 +03:00
Code Issues Wiki Activity

Merge pull request #6911 from jflyper/bfdev-move-USE_ITERM_RELAX-to-include-USE_ABSOLUTE_CONTROL

Browse source 
Move USE_ITERM_RELAX up to prevent unused warning of applyAbsoluteControl
This commit is contained in:
borisbstyle 2018-11-08 11:50:13 +01:00 • committed by GitHub
commit 7566f81d38
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/flight/pid.c
View file

@ -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)
{ {