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

Fix switch warning for X9 Lite

Browse Source
This commit is contained in:
Bertrand Songis
2019-06-05 10:17:35 +02:00
parent aeded5dffa
commit eee918a304
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/128x64/model_setup.cpp
+7 -9
View File
@@ -291,6 +291,7 @@ void menuModelSetup(event_t event)
#endif
int8_t old_editMode = s_editMode;
int8_t old_posHorz = menuHorizontalPosition;
#if defined(PCBTARANIS)
MENU_TAB({
@@ -599,13 +600,11 @@ void menuModelSetup(event_t event)
}
}
LcdFlags line = attr;
int current = 0;
for (int i=0; i<switchWarningsCount; i++) {
for (int i = 0; i < switchWarningsCount; i++) {
if (SWITCH_WARNING_ALLOWED(i)) {
div_t qr = div(current, 4);
if (!READ_ONLY() && event==EVT_KEY_BREAK(KEY_ENTER) && line && l_posHorz==current && old_editMode) {
if (!READ_ONLY() && event==EVT_KEY_BREAK(KEY_ENTER) && attr && l_posHorz == current && old_posHorz >= 0) {
g_model.switchWarningEnable ^= (1 << i);
storageDirty(EE_MODEL);
#if defined(PCBXLITE)
@@ -614,8 +613,8 @@ void menuModelSetup(event_t event)
}
uint8_t swactive = !(g_model.switchWarningEnable & (1<<i));
c = "\300-\301"[states & 0x03];
//lcdDrawChar(MODEL_SETUP_2ND_COLUMN+qr.rem*(2*FW+1), y+FH*qr.quot, 'A'+i, line && (menuHorizontalPosition==current) ? INVERS : 0);
lcdDrawSizedText(MODEL_SETUP_2ND_COLUMN + qr.rem*((2*FW)+1), y+FH*qr.quot, FIRSTSW_STR+(i*length)+3, 1, line && (menuHorizontalPosition==current) ? INVERS : 0);
// lcdDrawChar(MODEL_SETUP_2ND_COLUMN+qr.rem*(2*FW+1), y+FH*qr.quot, 'A'+i, attr && (menuHorizontalPosition==current) ? INVERS : 0);
lcdDrawSizedText(MODEL_SETUP_2ND_COLUMN + qr.rem*((2*FW)+1), y+FH*qr.quot, FIRSTSW_STR+(i*length)+3, 1, attr && (menuHorizontalPosition==current) ? INVERS : 0);
if (swactive) lcdDrawChar(lcdNextPos, y+FH*qr.quot, c);
++current;
}
@@ -653,7 +652,6 @@ void menuModelSetup(event_t event)
}
}
}
LcdFlags line = attr;
for (uint8_t i=0; i<NUM_SWITCHES-1/*not on TRN switch*/; i++) {
uint8_t swactive = !(g_model.switchWarningEnable & 1 << i);
@@ -669,11 +667,11 @@ void menuModelSetup(event_t event)
c = *(STR_VSWITCHES - 2 + 9 + (3*(i+1)));
states >>= 1;
}
if (line && (menuHorizontalPosition == i)) {
if (attr && (menuHorizontalPosition == i)) {
attr = BLINK | INVERS;
}
lcdDrawChar(MODEL_SETUP_2ND_COLUMN+i*FW, y, (swactive) ? c : '-', attr);
lcdDrawText(MODEL_SETUP_2ND_COLUMN+(NUM_SWITCHES*FW), y, "<]", (menuHorizontalPosition == NUM_SWITCHES-1 && !NO_HIGHLIGHT()) ? line : 0);
lcdDrawText(MODEL_SETUP_2ND_COLUMN+(NUM_SWITCHES*FW), y, "<]", (menuHorizontalPosition == NUM_SWITCHES-1 && !NO_HIGHLIGHT()) ? attr : 0);
}
#endif
break;