diff --git a/src/gruvin9x.cpp b/src/gruvin9x.cpp index b0fccab3e..b6f8acef2 100644 --- a/src/gruvin9x.cpp +++ b/src/gruvin9x.cpp @@ -280,13 +280,9 @@ void applyExpos(int16_t *anas, uint8_t phase) 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); + v = expo(v, k); 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; } } diff --git a/src/model_menus.cpp b/src/model_menus.cpp index 8f56a2c2c..9489e7ba0 100644 --- a/src/model_menus.cpp +++ b/src/model_menus.cpp @@ -386,7 +386,7 @@ void EditName(uint8_t x, uint8_t y, char *name, uint8_t size, uint8_t event, boo void menuProcModel(uint8_t event) { lcd_outdezNAtt(7*FW,0,g_eeGeneral.currModel+1,INVERS+LEADING0,2); - MENU("SETUP", menuTabModel, e_Model, (g_model.protocol ? 10 : 11), {0,sizeof(g_model.name)-1,3,3,0,0,0,1,6,2,1}); + MENU("SETUP", menuTabModel, e_Model, (g_model.protocol ? 10 : 11), {0,sizeof(g_model.name)-1,3,3,0,0,0,0,6,2,1}); uint8_t sub = m_posVert; uint8_t y = 1*FH; @@ -460,17 +460,7 @@ void menuProcModel(uint8_t event) if(s_pgOfs0 || p1valdiff)) { - switch (m_posHorz) { - case 0: - CHECK_INCDEC_MODELVAR(event,g_model.thrTrim,0,1); - break; - case 1: - CHECK_INCDEC_MODELVAR(event,g_model.thrExpo,0,1); - break; - } - } + if (sub==subN) CHECK_INCDEC_MODELVAR(event,g_model.thrTrim,0,1); if((y+=FH)>7*FH) return; }subN++; diff --git a/src/myeeprom.h b/src/myeeprom.h index 26f654a20..2637e6d1f 100644 --- a/src/myeeprom.h +++ b/src/myeeprom.h @@ -235,7 +235,7 @@ typedef struct t_ModelData { uint8_t thrTrim:1; // Enable Throttle Trim int8_t ppmNCH:4; uint8_t trimInc:3; // Trim Increments - uint8_t thrExpo:1; // Enable Throttle Expo + uint8_t spare1:1; uint8_t pulsePol:1; uint8_t extendedLimits:1; uint8_t extendedTrims:1; diff --git a/src/pers.cpp b/src/pers.cpp index c7d5e8246..77663b493 100644 --- a/src/pers.cpp +++ b/src/pers.cpp @@ -107,7 +107,6 @@ uint8_t Translate() g_model.protocol = v3->protocol; g_model.ppmNCH = v3->ppmNCH; g_model.thrTrim = v3->thrTrim; - g_model.thrExpo = v3->thrExpo; g_model.trimInc = v3->trimInc; g_model.pulsePol = v3->pulsePol; if (g_eeGeneral.myVers == EEPROM_VER_r584)