[all] d>=ofs and Timers were not working with EXT=STD

This commit is contained in:
bsongis@gmail.com
2013-04-15 13:48:58 +00:00
parent 9cb026ec58
commit ae1be246b6
2 changed files with 11 additions and 8 deletions
+5 -2
View File
@@ -1039,8 +1039,11 @@ bool __getSwitch(int8_t swtch)
y = calc100toRESX(cs->v2);
}
#else
if (cs->v1 >= MIXSRC_GVAR1) {
y = cs->v2; // it's a GVAR or a Timer
if (cs->v1 >= MIXSRC_FIRST_TELEM) {
y = (int16_t)3 * cs->v2; // it's a Timer
}
else if (cs->v1 >= MIXSRC_GVAR1) {
y = cs->v2; // it's a GVAR
}
else {
y = calc100toRESX(cs->v2);