From ffd41510297259aac330aef5d2713af7baf4b541 Mon Sep 17 00:00:00 2001 From: bsongis Date: Sun, 22 Jun 2014 09:29:12 +0200 Subject: [PATCH] Menu length increased on Taranis to allow backups with date in the filename --- radio/src/gui/menu_model.cpp | 2 +- radio/src/gui/menus.h | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/radio/src/gui/menu_model.cpp b/radio/src/gui/menu_model.cpp index a5eee64eb..c05785473 100644 --- a/radio/src/gui/menu_model.cpp +++ b/radio/src/gui/menu_model.cpp @@ -308,7 +308,7 @@ void onModelSelectMenu(const char *result) POPUP_WARNING(eeBackupModel(sub)); } else if (result == STR_RESTORE_MODEL || result == STR_UPDATE_LIST) { - if (!listSdFiles(MODELS_PATH, MODELS_EXT, sizeof(g_model.header.name), NULL)) { + if (!listSdFiles(MODELS_PATH, MODELS_EXT, MENU_LINE_LENGTH-1, NULL)) { POPUP_WARNING(STR_NO_MODELS_ON_SD); s_menu_flags = 0; } diff --git a/radio/src/gui/menus.h b/radio/src/gui/menus.h index 0ae5507b9..ccce8e34d 100644 --- a/radio/src/gui/menus.h +++ b/radio/src/gui/menus.h @@ -397,7 +397,11 @@ void displayWarning(uint8_t event); #else #define MENU_ADD_SD_ITEM(s) #endif - #define MENU_LINE_LENGTH (LEN_MODEL_NAME+1) + #if LCD_W >= 212 + #define MENU_LINE_LENGTH (LEN_MODEL_NAME+12) + #else + #define MENU_LINE_LENGTH (LEN_MODEL_NAME+1) + #endif extern const char *s_menu[MENU_MAX_LINES]; extern uint16_t s_menu_count; extern uint8_t s_menu_flags;