From 1812eee8fd7ebbdfcc45c6f86f395e92e99377e8 Mon Sep 17 00:00:00 2001
From: mikeller <github@ike.ch>
Date: Sun, 31 May 2020 14:14:58 +1200
Subject: [PATCH] Cleaned up 'getEstimatedVario()'.

---
 src/main/flight/position.c     | 7 ++-----
 src/main/telemetry/smartport.c | 2 ++
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/main/flight/position.c b/src/main/flight/position.c
index daa3e1e124..fc60621351 100644
--- a/src/main/flight/position.c
+++ b/src/main/flight/position.c
@@ -188,12 +188,9 @@ int32_t getEstimatedAltitudeCm(void)
     return estimatedAltitudeCm;
 }
 
-// This should be removed or fixed, but it would require changing a lot of other things to get rid of.
+#ifdef USE_VARIO
 int16_t getEstimatedVario(void)
 {
-#ifdef USE_VARIO
     return estimatedVario;
-#else
-    return 0;
-#endif
 }
+#endif
diff --git a/src/main/telemetry/smartport.c b/src/main/telemetry/smartport.c
index cfa7a3aab0..1736e6b08e 100644
--- a/src/main/telemetry/smartport.c
+++ b/src/main/telemetry/smartport.c
@@ -705,10 +705,12 @@ void processSmartPortTelemetry(smartPortPayload_t *payload, volatile bool *clear
                 smartPortSendPackage(id, getMAhDrawn()); // given in mAh, unknown requested unit
                 *clearToSend = false;
                 break;
+#if defined(USE_VARIO)
             case FSSP_DATAID_VARIO      :
                 smartPortSendPackage(id, getEstimatedVario()); // unknown given unit but requested in 100 = 1m/s
                 *clearToSend = false;
                 break;
+#endif
             case FSSP_DATAID_HEADING    :
                 smartPortSendPackage(id, attitude.values.yaw * 10); // given in 10*deg, requested in 10000 = 100 deg
                 *clearToSend = false;