Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-14 03:50:02 +03:00
Code Issues Wiki Activity

Extended configuration status to accommodate custom defaults.

Browse source
This commit is contained in:
mikeller 2019-09-01 19:54:00 +12:00 • committed by Michael Keller
parent 227f6f76a2
commit 1c8cfbd241
8 changed files with 85 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

67
src/main/cli/cli.c
View file

@ -676,7 +676,7 @@ static void backupAndResetConfigs(const bool useCustomDefaults)
backupConfigs();
// reset all configs to defaults to do differencing
resetConfigs();
resetConfig();
#if defined(USE_CUSTOM_DEFAULTS)
if (useCustomDefaults) {
@ -4136,7 +4136,7 @@ static void cliBatch(char *cmdline)
}
#endif
static bool doSave(void)
static bool prepareSave(void)
{
#if defined(USE_CUSTOM_DEFAULTS)
if (processingCustomDefaults) {
@ -4162,53 +4162,56 @@ static bool doSave(void)
#endif // USE_BOARD_INFO
if (featureMaskIsCopied) {
writeEEPROMWithFeatures(featureMaskCopy);
} else {
writeEEPROM();
featureDisableAll();
featureEnable(featureMaskCopy);
}
return true;
}
bool tryPrepareSave(void)
{
bool success = prepareSave();
#if defined(USE_CLI_BATCH)
if (!success) {
cliPrintCommandBatchWarning("PLEASE FIX ERRORS THEN 'SAVE'");
resetCommandBatch();
return false;
}
#else
UNUSED(success);
#endif
return true;
}
static void cliSave(char *cmdline)
{
UNUSED(cmdline);
#if defined(USE_CLI_BATCH)
if (!doSave()) {
cliPrintCommandBatchWarning("PLEASE FIX ERRORS THEN 'SAVE'");
resetCommandBatch();
return;
} else
#endif
{
if (tryPrepareSave()) {
writeEEPROM();
cliPrintHashLine("saving");
}
cliReboot();
cliReboot();
}
}
bool cliResetConfig(bool useCustomDefaults)
#if defined(USE_CUSTOM_DEFAULTS)
bool resetConfigToCustomDefaults(void)
{
resetConfigs();
resetConfig();
#ifdef USE_CLI_BATCH
commandBatchError = false;
#endif
#if defined(USE_CUSTOM_DEFAULTS)
if (useCustomDefaults) {
cliProcessCustomDefaults();
}
#else
UNUSED(useCustomDefaults);
#endif
cliProcessCustomDefaults();
return doSave();
return prepareSave();
}
#if defined(USE_CUSTOM_DEFAULTS)
static bool isCustomDefaults(char *ptr)
{
return strncmp(ptr, "# " FC_FIRMWARE_NAME, 12) == 0;
@ -4263,7 +4266,7 @@ static void cliDefaults(char *cmdline)
cliPrintHashLine("resetting to defaults");
resetConfigs();
resetConfig();
#ifdef USE_CLI_BATCH
// Reset only the error state and allow the batch active state to remain.
@ -4279,8 +4282,10 @@ static void cliDefaults(char *cmdline)
}
#endif
if (saveConfigs) {
cliSave(NULL);
if (saveConfigs && tryPrepareSave()) {
writeUnmodifiedConfigToEEPROM();
cliReboot();
}
}
@ -6533,6 +6538,8 @@ bool cliProcessCustomDefaults(void)
memcpy(cliBuffer, cliBufferTemp, sizeof(cliBuffer));
bufferIndex = bufferIndexTemp;
systemConfigMutable()->configurationState = CONFIGURATION_STATE_DEFAULTS_CUSTOM;
return true;
}
#endif