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

Safer switch warning entry - fixed

Browse Source
This commit is contained in:
Andre Bernet
2013-11-30 15:34:22 +01:00
parent f9adb56d10 037bfb373a
commit ad7c110179
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/menu_model.cpp
+15 -12
View File
@@ -1142,21 +1142,24 @@ void menuModelSetup(uint8_t event)
char c;
if (attr) {
s_editMode = 0;
switch(event) {
CASE_EVT_ROTARY_BREAK
case EVT_KEY_BREAK(KEY_ENTER):
if (!READ_ONLY()) {
killEvents(event);
if (m_posHorz == NUM_SWITCHES-1) {
if (!READ_ONLY()) {
switch(event) {
CASE_EVT_ROTARY_BREAK
case EVT_KEY_BREAK(KEY_ENTER):
killEvents(event);
if (m_posHorz < NUM_SWITCHES-1) {
g_model.nSwToWarn ^= (1 << m_posHorz);
eeDirty(EE_MODEL);
}
break;
case EVT_KEY_LONG(KEY_ENTER):
if (m_posHorz == NUM_SWITCHES-1) {
getMovedSwitch();
g_model.switchWarningStates = switches_states;
eeDirty(EE_MODEL);
}
else {
g_model.nSwToWarn ^= (1 << m_posHorz);
}
eeDirty(EE_MODEL);
}
break;
}
}
}
LcdFlags line = attr;
@@ -1188,7 +1191,7 @@ void menuModelSetup(uint8_t event)
attr |= INVERS;
}
lcd_putcAtt(MODEL_SETUP_2ND_COLUMN+i*FW, y, (swactive || (attr & BLINK)) ? c : '-', attr);
lcd_putsAtt(MODEL_SETUP_2ND_COLUMN+(NUM_SWITCHES*FW), y, "<]", m_posHorz == NUM_SWITCHES-1 ? line : 0);
lcd_putsAtt(MODEL_SETUP_2ND_COLUMN+(NUM_SWITCHES*FW), y, "<]", m_posHorz == NUM_SWITCHES-1 ? line | BLINK : 0);
#endif
}
break;