simu compilation broken

This commit is contained in:
bsongis
2012-07-06 18:08:16 +00:00
parent 177d3739d4
commit 356933f0bf
2 changed files with 11 additions and 9 deletions
+10
View File
@@ -416,6 +416,16 @@ void applyExpos(int16_t *anas)
}
}
int16_t calc1000toRESX(int16_t x)
{
// return x + x/32 - x/128 + x/512;
int16_t y = x>>5;
x+=y;
y=y>>2;
x-=y;
return x+(y>>2);
}
int16_t applyLimits(uint8_t channel, int32_t value)
{
int16_t ofs = g_model.limitData[channel].offset;
+1 -9
View File
@@ -717,15 +717,7 @@ inline int16_t calc100toRESX(int8_t x)
return ((x*41)>>2) - x/64;
}
int16_t calc1000toRESX(int16_t x)
{
// return x + x/32 - x/128 + x/512;
int16_t y = x>>5;
x+=y;
y=y>>2;
x-=y;
return x+(y>>2);
}
extern int16_t calc1000toRESX(int16_t x);
#endif
extern volatile uint16_t g_tmr10ms;