Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-21 23:35:34 +03:00
Code Issues Wiki Activity

Added PG config definitions 6

Browse source
This commit is contained in:
Martin Budden 2017-02-26 08:48:16 +00:00
parent 8a8aae49b9
commit 6b27f10c94
10 changed files with 137 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -127,8 +127,6 @@ PG_REGISTER_WITH_RESET_FN(statusLedConfig_t, statusLedConfig, PG_STATUS_LED_CONF
master_t masterConfig; // master config struct with data independent from profiles
profile_t *currentProfile;
controlRateConfig_t *currentControlRateProfile;
#ifndef USE_PARAMETER_GROUPS
static void resetAccelerometerTrims(flightDynamicsTrims_t *accelerometerTrims)
{
@ -148,7 +146,6 @@ static void resetCompassConfig(compassConfig_t* compassConfig)
compassConfig->interruptTag = IO_TAG_NONE;
#endif
}
#endif
static void resetControlRateProfile(controlRateConfig_t *controlRateConfig)
{
@ -165,6 +162,7 @@ static void resetControlRateProfile(controlRateConfig_t *controlRateConfig)
controlRateConfig->rates[axis] = 70;
}
}
#endif
static void resetPidProfile(pidProfile_t *pidProfile)
{
@ -768,14 +766,6 @@ uint8_t getCurrentControlRateProfileIndex(void)
return systemConfigMutable()->activeRateProfile;
}
static void setControlRateProfile(uint8_t controlRateProfileIndex)
{
if (controlRateProfileIndex < MAX_CONTROL_RATE_PROFILE_COUNT) {
systemConfigMutable()->activeRateProfile = controlRateProfileIndex;
currentControlRateProfile = controlRateProfilesMutable(controlRateProfileIndex);
}
}
uint16_t getCurrentMinthrottle(void)
{
return motorConfig()->minthrottle;
@ -993,9 +983,11 @@ void createDefaultConfig(master_t *config)
for (int ii = 0; ii < MAX_PROFILE_COUNT; ++ii) {
resetProfile(&config->profile[ii]);
}
for (int ii = 0; ii < MAX_CONTROL_RATE_PROFILE_COUNT; ++ii) {
#ifndef USE_PARAMETER_GROUPS
for (int ii = 0; ii < CONTROL_RATE_PROFILE_COUNT; ++ii) {
resetControlRateProfile(&config->controlRateProfile[ii]);
}
#endif
config->compassConfig.mag_declination = 0;
@ -1363,15 +1355,6 @@ void changeProfile(uint8_t profileIndex)
beeperConfirmationBeeps(profileIndex + 1);
}
void changeControlRateProfile(uint8_t profileIndex)
{
if (profileIndex >= MAX_RATEPROFILES) {
profileIndex = MAX_RATEPROFILES - 1;
}
setControlRateProfile(profileIndex);
generateThrottleCurve();
}
void beeperOffSet(uint32_t mask)
{
beeperConfigMutable()->beeper_off_flags |= mask;