From c28ca22f95545928558d9c44a015483148beb327 Mon Sep 17 00:00:00 2001
From: Michael Keller <github@ike.ch>
Date: Sun, 17 Feb 2019 00:56:49 +1300
Subject: [PATCH] Fix OSD USE_CMS usage (#7576)

Fix OSD USE_CMS usage
---
 src/main/io/osd.c | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/src/main/io/osd.c b/src/main/io/osd.c
index 2ca98cf13..38b2d1347 100644
--- a/src/main/io/osd.c
+++ b/src/main/io/osd.c
@@ -155,7 +155,6 @@ static escSensorData_t *escDataCombined;
 #define AH_SIDEBAR_WIDTH_POS 7
 #define AH_SIDEBAR_HEIGHT_POS 3
 
-#ifdef USE_CMS
 static const char compassBar[] = {
   SYM_HEADING_W,
   SYM_HEADING_LINE, SYM_HEADING_DIVIDED_LINE, SYM_HEADING_LINE,
@@ -203,7 +202,6 @@ static const uint8_t osdElementDisplayOrder[] = {
     OSD_COMPASS_BAR,
     OSD_ANTI_GRAVITY
 };
-#endif // USE_CMS
 
 PG_REGISTER_WITH_RESET_FN(osdConfig_t, osdConfig, PG_OSD_CONFIG, 3);
 
@@ -220,7 +218,6 @@ static char osdGetMetersToSelectedUnitSymbol(void)
     }
 }
 
-#ifdef USE_CMS
 /**
  * Gets average battery cell voltage in 0.01V units.
  */
@@ -239,7 +236,6 @@ static char osdGetBatterySymbol(int cellVoltage)
         return SYM_BATT_EMPTY - constrain(symOffset, 0, 6);
     }
 }
-#endif
 
 /**
  * Converts altitude based on the current unit system.
@@ -286,7 +282,6 @@ static void osdFormatAltitudeString(char * buff, int altitude)
     buff[4] = '.';
 }
 
-#ifdef USE_CMS
 static void osdFormatPID(char * buff, const char * label, const pidf_t * pid)
 {
     tfp_sprintf(buff, "%s %3d %3d %3d", label, pid->P, pid->I, pid->D);
@@ -318,7 +313,6 @@ static uint8_t osdGetDirectionSymbolFromHeading(int heading)
 
     return SYM_ARROW_SOUTH + heading;
 }
-#endif
 
 static char osdGetTimerSymbol(osd_timer_source_e src)
 {
@@ -379,7 +373,6 @@ STATIC_UNIT_TESTED void osdFormatTimer(char *buff, bool showSymbol, bool usePrec
     osdFormatTime(buff, (usePrecision ? OSD_TIMER_PRECISION(timer) : OSD_TIMER_PREC_SECOND), osdGetTimerValue(src));
 }
 
-#ifdef USE_CMS
 #ifdef USE_GPS
 static void osdFormatCoordinate(char *buff, char sym, int32_t val)
 {
@@ -411,7 +404,6 @@ static void osdFormatMessage(char *buff, size_t size, const char *message)
     // Ensure buff is zero terminated
     buff[size - 1] = '\0';
 }
-#endif // USE_CMS
 
 #ifdef USE_RTC_TIME
 static bool osdFormatRtcDateTime(char *buffer)
@@ -457,7 +449,6 @@ bool osdWarnGetState(uint8_t warningIndex)
     return osdConfig()->enabledWarnings & (1 << warningIndex);
 }
 
-#ifdef USE_CMS
 static bool osdDrawSingleElement(uint8_t item)
 {
     if (!VISIBLE(osdConfig()->item_pos[item]) || BLINK(item)) {
@@ -1090,7 +1081,6 @@ static void osdDrawElements(void)
     osdDrawSingleElement(OSD_CORE_TEMPERATURE);
 #endif
 }
-#endif // USE_CMS
 
 void pgResetFn_osdConfig(osdConfig_t *osdConfig)
 {
@@ -1595,16 +1585,13 @@ STATIC_UNIT_TESTED void osdRefresh(timeUs_t currentTimeUs)
 #endif
 
 #ifdef USE_CMS
-    if (!displayIsGrabbed(osdDisplayPort)) {
+    if (!displayIsGrabbed(osdDisplayPort))
+#endif
+    {
         osdUpdateAlarms();
         osdDrawElements();
         displayHeartbeat(osdDisplayPort);
-#ifdef OSD_CALLS_CMS
-    } else {
-        cmsUpdate(currentTimeUs);
-#endif
     }
-#endif
     lastArmState = ARMING_FLAG(ARMED);
 }
 
-- 
2.11.4.GIT