From 9cd3085bc080980f8d02d865b592d3a41b35108c Mon Sep 17 00:00:00 2001
From: Martin Budden <mjbudden@gmail.com>
Date: Wed, 3 Jan 2018 09:53:18 +0000
Subject: [PATCH] Rationalise USE_ #defines

---
 src/main/target/BETAFLIGHTF3/target.h  |  1 -
 src/main/target/COLIBRI_RACE/target.h  |  2 --
 src/main/target/FRSKYF3/target.h       |  5 -----
 src/main/target/OMNIBUS/target.h       |  3 ---
 src/main/target/SPRACINGF3EVO/target.h |  1 -
 src/main/target/common_fc_pre.h        | 16 +++++++---------
 6 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/src/main/target/BETAFLIGHTF3/target.h b/src/main/target/BETAFLIGHTF3/target.h
index 7a8d41afe8..76147caee6 100644
--- a/src/main/target/BETAFLIGHTF3/target.h
+++ b/src/main/target/BETAFLIGHTF3/target.h
@@ -21,7 +21,6 @@
 #define TARGET_BOARD_IDENTIFIER "BFF3"
 
 // Removing some features to make the firmware fit the flash space
-#undef USE_TELEMETRY_HOTT
 #undef USE_TELEMETRY_JETIEXBUS
 #undef USE_TELEMETRY_LTM
 
diff --git a/src/main/target/COLIBRI_RACE/target.h b/src/main/target/COLIBRI_RACE/target.h
index 2c307343c7..9000ecbb76 100644
--- a/src/main/target/COLIBRI_RACE/target.h
+++ b/src/main/target/COLIBRI_RACE/target.h
@@ -24,8 +24,6 @@
 
 #define CONFIG_FASTLOOP_PREFERRED_ACC ACC_DEFAULT
 
-#undef USE_RX_MSP // never used.
-
 #define LED0_PIN                PC15
 #define LED1_PIN                PC14
 #define LED2_PIN                PC13
diff --git a/src/main/target/FRSKYF3/target.h b/src/main/target/FRSKYF3/target.h
index 56b5c2bdd4..c55c815730 100644
--- a/src/main/target/FRSKYF3/target.h
+++ b/src/main/target/FRSKYF3/target.h
@@ -17,11 +17,6 @@
 
 #pragma once
 
-// no space left
-#undef USE_TELEMETRY_JETIEXBUS
-#undef USE_TELEMETRY_HOTT
-#undef USE_TELEMETRY_LTM
-
 #define TARGET_BOARD_IDENTIFIER "FRF3"
 #define USE_TARGET_CONFIG
 #define CONFIG_FASTLOOP_PREFERRED_ACC ACC_NONE
diff --git a/src/main/target/OMNIBUS/target.h b/src/main/target/OMNIBUS/target.h
index 8ea2192501..a47bda0021 100644
--- a/src/main/target/OMNIBUS/target.h
+++ b/src/main/target/OMNIBUS/target.h
@@ -19,13 +19,10 @@
 
 // Removed to make the firmware fit into flash:
 #undef USE_TELEMETRY_IBUS
-#undef USE_TELEMETRY_HOTT
 #undef USE_TELEMETRY_JETIEXBUS
 #undef USE_SERIALRX_JETIEXBUS
 #undef USE_TELEMETRY_MAVLINK
 #undef USE_TELEMETRY_LTM
-#undef USE_RCDEVICE
-#undef USE_DASHBOARD
 
 
 #define TARGET_BOARD_IDENTIFIER "OMNI" // https://en.wikipedia.org/wiki/Omnibus
diff --git a/src/main/target/SPRACINGF3EVO/target.h b/src/main/target/SPRACINGF3EVO/target.h
index af108ab452..2c67ef066a 100644
--- a/src/main/target/SPRACINGF3EVO/target.h
+++ b/src/main/target/SPRACINGF3EVO/target.h
@@ -42,7 +42,6 @@
 #undef USE_TELEMETRY_JETIEXBUS
 #undef USE_SERIALRX_JETIEXBUS
 #undef USE_TELEMETRY_MAVLINK
-#undef USE_DASHBOARD
 
 
 #define CONFIG_FASTLOOP_PREFERRED_ACC ACC_DEFAULT
diff --git a/src/main/target/common_fc_pre.h b/src/main/target/common_fc_pre.h
index 59f321ae03..e6ae03454e 100644
--- a/src/main/target/common_fc_pre.h
+++ b/src/main/target/common_fc_pre.h
@@ -49,7 +49,6 @@
 #define USE_DSHOT
 #define USE_ESC_SENSOR
 #define I2C3_OVERCLOCK true
-#define USE_TELEMETRY_IBUS
 #define USE_GYRO_DATA_ANALYSE
 #endif
 
@@ -61,15 +60,14 @@
 #define USE_ESC_SENSOR
 #define I2C3_OVERCLOCK true
 #define I2C4_OVERCLOCK true
-#define USE_TELEMETRY_IBUS
 #define USE_GYRO_DATA_ANALYSE
 #endif
 
 #if defined(STM32F4) || defined(STM32F7)
-#define TASK_GYROPID_DESIRED_PERIOD     125
+#define TASK_GYROPID_DESIRED_PERIOD     125 // 125us = 8kHz
 #define SCHEDULER_DELAY_LIMIT           10
 #else
-#define TASK_GYROPID_DESIRED_PERIOD     1000
+#define TASK_GYROPID_DESIRED_PERIOD     1000 // 1000us = 1kHz
 #define SCHEDULER_DELAY_LIMIT           100
 #endif
 
@@ -133,7 +131,6 @@
 #define USE_TELEMETRY_JETIEXBUS
 #define USE_TELEMETRY_MAVLINK
 #define USE_TELEMETRY_SRXL
-#define USE_DASHBOARD
 #define USE_MSP_DISPLAYPORT
 #define USE_RCDEVICE
 #define USE_RX_MSP
@@ -164,12 +161,13 @@
 #endif
 
 #if (FLASH_SIZE > 256)
-// Temporarily moved GPS here because of overflowing flash size on F3
+#define USE_ALT_HOLD
+#define USE_DASHBOARD
 #define USE_GPS
 #define USE_GPS_UBLOX
 #define USE_GPS_NMEA
-#define USE_NAV
-#define USE_ALT_HOLD
-#define USE_UNCOMMON_MIXERS
 #define USE_OSD_ADJUSTMENTS
+#define USE_NAV
+#define USE_TELEMETRY_IBUS
+#define USE_UNCOMMON_MIXERS
 #endif