From bca171723a3373f81bcc7539dd35a1e4c2a9200e Mon Sep 17 00:00:00 2001
From: Martin Budden <mjbudden@gmail.com>
Date: Fri, 20 May 2016 00:01:55 +0100
Subject: [PATCH] Tidied target.h files

---
 src/main/platform.h                |  1 +
 src/main/target/CC3D/target.h      |  1 -
 src/main/target/CJMCU/target.h     | 16 +++++++++-------
 src/main/target/LUX_RACE/target.h  |  1 -
 src/main/target/OLIMEXINO/target.h |  4 ++--
 src/main/target/common.h           |  2 +-
 6 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/main/platform.h b/src/main/platform.h
index 44684f63db..07d1b655ea 100644
--- a/src/main/platform.h
+++ b/src/main/platform.h
@@ -43,5 +43,6 @@
 
 #endif // STM32F10X
 
+#include "target/common.h"
 #include "target.h"
 
diff --git a/src/main/target/CC3D/target.h b/src/main/target/CC3D/target.h
index 763c222dc9..16a585e83f 100644
--- a/src/main/target/CC3D/target.h
+++ b/src/main/target/CC3D/target.h
@@ -145,7 +145,6 @@
 #undef TELEMETRY
 #undef TELEMETRY_LTM
 #undef SERIAL_RX
-//#define SKIP_RX_MSP
 #endif
 
 // DEBUG
diff --git a/src/main/target/CJMCU/target.h b/src/main/target/CJMCU/target.h
index 9aff20f135..6caeed93d0 100644
--- a/src/main/target/CJMCU/target.h
+++ b/src/main/target/CJMCU/target.h
@@ -20,17 +20,19 @@
 #define TARGET_BOARD_IDENTIFIER "CJM1" // CJMCU
 #define USE_HARDWARE_REVISION_DETECTION
 
+#define LED0
 #define LED0_GPIO GPIOC
 #define LED0_PIN Pin_14 // PC14 (LED)
-#define LED0
 #define LED0_PERIPHERAL RCC_APB2Periph_GPIOC
+
+#define LED1
 #define LED1_GPIO GPIOC
 #define LED1_PIN Pin_13 // PC13 (LED)
-#define LED1
 #define LED1_PERIPHERAL RCC_APB2Periph_GPIOC
+
+#define LED2
 #define LED2_GPIO GPIOC
 #define LED2_PIN Pin_15 // PC15 (LED)
-#define LED2
 #define LED2_PERIPHERAL RCC_APB2Periph_GPIOC
 
 
@@ -40,8 +42,8 @@
 #define GYRO
 #define USE_GYRO_MPU6050
 
-//#define MAG
-//#define USE_MAG_HMC5883
+#define MAG
+#define USE_MAG_HMC5883
 
 #define BRUSHED_MOTORS
 
@@ -66,7 +68,7 @@
 #define USE_QUAD_MIXER_ONLY
 
 
-#if (FLASH_SIZE <=> 64)
+#if (FLASH_SIZE <= 64)
 #undef BLACKBOX
 #define SKIP_TASK_STATISTICS
 #endif
@@ -77,7 +79,7 @@
 #undef GPS_PROTO_UBLOX
 #undef GPS_PROTO_I2C_NAV
 #undef GPS_PROTO_NAZA
+#undef SKIP_RX_MSP
 
 //#undef USE_CLI
-//#define BLACKBOX
 
diff --git a/src/main/target/LUX_RACE/target.h b/src/main/target/LUX_RACE/target.h
index 3ef5cd954e..70e411c7d6 100644
--- a/src/main/target/LUX_RACE/target.h
+++ b/src/main/target/LUX_RACE/target.h
@@ -149,7 +149,6 @@
 #define BIND_PORT  GPIOC
 #define BIND_PIN   Pin_5
 
-#define GTUNE
 #define USE_SERIAL_4WAY_BLHELI_INTERFACE
 #undef GPS_PROTO_NMEA
 #undef GPS_PROTO_UBLOX
diff --git a/src/main/target/OLIMEXINO/target.h b/src/main/target/OLIMEXINO/target.h
index 46222f83a2..1d0c564405 100644
--- a/src/main/target/OLIMEXINO/target.h
+++ b/src/main/target/OLIMEXINO/target.h
@@ -23,18 +23,18 @@
 //#define OLIMEXINO_UNCUT_LED2_E_JUMPER
 
 #ifdef OLIMEXINO_UNCUT_LED1_E_JUMPER
+#define LED0
 #define LED0_GPIO   GPIOA
 #define LED0_PIN    Pin_5 // D13, PA5/SPI1_SCK/ADC5 - "LED1" on silkscreen, Green
 #define LED0_PERIPHERAL RCC_APB2Periph_GPIOA
-#define LED0
 #endif
 
 #ifdef OLIMEXINO_UNCUT_LED2_E_JUMPER
 // "LED2" is using one of the PWM pins (CH2/PWM2), so we must not use PWM2 unless the jumper is cut.  @See pwmInit()
+#define LED1
 #define LED1_GPIO   GPIOA
 #define LED1_PIN    Pin_1 // D3, PA1/USART2_RTS/ADC1/TIM2_CH3 - "LED2" on silkscreen, Yellow
 #define LED1_PERIPHERAL RCC_APB2Periph_GPIOA
-#define LED1
 #endif
 
 #define GYRO
diff --git a/src/main/target/common.h b/src/main/target/common.h
index 03b6d2f7e0..1085d0663d 100644
--- a/src/main/target/common.h
+++ b/src/main/target/common.h
@@ -23,6 +23,7 @@
 #define DISPLAY_ARMED_BITMAP
 #else
 #define SKIP_CLI_COMMAND_HELP
+#define SKIP_RX_MSP
 #define DISABLE_UNCOMMON_MIXERS
 #endif
 
@@ -44,4 +45,3 @@
 #define TELEMETRY_SMARTPORT
 #define TELEMETRY_LTM
 
-