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

FSPLASH bug fixed

Browse Source 
Rotary Encoders Navigation bugs fixed
This commit is contained in:
bsongis
2012-11-08 11:30:27 +00:00
parent eb4bfffc33
commit ba65591076
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/general_menus.cpp
+3 -1
View File
@@ -120,7 +120,9 @@ enum menuGeneralSetupItems {
ITEM_SETUP_FLASH_BEEP,
ITEM_SETUP_BACKLIGHT_MODE,
ITEM_SETUP_BACKLIGHT_DELAY,
IF_SPLASH(ITEM_SETUP_DISABLE_SPLASH)
#if defined(SPLASH) && !defined(FSPLASH)
ITEM_SETUP_DISABLE_SPLASH,
#endif
IF_FRSKY(ITEM_SETUP_TIMEZONE)
IF_FRSKY(ITEM_SETUP_GPSFORMAT)
ITEM_SETUP_RX_CHANNEL_ORD,
src/menus.cpp
+4 -2
View File
@@ -259,7 +259,7 @@ bool check(uint8_t event, uint8_t curr, const MenuFuncP *menuTab, uint8_t menuTa
}
if (g_eeGeneral.reNavigation && event == EVT_KEY_BREAK(BTN_REa+g_eeGeneral.reNavigation-1)) {
if (s_editMode > 0 && (maxcol & ZCHAR)) {
if (m_posHorz < maxcol-ZCHAR) {
if (m_posHorz < (uint8_t)maxcol-ZCHAR) {
m_posHorz++;
}
else {
@@ -374,6 +374,7 @@ bool check(uint8_t event, uint8_t curr, const MenuFuncP *menuTab, uint8_t menuTa
if (m_posVert < maxrow) {
++m_posVert;
maxcol = MAXCOL(m_posVert);
if (maxcol & ZCHAR) maxcol = 0;
if (maxcol < 0) m_posVert++;
m_posHorz = 0;
}
@@ -393,7 +394,8 @@ bool check(uint8_t event, uint8_t curr, const MenuFuncP *menuTab, uint8_t menuTa
}
else {
maxcol = MAXCOL(m_posVert);
if (maxcol < 0) { --m_posVert; maxcol = MAXCOL(m_posVert); }
if (maxcol & ZCHAR) maxcol = 0;
if (maxcol < 0) { --m_posVert; maxcol = MAXCOL(m_posVert); if (maxcol & ZCHAR) maxcol = 0; }
m_posHorz = maxcol;
}
}
src/model_menus.cpp
+2 -2
View File
@@ -1608,7 +1608,7 @@ void menuModelExpoOne(uint8_t event)
ExpoData *ed = expoaddress(s_currIdx);
putsChnRaw(7*FW+FW/2,0,ed->chn+1,0);
SUBMENU(STR_MENUDREXPO, EXPO_FIELD_MAX, {IF_PCBSKY9X(sizeof(ed->name)) 0, 0, IF_CURVES(1) IF_FLIGHT_PHASES(MAX_PHASES-1) 0 /*, ...*/});
SUBMENU(STR_MENUDREXPO, EXPO_FIELD_MAX, {IF_PCBSKY9X(ZCHAR|(sizeof(ed->name)-1)) 0, 0, IF_CURVES(1) IF_FLIGHT_PHASES(MAX_PHASES-1) 0 /*, ...*/});
int8_t sub = m_posVert;
@@ -1710,7 +1710,7 @@ void menuModelMixOne(uint8_t event)
MixData *md2 = mixaddress(s_currIdx) ;
putsChn(lcdLastPos+1*FW,0,md2->destCh+1,0);
SUBMENU_NOTITLE(MIX_FIELD_COUNT, {IF_PCBSKY9X(sizeof(md2->name)) 0, 0, 0, 1, IF_CURVES(1) 0, IF_FLIGHT_PHASES(MAX_PHASES-1) 0 /*, ...*/});
SUBMENU_NOTITLE(MIX_FIELD_COUNT, {IF_PCBSKY9X(ZCHAR|(sizeof(md2->name)-1)) 0, 0, 0, 1, IF_CURVES(1) 0, IF_FLIGHT_PHASES(MAX_PHASES-1) 0 /*, ...*/});
int8_t sub = m_posVert;
int8_t editMode = s_editMode;