Actual fix to the missing first two characters

This commit is contained in:
leptun 2019-08-10 21:03:45 +03:00
parent 7ce2fedac7
commit 596ffe1dc2
12 changed files with 22 additions and 22 deletions

View file

@ -6131,7 +6131,7 @@ Sigma_Exit:
WRITE(PS_ON_PIN, PS_ON_ASLEEP); WRITE(PS_ON_PIN, PS_ON_ASLEEP);
#endif #endif
powersupply = false; 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); lcd_update(0);
break; break;

View file

@ -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); menu_draw_item_puts_P(LCD_STR_REFRESH[0], str);
lcd_set_cursor(LCD_WIDTH - 4 - strlen_P(toggle), menu_row); lcd_set_cursor(LCD_WIDTH - 4 - strlen_P(toggle), menu_row);
lcd_putc('['); lcd_printf_P(PSTR("[%S]"), toggle);
lcd_puts_P(toggle);
lcd_putc(']');
// lcd_printf_P(PSTR("[%s]"), toggle);
} }
//! @brief Format sheet name //! @brief Format sheet name

View file

@ -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_YES[] PROGMEM_I1 = ISTR("Yes"); ////
const char MSG_V2_CALIBRATION[] PROGMEM_I1 = ISTR("First layer cal."); ////c=17 r=1 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 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 //not internationalized messages
const char MSG_SD_WORKDIR_FAIL[] PROGMEM_N1 = "workDir open failed"; //// const char MSG_SD_WORKDIR_FAIL[] PROGMEM_N1 = "workDir open failed"; ////
const char MSG_BROWNOUT_RESET[] PROGMEM_N1 = " Brown out Reset"; //// const char MSG_BROWNOUT_RESET[] PROGMEM_N1 = " Brown out Reset"; ////

View file

@ -104,6 +104,8 @@ extern const char MSG_WIZARD_QUIT[];
extern const char MSG_YES[]; extern const char MSG_YES[];
extern const char MSG_V2_CALIBRATION[]; extern const char MSG_V2_CALIBRATION[];
extern const char WELCOME_MSG[]; extern const char WELCOME_MSG[];
extern const char MSG_OFF[];
extern const char MSG_ON[];
//not internationalized messages //not internationalized messages
extern const char MSG_BROWNOUT_RESET[]; extern const char MSG_BROWNOUT_RESET[];
extern const char MSG_EXTERNAL_RESET[]; extern const char MSG_EXTERNAL_RESET[];

View file

@ -5569,7 +5569,7 @@ static void lcd_settings_menu()
SETTINGS_CUTTER; 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; SETTINGS_SILENT_MODE;
@ -6878,7 +6878,7 @@ static void lcd_tune_menu()
if(farm_mode) 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 #ifdef TMC2130

View file

@ -925,8 +925,8 @@
# #
"Y-correct:" "Y-correct:"
# #MSG_OFF
"Off" "Off"
# #MSG_ON
"On" "On"

View file

@ -1234,10 +1234,10 @@
"Y-correct:" "Y-correct:"
"Korekce Y:" "Korekce Y:"
# #MSG_OFF
"Off" "Off"
"Vyp" "Vyp"
# #MSG_ON
"On" "On"
"Zap" "Zap"

View file

@ -1235,10 +1235,10 @@
"Y-correct:" "Y-correct:"
"Y-Korrektur:" "Y-Korrektur:"
# #MSG_OFF
"Off" "Off"
"Aus" "Aus"
# #MSG_ON
"On" "On"
"An" "An"

View file

@ -1234,10 +1234,10 @@
"Y-correct:" "Y-correct:"
"Y-correcion:" "Y-correcion:"
# #MSG_OFF
"Off" "Off"
"Ina" "Ina"
# #MSG_ON
"On" "On"
"Act" "Act"

View file

@ -1234,10 +1234,10 @@
"Y-correct:" "Y-correct:"
"Correct-Y:" "Correct-Y:"
# #MSG_OFF
"Off" "Off"
"\x00" "\x00"
# #MSG_ON
"On" "On"
"\x00" "\x00"

View file

@ -1234,10 +1234,10 @@
"Y-correct:" "Y-correct:"
"Correzione-Y:" "Correzione-Y:"
# #MSG_OFF
"Off" "Off"
"\x00" "\x00"
# #MSG_ON
"On" "On"
"\x00" "\x00"

View file

@ -1234,10 +1234,10 @@
"Y-correct:" "Y-correct:"
"Korekcja Y:" "Korekcja Y:"
# #MSG_OFF
"Off" "Off"
"Wyl" "Wyl"
# #MSG_ON
"On" "On"
"Wl" "Wl"