From f6ca9de8e1c88923424719cb3ec55de25d76a562 Mon Sep 17 00:00:00 2001
From: nathan <nathan@vertile.com>
Date: Wed, 15 Jun 2016 21:01:29 -0700
Subject: [PATCH] clean up #defines and comment

---
 src/main/drivers/max7456_symbols.h               |  4 ++--
 src/main/target/OMNIBUS/target.h                 | 11 ++++++++---
 src/main/target/OMNIBUS/target.mk                |  2 +-
 src/main/target/SIRINFPV/target.mk               |  2 +-
 src/main/target/STM32F3DISCOVERYMAX7456/target.h |  7 ++++---
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/main/drivers/max7456_symbols.h b/src/main/drivers/max7456_symbols.h
index 2d7862ebd..e2f633b8c 100644
--- a/src/main/drivers/max7456_symbols.h
+++ b/src/main/drivers/max7456_symbols.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#ifdef MAX_OSD
+#ifdef USE_MAX7456
 
 // Character Symbols
 #define SYM_BLANK 0X20
@@ -230,4 +230,4 @@
 #define SYM_MIN 0xB3
 #define SYM_AVG 0xB4
 
-#endif //MAX_OSD
+#endif
diff --git a/src/main/target/OMNIBUS/target.h b/src/main/target/OMNIBUS/target.h
index 756f7fbb8..228d843fa 100644
--- a/src/main/target/OMNIBUS/target.h
+++ b/src/main/target/OMNIBUS/target.h
@@ -115,9 +115,14 @@
 #define SPI1_MISO_PIN           PA6
 #define SPI1_MOSI_PIN           PA7
 
-#define MAX_OSD
-#define MAX_OSD_SPI_INSTANCE              SPI1
-#define MAX_OSD_SPI_CS_PIN                SPI1_NSS_PIN
+// OSD define info:
+//   feature name (includes source) -> MAX_OSD, used in target.mk
+// include the osd code
+#define OSD
+// include the max7456 driver
+#define USE_MAX7456
+#define MAX7456_SPI_INSTANCE              SPI1
+#define MAX7456_SPI_CS_PIN                SPI1_NSS_PIN
 
 
 #define USE_SPI
diff --git a/src/main/target/OMNIBUS/target.mk b/src/main/target/OMNIBUS/target.mk
index 435a35a19..8259bfa92 100644
--- a/src/main/target/OMNIBUS/target.mk
+++ b/src/main/target/OMNIBUS/target.mk
@@ -1,5 +1,5 @@
 F3_TARGETS  += $(TARGET)
-FEATURES    = VCP SDCARD OSD
+FEATURES    = VCP SDCARD MAX_OSD
 
 TARGET_SRC = \
             drivers/accgyro_mpu.c \
diff --git a/src/main/target/SIRINFPV/target.mk b/src/main/target/SIRINFPV/target.mk
index 151c7f138..1dfe1ea32 100644
--- a/src/main/target/SIRINFPV/target.mk
+++ b/src/main/target/SIRINFPV/target.mk
@@ -1,5 +1,5 @@
 F3_TARGETS  += $(TARGET)
-FEATURES    = VCP SDCARD OSD
+FEATURES    = VCP SDCARD MAX_OSD
 
 TARGET_SRC = \
             drivers/accgyro_mpu.c \
diff --git a/src/main/target/STM32F3DISCOVERYMAX7456/target.h b/src/main/target/STM32F3DISCOVERYMAX7456/target.h
index 4a67680a6..8fdef97b4 100644
--- a/src/main/target/STM32F3DISCOVERYMAX7456/target.h
+++ b/src/main/target/STM32F3DISCOVERYMAX7456/target.h
@@ -98,9 +98,10 @@
 //#define USE_BARO_BMP280
 //#define USE_BARO_SPI_BMP280
 
-#define MAX_OSD
-#define MAX_OSD_SPI_INSTANCE              SPI2
-#define MAX_OSD_SPI_CS_PIN                SPI2_NSS_PIN
+#define OSD
+#define USE_MAX7456
+#define MAX7456_SPI_INSTANCE              SPI2
+#define MAX7456_SPI_CS_PIN                SPI2_NSS_PIN
 
 //#define USE_SDCARD
 //#define USE_SDCARD_SPI2