From c26d6362b1b5c27c6b2d7c99090b95427b8e74e8 Mon Sep 17 00:00:00 2001
From: Dominic Clifton <me@dominicclifton.name>
Date: Mon, 7 Apr 2014 22:31:20 +0100
Subject: [PATCH] Rename some telemetry variables and methods to better
 indicate the intent of the code and thus the readability and maintainability
 of it.

---
 src/telemetry_common.c | 24 ++++++++++++------------
 src/telemetry_common.h |  1 -
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/telemetry_common.c b/src/telemetry_common.c
index 4300107997..1153290dd2 100644
--- a/src/telemetry_common.c
+++ b/src/telemetry_common.c
@@ -59,23 +59,23 @@ void initTelemetry(void)
 
 static bool telemetryEnabled = false;
 
-bool isTelemetryEnabled(void)
+bool determineNewTelemetryEnabledState(void)
 {
-    bool telemetryCurrentlyEnabled = true;
+    bool enabled = true;
 
     if (mcfg.telemetry_port == TELEMETRY_PORT_UART) {
         if (!mcfg.telemetry_switch)
-            telemetryCurrentlyEnabled = f.ARMED;
+            enabled = f.ARMED;
         else
-            telemetryCurrentlyEnabled = rcOptions[BOXTELEMETRY];
+            enabled = rcOptions[BOXTELEMETRY];
     }
 
-    return telemetryCurrentlyEnabled;
+    return enabled;
 }
 
-bool shouldChangeTelemetryStateNow(bool telemetryCurrentlyEnabled)
+bool shouldChangeTelemetryStateNow(bool newState)
 {
-    return telemetryCurrentlyEnabled != telemetryEnabled;
+    return newState != telemetryEnabled;
 }
 
 static void configureTelemetryPort(void) {
@@ -104,23 +104,23 @@ void checkTelemetryState(void)
         return;
     }
 
-    bool telemetryCurrentlyEnabled = isTelemetryEnabled();
+    bool newEnabledState = determineNewTelemetryEnabledState();
 
-    if (!shouldChangeTelemetryStateNow(telemetryCurrentlyEnabled)) {
+    if (!shouldChangeTelemetryStateNow(newEnabledState)) {
         return;
     }
 
-    if (telemetryCurrentlyEnabled)
+    if (newEnabledState)
         configureTelemetryPort();
     else
         freeTelemetryPort();
 
-    telemetryEnabled = telemetryCurrentlyEnabled;
+    telemetryEnabled = newEnabledState;
 }
 
 void handleTelemetry(void)
 {
-    if (!isTelemetryConfigurationValid || !isTelemetryEnabled())
+    if (!isTelemetryConfigurationValid || !determineNewTelemetryEnabledState())
         return;
 
     if (isTelemetryProviderFrSky()) {
diff --git a/src/telemetry_common.h b/src/telemetry_common.h
index 5462132b3f..0241d6415e 100644
--- a/src/telemetry_common.h
+++ b/src/telemetry_common.h
@@ -12,6 +12,5 @@
 void initTelemetry(void);
 void checkTelemetryState(void);
 void handleTelemetry(void);
-bool isTelemetryEnabled(void);
 
 #endif /* TELEMETRY_COMMON_H_ */