From 14104d00a2f7430c719a2192be5ae30561ad069b Mon Sep 17 00:00:00 2001 From: bsongis Date: Wed, 9 Nov 2011 20:11:15 +0000 Subject: [PATCH] Bugs in EXPOS/DR --- src/gruvin9x.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gruvin9x.cpp b/src/gruvin9x.cpp index 0d847ed18..646db5dbd 100644 --- a/src/gruvin9x.cpp +++ b/src/gruvin9x.cpp @@ -278,15 +278,15 @@ void applyExpos(int16_t *anas) } } if (getSwitch(ed.swtch, 1)) { - cur_chn = ed.chn; - int16_t v = anas2[cur_chn]; + int16_t v = anas2[ed.chn]; if((v<0 && ed.mode&1) || (v>=0 && ed.mode&2)) { + cur_chn = ed.chn; int16_t k = ed.expo; if (IS_THROTTLE(cur_chn) && g_model.thrExpo) v = 2*expo((v+RESX)/2, k); else v = expo(v, k); - if (ed.curve) v = applyCurve(v, ed.curve, 0); + if (ed.curve) v = applyCurve(v, ed.curve > 10 ? ed.curve + 4 : ed.curve, 0); v = ((int32_t)v * ed.weight) / 100; if (IS_THROTTLE(cur_chn) && g_model.thrExpo) v -= RESX; anas[cur_chn] = v;