piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Issue 53 fixed

Browse Source 
Issue 75 fixed
This commit is contained in:
bsongis
2012-08-11 20:08:58 +00:00
parent 5697f4aa72
commit 0eee68144d
3 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/model_menus.cpp
+4 -4
View File
@@ -2501,11 +2501,11 @@ void menuProcFunctionSwitches(uint8_t event)
uint8_t active = (attr && (s_editMode>0 || p1valdiff));
switch (j) {
case 0:
if (sd->func <= FUNC_SAFETY_CH16 && sd->delay) {
if (sd->func <= FUNC_TRAINER_AIL && sd->delay) {
if (sd->swtch > MAX_SWITCH+1) sd->swtch -= (MAX_SWITCH+1);
if (sd->swtch < -MAX_SWITCH-1) sd->swtch += (MAX_SWITCH+1);
}
putsSwitches(3, y, sd->swtch, SWONOFF | attr | ((abs(sd->swtch) <= (MAX_SWITCH+1) && getSwitch(sd->swtch, 0) && (sd->func >= 16 || sd->delay)) ? BOLD : 0));
putsSwitches(3, y, sd->swtch, SWONOFF | attr | ((abs(sd->swtch) <= (MAX_SWITCH+1) && getSwitch(sd->swtch, 0) && (sd->func > FUNC_INSTANT_TRIM || sd->delay)) ? BOLD : 0));
if (active) {
CHECK_INCDEC_MODELSWITCH( event, sd->swtch, SWITCH_OFF-MAX_SWITCH, SWITCH_ON+MAX_SWITCH+1);
}
@@ -2609,7 +2609,7 @@ void menuProcFunctionSwitches(uint8_t event)
lcd_outdezAtt(18*FW, y, val_displayed, attr);
}
else {
if (attr) m_posHorz = 0;
if (attr) m_posHorz = ((event & EVT_KEY_MASK) == KEY_LEFT ? 1 : 3);
break;
}
@@ -2623,7 +2623,7 @@ void menuProcFunctionSwitches(uint8_t event)
break;
case 3:
if (sd->swtch && sd->func <= FUNC_SAFETY_CH16) {
if (sd->swtch && sd->func <= FUNC_INSTANT_TRIM) {
#if defined(GRAPHICS)
menu_lcd_onoff(20*FW, y, sd->delay, attr ) ;
#else