From 42b41e8f03920fab45b5c9485b5c336831c36319 Mon Sep 17 00:00:00 2001 From: bsongis Date: Tue, 26 Feb 2013 13:32:58 +0000 Subject: [PATCH] [X9D] GVARS screen --- src/lcd.cpp | 5 ++++- src/main_views.cpp | 3 --- src/model_menus.cpp | 16 ++++++++-------- src/open9x.cpp | 7 +++++-- src/x9d_logo.bmp | Bin 1144 -> 3126 bytes src/x9d_logo.lbm | 10 +++++----- 6 files changed, 22 insertions(+), 19 deletions(-) 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<cuy>8UmsqfiM!{YK zh$x~kZ*DdTPtQB=pzqI{oV`1DX1+T!-@UupI!%2t!XiFSKvC9w`O3$a1Jd%y!nZ6L zWZ{!(;{8EbV#2*Ju+m-fQ%V4B2%VJ zaC38mySqCwXU+^sl8_}!7G%wu6&@ZQ@bvVAmzNi^Wy^-_*|Wpj+Z#D@pNQ zs8Xd0s#dLvYSpTtdiCn4QKJTG)~tzIwQ9lF*B7;G*G8Q>bx^l%U8qzl)T>ty_3PJ1 zg9Z)Iuwg?qYSajg8#jiZpC6huX@aIro1$5>W@z5LIa;)6ftD>>qE)L_Xx+Ls+O%l{ zwOWm~ZQG(bzCAj0=zxwLJEBvkPUzgZGrDx?g05Y=qFc9a=-$0Mdi3alo;`b_ zSFc{^-McsX^yveQMuWb6`=VdJe(2x7KL!jKfPn)CV$h&L7(93|h71{kp+kpa*sx(3 zK72Svj2MBDBS&J?s8JX_dNjt283V0Wi?L(JV%)fK7(aeICQO)si4!Nn-`^jTCQZWR z$&(Qf5P&IDreNySshBox8m3R5ju|s%VCKx3m^Et_bUGbo&z_ArbLL>~+_{)HZyx5) zpN|C#7GUARg;=y`5ds4P5fl`J;NV~^Uc4AfmMp>2rAx7F*)l9&z8oPTAy~0u1y-(H ziB+psVfE_OShHpg)~;QPb?eq){rdITuwer>Zrq4Xn>HadG!&aRZ^o7_Td;NOR&3k0 z4SKyEVPRp|zI{7(?AU>wJ9lE&u3gx@dpGv%*@L}%_hR3^eb~Q$KMou?fP)7Q;?SW( zIDGgpjvP6HqeqXzU@+j=v12%X{5VdWIDwNVPvX?6Q#gJ4G|rqkgR^JP;@r7&IDh^; zE?l^Pix)5A(xpqdeEBl2T)Bd)SFgfoG~(K|Yq);>I&R#!ftxpPB0M}Cw{G3S?c29; z=guA6y?Yn;?%l)v`}gtS!2>*e_z)2h5qR|I5gtE&43o)(Cr_T>>C>l(jEqE7R1}^) zdxq!FpX0@g7kK&dC0@OHh1aiNDG(-o1N=_wV21!-o&}`0*pmW;3FrqY)Dm zgV@+ueEReWadC0@{P{ED$1 zWbos~9mLTrcppiOCu+}l_Lie45tJe^9)M>wJL5-L7jfM|8xt8H0Ivj!bjATu7M+pt zF7z!0E3_C-z{?DBs2a-=bO(u{wB3d44*>cRCD%s+`MLPf7a3oHA_Xc%g2Oz$b_O!O z`a3y)GObL*S^!Wuo{rHA=`H!W`q3N4J4j6;Xl@EtXs&@~^CIRi`Bf*8pZS~3R?(`{ z6*9Vgpv}{SnPynLMB#1%l^U5!)CgmUI*fms80GKC`0vrz{8PXGsmbx@F_xzO!w|x$ zH5RWfz5#|A$m;G?EyJ)I6$%TVyiW z;tV{I)9P6>+03@Pf{m6Ft0fJqI*XkZ$rd2C*g9cNWj7P)`MW@rYAwJZ@Ny8ZwcYe}Wp@j&gx&Zcwg`?F?4i zoLZiW?;l&?WKa@Jl1koj;n9;|$v{RyrpyL!pvJl#M*i>-T-(W48cZ;Xy$DfR9O4Xd z3>!?6f>&W(DVS8-Td;O4-*gI6=*+h2esb~TZ#(qML`0hPAxb6F#l`&!Ox;|oHFC53 z?%qEjTAu(J$DSse3Nuko4jgs_Jo4>J;*=#bZCFP&Ol`6GTp^%T$Z)CNH P>Xa(2?abMY|DyZ_m?y?M literal 1144 zcmah{OK1~O6g>&4RVSZLb#3G5!mW%;VTwdtNd=p=U1b|rMo{pFl9dhUCM&zn!nkr1 zB$487z<^5$buBa*+NQRN=6dd%nF=MT7v6h!?z!jO^JeD8?T0Ctc)sOO#qv?uwhhN|;JPjfg#wDjB1)waDwPVV)hg=sIvR}zTCEm*-$$?4L%-jLh#YCm zO420!iw<(6NRX3&8MounF(6w+ah2Cro;+9zeBw%@jN;6+E5;@8J4RNa9C_NM45dP- zLHDW};i^I-#MO}&eZLcua-v9#8?LYv^3C)JH~Pe>&ynH$7>`DAoY7a@+)u634a?E} z)Tg;0?bBW8kNEM|!*-=mO&Lo6U+AQhqK2|a4NdKtP%P2x!aG1xCJPv_7JVmAak*4n zMS2gpA?B3SW@(JGA|qrJ*2vTS{60=Ab4d$G=$6t{M*Pw6br~O(bQqF0VCTJ>nI%KL z%~F?JT5)WV6Y%%V1~~PSxf(=fhg(*(S*IRozQ@uNKHS00)$$nDQ@)&C%&)as!x@p^ zrAM#ITZ2JhF1j#xNdEz>A#KQgIQe@#$6n?mr-3ZLbjD{gh70 z+pD(S{N}FwS!{2**JWrCh~oLqYn6*bUmhLDk3ZjdANJ{LR{VNA%KqTAS+V{7Vm~