From 596ffe1dc2fcd57e4ddbba98b06872823ed31078 Mon Sep 17 00:00:00 2001 From: leptun Date: Sat, 10 Aug 2019 21:03:45 +0300 Subject: [PATCH] Actual fix to the missing first two characters --- Firmware/Marlin_main.cpp | 2 +- Firmware/menu.cpp | 6 +----- Firmware/messages.c | 2 ++ Firmware/messages.h | 2 ++ Firmware/ultralcd.cpp | 4 ++-- lang/lang_en.txt | 4 ++-- lang/lang_en_cz.txt | 4 ++-- lang/lang_en_de.txt | 4 ++-- lang/lang_en_es.txt | 4 ++-- lang/lang_en_fr.txt | 4 ++-- lang/lang_en_it.txt | 4 ++-- lang/lang_en_pl.txt | 4 ++-- 12 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index c1d46be1..a9fbf958 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -6131,7 +6131,7 @@ Sigma_Exit: WRITE(PS_ON_PIN, PS_ON_ASLEEP); #endif powersupply = false; - LCD_MESSAGERPGM(CAT4(CUSTOM_MENDEL_NAME,PSTR(" "),_i("Off"),PSTR("."))); + LCD_MESSAGERPGM(CAT4(CUSTOM_MENDEL_NAME,PSTR(" "),MSG_OFF,PSTR("."))); lcd_update(0); break; diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp index 08503111..8d3c8d64 100755 --- a/Firmware/menu.cpp +++ b/Firmware/menu.cpp @@ -188,11 +188,7 @@ static void menu_draw_toggle_puts_P(const char* str, const char* toggle) { menu_draw_item_puts_P(LCD_STR_REFRESH[0], str); lcd_set_cursor(LCD_WIDTH - 4 - strlen_P(toggle), menu_row); - lcd_putc('['); - lcd_puts_P(toggle); - lcd_putc(']'); - - // lcd_printf_P(PSTR("[%s]"), toggle); + lcd_printf_P(PSTR("[%S]"), toggle); } //! @brief Format sheet name diff --git a/Firmware/messages.c b/Firmware/messages.c index 83665d4b..8ba32a4d 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -104,6 +104,8 @@ const char MSG_WIZARD_QUIT[] PROGMEM_I1 = ISTR("You can always resume the Wizard const char MSG_YES[] PROGMEM_I1 = ISTR("Yes"); //// const char MSG_V2_CALIBRATION[] PROGMEM_I1 = ISTR("First layer cal."); ////c=17 r=1 const char WELCOME_MSG[] PROGMEM_I1 = ISTR(CUSTOM_MENDEL_NAME " OK."); ////c=20 +const char MSG_OFF[] PROGMEM_I1 = ISTR("Off"); //// +const char MSG_ON[] PROGMEM_I1 = ISTR("On"); //// //not internationalized messages const char MSG_SD_WORKDIR_FAIL[] PROGMEM_N1 = "workDir open failed"; //// const char MSG_BROWNOUT_RESET[] PROGMEM_N1 = " Brown out Reset"; //// diff --git a/Firmware/messages.h b/Firmware/messages.h index f944f52d..65ddbab3 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -104,6 +104,8 @@ extern const char MSG_WIZARD_QUIT[]; extern const char MSG_YES[]; extern const char MSG_V2_CALIBRATION[]; extern const char WELCOME_MSG[]; +extern const char MSG_OFF[]; +extern const char MSG_ON[]; //not internationalized messages extern const char MSG_BROWNOUT_RESET[]; extern const char MSG_EXTERNAL_RESET[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 35afc954..cf81908d 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5569,7 +5569,7 @@ static void lcd_settings_menu() SETTINGS_CUTTER; - MENU_ITEM_TOGGLE_P(_i("Fans check"), fans_check_enabled ? _i("On") : _i("Off"), lcd_set_fan_check); + MENU_ITEM_TOGGLE_P(_i("Fans check"), fans_check_enabled ? _T(MSG_ON) : _T(MSG_OFF), lcd_set_fan_check); SETTINGS_SILENT_MODE; @@ -6878,7 +6878,7 @@ static void lcd_tune_menu() if(farm_mode) { - MENU_ITEM_TOGGLE_P(_i("Fans check"), fans_check_enabled ? _i("On") : _i("Off"), lcd_set_fan_check); + MENU_ITEM_TOGGLE_P(_i("Fans check"), fans_check_enabled ? _T(MSG_ON) : _T(MSG_OFF), lcd_set_fan_check); } #ifdef TMC2130 diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 8e00dd80..8819d40a 100755 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -925,8 +925,8 @@ # "Y-correct:" -# +#MSG_OFF "Off" -# +#MSG_ON "On" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 70169394..9a4b7579 100755 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -1234,10 +1234,10 @@ "Y-correct:" "Korekce Y:" -# +#MSG_OFF "Off" "Vyp" -# +#MSG_ON "On" "Zap" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index fbfb27fd..1dc09798 100755 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -1235,10 +1235,10 @@ "Y-correct:" "Y-Korrektur:" -# +#MSG_OFF "Off" "Aus" -# +#MSG_ON "On" "An" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index b1da127d..ba1fea1e 100755 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -1234,10 +1234,10 @@ "Y-correct:" "Y-correcion:" -# +#MSG_OFF "Off" "Ina" -# +#MSG_ON "On" "Act" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 57ed8d11..f86795d7 100755 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -1234,10 +1234,10 @@ "Y-correct:" "Correct-Y:" -# +#MSG_OFF "Off" "\x00" -# +#MSG_ON "On" "\x00" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index b79b678a..4130aedb 100755 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -1234,10 +1234,10 @@ "Y-correct:" "Correzione-Y:" -# +#MSG_OFF "Off" "\x00" -# +#MSG_ON "On" "\x00" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 79765625..45b402fa 100755 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -1234,10 +1234,10 @@ "Y-correct:" "Korekcja Y:" -# +#MSG_OFF "Off" "Wyl" -# +#MSG_ON "On" "Wl"