From f29b9dd3293e45d3a25cae9ca38338b971fb2201 Mon Sep 17 00:00:00 2001
From: Nicholas Sherlock <n.sherlock@gmail.com>
Date: Fri, 28 Aug 2015 21:26:11 +1200
Subject: [PATCH] Blackbox: Use rx getters instead of importing private state
 directly

---
 src/main/blackbox/blackbox.c | 6 ++----
 src/main/rx/rx.c             | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/main/blackbox/blackbox.c b/src/main/blackbox/blackbox.c
index 11e47e834..64f7257c3 100644
--- a/src/main/blackbox/blackbox.c
+++ b/src/main/blackbox/blackbox.c
@@ -312,8 +312,6 @@ extern uint32_t currentTime;
 
 //From rx.c:
 extern uint16_t rssi;
-bool rxSignalReceived;
-bool rxFlightChannelsValid;
 
 static BlackboxState blackboxState = BLACKBOX_STATE_DISABLED;
 
@@ -712,8 +710,8 @@ static void loadSlowState(blackboxSlowState_t *slow)
     slow->flightModeFlags = flightModeFlags;
     slow->stateFlags = stateFlags;
     slow->failsafePhase = failsafePhase();
-    slow->rxSignalReceived = rxSignalReceived;
-    slow->rxFlightChannelsValid = rxFlightChannelsValid;
+    slow->rxSignalReceived = rxIsReceivingSignal();
+    slow->rxFlightChannelsValid = rxAreFlightChannelsValid();
 }
 
 /**
diff --git a/src/main/rx/rx.c b/src/main/rx/rx.c
index 66f33e091..78016c43b 100644
--- a/src/main/rx/rx.c
+++ b/src/main/rx/rx.c
@@ -66,8 +66,8 @@ const char rcChannelLetters[] = "AERT12345678abcdefgh";
 uint16_t rssi = 0;                  // range: [0;1023]
 
 static bool rxDataReceived = false;
-bool rxSignalReceived = false;
-bool rxFlightChannelsValid = false;
+static bool rxSignalReceived = false;
+static bool rxFlightChannelsValid = false;
 
 static uint32_t rxUpdateAt = 0;
 static uint32_t needRxSignalBefore = 0;