1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-18 05:45:31 +03:00

Merge pull request #5986 from mikeller/fix_cli_typo

Fixed typo in CLI.
This commit is contained in:
Michael Keller 2018-05-27 23:54:00 +12:00 committed by GitHub
commit 823c761c01
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -171,7 +171,7 @@ static uint32_t bufferIndex = 0;
static bool configIsInCopy = false; static bool configIsInCopy = false;
static const char* const emptyName = "-"; static const char* const emptyName = "-";
static const char* const emptryString = ""; static const char* const emptyString = "";
#ifndef USE_QUAD_MIXER_ONLY #ifndef USE_QUAD_MIXER_ONLY
// sync this with mixerMode_e // sync this with mixerMode_e
@ -2227,14 +2227,14 @@ static void printFeature(uint8_t dumpMask, const featureConfig_t *featureConfig,
const uint32_t mask = featureConfig->enabledFeatures; const uint32_t mask = featureConfig->enabledFeatures;
const uint32_t defaultMask = featureConfigDefault->enabledFeatures; const uint32_t defaultMask = featureConfigDefault->enabledFeatures;
for (uint32_t i = 0; featureNames[i]; i++) { // disabled features first for (uint32_t i = 0; featureNames[i]; i++) { // disabled features first
if (strcmp(featureNames[i], emptryString) != 0) { //Skip unused if (strcmp(featureNames[i], emptyString) != 0) { //Skip unused
const char *format = "feature -%s"; const char *format = "feature -%s";
cliDefaultPrintLinef(dumpMask, (defaultMask | ~mask) & (1 << i), format, featureNames[i]); cliDefaultPrintLinef(dumpMask, (defaultMask | ~mask) & (1 << i), format, featureNames[i]);
cliDumpPrintLinef(dumpMask, (~defaultMask | mask) & (1 << i), format, featureNames[i]); cliDumpPrintLinef(dumpMask, (~defaultMask | mask) & (1 << i), format, featureNames[i]);
} }
} }
for (uint32_t i = 0; featureNames[i]; i++) { // enabled features for (uint32_t i = 0; featureNames[i]; i++) { // enabled features
if (strcmp(featureNames[i], emptryString) != 0) { //Skip unused if (strcmp(featureNames[i], emptyString) != 0) { //Skip unused
const char *format = "feature %s"; const char *format = "feature %s";
if (defaultMask & (1 << i)) { if (defaultMask & (1 << i)) {
cliDefaultPrintLinef(dumpMask, (~defaultMask | mask) & (1 << i), format, featureNames[i]); cliDefaultPrintLinef(dumpMask, (~defaultMask | mask) & (1 << i), format, featureNames[i]);
@ -2265,7 +2265,7 @@ static void cliFeature(char *cmdline)
for (uint32_t i = 0; ; i++) { for (uint32_t i = 0; ; i++) {
if (featureNames[i] == NULL) if (featureNames[i] == NULL)
break; break;
if (strcmp(featureNames[i], emptryString) != 0) //Skip unused if (strcmp(featureNames[i], emptyString) != 0) //Skip unused
cliPrintf(" %s", featureNames[i]); cliPrintf(" %s", featureNames[i]);
} }
cliPrintLinefeed(); cliPrintLinefeed();