Merge pull request #4076 from jirif/pr_4017_fix
BF 3.2 setpointweight is disabled by default
This commit is contained in:
commit
dc7436efad
|
@ -488,7 +488,7 @@ void pidController(const pidProfile_t *pidProfile, const rollAndPitchTrims_t *an
|
||||||
gyroRateFiltered = dtermLpfApplyFn(dtermFilterLpf[axis], gyroRateFiltered);
|
gyroRateFiltered = dtermLpfApplyFn(dtermFilterLpf[axis], gyroRateFiltered);
|
||||||
|
|
||||||
float dynC = 0;
|
float dynC = 0;
|
||||||
if ( (pidProfile->setpointRelaxRatio < 100) && (!flightModeFlags) ) {
|
if ( (pidProfile->dtermSetpointWeight > 0) && (!flightModeFlags) ) {
|
||||||
dynC = dtermSetpointWeight * MIN(getRcDeflectionAbs(axis) * relaxFactor, 1.0f);
|
dynC = dtermSetpointWeight * MIN(getRcDeflectionAbs(axis) * relaxFactor, 1.0f);
|
||||||
}
|
}
|
||||||
const float rD = dynC * currentPidSetpoint - gyroRateFiltered; // cr - y
|
const float rD = dynC * currentPidSetpoint - gyroRateFiltered; // cr - y
|
||||||
|
|
Loading…
Reference in New Issue