Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-19 22:35:12 +03:00
Code Issues Wiki Activity

Fixes #934

Browse source
This commit is contained in:
bsongis 2014-04-14 16:19:19 +02:00
parent f2dba0a9ba
commit 01ee8c31fc
1 changed files with 24 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

29
radio/src/opentx.cpp
View file

@ -946,6 +946,13 @@ int expo(int x, int k)
return neg? -y : y; return neg? -y : y;
} }
#if defined(HELI)
int16_t cyc_anas[3] = {0};
#if defined(PCBTARANIS)
int16_t heliAnas[4] = {0};
#endif
#endif
void applyExpos(int16_t *anas, uint8_t mode APPLY_EXPOS_EXTRA_PARAMS) void applyExpos(int16_t *anas, uint8_t mode APPLY_EXPOS_EXTRA_PARAMS)
{ {
#if !defined(PCBTARANIS) #if !defined(PCBTARANIS)
@ -967,10 +974,21 @@ void applyExpos(int16_t *anas, uint8_t mode APPLY_EXPOS_EXTRA_PARAMS)
continue; continue;
if (getSwitch(ed->swtch)) { if (getSwitch(ed->swtch)) {
#if defined(PCBTARANIS) #if defined(PCBTARANIS)
int v = (ed->srcRaw == ovwrIdx ? ovwrValue : getValue(ed->srcRaw)); int v;
if (ed->srcRaw != ovwrIdx && ed->srcRaw >= MIXSRC_FIRST_TELEM && ed->scale > 0) { if (ed->srcRaw == ovwrIdx)
v = ovwrValue;
#if defined(HELI)
else if (ed->srcRaw == MIXSRC_Ele)
v = heliAnas[ELE_STICK];
else if (ed->srcRaw == MIXSRC_Ail)
v = heliAnas[AIL_STICK];
#endif
else {
v = getValue(ed->srcRaw);
if (ed->srcRaw >= MIXSRC_FIRST_TELEM && ed->scale > 0) {
v = limit(-1024, int((v * 1024) / convertTelemValue(ed->srcRaw-MIXSRC_FIRST_TELEM+1, ed->scale)), 1024); v = limit(-1024, int((v * 1024) / convertTelemValue(ed->srcRaw-MIXSRC_FIRST_TELEM+1, ed->scale)), 1024);
} }
}
#else #else
int16_t v = anas2[ed->chn]; int16_t v = anas2[ed->chn];
#endif #endif
@ -1193,9 +1211,6 @@ int16_t applyLimits(uint8_t channel, int32_t value)
int16_t calibratedStick[NUM_STICKS+NUM_POTS]; int16_t calibratedStick[NUM_STICKS+NUM_POTS];
int16_t channelOutputs[NUM_CHNOUT] = {0}; int16_t channelOutputs[NUM_CHNOUT] = {0};
int16_t ex_chans[NUM_CHNOUT] = {0}; // Outputs (before LIMITS) of the last perMain; int16_t ex_chans[NUM_CHNOUT] = {0}; // Outputs (before LIMITS) of the last perMain;
#ifdef HELI
int16_t cyc_anas[3] = {0};
#endif
// TODO same naming convention than the putsMixerSource // TODO same naming convention than the putsMixerSource
@ -3181,7 +3196,7 @@ void evalInputs(uint8_t mode)
if (d && (ch==ELE_STICK || ch==AIL_STICK)) { if (d && (ch==ELE_STICK || ch==AIL_STICK)) {
v = (int32_t(v) * calc100toRESX(g_model.swashR.value)) / int32_t(d); v = (int32_t(v) * calc100toRESX(g_model.swashR.value)) / int32_t(d);
#if defined(PCBTARANIS) #if defined(PCBTARANIS)
calibratedStick[ch] = v; heliAnas[ch] = v;
#endif #endif
} }
#endif #endif
@ -3662,7 +3677,7 @@ void evalFunctions()
} }
#if defined(PCBTARANIS) #if defined(PCBTARANIS)
#define HELI_ANAS_ARRAY calibratedStick #define HELI_ANAS_ARRAY heliAnas
#else #else
#define HELI_ANAS_ARRAY anas #define HELI_ANAS_ARRAY anas
#endif #endif