Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-17 05:15:25 +03:00
Code Issues Wiki Activity

incorporate style feedback

Browse source
This commit is contained in:
Thorsten Laux 2018-05-25 11:32:15 +02:00
parent 7c8c3b6784
commit df71817fba
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -364,8 +364,13 @@ void pidInitConfig(const pidProfile_t *pidProfile)
crashLimitYaw = pidProfile->crash_limit_yaw;
itermLimit = pidProfile->itermLimit;
throttleBoost = pidProfile->throttle_boost * 0.1f;
<<<<<<< HEAD
itermRotation = pidProfile->iterm_rotation;
smartFeedforward = pidProfile->smart_feedforward;
=======
smartFeedforward = pidProfile->smart_feedforward;
itermRotation = pidProfile->iterm_rotation;
>>>>>>> incorporate style feedback
itermRelax = pidProfile->iterm_relax;
itermRelaxCutoffLow = pidProfile->iterm_relax_cutoff_low;
itermRelaxCutoffHigh = pidProfile->iterm_relax_cutoff_high;