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

Fixes #1235

Browse source
This commit is contained in:
bsongis 2014-06-10 11:35:47 +02:00
parent 4305935fd4
commit 9be2755d91
1 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

23
radio/src/opentx.cpp
View file

@ -1082,7 +1082,9 @@ void checkTHR()
else { else {
calibratedStick[thrchn] = -1024; calibratedStick[thrchn] = -1024;
#if !defined(PCBTARANIS) #if !defined(PCBTARANIS)
rawAnas[thrchn] = anas[thrchn] = calibratedStick[thrchn]; if (thrchn < NUM_STICKS) {
rawAnas[thrchn] = anas[thrchn] = calibratedStick[thrchn];
}
#endif #endif
MESSAGE(STR_THROTTLEWARN, STR_THROTTLENOTIDLE, STR_PRESSANYKEYTOSKIP, AU_THROTTLE_ALERT); MESSAGE(STR_THROTTLEWARN, STR_THROTTLENOTIDLE, STR_PRESSANYKEYTOSKIP, AU_THROTTLE_ALERT);
} }
@ -2156,11 +2158,11 @@ void doMixerCalculations()
val = val - gModelMin; val = val - gModelMin;
#if defined(PPM_LIMITS_SYMETRICAL) #if defined(PPM_LIMITS_SYMETRICAL)
if (lim->symetrical) if (lim->symetrical) {
val -= calc1000toRESX(lim->offset); val -= calc1000toRESX(lim->offset);
}
#endif #endif
gModelMax -= gModelMin; // we compare difference between Max and Mix for recaling needed; Max and Min are shifted to 0 by default gModelMax -= gModelMin; // we compare difference between Max and Mix for recaling needed; Max and Min are shifted to 0 by default
// usually max is 1024 min is -1024 --> max-min = 2048 full range // usually max is 1024 min is -1024 --> max-min = 2048 full range
@ -2182,7 +2184,7 @@ void doMixerCalculations()
#ifdef PCBTARANIS #ifdef PCBTARANIS
val = RESX + calibratedStick[g_model.thrTraceSrc == 0 ? THR_STICK : g_model.thrTraceSrc+NUM_STICKS-1]; val = RESX + calibratedStick[g_model.thrTraceSrc == 0 ? THR_STICK : g_model.thrTraceSrc+NUM_STICKS-1];
#else #else
val = RESX + rawAnas[g_model.thrTraceSrc == 0 ? THR_STICK : g_model.thrTraceSrc+NUM_STICKS-1]; val = RESX + (g_model.thrTraceSrc == 0 ? rawAnas[THR_STICK] : calibratedStick[g_model.thrTraceSrc+NUM_STICKS-1]);
#endif #endif
} }
@ -2205,8 +2207,6 @@ void doMixerCalculations()
timerState->sum = 0; timerState->sum = 0;
} }
// value for time described in timer->mode
// OFFABSTHsTH%THt
if (tm == TMRMODE_THR_REL) { if (tm == TMRMODE_THR_REL) {
timerState->cnt++; timerState->cnt++;
timerState->sum+=val; timerState->sum+=val;
@ -2227,21 +2227,22 @@ void doMixerCalculations()
// @@@ open.20.fsguruh: why so complicated? we have already a s_sum field; use it for the half seconds (not showable) as well // @@@ open.20.fsguruh: why so complicated? we have already a s_sum field; use it for the half seconds (not showable) as well
// check for s_cnt[i]==0 is not needed because we are shure it is at least 1 // check for s_cnt[i]==0 is not needed because we are shure it is at least 1
#if defined(ACCURAT_THROTTLE_TIMER) #if defined(ACCURAT_THROTTLE_TIMER)
if ((timerState->sum/timerState->cnt)>=128) { // throttle was normalized to 0 to 128 value (throttle/64*2 (because - range is added as well) if ((timerState->sum/timerState->cnt) >= 128) { // throttle was normalized to 0 to 128 value (throttle/64*2 (because - range is added as well)
newTimerVal++; // add second used of throttle newTimerVal++; // add second used of throttle
timerState->sum-=128*timerState->cnt; timerState->sum -= 128*timerState->cnt;
} }
#else #else
if ((timerState->sum/timerState->cnt)>=32) { // throttle was normalized to 0 to 32 value (throttle/16*2 (because - range is added as well) if ((timerState->sum/timerState->cnt) >= 32) { // throttle was normalized to 0 to 32 value (throttle/16*2 (because - range is added as well)
newTimerVal++; // add second used of throttle newTimerVal++; // add second used of throttle
timerState->sum-=32*timerState->cnt; timerState->sum -= 32*timerState->cnt;
} }
#endif #endif
timerState->cnt=0; timerState->cnt=0;
} }
else if (tm == TMRMODE_THR_TRG) { else if (tm == TMRMODE_THR_TRG) {
if (val || newTimerVal > 0) if (val || newTimerVal > 0) {
newTimerVal++; newTimerVal++;
}
} }
else { else {
if (tm > 0) tm -= (TMR_VAROFS-1); if (tm > 0) tm -= (TMR_VAROFS-1);