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

Fixed conditional scope.

Browse source 
Fix unit tests.
This commit is contained in:
mikeller 2019-03-08 08:16:36 +13:00 • committed by Michael Keller
parent 0ba3c5e468
commit b578801208
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -170,7 +170,7 @@ void resetPidProfile(pidProfile_t *pidProfile)
.iterm_rotation = false, .iterm_rotation = false,
.smart_feedforward = false, .smart_feedforward = false,
.iterm_relax = ITERM_RELAX_RP, .iterm_relax = ITERM_RELAX_RP,
.iterm_relax_cutoff = 20, .iterm_relax_cutoff = ITERM_RELAX_CUTOFF_DEFAULT,
.iterm_relax_type = ITERM_RELAX_SETPOINT, .iterm_relax_type = ITERM_RELAX_SETPOINT,
.acro_trainer_angle_limit = 20, .acro_trainer_angle_limit = 20,
.acro_trainer_lookahead_ms = 50, .acro_trainer_lookahead_ms = 50,
@ -574,8 +574,9 @@ void pidInitConfig(const pidProfile_t *pidProfile)
pidCoefficient[axis].Kf = FEEDFORWARD_SCALE * (pidProfile->pid[axis].F / 100.0f); pidCoefficient[axis].Kf = FEEDFORWARD_SCALE * (pidProfile->pid[axis].F / 100.0f);
} }
#ifdef USE_INTEGRATED_YAW_CONTROL #ifdef USE_INTEGRATED_YAW_CONTROL
if (!pidProfile->use_integrated_yaw) { if (!pidProfile->use_integrated_yaw)
#endif #endif
{
pidCoefficient[FD_YAW].Ki *= 2.5f; pidCoefficient[FD_YAW].Ki *= 2.5f;
} }

3
src/test/unit/pid_unittest.cc
View file

@ -94,6 +94,9 @@ void setDefaultTestSettings(void) {
pidProfile->pid[PID_YAW] = { 70, 45, 20, 60 }; pidProfile->pid[PID_YAW] = { 70, 45, 20, 60 };
pidProfile->pid[PID_LEVEL] = { 50, 50, 75, 0 }; pidProfile->pid[PID_LEVEL] = { 50, 50, 75, 0 };
// Compensate for the upscaling done without 'use_integrated_yaw'
pidProfile->pid[PID_YAW].I = pidProfile->pid[PID_YAW].I / 2.5f;
pidProfile->pidSumLimit = PIDSUM_LIMIT; pidProfile->pidSumLimit = PIDSUM_LIMIT;
pidProfile->pidSumLimitYaw = PIDSUM_LIMIT_YAW; pidProfile->pidSumLimitYaw = PIDSUM_LIMIT_YAW;
pidProfile->yaw_lowpass_hz = 0; pidProfile->yaw_lowpass_hz = 0;