NAVIGATION_MENUS definition removed

This commit is contained in:
Bertrand Songis
2019-03-21 15:21:16 +01:00
parent b0b027e958
commit 4de9e3f73b
9 changed files with 5 additions and 45 deletions
-8
View File
@@ -22,7 +22,6 @@
#define MODELSEL_W LCD_W
#if defined(NAVIGATION_MENUS)
void onModelSelectMenu(const char * result)
{
int8_t sub = menuVerticalPosition;
@@ -67,7 +66,6 @@ void onModelSelectMenu(const char * result)
}
#endif
}
#endif
void menuModelSelect(event_t event)
{
@@ -194,7 +192,6 @@ void menuModelSelect(event_t event)
else if (event == EVT_KEY_LONG(KEY_ENTER) || IS_ROTARY_BREAK(event)) {
s_copyMode = 0;
killEvents(event);
#if defined(NAVIGATION_MENUS)
if (g_eeGeneral.currModel != sub) {
if (eeModelExists(sub)) {
POPUP_MENU_ADD_ITEM(STR_SELECT_MODEL);
@@ -218,11 +215,6 @@ void menuModelSelect(event_t event)
POPUP_MENU_ADD_ITEM(STR_MOVE_MODEL);
}
POPUP_MENU_START(onModelSelectMenu);
#else
if (g_eeGeneral.currModel != sub) {
selectModel(sub);
}
#endif
}
else if (eeModelExists(sub)) {
s_copyMode = (s_copyMode == COPY_MODE ? MOVE_MODE : COPY_MODE);