Safer switch warning entry - fixed
This commit is contained in:
+14
-11
@@ -1142,21 +1142,24 @@ void menuModelSetup(uint8_t event)
|
|||||||
char c;
|
char c;
|
||||||
if (attr) {
|
if (attr) {
|
||||||
s_editMode = 0;
|
s_editMode = 0;
|
||||||
switch(event) {
|
if (!READ_ONLY()) {
|
||||||
CASE_EVT_ROTARY_BREAK
|
switch(event) {
|
||||||
case EVT_KEY_BREAK(KEY_ENTER):
|
CASE_EVT_ROTARY_BREAK
|
||||||
if (!READ_ONLY()) {
|
case EVT_KEY_BREAK(KEY_ENTER):
|
||||||
killEvents(event);
|
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) {
|
if (m_posHorz == NUM_SWITCHES-1) {
|
||||||
getMovedSwitch();
|
getMovedSwitch();
|
||||||
g_model.switchWarningStates = switches_states;
|
g_model.switchWarningStates = switches_states;
|
||||||
|
eeDirty(EE_MODEL);
|
||||||
}
|
}
|
||||||
else {
|
|
||||||
g_model.nSwToWarn ^= (1 << m_posHorz);
|
|
||||||
}
|
|
||||||
eeDirty(EE_MODEL);
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
LcdFlags line = attr;
|
LcdFlags line = attr;
|
||||||
@@ -1188,7 +1191,7 @@ void menuModelSetup(uint8_t event)
|
|||||||
attr |= INVERS;
|
attr |= INVERS;
|
||||||
}
|
}
|
||||||
lcd_putcAtt(MODEL_SETUP_2ND_COLUMN+i*FW, y, (swactive || (attr & BLINK)) ? c : '-', attr);
|
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
|
#endif
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|||||||
Reference in New Issue
Block a user