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

Merge pull request #4127 from jirif/diff_all_export_import

Browse source 
"diff|dump all" export can be used as direct copy/paste import
This commit is contained in:
Martin Budden 2017-09-14 11:15:14 +01:00 • committed by GitHub
commit 1dca5adb2b
1 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/main/fc/cli.c
View file

@ -2762,11 +2762,21 @@ static void cliSave(char *cmdline)
static void cliDefaults(char *cmdline) static void cliDefaults(char *cmdline)
{ {
UNUSED(cmdline); bool saveConfigs;
if (isEmpty(cmdline)) {
saveConfigs = true;
} else if (strncasecmp(cmdline, "nosave", 6) == 0) {
saveConfigs = false;
} else {
return;
}
cliPrintHashLine("resetting to defaults"); cliPrintHashLine("resetting to defaults");
resetEEPROM(); resetConfigs();
cliReboot(); if (saveConfigs) {
cliSave(NULL);
}
} }
STATIC_UNIT_TESTED void cliGet(char *cmdline) STATIC_UNIT_TESTED void cliGet(char *cmdline)
@ -3435,7 +3445,7 @@ static void printConfig(char *cmdline, bool doDiff)
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"); cliPrintHashLine("reset configuration to default settings");
cliPrint("defaults"); cliPrint("defaults nosave");
cliPrintLinefeed(); cliPrintLinefeed();
} }
@ -3600,7 +3610,7 @@ const clicmd_t cmdTable[] = {
#ifdef LED_STRIP #ifdef LED_STRIP
CLI_COMMAND_DEF("color", "configure colors", NULL, cliColor), CLI_COMMAND_DEF("color", "configure colors", NULL, cliColor),
#endif #endif
CLI_COMMAND_DEF("defaults", "reset to defaults and reboot", NULL, cliDefaults), CLI_COMMAND_DEF("defaults", "reset to defaults and reboot", "[nosave]", cliDefaults),
CLI_COMMAND_DEF("diff", "list configuration changes from default", CLI_COMMAND_DEF("diff", "list configuration changes from default",
"[master|profile|rates|all] {defaults}", cliDiff), "[master|profile|rates|all] {defaults}", cliDiff),
#ifdef USE_DSHOT #ifdef USE_DSHOT