Merge branch 'next' into bsongis/9XR-PRO_port

This commit is contained in:
Bertrand Songis
2013-12-23 16:12:41 +01:00
30 changed files with 25411 additions and 30397 deletions
+4
View File
@@ -3829,7 +3829,11 @@ void doMixerCalculations()
if (val<0) val=0; // prevent val be negative, which would corrupt throttle trace and timers; could occur if safetyswitch is smaller than limits
}
else {
#ifdef PCBTARANIS
val = RESX + calibratedStick[g_model.thrTraceSrc == 0 ? THR_STICK : g_model.thrTraceSrc+NUM_STICKS-1];
#else
val = RESX + rawAnas[g_model.thrTraceSrc == 0 ? THR_STICK : g_model.thrTraceSrc+NUM_STICKS-1];
#endif
}
#if !defined(CPUM64)