Merge pull request betaflight#4489 from mikeller/fixed_ifndef_case_fo…

…r_use_change Fixed 'ifndef' cases for change to 'USE_<x>'.
wind0r · Nov 5, 2017 · bee8689 · bee8689
2 parents 7643e1c + 1ff9c27
commit bee8689
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/main/fc/cli.c b/src/main/fc/cli.c
@@ -2002,13 +2002,13 @@ static void cliFeature(char *cmdline)
             if (strncasecmp(cmdline, featureNames[i], len) == 0) {
 
                 mask = 1 << i;
-#ifndef GPS
+#ifndef USE_GPS
                 if (mask & FEATURE_GPS) {
                     cliPrintLine("unavailable");
                     break;
                 }
 #endif
-#ifndef SONAR
+#ifndef USE_SONAR
                 if (mask & FEATURE_SONAR) {
                     cliPrintLine("unavailable");
                     break;

diff --git a/src/main/fc/config.c b/src/main/fc/config.c
@@ -440,11 +440,11 @@ static void validateAndFixConfig(void)
     featureClear(FEATURE_SOFTSERIAL);
 #endif
 
-#ifndef GPS
+#ifndef USE_GPS
     featureClear(FEATURE_GPS);
 #endif
 
-#ifndef SONAR
+#ifndef USE_SONAR
     featureClear(FEATURE_SONAR);
 #endif
 
@@ -468,7 +468,7 @@ static void validateAndFixConfig(void)
     featureClear(FEATURE_DASHBOARD);
 #endif
 
-#ifndef OSD
+#ifndef USE_OSD
     featureClear(FEATURE_OSD);
 #endif
 

diff --git a/src/main/fc/rc_adjustments.c b/src/main/fc/rc_adjustments.c
@@ -56,7 +56,7 @@ static pidProfile_t *pidProfile;
 
 static void blackboxLogInflightAdjustmentEvent(adjustmentFunction_e adjustmentFunction, int32_t newValue)
 {
-#ifndef BLACKBOX
+#ifndef USE_BLACKBOX
     UNUSED(adjustmentFunction);
     UNUSED(newValue);
 #else
@@ -73,7 +73,7 @@ static void blackboxLogInflightAdjustmentEvent(adjustmentFunction_e adjustmentFu
 #if 0
 static void blackboxLogInflightAdjustmentEventFloat(adjustmentFunction_e adjustmentFunction, float newFloatValue)
 {
-#ifndef BLACKBOX
+#ifndef USE_BLACKBOX
     UNUSED(adjustmentFunction);
     UNUSED(newFloatValue);
 #else