From 7247a511cfc9c1ab4706524aa1c1c6e6136d98ee Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Sun, 10 Apr 2016 13:42:55 +0200
Subject: [PATCH] Simu compilation fix

---
 radio/src/opentx.cpp | 40 ------------------------------------
 radio/src/opentx.h   | 48 ++++++++++++++++++++++++++++++++++++--------
 2 files changed, 40 insertions(+), 48 deletions(-)

diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index ff3b7f320..a3f734171 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -921,46 +921,6 @@ getvalue_t convert8bitsTelemValue(uint8_t channel, ls_telemetry_value_t value)
 }
 #endif
 
-#if defined(FRSKY)&& !defined(CPUARM)
-FORCEINLINE void convertUnit(getvalue_t & val, uint8_t & unit)
-{
-  if (IS_IMPERIAL_ENABLE()) {
-    if (unit == UNIT_TEMPERATURE) {
-      val += 18;
-      val *= 115;
-      val >>= 6;
-    }
-    if (unit == UNIT_DIST) {
-      // m to ft *105/32
-      val = val * 3 + (val >> 2) + (val >> 5);
-    }
-    if (unit == UNIT_FEET) {
-      unit = UNIT_DIST;
-    }
-    if (unit == UNIT_KTS) {
-      // kts to mph
-      unit = UNIT_SPEED;
-      val = (val * 23) / 20;
-    }
-  }
-  else {
-    if (unit == UNIT_KTS) {
-      // kts to km/h
-      unit = UNIT_SPEED;
-#if defined(CPUARM)
-      val = (val * 1852) / 1000;
-#else
-      val = (val * 50) / 27;
-#endif
-    }
-  }
-
-  if (unit == UNIT_HDG) {
-    unit = UNIT_TEMPERATURE;
-  }
-}
-#endif
-
 #define INAC_STICKS_SHIFT   6
 #define INAC_SWITCHES_SHIFT 8
 bool inputsMoved()
diff --git a/radio/src/opentx.h b/radio/src/opentx.h
index 913c5432b..350295206 100644
--- a/radio/src/opentx.h
+++ b/radio/src/opentx.h
@@ -1543,14 +1543,6 @@ extern union ReusableBuffer reusableBuffer;
 
 void checkFlashOnBeep();
 
-#if defined(CPUARM)
-void putsValueWithUnit(coord_t x, coord_t y, int32_t val, uint8_t unit, LcdFlags att);
-#elif defined(FRSKY)
-void convertUnit(getvalue_t & val, uint8_t & unit); // TODO check FORCEINLINE on stock
-#else
-#define convertUnit(...)
-#endif
-
 #if defined(CPUARM)
 uint8_t zlen(const char *str, uint8_t size);
 bool zexist(const char *str, uint8_t size);
@@ -1701,6 +1693,46 @@ void varioWakeup();
   #define IS_IMPERIAL_ENABLE() (0)
 #endif
 
+#if defined(CPUARM)
+void putsValueWithUnit(coord_t x, coord_t y, int32_t val, uint8_t unit, LcdFlags att);
+#elif defined(FRSKY)
+FORCEINLINE void convertUnit(getvalue_t & val, uint8_t & unit)
+{
+  if (IS_IMPERIAL_ENABLE()) {
+    if (unit == UNIT_TEMPERATURE) {
+      val += 18;
+      val *= 115;
+      val >>= 6;
+    }
+    if (unit == UNIT_DIST) {
+      // m to ft *105/32
+      val = val * 3 + (val >> 2) + (val >> 5);
+    }
+    if (unit == UNIT_FEET) {
+      unit = UNIT_DIST;
+    }
+    if (unit == UNIT_KTS) {
+      // kts to mph
+      unit = UNIT_SPEED;
+      val = (val * 23) / 20;
+    }
+  }
+  else {
+    if (unit == UNIT_KTS) {
+      // kts to km/h
+      unit = UNIT_SPEED;
+      val = (val * 50) / 27;
+    }
+  }
+
+  if (unit == UNIT_HDG) {
+    unit = UNIT_TEMPERATURE;
+  }
+}
+#else
+#define convertUnit(...)
+#endif
+
 #if !defined(CPUARM)
   #define IS_USR_PROTO_FRSKY_HUB()   (g_model.frsky.usrProto == USR_PROTO_FRSKY)
   #define IS_USR_PROTO_WS_HOW_HIGH() (g_model.frsky.usrProto == USR_PROTO_WS_HOW_HIGH)