Fix rebase error
This commit is contained in:
parent
4f6e0fc114
commit
9aa57eb6b0
|
@ -126,8 +126,8 @@ void pidBetaflight(const pidProfile_t *pidProfile, uint16_t max_angle_inclinatio
|
||||||
Kd[axis] = DTERM_SCALE * pidProfile->D8[axis];
|
Kd[axis] = DTERM_SCALE * pidProfile->D8[axis];
|
||||||
b[axis] = pidProfile->ptermSetpointWeight / 100.0f;
|
b[axis] = pidProfile->ptermSetpointWeight / 100.0f;
|
||||||
c[axis] = pidProfile->dtermSetpointWeight / 100.0f;
|
c[axis] = pidProfile->dtermSetpointWeight / 100.0f;
|
||||||
yawMaxVelocity = pidProfile->pidMaxVelocityYaw * 1000 * getdT();
|
yawMaxVelocity = pidProfile->yawRateAccelLimit * 1000 * getdT();
|
||||||
rollPitchMaxVelocity = pidProfile->pidMaxVelocityRollPitch * 1000 * getdT();
|
rollPitchMaxVelocity = pidProfile->rateAccelLimit * 1000 * getdT();
|
||||||
|
|
||||||
configP[axis] = pidProfile->P8[axis];
|
configP[axis] = pidProfile->P8[axis];
|
||||||
configI[axis] = pidProfile->I8[axis];
|
configI[axis] = pidProfile->I8[axis];
|
||||||
|
|
Loading…
Reference in New Issue