Issue 121 fixed

This commit is contained in:
bsongis
2012-09-04 14:51:32 +00:00
parent 7a6e800c8a
commit e42fb6da31
4 changed files with 10 additions and 5 deletions
-2
View File
@@ -282,8 +282,6 @@ void menuMainView(uint8_t event)
case e_outputValues:
x0 = (i%4*9+3)*FW/2;
y0 = i/4*FH+40;
// *1000/1024 = x - x/32 + x/128
#define GPERC(x) (x - x/32 + x/128)
#if defined (DECIMALS_DISPLAYED)
lcd_outdezAtt( x0+4*FW , y0, GPERC(val), PREC1);
#else
+1 -1
View File
@@ -2131,7 +2131,7 @@ void menuProcLimits(uint8_t _event)
lcd_outdezAtt(12*FW, 0, PPM_CENTER+limitaddress(sub)->ppmCenter+g_chans512[sub]/2, 0);
lcd_puts(12*FW, 0, STR_US);
#else
lcd_outdezAtt(12*FW, 0, (g_chans512[sub] * 25) / 256, 0);
lcd_outdezAtt(12*FW, 0, GPERC(g_chans512[sub]), PREC1);
#endif
}
+6 -2
View File
@@ -2378,9 +2378,13 @@ inline void doMixerCalculations(tmr10ms_t tmr10ms, uint8_t tick10ms)
uint8_t ch = g_model.thrTraceSrc-NUM_POTS-1;
val = g_chans512[ch];
if (g_model.limitData[ch].revert)
val = -val + calc100toRESX(g_model.limitData[ch].max + 100) - RESX;
val = -val + calc100toRESX(g_model.limitData[ch].max + 100);
else
val = val - calc100toRESX(g_model.limitData[ch].min - 100) - RESX;
val = val - calc100toRESX(g_model.limitData[ch].min - 100);
if (g_model.limitData[ch].symetrical)
val -= calc1000toRESX(g_model.limitData[ch].offset);
val = val * 20 / (20+(g_model.limitData[ch].max-g_model.limitData[ch].min)/10);
val -= RESX;
}
else {
val = calibratedStick[g_model.thrTraceSrc+NUM_STICKS-1];
+3
View File
@@ -835,6 +835,9 @@ inline int16_t calc100toRESX(int8_t x)
extern int16_t calc1000toRESX(int16_t x);
#endif
// *1000/1024 = x - x/32 + x/128
#define GPERC(x) (x - x/32 + x/128)
#if defined(PCBARM)
// This doesn't need protection on this processor
#define tmr10ms_t uint32_t