Merge pull request #7633 from mikeller/reorder_cli_diff
Put display name in CLI 'diff' in a better position.
This commit is contained in:
commit
d86310bea2
|
@ -5030,11 +5030,6 @@ static void printConfig(char *cmdline, bool doDiff)
|
||||||
cliPrintHashLine("name");
|
cliPrintHashLine("name");
|
||||||
printName(dumpMask, &pilotConfig_Copy);
|
printName(dumpMask, &pilotConfig_Copy);
|
||||||
|
|
||||||
#ifdef USE_OSD
|
|
||||||
cliPrintHashLine("display_name");
|
|
||||||
printDisplayName(dumpMask, &pilotConfig_Copy);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef USE_RESOURCE_MGMT
|
#ifdef USE_RESOURCE_MGMT
|
||||||
cliPrintHashLine("resources");
|
cliPrintHashLine("resources");
|
||||||
printResource(dumpMask);
|
printResource(dumpMask);
|
||||||
|
@ -5118,6 +5113,11 @@ static void printConfig(char *cmdline, bool doDiff)
|
||||||
cliPrintHashLine("rxfail");
|
cliPrintHashLine("rxfail");
|
||||||
printRxFailsafe(dumpMask, rxFailsafeChannelConfigs_CopyArray, rxFailsafeChannelConfigs(0));
|
printRxFailsafe(dumpMask, rxFailsafeChannelConfigs_CopyArray, rxFailsafeChannelConfigs(0));
|
||||||
|
|
||||||
|
#ifdef USE_OSD
|
||||||
|
cliPrintHashLine("display_name");
|
||||||
|
printDisplayName(dumpMask, &pilotConfig_Copy);
|
||||||
|
#endif
|
||||||
|
|
||||||
cliPrintHashLine("master");
|
cliPrintHashLine("master");
|
||||||
dumpAllValues(MASTER_VALUE, dumpMask);
|
dumpAllValues(MASTER_VALUE, dumpMask);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue