Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-24 08:45:36 +03:00
Code Issues Wiki Activity

Merge tag 'v3.1.2'

Browse source
This commit is contained in:
borisbstyle 2017-02-02 00:23:33 +01:00
commit 51b19855dd
6 changed files with 24 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/main/fc/config.c
View file

@ -60,7 +60,6 @@
#include "fc/config.h"
#include "fc/rc_controls.h"
#include "fc/rc_curves.h"
#include "fc/runtime_config.h"
#include "flight/altitudehold.h"
@ -181,11 +180,11 @@ static void resetPidProfile(pidProfile_t *pidProfile)
pidProfile->levelAngleLimit = 55;
pidProfile->levelSensitivity = 55;
pidProfile->setpointRelaxRatio = 30;
pidProfile->dtermSetpointWeight = 200;
pidProfile->dtermSetpointWeight = 190;
pidProfile->yawRateAccelLimit = 10.0f;
pidProfile->rateAccelLimit = 0.0f;
pidProfile->itermThrottleThreshold = 300;
pidProfile->itermAcceleratorGain = 3.0f;
pidProfile->itermThrottleThreshold = 350;
pidProfile->itermAcceleratorGain = 1.5f;
pidProfile->itermAcceleratorRateLimit = 80;
}
@ -887,15 +886,8 @@ void resetConfigs(void)
#endif
}
void activateControlRateConfig(void)
{
generateThrottleCurve(currentControlRateProfile, &masterConfig.motorConfig);
}
void activateConfig(void)
{
activateControlRateConfig();
resetAdjustmentStates();
useRcControlsConfig(
@ -1205,7 +1197,6 @@ void changeControlRateProfile(uint8_t profileIndex)
profileIndex = MAX_RATEPROFILES - 1;
}
setControlRateProfile(profileIndex);
activateControlRateConfig();
}
void beeperOffSet(uint32_t mask)