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

THR Warn bug fixed.

Browse Source
This commit is contained in:
bsongis
2012-05-11 19:21:27 +00:00
parent b4645560f6
commit ff878bf884
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/menus.cpp
+2 -1
View File
@@ -195,7 +195,8 @@ bool check(uint8_t event, uint8_t curr, const MenuFuncP *menuTab, uint8_t menuTa
int8_t maxcol = MAXCOL(m_posVert);
#if defined(ROTARY_ENCODERS)
check_rotary_encoder();
if (!(s_warning || s_sdcard_error || s_menu_count))
check_rotary_encoder();
if (m_posVert < 0 && (event==EVT_KEY_FIRST(BTN_REa) || event==EVT_KEY_FIRST(BTN_REb) || event==EVT_KEY_FIRST(KEY_MENU))) {
popMenu();
killEvents(event);
src/menus.h
+4
View File
@@ -204,6 +204,10 @@ extern uint8_t s_menu_flags;
extern uint8_t s_menu_offset;
extern bool s_menu_more;
const char * displayMenu(uint8_t event);
extern const pm_char * s_sdcard_error;
#else
#define s_menu_count 0
#define s_sdcard_error 0
#endif
#endif
src/model_menus.cpp
+8 -7
View File
@@ -204,7 +204,10 @@ void menuProcModelSelect(uint8_t event)
}
#if defined(SDCARD)
uint8_t _event = (s_warning || s_sdcard_error || s_menu_count) ? 0 : event;
uint8_t _event = event;
if (s_warning || s_sdcard_error || s_menu_count) {
_event = 0;
}
#else
uint8_t _event = s_warning ? 0 : event;
#endif
@@ -239,9 +242,7 @@ void menuProcModelSelect(uint8_t event)
s_copyTgtOfs = 0;
s_copySrcRow = -1;
s_editMode = -1;
#if defined(PCBV4)
eeCheck(true);
#endif
break;
case EVT_KEY_LONG(KEY_EXIT):
if (s_copyMode && s_copyTgtOfs == 0 && g_eeGeneral.currModel != sub && eeModelExists(sub)) {
@@ -663,15 +664,15 @@ void menuProcModel(uint8_t event)
case ITEM_MODEL_THROTTLE_TRIM:
lcd_putsLeft(y, STR_TTRIM);
menu_lcd_onoff(MODEL_PARAM_OFS, y, g_model.disableThrottleWarning, attr) ;
if (attr) CHECK_INCDEC_MODELVAR(event,g_model.disableThrottleWarning,0,1);
menu_lcd_onoff(MODEL_PARAM_OFS, y, g_model.thrTrim, attr) ;
if (attr) CHECK_INCDEC_MODELVAR(event,g_model.thrTrim,0,1);
break;
case ITEM_MODEL_THROTTLE_WARNING:
{
lcd_putsLeft(y, STR_THROTTLEWARNING);
menu_lcd_onoff(MODEL_PARAM_OFS, y, !g_model.thrTrim, attr) ;
if (attr) g_model.thrTrim = !checkIncDecModel(event, !g_model.thrTrim, 0, 1);
menu_lcd_onoff(MODEL_PARAM_OFS, y, !g_model.disableThrottleWarning, attr) ;
if (attr) g_model.disableThrottleWarning = !checkIncDecModel(event, !g_model.disableThrottleWarning, 0, 1);
break;
}