diff --git a/src/main_views.cpp b/src/main_views.cpp index 332cde9b0..f878305ad 100644 --- a/src/main_views.cpp +++ b/src/main_views.cpp @@ -73,12 +73,6 @@ void menuMainView(uint8_t event) uint8_t view = g_eeGeneral.view; uint8_t view_base = view & 0x0f; -#if defined(FRSKY) || defined(JETI) || defined(ARDUPILOT) || defined(NMEA) - if (isFunctionActive(FUNC_TELEMETRY_SCREEN)) { - event = EVT_KEY_LONG(KEY_DOWN); - } -#endif - switch(event) { /* TODO if timer2 is OFF, it's possible to use this timer2 as in er9x... diff --git a/src/menus.h b/src/menus.h index 8c457a1ba..0f102a55c 100644 --- a/src/menus.h +++ b/src/menus.h @@ -150,28 +150,28 @@ typedef void (*MenuFuncP_PROGMEM)(uint8_t event); #define TITLE(str) TITLEP(str) #define MENU(title, tab, menu, lines_count, ...) \ -TITLE(title); \ static const pm_uint8_t mstate_tab[] PROGMEM = __VA_ARGS__; \ -if (!check(event,menu,tab,DIM(tab),mstate_tab,DIM(mstate_tab)-1,lines_count-1)) return; +if (!check(event,menu,tab,DIM(tab),mstate_tab,DIM(mstate_tab)-1,lines_count-1)) return; \ +TITLE(title) #define SIMPLE_MENU_NOTITLE(tab, menu, lines_count) \ if (!check_simple(event,menu,tab,DIM(tab),lines_count-1)) return; #define SIMPLE_MENU(title, tab, menu, lines_count) \ -TITLE(title); \ -SIMPLE_MENU_NOTITLE(tab, menu, lines_count) +SIMPLE_MENU_NOTITLE(tab, menu, lines_count); \ +TITLE(title) #define SUBMENU(title, lines_count, ...) \ -TITLE(title); \ static const pm_uint8_t mstate_tab[] PROGMEM = __VA_ARGS__; \ -if (!check(event,0,NULL,0,mstate_tab,DIM(mstate_tab)-1,lines_count-1)) return; +if (!check(event,0,NULL,0,mstate_tab,DIM(mstate_tab)-1,lines_count-1)) return; \ +TITLE(title) #define SIMPLE_SUBMENU_NOTITLE(lines_count) \ if (!check_submenu_simple(event,lines_count-1)) return; #define SIMPLE_SUBMENU(title, lines_count) \ -TITLE(title); \ -SIMPLE_SUBMENU_NOTITLE(lines_count) +SIMPLE_SUBMENU_NOTITLE(lines_count); \ +TITLE(title) extern const pm_char * s_warning; // TODO macro for s_warning diff --git a/src/model_menus.cpp b/src/model_menus.cpp index f45b87362..49647e11d 100644 --- a/src/model_menus.cpp +++ b/src/model_menus.cpp @@ -181,11 +181,6 @@ void menuProcModelSelect(uint8_t event) int8_t sub = m_posVert; - lcd_puts(9*FW-(LEN_FREE-4)*FW, 0, STR_FREE); - lcd_outdezAtt( 17*FW, 0, EeFsGetFree(),0); - - DisplayScreenIndex(e_ModelSelect, DIM(menuTabModel), (sub == g_eeGeneral.currModel) ? INVERS : 0); - #ifdef NAVIGATION_RE1 if (scrollRE > 0 && s_editMode < 0) { chainMenu(menuProcModel); @@ -312,6 +307,11 @@ void menuProcModelSelect(uint8_t event) break; } + lcd_puts(9*FW-(LEN_FREE-4)*FW, 0, STR_FREE); + lcd_outdezAtt( 17*FW, 0, EeFsGetFree(),0); + + DisplayScreenIndex(e_ModelSelect, DIM(menuTabModel), (sub == g_eeGeneral.currModel) ? INVERS : 0); + if (sub-s_pgOfs < 1) s_pgOfs = max(0, sub-1); else if (sub-s_pgOfs > 5) s_pgOfs = min(MAX_MODELS-7, sub-4); diff --git a/src/myeeprom.h b/src/myeeprom.h index f4524a0a1..d43fbae7d 100644 --- a/src/myeeprom.h +++ b/src/myeeprom.h @@ -188,7 +188,6 @@ enum Functions { FUNC_INSTANT_TRIM, FUNC_TRIMS_2_OFS, FUNC_PLAY_SOUND, - FUNC_TELEMETRY_SCREEN, #ifdef SOMO FUNC_PLAY_SOMO, #endif diff --git a/src/translations/en.h b/src/translations/en.h index 4e76fd0a1..b2665f482 100644 --- a/src/translations/en.h +++ b/src/translations/en.h @@ -73,7 +73,7 @@ #else #define TR_SOMO #endif -#define TR_VFSWFUNC "Security \0 ""Trainer \0 ""Instant Trim ""Trims2Offsets""Play Sound\0 ""Telem. View\0 " TR_SOMO TR_SDCLOGGS +#define TR_VFSWFUNC "Security \0 ""Trainer \0 ""Instant Trim ""Trims2Offsets""Play Sound\0 " TR_SOMO TR_SDCLOGGS #define LEN_FUNCSOUNDS 6 #define TR_FUNCSOUNDS "Warn1 ""Warn2 ""Cheep ""Ring ""SciFi ""Robot ""Chirp ""Tada ""Crickt""Siren ""AlmClk""Ratata""Tick ""Haptc1""Haptc2""Haptc3" diff --git a/src/translations/fr.h b/src/translations/fr.h index da6538bdd..559fe597b 100644 --- a/src/translations/fr.h +++ b/src/translations/fr.h @@ -73,7 +73,7 @@ #else #define TR_SOMO #endif -#define TR_VFSWFUNC "Securite \0 ""Ecolage \0 ""Trim instant ""Trims2Offsets""Jouer son\0 ""Telem. View\0 " TR_SOMO TR_SDCLOGGS +#define TR_VFSWFUNC "Securite \0 ""Ecolage \0 ""Trim instant ""Trims2Offsets""Jouer son\0 " TR_SOMO TR_SDCLOGGS #define LEN_FUNCSOUNDS 6 #define TR_FUNCSOUNDS "Warn1 ""Warn2 ""Cheep ""Ring ""SciFi ""Robot ""Chirp ""Tada ""Crickt""Siren ""AlmClk""Ratata""Tick ""Haptc1""Haptc2""Haptc3"