From 0f3c4afcc460ecc03f0453f2d7200747d0f7c01d Mon Sep 17 00:00:00 2001 From: tracernz Date: Sun, 15 Mar 2015 17:11:49 +1300 Subject: [PATCH 1/2] Add note on passthrough mode --- docs/Modes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Modes.md b/docs/Modes.md index 0c2c7ec10..517b7e10d 100644 --- a/docs/Modes.md +++ b/docs/Modes.md @@ -16,7 +16,7 @@ auxillary receiver channels and other events such as failsafe detection. | 9 | 8 | CAMTRIG | | | 10 | 9 | GPSHOME | Autonomous flight to HOME position | | 11 | 10 | GPSHOLD | Maintain the same longitude/lattitude | -| 12 | 11 | PASSTHRU | | +| 12 | 11 | PASSTHRU | Pass roll, yaw, and pitch directly from rx to servos in airplane mix | | 13 | 12 | BEEPERON | Enable beeping - useful for locating a crashed aircraft | | 14 | 13 | LEDMAX | | | 15 | 14 | LEDLOW | | From 1e7fb08b9d8afc98945b0eb77b6b55ce55c43888 Mon Sep 17 00:00:00 2001 From: Dominic Clifton Date: Sun, 15 Mar 2015 22:05:39 +0100 Subject: [PATCH 2/2] Ensure failsafe is not reset when using stale serial rx channel data. --- src/main/rx/rx.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/rx/rx.c b/src/main/rx/rx.c index 627885683..e530611aa 100644 --- 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++) {