From 1ff9c27314c79a57dfc519f51f7e0359316cc007 Mon Sep 17 00:00:00 2001
From: mikeller <github@ike.ch>
Date: Sun, 5 Nov 2017 22:49:56 +1300
Subject: [PATCH] Fixed 'ifndef' cases for change to 'USE_<x>'.

---
 src/main/fc/cli.c            | 4 ++--
 src/main/fc/config.c         | 6 +++---
 src/main/fc/rc_adjustments.c | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/fc/cli.c b/src/main/fc/cli.c
index dcc62ed0cd..5e8f2a5f40 100755
--- 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
index 30c1d0376b..1470ee8120 100755
--- 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
index beeeabe14a..79b1f63e4c 100644
--- 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