piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Trainer code simplification (#4519)

Browse Source
This commit is contained in:
Bertrand Songis
2017-02-27 13:50:03 +01:00
committed by GitHub
parent 89e1dfeeff
commit 7bc557b4eb
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/trainer_input.h
+10 -10
View File
@@ -41,8 +41,8 @@ void checkTrainerSignalWarning();
// Needs to be inlined to avoid slow function calls in ISR routines
inline void captureTrainerPulses(uint16_t capture)
{
static uint16_t lastCapt=0;
static uint8_t channelNumber=0;
static uint16_t lastCapt = 0;
static int8_t channelNumber = -1;
uint16_t val = (uint16_t)(capture - lastCapt) / 2;
lastCapt = capture;
@@ -52,19 +52,19 @@ inline void captureTrainerPulses(uint16_t capture)
//
// G: Prioritize reset pulse. (Needed when less than 16 incoming pulses)
//
if (val>4000 && val<19000) {
channelNumber = 1; // triggered
if (val > 4000 && val < 19000) {
channelNumber = 0; // triggered
}
else {
if ((channelNumber > 0) && (channelNumber <= MAX_TRAINER_CHANNELS)) {
if (val>800 && val<2200) {
if (channelNumber >= 0 && channelNumber < MAX_TRAINER_CHANNELS) {
if (val > 800 && val < 2200) {
ppmInputValidityTimer = PPM_IN_VALID_TIMEOUT;
ppmInput[channelNumber++ - 1] =
//+-500 != 512, but close enough.
(int16_t)(val - 1500)*(g_eeGeneral.PPM_Multiplier+10)/10;
ppmInput[channelNumber++] =
// +-500 != 512, but close enough.
(int16_t)(val - 1500) * (g_eeGeneral.PPM_Multiplier+10) / 10;
}
else {
channelNumber = 0; // not triggered
channelNumber = -1; // not triggered
}
}
}