mirror of
https://github.com/betaflight/betaflight.git
synced 2025-07-15 20:35:33 +03:00
Moved things around to make them more consistent and capture all error states.
This commit is contained in:
parent
2ce19e89a1
commit
eed54680d2
1 changed files with 27 additions and 24 deletions
|
@ -5281,12 +5281,28 @@ static void printConfig(char *cmdline, bool doDiff)
|
|||
|
||||
backupAndResetConfigs();
|
||||
|
||||
#ifdef USE_CLI_BATCH
|
||||
bool batchModeEnabled = false;
|
||||
#endif
|
||||
if ((dumpMask & DUMP_MASTER) || (dumpMask & DUMP_ALL)) {
|
||||
cliPrintHashLine("version");
|
||||
cliVersion(NULL);
|
||||
cliPrintLinefeed();
|
||||
|
||||
if (!(dumpMask & BARE)) {
|
||||
#ifdef USE_CLI_BATCH
|
||||
cliPrintHashLine("start the command batch");
|
||||
cliPrintLine("batch start");
|
||||
batchModeEnabled = true;
|
||||
#endif
|
||||
|
||||
if ((dumpMask & (DUMP_ALL | DO_DIFF)) == (DUMP_ALL | DO_DIFF)) {
|
||||
cliPrintHashLine("reset configuration to default settings");
|
||||
cliPrintLine("defaults nosave");
|
||||
}
|
||||
}
|
||||
|
||||
#if defined(USE_BOARD_INFO)
|
||||
cliPrintLinefeed();
|
||||
cliBoardName("");
|
||||
cliManufacturerId("");
|
||||
#endif
|
||||
|
@ -5298,19 +5314,6 @@ static void printConfig(char *cmdline, bool doDiff)
|
|||
#endif
|
||||
}
|
||||
|
||||
if (!(dumpMask & BARE)) {
|
||||
if ((dumpMask & (DUMP_ALL | DO_DIFF)) == (DUMP_ALL | DO_DIFF)) {
|
||||
cliPrintHashLine("reset configuration to default settings");
|
||||
cliPrint("defaults nosave");
|
||||
cliPrintLinefeed();
|
||||
}
|
||||
|
||||
#ifdef USE_CLI_BATCH
|
||||
cliPrintHashLine("start the command batch");
|
||||
cliPrintLine("batch start");
|
||||
#endif
|
||||
}
|
||||
|
||||
if (!(dumpMask & HARDWARE_ONLY)) {
|
||||
cliPrintHashLine("name");
|
||||
printName(dumpMask, &pilotConfig_Copy);
|
||||
|
@ -5413,11 +5416,6 @@ static void printConfig(char *cmdline, bool doDiff)
|
|||
cliPrintHashLine("master");
|
||||
if (dumpMask & HARDWARE_ONLY) {
|
||||
dumpAllValues(HARDWARE_VALUE, dumpMask);
|
||||
|
||||
#ifdef USE_CLI_BATCH
|
||||
cliPrintHashLine("end the command batch");
|
||||
cliPrintLine("batch end");
|
||||
#endif
|
||||
} else {
|
||||
dumpAllValues(MASTER_VALUE, dumpMask);
|
||||
|
||||
|
@ -5449,6 +5447,9 @@ static void printConfig(char *cmdline, bool doDiff)
|
|||
|
||||
cliPrintHashLine("save configuration");
|
||||
cliPrint("save");
|
||||
#ifdef USE_CLI_BATCH
|
||||
batchModeEnabled = false;
|
||||
#endif
|
||||
}
|
||||
|
||||
rateProfileIndexToUse = CURRENT_PROFILE_INDEX;
|
||||
|
@ -5456,11 +5457,6 @@ static void printConfig(char *cmdline, bool doDiff)
|
|||
cliDumpPidProfile(systemConfig_Copy.pidProfileIndex, dumpMask);
|
||||
|
||||
cliDumpRateProfile(systemConfig_Copy.activeRateProfile, dumpMask);
|
||||
|
||||
#ifdef USE_CLI_BATCH
|
||||
cliPrintHashLine("end the command batch");
|
||||
cliPrintLine("batch end");
|
||||
#endif
|
||||
}
|
||||
}
|
||||
} else if (dumpMask & DUMP_PROFILE) {
|
||||
|
@ -5469,6 +5465,13 @@ static void printConfig(char *cmdline, bool doDiff)
|
|||
cliDumpRateProfile(systemConfig_Copy.activeRateProfile, dumpMask);
|
||||
}
|
||||
|
||||
#ifdef USE_CLI_BATCH
|
||||
if (batchModeEnabled) {
|
||||
cliPrintHashLine("end the command batch");
|
||||
cliPrintLine("batch end");
|
||||
}
|
||||
#endif
|
||||
|
||||
// restore configs from copies
|
||||
restoreConfigs();
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue