Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-17 05:15:25 +03:00
Code Issues Wiki Activity

Merge branch 'master' into development

Browse source
This commit is contained in:
borisbstyle 2016-08-11 09:05:52 +02:00
commit 96bf7ea638
3 changed files with 42 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/main/io/serial_cli.c
View file

@ -2306,16 +2306,18 @@ static void printConfig(char *cmdline, bool doDiff)
dumpMask = DUMP_RATES; // only
} else if ((options = checkCommand(cmdline, "all"))) {
dumpMask = DUMP_ALL; // all profiles and rates
} else {
options = cmdline;
}
master_t defaultConfig;
if (doDiff) {
dumpMask = dumpMask | DO_DIFF;
createDefaultConfig(&defaultConfig);
}
createDefaultConfig(&defaultConfig);
if (checkCommand(options, "commented")) {
dumpMask = dumpMask | DIFF_COMMENTED; // add unchanged values as comments for diff
if (checkCommand(cmdline, "commented")) {
dumpMask = dumpMask | DIFF_COMMENTED; // add unchanged values as comments for diff
}
}
if ((dumpMask & DUMP_MASTER) || (dumpMask & DUMP_ALL)) {
@ -2977,10 +2979,10 @@ static bool cliDumpPrintf(uint8_t dumpMask, bool equalsDefault, const char *form
va_end(va);
#ifdef USE_SLOW_SERIAL_CLI
delay(1);
delay(1);
#endif
return true;
return true;
}
return false;
@ -3210,7 +3212,7 @@ static void cliGet(char *cmdline)
val = &valueTable[i];
cliPrintf("%s = ", valueTable[i].name);
cliPrintVar(val, 0);
cliPrint("\n");
cliPrint("\r\n");
cliPrintVarRange(val);
cliPrint("\r\n");