Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-13 19:40:31 +03:00
Code Issues Wiki Activity

Added support for resetting to custom defaults to MSP.

Browse source
This commit is contained in:
mikeller 2019-08-29 00:00:06 +12:00
parent e38d460acf
commit 772b249a3f
7 changed files with 115 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -667,6 +667,10 @@ static bool isWritingConfigToCopy()
;
}
#if defined(USE_CUSTOM_DEFAULTS)
bool cliProcessCustomDefaults(void);
#endif
static void backupAndResetConfigs(const bool useCustomDefaults)
{
backupConfigs();
@ -4132,26 +4136,20 @@ static void cliBatch(char *cmdline)
}
#endif
static void cliSave(char *cmdline)
static bool doSave(void)
{
UNUSED(cmdline);
#if defined(USE_CUSTOM_DEFAULTS)
if (processingCustomDefaults) {
return;
return false;
}
#endif
#ifdef USE_CLI_BATCH
if (commandBatchActive && commandBatchError) {
cliPrintCommandBatchWarning("PLEASE FIX ERRORS THEN 'SAVE'");
resetCommandBatch();
return;
return false;
}
#endif
cliPrintHashLine("saving");
#if defined(USE_BOARD_INFO)
if (boardInformationUpdated) {
persistBoardInformation();
@ -4169,14 +4167,54 @@ static void cliSave(char *cmdline)
writeEEPROM();
}
return true;
}
static void cliSave(char *cmdline)
{
UNUSED(cmdline);
if (!doSave()) {
cliPrintCommandBatchWarning("PLEASE FIX ERRORS THEN 'SAVE'");
resetCommandBatch();
return;
} else {
cliPrintHashLine("saving");
}
cliReboot();
}
bool cliResetConfig(bool useCustomDefaults)
{
resetConfigs();
#ifdef USE_CLI_BATCH
commandBatchError = false;
#endif
#if defined(USE_CUSTOM_DEFAULTS)
static bool isDefaults(char *ptr)
if (useCustomDefaults) {
cliProcessCustomDefaults();
}
#else
UNUSED(useCustomDefaults);
#endif
return doSave();
}
#if defined(USE_CUSTOM_DEFAULTS)
static bool isCustomDefaults(char *ptr)
{
return strncmp(ptr, "# " FC_FIRMWARE_NAME, 12) == 0;
}
bool hasCustomDefaults(void)
{
return isCustomDefaults(customDefaultsStart);
}
#endif
static void cliDefaults(char *cmdline)
@ -4199,7 +4237,7 @@ static void cliDefaults(char *cmdline)
useCustomDefaults = false;
} else if (strncasecmp(cmdline, "show", 4) == 0) {
char *customDefaultsPtr = customDefaultsStart;
if (isDefaults(customDefaultsPtr)) {
if (isCustomDefaults(customDefaultsPtr)) {
while (*customDefaultsPtr && *customDefaultsPtr != 0xFF && customDefaultsPtr < customDefaultsEnd) {
if (*customDefaultsPtr != '\n') {
cliPrintf("%c", *customDefaultsPtr++);
@ -6468,7 +6506,7 @@ void cliProcess(void)
bool cliProcessCustomDefaults(void)
{
char *customDefaultsPtr = customDefaultsStart;
if (processingCustomDefaults || !isDefaults(customDefaultsPtr)) {
if (processingCustomDefaults || !isCustomDefaults(customDefaultsPtr)) {
return false;
}