rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2098 from mikeller/cleanup_minimal_diff_dump 

Cleaned up output of diff / dump when CLI_MINIMAL_VERBOSITY is on.
This commit is contained in:
Michael Keller 2017-01-15 14:14:16 +13:00 committed by GitHub
parent 77f57f7fc8 1ef293a3c5
commit 3d26421e7e
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/fc/cli.c
View File

@ -2765,9 +2765,8 @@ static void cliReboot(void)
static void cliDfu(char *cmdLine) static void cliDfu(char *cmdLine)
{ {
UNUSED(cmdLine); UNUSED(cmdLine);
#ifndef CLI_MINIMAL_VERBOSITY
cliPrint("\r\nRestarting in DFU mode"); cliPrintHashLine("restarting in DFU mode");
#endif
cliRebootEx(true); cliRebootEx(true);
} }
@ -2775,9 +2774,7 @@ static void cliExit(char *cmdline)
{ {
UNUSED(cmdline); UNUSED(cmdline);
#ifndef CLI_MINIMAL_VERBOSITY cliPrintHashLine("leaving CLI mode, unsaved changes lost");
cliPrint("\r\nLeaving CLI mode, unsaved changes lost.\r\n");
#endif
bufWriterFlush(cliWriter); bufWriterFlush(cliWriter);
*cliBuffer = '\0'; *cliBuffer = '\0';
@ -3043,7 +3040,7 @@ static void cliSave(char *cmdline)
{ {
UNUSED(cmdline); UNUSED(cmdline);
cliPrint("Saving"); cliPrintHashLine("saving");
writeEEPROM(); writeEEPROM();
cliReboot(); cliReboot();
} }
@ -3052,7 +3049,7 @@ static void cliDefaults(char *cmdline)
{ {
UNUSED(cmdline); UNUSED(cmdline);
cliPrint("Resetting to defaults"); cliPrintHashLine("resetting to defaults");
resetEEPROM(); resetEEPROM();
cliReboot(); cliReboot();
} }
@ -3561,13 +3558,12 @@ static void printConfig(char *cmdline, bool doDiff)
cliPrintHashLine("version"); cliPrintHashLine("version");
cliVersion(NULL); cliVersion(NULL);
#ifndef CLI_MINIMAL_VERBOSITY
if ((dumpMask & (DUMP_ALL | DO_DIFF)) == (DUMP_ALL | DO_DIFF)) { if ((dumpMask & (DUMP_ALL | DO_DIFF)) == (DUMP_ALL | DO_DIFF)) {
cliPrintHashLine("reset configuration to default settings\r\ndefaults"); cliPrintHashLine("reset configuration to default settings");
cliPrint("defaults\r\n");
} }
cliPrintHashLine("name"); cliPrintHashLine("name");
#endif
printName(dumpMask); printName(dumpMask);
#ifdef USE_RESOURCE_MGMT #ifdef USE_RESOURCE_MGMT
@ -3653,19 +3649,16 @@ static void printConfig(char *cmdline, bool doDiff)
} }
changeControlRateProfile(currentRateIndex); changeControlRateProfile(currentRateIndex);
#ifndef CLI_MINIMAL_VERBOSITY
cliPrintHashLine("restore original rateprofile selection"); cliPrintHashLine("restore original rateprofile selection");
cliRateProfile(""); cliRateProfile("");
#endif
} }
changeProfile(activeProfile); changeProfile(activeProfile);
#ifndef CLI_MINIMAL_VERBOSITY
cliPrintHashLine("restore original profile selection"); cliPrintHashLine("restore original profile selection");
cliProfile(""); cliProfile("");
cliPrintHashLine("save configuration\r\nsave"); cliPrintHashLine("save configuration");
#endif cliPrint("save");
} else { } else {
cliDumpProfile(masterConfig.current_profile_index, dumpMask, &defaultConfig); cliDumpProfile(masterConfig.current_profile_index, dumpMask, &defaultConfig);
cliDumpRateProfile(currentProfile->activeRateProfile, dumpMask, &defaultConfig); cliDumpRateProfile(currentProfile->activeRateProfile, dumpMask, &defaultConfig);