diff --git a/src/lcd.cpp b/src/lcd.cpp index f45590652..5f251753f 100644 --- a/src/lcd.cpp +++ b/src/lcd.cpp @@ -750,7 +750,10 @@ void putsVBat(xcoord_t x, uint8_t y, LcdFlags att) void putsStrIdx(xcoord_t x, uint8_t y, const pm_char *str, uint8_t idx, LcdFlags att) { lcd_putsAtt(x, y, str, att); - lcd_outdezNAtt(lcdLastPos, y, idx, att|LEFT, 2); + if (att & SMLSIZE) + lcd_outdezNAtt(lcdLastPos+1, y, idx, att|LEFT, 2); + else + lcd_outdezNAtt(lcdLastPos, y, idx, att|LEFT, 2); lcd_putsAtt(x, y, str, att); } diff --git a/src/main_views.cpp b/src/main_views.cpp index 154bc541c..d9dbd2466 100644 --- a/src/main_views.cpp +++ b/src/main_views.cpp @@ -420,9 +420,6 @@ void menuMainView(uint8_t event) resetTimer(1); } #endif - else { - resetTimer(0); - } AUDIO_KEYPAD_UP(); break; diff --git a/src/model_menus.cpp b/src/model_menus.cpp index b1cfa80fb..e92e63a0b 100644 --- a/src/model_menus.cpp +++ b/src/model_menus.cpp @@ -49,7 +49,7 @@ enum EnumTabModel { e_MixAll, e_Limits, IF_CURVES(e_CurvesAll) -#if LCD_W >= 260 +#if LCD_W >= 212 IF_GVARS(e_GVars) #endif e_CustomSwitches, @@ -82,7 +82,7 @@ const MenuFuncP_PROGMEM menuTabModel[] PROGMEM = { menuModelMixAll, menuModelLimits, IF_CURVES(menuModelCurvesAll) -#if LCD_W >= 260 +#if LCD_W >= 212 IF_GVARS(menuModelGVars) #endif menuModelCustomSwitches, @@ -1461,10 +1461,10 @@ void menuModelPhaseOne(uint8_t event) if (v > GVAR_MAX) { uint8_t p = v - GVAR_MAX - 1; if (p >= s_currIdx) p++; - putsFlightPhase(MIXES_2ND_COLUMN+2*FW, y, p+1, m_posHorz==1 ? attr : 0); + putsFlightPhase(11*FW, y, p+1, m_posHorz==1 ? attr : 0); } else { - lcd_putsAtt(12*FW, y, STR_OWN, m_posHorz==1 ? attr : 0); + lcd_putsAtt(11*FW, y, STR_OWN, m_posHorz==1 ? attr : 0); } if (attr && s_currIdx>0 && m_posHorz==1 && (editMode>0 || p1valdiff)) { if (v < GVAR_MAX) v = GVAR_MAX; @@ -2921,7 +2921,7 @@ void menuModelCurvesAll(uint8_t event) } #endif -#if LCD_W >= 260 && defined(GVARS) +#if LCD_W >= 212 && defined(GVARS) void menuModelGVars(uint8_t event) { MENU(PSTR("GLOBAL VARIABLES"), menuTabModel, e_GVars, 1+MAX_GVARS, {0, MAX_PHASES, MAX_PHASES, MAX_PHASES, MAX_PHASES, MAX_PHASES, MAX_PHASES, MAX_PHASES, MAX_PHASES, MAX_PHASES}); @@ -2935,9 +2935,9 @@ void menuModelGVars(uint8_t event) for (uint8_t j=0; j<1+MAX_PHASES; j++) { uint8_t attr = ((sub==i && m_posHorz==j) ? ((s_editMode>0) ? BLINK|INVERS : INVERS) : 0); - xcoord_t x = 14*FW + (j-1)*(2+4*FWNUM) - 1; + xcoord_t x = 12*FW + FWNUM + (j-1)*(2+3*FWNUM) - 1; - if (i==0 && j!=9) putsStrIdx(x+FWNUM, 2*FH, STR_FP, j, 0); + if (i==0 && j!=9) putsStrIdx(x+2, 2*FH, STR_FP, j, SMLSIZE); switch(j) { @@ -2957,7 +2957,7 @@ void menuModelGVars(uint8_t event) vmin = GVAR_MAX+1; vmax = GVAR_MAX+MAX_PHASES; } else { - if (abs(v) >= 1000) + if (abs(v) >= 100) lcd_outdezAtt(x, y+1, v, attr | TINSIZE); else lcd_outdezAtt(x, y, v, attr); diff --git a/src/open9x.cpp b/src/open9x.cpp index 1faecaad7..4cb7b7bc1 100644 --- a/src/open9x.cpp +++ b/src/open9x.cpp @@ -1892,15 +1892,18 @@ BeepANACenter evalSticks(uint8_t mode) } #endif + BeepANACenter mask = (BeepANACenter)1 << ch; + if (i < NUM_STICKS+NUM_POTS) { calibratedStick[ch] = v; //for show in expo // filtering for center beep uint8_t tmp = (uint16_t)abs(v) / 16; - if (tmp <= 1) anaCenter |= (tmp==0 ? (BeepANACenter)1<