diff --git a/Firmware/messages.c b/Firmware/messages.c index 7cb304fc..1ba6da70 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -58,11 +58,14 @@ const char MSG_SHEET[] PROGMEM_I1 = ISTR("Sheet"); ////c=10 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"); //// +const char MSG_MMU_FAILS[] PROGMEM_I1 = ISTR("MMU fails"); ////c=14 +const char MSG_MMU_LOAD_FAILS[] PROGMEM_I1 = ISTR("MMU load fails"); ////c=14 const char MSG_NO[] PROGMEM_I1 = ISTR("No"); //// const char MSG_NOZZLE[] PROGMEM_I1 = ISTR("Nozzle"); //// const char MSG_PAPER[] PROGMEM_I1 = ISTR("Place a sheet of paper under the nozzle during the calibration of first 4 points. If the nozzle catches the paper, power off the printer immediately."); ////c=20 r=10 const char MSG_PLACE_STEEL_SHEET[] PROGMEM_I1 = ISTR("Please place steel sheet on heatbed."); ////c=20 r=4 const char MSG_PLEASE_WAIT[] PROGMEM_I1 = ISTR("Please wait"); ////c=20 +const char MSG_POWER_FAILURES[] PROGMEM_I1 = ISTR("Power failures"); ////c=14 const char MSG_PREHEAT_NOZZLE[] PROGMEM_I1 = ISTR("Preheat the nozzle!"); ////c=20 const char MSG_PRESS_TO_UNLOAD[] PROGMEM_I1 = ISTR("Please press the knob to unload filament"); ////c=20 r=4 const char MSG_PRINT_ABORTED[] PROGMEM_I1 = ISTR("Print aborted"); ////c=20 diff --git a/Firmware/messages.h b/Firmware/messages.h index 4a363ba4..d21f9403 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -57,11 +57,14 @@ extern const char MSG_SHEET[]; extern const char MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1[]; extern const char MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2[]; extern const char MSG_MENU_CALIBRATION[]; +extern const char MSG_MMU_FAILS[]; +extern const char MSG_MMU_LOAD_FAILS[]; extern const char MSG_NO[]; extern const char MSG_NOZZLE[]; extern const char MSG_PAPER[]; extern const char MSG_PLACE_STEEL_SHEET[]; extern const char MSG_PLEASE_WAIT[]; +extern const char MSG_POWER_FAILURES[]; extern const char MSG_PREHEAT_NOZZLE[]; extern const char MSG_PRESS_TO_UNLOAD[]; extern const char MSG_PRINT_ABORTED[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 7d2e26d4..94cb9cea 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1657,8 +1657,8 @@ static void lcd_menu_fails_stats_mmu() //! @code{.unparsed} //! |01234567890123456789| //! |Last print failures | c=20 r=1 -//! | MMU fails: 000| c=14 r=1 -//! | MMU load fails: 000| c=14 r=1 +//! | MMU fails: 000| MSG_MMU_FAILS c=14 +//! | MMU load fails: 000| MSG_MMU_LOAD_FAILS c=14 //! | | //! ---------------------- //! @endcode @@ -1671,8 +1671,8 @@ static void lcd_menu_fails_stats_mmu_print() lcd_home(); lcd_printf_P(PSTR("%S\n" " %-16.16S%-3d\n" " %-16.16S%-3d"), _i("Last print failures"), ////c=20 r=1 - _i("MMU fails"), fails, ////c=14 r=1 - _i("MMU load fails"), load_fails); ////c=14 r=1 + _T(MSG_MMU_FAILS), fails, ////c=14 r=1 + _T(MSG_MMU_LOAD_FAILS), load_fails); ////c=14 r=1 menu_back_if_clicked_fb(); } @@ -1681,8 +1681,8 @@ static void lcd_menu_fails_stats_mmu_print() //! @code{.unparsed} //! |01234567890123456789| //! |Total failures | c=20 r=1 -//! | MMU fails: 000| c=14 r=1 -//! | MMU load fails: 000| c=14 r=1 +//! | MMU fails: 000| MSG_MMU_FAILS c=14 +//! | MMU load fails: 000| MSG_MMU_LOAD_FAILS c=14 //! | MMU power fails:000| c=14 r=1 //! ---------------------- //! @endcode @@ -1696,8 +1696,8 @@ static void lcd_menu_fails_stats_mmu_total() lcd_home(); lcd_printf_P(PSTR("%S\n" " %-16.16S%-3d\n" " %-16.16S%-3d\n" " %-16.16S%-3d"), _i("Total failures"), ////c=20 r=1 - _i("MMU fails"), fails, ////c=14 r=1 - _i("MMU load fails"), load_fails, ////c=14 r=1 + _T(MSG_MMU_FAILS), fails, ////c=14 r=1 + _T(MSG_MMU_LOAD_FAILS), load_fails, ////c=14 r=1 _i("MMU power fails"), mmu_power_failures); ////c=14 r=1 menu_back_if_clicked_fb(); } @@ -1710,7 +1710,7 @@ static const char failStatsFmt[] PROGMEM = "%S\n" " %-16.16S%-3d\n" " %-16.16S%- //! @code{.unparsed} //! |01234567890123456789| //! |Total failures | c=20 r=1 -//! | Power failures: 000| c=14 r=1 +//! | Power failures: 000| MSG_POWER_FAILURES c=14 //! | Filam. runouts: 000| c=14 r=1 //! | Crash X:000 Y:000| c=7 r=1 //! ---------------------- @@ -1726,7 +1726,7 @@ static void lcd_menu_fails_stats_total() lcd_home(); lcd_printf_P(failStatsFmt, _i("Total failures"), ////c=20 r=1 - _i("Power failures"), power, ////c=14 r=1 + _T(MSG_POWER_FAILURES), power, ////c=14 r=1 _i("Filam. runouts"), filam, ////c=14 r=1 _i("Crash"), crashX, crashY); ////c=7 r=1 menu_back_if_clicked_fb(); @@ -1737,7 +1737,7 @@ static void lcd_menu_fails_stats_total() //! @code{.unparsed} //! |01234567890123456789| //! |Last print failures | c=20 r=1 -//! | Power failures 000| c=14 r=1 +//! | Power failures 000| MSG_POWER_FAILURES c=14 //! | Filam. runouts 000| c=14 r=1 //! | Crash X:000 Y:000| c=7 r=1 //! ---------------------- @@ -1754,7 +1754,7 @@ static void lcd_menu_fails_stats_print() #ifndef PAT9125 lcd_printf_P(failStatsFmt, _i("Last print failures"), ////c=20 r=1 - _i("Power failures"), power, ////c=14 r=1 + _T(MSG_POWER_FAILURES), power, ////c=14 r=1 _i("Filam. runouts"), filam, ////c=14 r=1 _i("Crash"), crashX, crashY); ////c=7 r=1 #else @@ -1764,7 +1764,7 @@ static void lcd_menu_fails_stats_print() " %-7.7S H %-3d S %-3d\n" " %-7.7S X %-3d Y %-3d"), _i("Last print failures"), ////c=20 r=1 - _i("Power failures"), power, ////c=14 r=1 + _T(MSG_POWER_FAILURES), power, ////c=14 r=1 _i("Runouts"), filam, fsensor_softfail, //c=7 _i("Crash"), crashX, crashY); ////c=7 r=1 #endif diff --git a/lang/lang_en.txt b/lang/lang_en.txt index c10879ca..57c88089 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -448,13 +448,13 @@ # "Measured skew" -# +#MSG_MMU_FAILS c=14 "MMU fails" # "MMU load failed " -# +#MSG_MMU_LOAD_FAILS c=14 "MMU load fails" #MSG_MMU_OK_RESUMING c=20 r=4 @@ -625,7 +625,7 @@ #MSG_FS_PAUSE c=5 "Pause" -# +#MSG_POWER_FAILURES c=14 "Power failures" #MSG_PRINT_ABORTED c=20 diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 28d78c44..1842e967 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -598,7 +598,7 @@ "Measured skew" "Merene zkoseni" -# +#MSG_MMU_FAILS c=14 "MMU fails" "Selhani MMU" @@ -606,7 +606,7 @@ "MMU load failed " "Zavedeni MMU selhalo" -# +#MSG_MMU_LOAD_FAILS c=14 "MMU load fails" "MMU selhani zavadeni" @@ -834,7 +834,7 @@ "Pause" "\x00" -# +#MSG_POWER_FAILURES c=14 "Power failures" "Vypadky proudu" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 893363ac..96394629 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -598,7 +598,7 @@ "Measured skew" "Schraeglauf" -# +#MSG_MMU_FAILS c=14 "MMU fails" "MMU Fehler" @@ -606,7 +606,7 @@ "MMU load failed " "MMU Ladefehler" -# +#MSG_MMU_LOAD_FAILS c=14 "MMU load fails" "MMU Ladefehler" @@ -834,7 +834,7 @@ "Pause" "\x00" -# +#MSG_POWER_FAILURES c=14 "Power failures" "Netzfehler" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 9c860f27..9ff9788e 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -598,7 +598,7 @@ "Measured skew" "Desviacion med:" -# +#MSG_MMU_FAILS c=14 "MMU fails" "Fallos MMU" @@ -606,7 +606,7 @@ "MMU load failed " "Carga MMU fallida" -# +#MSG_MMU_LOAD_FAILS c=14 "MMU load fails" "Carga MMU falla" @@ -834,7 +834,7 @@ "Pause" "Pausa" -# +#MSG_POWER_FAILURES c=14 "Power failures" "Cortes de energia" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 43b81068..61cd88ea 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -598,7 +598,7 @@ "Measured skew" "Deviat.mesuree" -# +#MSG_MMU_FAILS c=14 "MMU fails" "Echecs MMU" @@ -606,7 +606,7 @@ "MMU load failed " "Echec chargement MMU" -# +#MSG_MMU_LOAD_FAILS c=14 "MMU load fails" "Echecs charg. MMU" @@ -834,7 +834,7 @@ "Pause" "\x00" -# +#MSG_POWER_FAILURES c=14 "Power failures" "Coup.de courant" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 0043c6d0..8943b888 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -598,7 +598,7 @@ "Measured skew" "Deviazione mis" -# +#MSG_MMU_FAILS c=14 "MMU fails" "Fallimenti MMU" @@ -606,7 +606,7 @@ "MMU load failed " "Caricamento MMU fallito" -# +#MSG_MMU_LOAD_FAILS c=14 "MMU load fails" "Caricamenti MMU falliti" @@ -834,7 +834,7 @@ "Pause" "Pausa" -# +#MSG_POWER_FAILURES c=14 "Power failures" "Mancanza corrente" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index b3f6893b..d6302a89 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -598,7 +598,7 @@ "Measured skew" "Zmierzony skos" -# +#MSG_MMU_FAILS c=14 "MMU fails" "Bledy MMU" @@ -606,7 +606,7 @@ "MMU load failed " "Blad ladowania MMU" -# +#MSG_MMU_LOAD_FAILS c=14 "MMU load fails" "Bledy ladow. MMU" @@ -834,7 +834,7 @@ "Pause" "Pauza" -# +#MSG_POWER_FAILURES c=14 "Power failures" "Zaniki zasilania"