Ensure failsafe is not reset when using stale serial rx channel data.

jsondag · Mar 15, 2015 · 1e7fb08 · 1e7fb08
1 parent 001cd74
commit 1e7fb08
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/main/rx/rx.c b/src/main/rx/rx.c
@@ -259,9 +259,13 @@ static void processRxChannels(void)
 
     bool shouldCheckPulse = true;
 
-    if (feature(FEATURE_FAILSAFE) && feature(FEATURE_RX_PPM)) {
-        shouldCheckPulse = isPPMDataBeingReceived();
-        resetPPMDataReceivedState();
+    if (feature(FEATURE_FAILSAFE)) {
+        if (feature(FEATURE_RX_PPM)) {
+            shouldCheckPulse = isPPMDataBeingReceived();
+            resetPPMDataReceivedState();
+        } else {
+            shouldCheckPulse = !isRxDataDriven();
+        }
     }
 
     for (chan = 0; chan < rxRuntimeConfig.channelCount; chan++) {