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

[all] Another Global Variables bug fixed (thanks again Gabriel!)

Browse Source
This commit is contained in:
bsongis
2012-10-16 08:06:57 +00:00
parent a57dbf9411
commit e52ef22269
1 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/menus.cpp
+21 -18
View File
@@ -137,25 +137,28 @@ int16_t checkIncDec(uint8_t event, int16_t val, int16_t i_min, int16_t i_max, ui
#endif
#if defined(AUTOSWITCH)
if (s_editMode>0 && (i_flags & INCDEC_SWITCH)) {
int8_t swtch = getMovedSwitch();
if (swtch) {
if (newval == DSW_TRN && swtch == DSW_TRN)
newval = -newval;
else
newval = swtch;
if (i_flags & INCDEC_SWITCH) {
if (s_editMode>0) {
int8_t swtch = getMovedSwitch();
if (swtch) {
if (newval == DSW_TRN && swtch == DSW_TRN)
newval = -newval;
else
newval = swtch;
}
}
if (event == EVT_KEY_LONG(KEY_MENU) && i_max > SWITCH_ON) {
s_editMode = !s_editMode;
if (newval > SWITCH_ON)
newval -= (MAX_SWITCH+1);
else if (newval > 0)
newval += (MAX_SWITCH+1);
else if (newval < SWITCH_OFF)
newval += (MAX_SWITCH+1);
else if (newval < 0)
newval -= (MAX_SWITCH+1);
}
}
if (event == EVT_KEY_LONG(KEY_MENU) && i_max > SWITCH_ON) {
s_editMode = !s_editMode;
if (newval > SWITCH_ON)
newval -= (MAX_SWITCH+1);
else if (newval > 0)
newval += (MAX_SWITCH+1);
else if (newval < SWITCH_OFF)
newval += (MAX_SWITCH+1);
else if (newval < 0)
newval -= (MAX_SWITCH+1);
}
#endif