Merge pull request #886 from AndersHoglund/fix_pidc_dependency

Move PIDweight to a common place.
This commit is contained in:
Martin Budden 2016-08-04 17:31:43 +01:00 committed by GitHub
commit 17267d773e
3 changed files with 6 additions and 3 deletions

View File

@ -53,6 +53,9 @@ bool pidStabilisationEnabled;
int16_t axisPID[3];
// PIDweight is a scale factor for PIDs which is derived from the throttle and TPA setting, and 100 = 100% scale means no PID reduction
uint8_t PIDweight[3];
#ifdef BLACKBOX
int32_t axisPID_P[3], axisPID_I[3], axisPID_D[3];
#endif

View File

@ -127,6 +127,9 @@ extern int32_t axisPID_P[3], axisPID_I[3], axisPID_D[3];
bool airmodeWasActivated;
extern uint32_t targetPidLooptime;
// PIDweight is a scale factor for PIDs which is derived from the throttle and TPA setting, and 100 = 100% scale means no PID reduction
extern uint8_t PIDweight[3];
void pidSetController(pidControllerType_e type);
void pidResetErrorGyroState(void);
void pidStabilisationState(pidStabilisationState_e pidControllerState);

View File

@ -62,9 +62,6 @@ extern biquadFilter_t dtermFilterNotch[3];
extern bool dtermNotchInitialised;
extern bool dtermBiquadLpfInitialised;
// PIDweight is a scale factor for PIDs which is derived from the throttle and TPA setting, and 100 = 100% scale means no PID reduction
uint8_t PIDweight[3];
void initFilters(const pidProfile_t *pidProfile);
float getdT(void);