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

"diff|dump all" export can be used as direct copy/paste import

Browse source 
"defaults" command causing reboot of the FC and ignoring remaining part of the pasted commands from "diff|dump all" exports. This change adding "nosave" parameter/functionality for the "defaults" command and "diff|dump all" exports. This parameter will not save eeprom and do not reboot the FC.
This commit is contained in:
jirif 2017-09-11 21:19:26 +02:00
parent b1f47c8a87
commit 004e98457f
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2762,11 +2762,11 @@ static void cliSave(char *cmdline)
static void cliDefaults(char *cmdline) static void cliDefaults(char *cmdline)
{ {
UNUSED(cmdline);
cliPrintHashLine("resetting to defaults"); cliPrintHashLine("resetting to defaults");
resetEEPROM(); resetConfigs();
cliReboot(); if (isEmpty(cmdline)) {
cliSave(NULL);
}
} }
STATIC_UNIT_TESTED void cliGet(char *cmdline) STATIC_UNIT_TESTED void cliGet(char *cmdline)
@ -3435,7 +3435,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 +3600,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