From f162fce7a79db5bb6b1c5e32aa52e9ddb86dac5b Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 14 Jun 2018 22:46:01 +0200 Subject: [PATCH] New ML support - fixed menu + resized reserved space --- Firmware/config.h | 2 +- Firmware/ultralcd.cpp | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Firmware/config.h b/Firmware/config.h index a9172429..0d70a12a 100644 --- a/Firmware/config.h +++ b/Firmware/config.h @@ -29,7 +29,7 @@ //LANG - Multi-language support //#define LANG_MODE 0 // primary language only #define LANG_MODE 1 // sec. language support -#define LANG_SIZE_RESERVED 0x2700 // reserved space for secondary language (~10kb) +#define LANG_SIZE_RESERVED 0x2200 // reserved space for secondary language (~10kb) //#define LANG_SIZE_RESERVED 0x1ef8 // reserved space for secondary language (~10kb) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index b4fbe6f7..0867d439 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3684,9 +3684,16 @@ static void lcd_language_menu() START_MENU(); if (lang_is_selected()) MENU_ITEM(back, _T(MSG_SETTINGS), 0); MENU_ITEM(setlang, lang_get_name_by_code(lang_get_code(0)), 0); -// MENU_ITEM(setlang, lang_get_name_by_code(lang_get_code(1)), 1); - for (int i = 2; i < lang_get_count(); i++) //skip seconday language - solved in lang_select - MENU_ITEM(setlang, lang_get_name_by_code(lang_get_code(i)), i); + uint8_t cnt = lang_get_count(); +#ifdef W25X20CL + if (cnt == 2) //display secondary language in case of clear xflash + MENU_ITEM(setlang, lang_get_name_by_code(lang_get_code(1)), 1); + else + for (int i = 2; i < cnt; i++) //skip seconday language - solved in lang_select +#else //W25X20CL + for (int i = 1; i < cnt; i++) //all seconday languages +#endif //W25X20CL + MENU_ITEM(setlang, lang_get_name_by_code(lang_get_code(i)), i); END_MENU(); } #endif //(LANG_MODE != 0)