Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-19 06:15:16 +03:00
Code Issues Wiki Activity

Add special failsafe handling for PPM whilst still keeping failsafe code

Browse source 
out of the PWM RX driver.
This commit is contained in:
Dominic Clifton 2014-05-22 21:22:31 +01:00
parent 910d63a722
commit d1be2ed5e2
3 changed files with 32 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/rx_common.c
View file

@ -13,6 +13,7 @@
#include "failsafe.h"
#include "drivers/pwm_rx.h"
#include "rx_pwm.h"
#include "rx_sbus.h"
#include "rx_spektrum.h"
@ -166,7 +167,7 @@ bool shouldProcessRx(uint32_t currentTime)
}
static bool isRxDataDriven(void) {
return !(feature(FEATURE_RX_PARALLEL_PWM) || feature(FEATURE_RX_PPM));
return !(feature(FEATURE_RX_PARALLEL_PWM | FEATURE_RX_PPM));
}
static uint8_t rcSampleIndex = 0;
@ -192,6 +193,14 @@ uint16_t calculateNonDataDrivenChannel(uint8_t chan, uint16_t sample)
void processRxChannels(void)
{
uint8_t chan;
bool shouldCheckPulse = true;
if (feature(FEATURE_FAILSAFE | FEATURE_RX_PPM)) {
shouldCheckPulse = isPPMDataBeingReceived();
resetPPMDataReceivedState();
}
for (chan = 0; chan < rxRuntimeConfig.channelCount; chan++) {
if (!rcReadRawFunc) {
@ -204,7 +213,7 @@ void processRxChannels(void)
// sample the channel
uint16_t sample = rcReadRawFunc(&rxRuntimeConfig, rawChannel);
if (feature(FEATURE_FAILSAFE)) {
if (feature(FEATURE_FAILSAFE) && shouldCheckPulse) {
failsafe->vTable->checkPulse(rawChannel, sample);
}