From fd9d58110b9da7e508a42fa0ea8cec687deb31ad Mon Sep 17 00:00:00 2001
From: Dominic Clifton <me@dominicclifton.name>
Date: Sat, 7 Jun 2014 16:46:06 +0100
Subject: [PATCH] Disable unused LED ring code.

Although it was compiled in for the NAZE target the ledringDetect()
method is never called.  Removing the feature for now too.
---
 Makefile                      |  1 -
 src/main/config/config.c      |  2 +-
 src/main/config/config.h      | 19 +++++++++----------
 src/main/io/serial_cli.c      |  2 +-
 src/main/target/NAZE/target.h |  1 -
 5 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index 9526c6e38..8430c53ea 100644
--- a/Makefile
+++ b/Makefile
@@ -182,7 +182,6 @@ NAZE_SRC	 = startup_stm32f10x_md_gcc.S \
 		   drivers/compass_hmc5883l.c \
 		   drivers/gpio_stm32f10x.c \
 		   drivers/light_led_stm32f10x.c \
-		   drivers/light_ledring.c \
 		   drivers/sonar_hcsr04.c \
 		   drivers/pwm_mapping.c \
 		   drivers/pwm_output.c \
diff --git a/src/main/config/config.c b/src/main/config/config.c
index b103ed5ba..c9adacf57 100755
--- a/src/main/config/config.c
+++ b/src/main/config/config.c
@@ -76,7 +76,7 @@ void mixerUseConfigs(servoParam_t *servoConfToUse, flight3DConfig_t *flight3DCon
 #define FLASH_WRITE_ADDR                (0x08000000 + (uint32_t)((FLASH_PAGE_SIZE * FLASH_PAGE_COUNT) - FLASH_TO_RESERVE_FOR_CONFIG)) // use the last flash pages for storage
master_t masterConfig;      // master config struct with data independent from profiles
 profile_t currentProfile;   // profile config struct
 
-static const uint8_t EEPROM_CONF_VERSION = 71;
+static const uint8_t EEPROM_CONF_VERSION = 72;
 
 static void resetAccelerometerTrims(flightDynamicsTrims_t *accelerometerTrims)
 {
diff --git a/src/main/config/config.h b/src/main/config/config.h
index 567e14337..e56a65714 100644
--- a/src/main/config/config.h
+++ b/src/main/config/config.h
@@ -25,16 +25,15 @@ typedef enum {
     FEATURE_MOTOR_STOP = 1 << 4,
     FEATURE_SERVO_TILT = 1 << 5,
     FEATURE_SOFTSERIAL = 1 << 6,
-    FEATURE_LED_RING = 1 << 7,
-    FEATURE_GPS = 1 << 8,
-    FEATURE_FAILSAFE = 1 << 9,
-    FEATURE_SONAR = 1 << 10,
-    FEATURE_TELEMETRY = 1 << 11,
-    FEATURE_CURRENT_METER = 1 << 12,
-    FEATURE_3D = 1 << 13,
-    FEATURE_RX_PARALLEL_PWM = 1 << 14,
-    FEATURE_RX_MSP = 1 << 15,
-    FEATURE_RSSI_ADC = 1 << 16
+    FEATURE_GPS = 1 << 7,
+    FEATURE_FAILSAFE = 1 << 8,
+    FEATURE_SONAR = 1 << 9,
+    FEATURE_TELEMETRY = 1 << 10,
+    FEATURE_CURRENT_METER = 1 << 11,
+    FEATURE_3D = 1 << 12,
+    FEATURE_RX_PARALLEL_PWM = 1 << 13,
+    FEATURE_RX_MSP = 1 << 14,
+    FEATURE_RSSI_ADC = 1 << 15
 } AvailableFeatures;
 
 bool feature(uint32_t mask);
diff --git a/src/main/io/serial_cli.c b/src/main/io/serial_cli.c
index 74e31f533..55c1836a5 100644
--- a/src/main/io/serial_cli.c
+++ b/src/main/io/serial_cli.c
@@ -101,7 +101,7 @@ static const char * const mixerNames[] = {
 // sync this with AvailableFeatures enum from board.h
 static const char * const featureNames[] = {
     "RX_PPM", "VBAT", "INFLIGHT_ACC_CAL", "RX_SERIAL", "MOTOR_STOP",
-    "SERVO_TILT", "SOFTSERIAL", "LED_RING", "GPS", "FAILSAFE",
+    "SERVO_TILT", "SOFTSERIAL", "GPS", "FAILSAFE",
     "SONAR", "TELEMETRY", "CURRENT_METER", "3D", "RX_PARALLEL_PWM",
     "RX_MSP", "RSSI_ADC", NULL
 };
diff --git a/src/main/target/NAZE/target.h b/src/main/target/NAZE/target.h
index 27b8fc02c..b53403dfa 100644
--- a/src/main/target/NAZE/target.h
+++ b/src/main/target/NAZE/target.h
@@ -36,7 +36,6 @@
 #define ACC
 #define MAG
 #define BARO
-#define LEDRING
 #define SONAR
 #define BUZZER
 #define LED0