diff --git a/Firmware/messages.c b/Firmware/messages.c index 1ba6da702..56b0d38d2 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -55,6 +55,7 @@ const char MSG_M117_V2_CALIBRATION[] PROGMEM_I1 = ISTR("M117 First layer cal."); const char MSG_MAIN[] PROGMEM_I1 = ISTR("Main"); //// const char MSG_BACK[] PROGMEM_I1 = ISTR("Back"); //// const char MSG_SHEET[] PROGMEM_I1 = ISTR("Sheet"); ////c=10 +const char MSG_STEEL_SHEETS[] PROGMEM_I1 = ISTR("Steel sheets"); ////c=18 const char MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1[] PROGMEM_I1 = ISTR("Measuring reference height of calibration point"); ////c=60 const char MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2[] PROGMEM_I1 = ISTR(" of 9"); ////c=14 const char MSG_MENU_CALIBRATION[] PROGMEM_I1 = ISTR("Calibration"); //// @@ -86,6 +87,7 @@ const char MSG_SELFTEST_MOTOR[] PROGMEM_I1 = ISTR("Motor"); //// const char MSG_SELFTEST_FILAMENT_SENSOR[] PROGMEM_I1 = ISTR("Filament sensor"); ////c=17 const char MSG_SELFTEST_WIRINGERROR[] PROGMEM_I1 = ISTR("Wiring error"); //// const char MSG_SETTINGS[] PROGMEM_I1 = ISTR("Settings"); //// +const char MSG_TOTAL[] PROGMEM_I1 = ISTR("Total"); ////c=6 const char MSG_HW_SETUP[] PROGMEM_I1 = ISTR("HW Setup"); ////c=18 const char MSG_MODE[] PROGMEM_I1 = ISTR("Mode"); //// const char MSG_HIGH_POWER[] PROGMEM_I1 = ISTR("High power"); //// diff --git a/Firmware/messages.h b/Firmware/messages.h index d21f9403e..c30fa54e3 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -54,6 +54,7 @@ extern const char MSG_M117_V2_CALIBRATION[]; extern const char MSG_MAIN[]; extern const char MSG_BACK[]; extern const char MSG_SHEET[]; +extern const char MSG_STEEL_SHEETS[]; extern const char MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1[]; extern const char MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2[]; extern const char MSG_MENU_CALIBRATION[]; @@ -86,6 +87,7 @@ extern const char MSG_SELFTEST_MOTOR[]; extern const char MSG_SELFTEST_FILAMENT_SENSOR[]; extern const char MSG_SELFTEST_WIRINGERROR[]; extern const char MSG_SETTINGS[]; +extern const char MSG_TOTAL[]; extern const char MSG_HW_SETUP[]; extern const char MSG_MODE[]; extern const char MSG_HIGH_POWER[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 94cb9cea5..cde25dbba 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1639,7 +1639,7 @@ void lcd_menu_extruder_info() // NOT static due to using ins //! |01234567890123456789| //! | Main | c=18 r=1 //! | Last print | MSG_LAST_PRINT c=18 -//! | Total | c=18 r=1 +//! | Total | MSG_TOTAL c=6 //! | | //! ---------------------- //! @endcode @@ -1648,7 +1648,7 @@ static void lcd_menu_fails_stats_mmu() MENU_BEGIN(); MENU_ITEM_BACK_P(_T(MSG_MAIN)); MENU_ITEM_SUBMENU_P(_T(MSG_LAST_PRINT), lcd_menu_fails_stats_mmu_print); - MENU_ITEM_SUBMENU_P(_i("Total"), lcd_menu_fails_stats_mmu_total); ////c=18 r=1 + MENU_ITEM_SUBMENU_P(_T(MSG_TOTAL), lcd_menu_fails_stats_mmu_total); ////c=18 r=1 MENU_END(); } @@ -1781,7 +1781,7 @@ static void lcd_menu_fails_stats_print() //! |01234567890123456789| //! | Main | c=18 r=1 //! | Last print | MSG_LAST_PRINT c=18 -//! | Total | c=18 r=1 +//! | Total | MSG_TOTAL c=6 //! | | //! ---------------------- //! @endcode @@ -1791,7 +1791,7 @@ static void lcd_menu_fails_stats() MENU_BEGIN(); MENU_ITEM_BACK_P(_T(MSG_MAIN)); MENU_ITEM_SUBMENU_P(_T(MSG_LAST_PRINT), lcd_menu_fails_stats_print); ////c=18 r=1 - MENU_ITEM_SUBMENU_P(_i("Total"), lcd_menu_fails_stats_total); ////c=18 r=1 + MENU_ITEM_SUBMENU_P(_T(MSG_TOTAL), lcd_menu_fails_stats_total); ////c=18 r=1 MENU_END(); } @@ -5642,7 +5642,7 @@ void lcd_hw_setup_menu(void) // can not be "static" MENU_BEGIN(); MENU_ITEM_BACK_P(_T(bSettings?MSG_SETTINGS:MSG_BACK)); // i.e. default menu-item / menu-item after checking mismatch - MENU_ITEM_SUBMENU_P(_i("Steel sheets"), sheets_menu); ////MSG_STEEL_SHEETS c=18 + MENU_ITEM_SUBMENU_P(_T(MSG_STEEL_SHEETS), sheets_menu); SETTINGS_NOZZLE; MENU_ITEM_SUBMENU_P(_i("Checks"), lcd_checking_menu); @@ -6561,7 +6561,7 @@ static void activate_calibrate_sheet() static void lcd_sheet_menu() { MENU_BEGIN(); - MENU_ITEM_BACK_P(_i("Steel sheets")); ////MSG_STEEL_SHEETS c=18 + MENU_ITEM_BACK_P(_T(MSG_STEEL_SHEETS)); if(eeprom_is_sheet_initialized(selected_sheet)){ MENU_ITEM_SUBMENU_P(_i("Select"), change_sheet); //// c=18 diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 57c880895..5913d491c 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -886,7 +886,7 @@ #MSG_UNLOADING_FILAMENT c=20 r=1 "Unloading filament" -# +#MSG_TOTAL c=6 "Total" #MSG_USED c=19 r=1 @@ -1093,7 +1093,7 @@ #MSG_SOUND_BLIND "Assist" -# c=18 +#MSG_STEEL_SHEET c=18 "Steel sheets" #MSG_Z_CORRECTION c=13 diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 1842e9678..7fbefefb7 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -1182,7 +1182,7 @@ "Unloading filament" "Vysouvam filament" -# +#MSG_TOTAL c=6 "Total" "Celkem" @@ -1458,7 +1458,7 @@ "Assist" "Asist." -# c=18 +#MSG_STEEL_SHEET c=18 "Steel sheets" "Tiskove platy" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 963946294..e9b689329 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -1182,7 +1182,7 @@ "Unloading filament" "Filament auswerfen" -# +#MSG_TOTAL c=6 "Total" "Gesamt" @@ -1458,7 +1458,7 @@ "Assist" "\x00" -# c=18 +#MSG_STEEL_SHEET c=18 "Steel sheets" "Stahlbleche" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 9ff9788ef..ef43b1491 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -1182,7 +1182,7 @@ "Unloading filament" "Soltando filamento" -# +#MSG_TOTAL c=6 "Total" "\x00" @@ -1458,7 +1458,7 @@ "Assist" "Asistido" -# c=18 +#MSG_STEEL_SHEET c=18 "Steel sheets" "Lamina de acero" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 61cd88ead..06d5c49d3 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -1182,7 +1182,7 @@ "Unloading filament" "Dechargement fil." -# +#MSG_TOTAL c=6 "Total" "Totale" @@ -1458,7 +1458,7 @@ "Assist" "\x00" -# c=18 +#MSG_STEEL_SHEET c=18 "Steel sheets" "Plaques en acier" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 8943b8886..567e92227 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -1182,7 +1182,7 @@ "Unloading filament" "Scaricando filamento" -# +#MSG_TOTAL c=6 "Total" "Totale" @@ -1458,7 +1458,7 @@ "Assist" "Assist." -# c=18 +#MSG_STEEL_SHEET c=18 "Steel sheets" "Piani d'acciaio" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index d6302a89c..f951c7d9e 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -1182,7 +1182,7 @@ "Unloading filament" "Rozladowuje filament" -# +#MSG_TOTAL c=6 "Total" "Suma" @@ -1458,7 +1458,7 @@ "Assist" "Asyst." -# c=18 +#MSG_STEEL_SHEET c=18 "Steel sheets" "Plyty stalowe"