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

Fixed 'diff'/'dump' for 'profile' and 'rates'.

Browse source
This commit is contained in:
mikeller 2019-03-09 22:41:15 +13:00
parent 49390594d3
commit afc8952ea3
1 changed files with 8 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/main/cli/cli.c
View file

@ -5323,8 +5323,8 @@ static void printConfig(char *cmdline, bool doDiff)
#endif #endif
#endif #endif
#ifndef USE_QUAD_MIXER_ONLY
if (!(dumpMask & HARDWARE_ONLY)) { if (!(dumpMask & HARDWARE_ONLY)) {
#ifndef USE_QUAD_MIXER_ONLY
cliPrintHashLine("mixer"); cliPrintHashLine("mixer");
const bool equalsDefault = mixerConfig_Copy.mixerMode == mixerConfig()->mixerMode; const bool equalsDefault = mixerConfig_Copy.mixerMode == mixerConfig()->mixerMode;
const char *formatMixer = "mixer %s"; const char *formatMixer = "mixer %s";
@ -5344,10 +5344,8 @@ static void printConfig(char *cmdline, bool doDiff)
cliDumpPrintLinef(dumpMask, customServoMixers(0)->rate == 0, "smix reset\r\n"); cliDumpPrintLinef(dumpMask, customServoMixers(0)->rate == 0, "smix reset\r\n");
printServoMix(dumpMask, customServoMixers_CopyArray, customServoMixers(0)); printServoMix(dumpMask, customServoMixers_CopyArray, customServoMixers(0));
#endif #endif
}
#endif #endif
if (!(dumpMask & HARDWARE_ONLY)) {
cliPrintHashLine("feature"); cliPrintHashLine("feature");
printFeature(dumpMask, &featureConfig_Copy, featureConfig()); printFeature(dumpMask, &featureConfig_Copy, featureConfig());
@ -5441,15 +5439,6 @@ static void printConfig(char *cmdline, bool doDiff)
cliDumpPidProfile(systemConfig_Copy.pidProfileIndex, dumpMask); cliDumpPidProfile(systemConfig_Copy.pidProfileIndex, dumpMask);
cliDumpRateProfile(systemConfig_Copy.activeRateProfile, dumpMask); cliDumpRateProfile(systemConfig_Copy.activeRateProfile, dumpMask);
}
}
if (dumpMask & DUMP_PROFILE) {
cliDumpPidProfile(systemConfig_Copy.pidProfileIndex, dumpMask);
}
if (dumpMask & DUMP_RATES) {
cliDumpRateProfile(systemConfig_Copy.activeRateProfile, dumpMask);
#ifdef USE_CLI_BATCH #ifdef USE_CLI_BATCH
cliPrintHashLine("end the command batch"); cliPrintHashLine("end the command batch");
@ -5457,6 +5446,11 @@ static void printConfig(char *cmdline, bool doDiff)
#endif #endif
} }
} }
} else if (dumpMask & DUMP_PROFILE) {
cliDumpPidProfile(systemConfig_Copy.pidProfileIndex, dumpMask);
} else if (dumpMask & DUMP_RATES) {
cliDumpRateProfile(systemConfig_Copy.activeRateProfile, dumpMask);
}
// restore configs from copies // restore configs from copies
restoreConfigs(); restoreConfigs();