3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove duplicate string MMU Fails and MMU Load Fails using MSG_MMU_FAILS and MSG_MMU_LOAD_FAILS

Browse Source
This commit is contained in:
3d-gussner 2021-01-25 17:38:36 +01:00
parent fbb3fad64b
commit 7222cf05cf
10 changed files with 40 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Firmware/messages.c
View File

@ -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_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_MEASURE_BED_REFERENCE_HEIGHT_LINE2[] PROGMEM_I1 = ISTR(" of 9"); ////c=14
const char MSG_MENU_CALIBRATION[] PROGMEM_I1 = ISTR("Calibration"); //// 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_NO[] PROGMEM_I1 = ISTR("No"); ////
const char MSG_NOZZLE[] PROGMEM_I1 = ISTR("Nozzle"); //// 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_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_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_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_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_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 const char MSG_PRINT_ABORTED[] PROGMEM_I1 = ISTR("Print aborted"); ////c=20

3
Firmware/messages.h
View File

@ -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_LINE1[];
extern const char MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2[]; extern const char MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2[];
extern const char MSG_MENU_CALIBRATION[]; 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_NO[];
extern const char MSG_NOZZLE[]; extern const char MSG_NOZZLE[];
extern const char MSG_PAPER[]; extern const char MSG_PAPER[];
extern const char MSG_PLACE_STEEL_SHEET[]; extern const char MSG_PLACE_STEEL_SHEET[];
extern const char MSG_PLEASE_WAIT[]; extern const char MSG_PLEASE_WAIT[];
extern const char MSG_POWER_FAILURES[];
extern const char MSG_PREHEAT_NOZZLE[]; extern const char MSG_PREHEAT_NOZZLE[];
extern const char MSG_PRESS_TO_UNLOAD[]; extern const char MSG_PRESS_TO_UNLOAD[];
extern const char MSG_PRINT_ABORTED[]; extern const char MSG_PRINT_ABORTED[];

26
Firmware/ultralcd.cpp
View File

@ -1657,8 +1657,8 @@ static void lcd_menu_fails_stats_mmu()
//! @code{.unparsed} //! @code{.unparsed}
//! |01234567890123456789| //! |01234567890123456789|
//! |Last print failures | c=20 r=1 //! |Last print failures | c=20 r=1
//! | MMU fails: 000| c=14 r=1 //! | MMU fails: 000| MSG_MMU_FAILS c=14
//! | MMU load fails: 000| c=14 r=1 //! | MMU load fails: 000| MSG_MMU_LOAD_FAILS c=14
//! | | //! | |
//! ---------------------- //! ----------------------
//! @endcode //! @endcode
@ -1671,8 +1671,8 @@ static void lcd_menu_fails_stats_mmu_print()
lcd_home(); lcd_home();
lcd_printf_P(PSTR("%S\n" " %-16.16S%-3d\n" " %-16.16S%-3d"), lcd_printf_P(PSTR("%S\n" " %-16.16S%-3d\n" " %-16.16S%-3d"),
_i("Last print failures"), ////c=20 r=1 _i("Last print failures"), ////c=20 r=1
_i("MMU fails"), fails, ////c=14 r=1 _T(MSG_MMU_FAILS), fails, ////c=14 r=1
_i("MMU load fails"), load_fails); ////c=14 r=1 _T(MSG_MMU_LOAD_FAILS), load_fails); ////c=14 r=1
menu_back_if_clicked_fb(); menu_back_if_clicked_fb();
} }
@ -1681,8 +1681,8 @@ static void lcd_menu_fails_stats_mmu_print()
//! @code{.unparsed} //! @code{.unparsed}
//! |01234567890123456789| //! |01234567890123456789|
//! |Total failures | c=20 r=1 //! |Total failures | c=20 r=1
//! | MMU fails: 000| c=14 r=1 //! | MMU fails: 000| MSG_MMU_FAILS c=14
//! | MMU load fails: 000| c=14 r=1 //! | MMU load fails: 000| MSG_MMU_LOAD_FAILS c=14
//! | MMU power fails:000| c=14 r=1 //! | MMU power fails:000| c=14 r=1
//! ---------------------- //! ----------------------
//! @endcode //! @endcode
@ -1696,8 +1696,8 @@ static void lcd_menu_fails_stats_mmu_total()
lcd_home(); lcd_home();
lcd_printf_P(PSTR("%S\n" " %-16.16S%-3d\n" " %-16.16S%-3d\n" " %-16.16S%-3d"), 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("Total failures"), ////c=20 r=1
_i("MMU fails"), fails, ////c=14 r=1 _T(MSG_MMU_FAILS), fails, ////c=14 r=1
_i("MMU load fails"), load_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 _i("MMU power fails"), mmu_power_failures); ////c=14 r=1
menu_back_if_clicked_fb(); menu_back_if_clicked_fb();
} }
@ -1710,7 +1710,7 @@ static const char failStatsFmt[] PROGMEM = "%S\n" " %-16.16S%-3d\n" " %-16.16S%-
//! @code{.unparsed} //! @code{.unparsed}
//! |01234567890123456789| //! |01234567890123456789|
//! |Total failures | c=20 r=1 //! |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 //! | Filam. runouts: 000| c=14 r=1
//! | Crash X:000 Y:000| c=7 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_home();
lcd_printf_P(failStatsFmt, lcd_printf_P(failStatsFmt,
_i("Total failures"), ////c=20 r=1 _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("Filam. runouts"), filam, ////c=14 r=1
_i("Crash"), crashX, crashY); ////c=7 r=1 _i("Crash"), crashX, crashY); ////c=7 r=1
menu_back_if_clicked_fb(); menu_back_if_clicked_fb();
@ -1737,7 +1737,7 @@ static void lcd_menu_fails_stats_total()
//! @code{.unparsed} //! @code{.unparsed}
//! |01234567890123456789| //! |01234567890123456789|
//! |Last print failures | c=20 r=1 //! |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 //! | Filam. runouts 000| c=14 r=1
//! | Crash X:000 Y:000| c=7 r=1 //! | Crash X:000 Y:000| c=7 r=1
//! ---------------------- //! ----------------------
@ -1754,7 +1754,7 @@ static void lcd_menu_fails_stats_print()
#ifndef PAT9125 #ifndef PAT9125
lcd_printf_P(failStatsFmt, lcd_printf_P(failStatsFmt,
_i("Last print failures"), ////c=20 r=1 _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("Filam. runouts"), filam, ////c=14 r=1
_i("Crash"), crashX, crashY); ////c=7 r=1 _i("Crash"), crashX, crashY); ////c=7 r=1
#else #else
@ -1764,7 +1764,7 @@ static void lcd_menu_fails_stats_print()
" %-7.7S H %-3d S %-3d\n" " %-7.7S H %-3d S %-3d\n"
" %-7.7S X %-3d Y %-3d"), " %-7.7S X %-3d Y %-3d"),
_i("Last print failures"), ////c=20 r=1 _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("Runouts"), filam, fsensor_softfail, //c=7
_i("Crash"), crashX, crashY); ////c=7 r=1 _i("Crash"), crashX, crashY); ////c=7 r=1
#endif #endif

6
lang/lang_en.txt
View File

@ -448,13 +448,13 @@
# #
"Measured skew" "Measured skew"
# #MSG_MMU_FAILS c=14
"MMU fails" "MMU fails"
# #
"MMU load failed " "MMU load failed "
# #MSG_MMU_LOAD_FAILS c=14
"MMU load fails" "MMU load fails"
#MSG_MMU_OK_RESUMING c=20 r=4 #MSG_MMU_OK_RESUMING c=20 r=4
@ -625,7 +625,7 @@
#MSG_FS_PAUSE c=5 #MSG_FS_PAUSE c=5
"Pause" "Pause"
# #MSG_POWER_FAILURES c=14
"Power failures" "Power failures"
#MSG_PRINT_ABORTED c=20 #MSG_PRINT_ABORTED c=20

6
lang/lang_en_cz.txt
View File

@ -598,7 +598,7 @@
"Measured skew" "Measured skew"
"Merene zkoseni" "Merene zkoseni"
# #MSG_MMU_FAILS c=14
"MMU fails" "MMU fails"
"Selhani MMU" "Selhani MMU"
@ -606,7 +606,7 @@
"MMU load failed " "MMU load failed "
"Zavedeni MMU selhalo" "Zavedeni MMU selhalo"
# #MSG_MMU_LOAD_FAILS c=14
"MMU load fails" "MMU load fails"
"MMU selhani zavadeni" "MMU selhani zavadeni"
@ -834,7 +834,7 @@
"Pause" "Pause"
"\x00" "\x00"
# #MSG_POWER_FAILURES c=14
"Power failures" "Power failures"
"Vypadky proudu" "Vypadky proudu"

6
lang/lang_en_de.txt
View File

@ -598,7 +598,7 @@
"Measured skew" "Measured skew"
"Schraeglauf" "Schraeglauf"
# #MSG_MMU_FAILS c=14
"MMU fails" "MMU fails"
"MMU Fehler" "MMU Fehler"
@ -606,7 +606,7 @@
"MMU load failed " "MMU load failed "
"MMU Ladefehler" "MMU Ladefehler"
# #MSG_MMU_LOAD_FAILS c=14
"MMU load fails" "MMU load fails"
"MMU Ladefehler" "MMU Ladefehler"
@ -834,7 +834,7 @@
"Pause" "Pause"
"\x00" "\x00"
# #MSG_POWER_FAILURES c=14
"Power failures" "Power failures"
"Netzfehler" "Netzfehler"

6
lang/lang_en_es.txt
View File

@ -598,7 +598,7 @@
"Measured skew" "Measured skew"
"Desviacion med:" "Desviacion med:"
# #MSG_MMU_FAILS c=14
"MMU fails" "MMU fails"
"Fallos MMU" "Fallos MMU"
@ -606,7 +606,7 @@
"MMU load failed " "MMU load failed "
"Carga MMU fallida" "Carga MMU fallida"
# #MSG_MMU_LOAD_FAILS c=14
"MMU load fails" "MMU load fails"
"Carga MMU falla" "Carga MMU falla"
@ -834,7 +834,7 @@
"Pause" "Pause"
"Pausa" "Pausa"
# #MSG_POWER_FAILURES c=14
"Power failures" "Power failures"
"Cortes de energia" "Cortes de energia"

6
lang/lang_en_fr.txt
View File

@ -598,7 +598,7 @@
"Measured skew" "Measured skew"
"Deviat.mesuree" "Deviat.mesuree"
# #MSG_MMU_FAILS c=14
"MMU fails" "MMU fails"
"Echecs MMU" "Echecs MMU"
@ -606,7 +606,7 @@
"MMU load failed " "MMU load failed "
"Echec chargement MMU" "Echec chargement MMU"
# #MSG_MMU_LOAD_FAILS c=14
"MMU load fails" "MMU load fails"
"Echecs charg. MMU" "Echecs charg. MMU"
@ -834,7 +834,7 @@
"Pause" "Pause"
"\x00" "\x00"
# #MSG_POWER_FAILURES c=14
"Power failures" "Power failures"
"Coup.de courant" "Coup.de courant"

6
lang/lang_en_it.txt
View File

@ -598,7 +598,7 @@
"Measured skew" "Measured skew"
"Deviazione mis" "Deviazione mis"
# #MSG_MMU_FAILS c=14
"MMU fails" "MMU fails"
"Fallimenti MMU" "Fallimenti MMU"
@ -606,7 +606,7 @@
"MMU load failed " "MMU load failed "
"Caricamento MMU fallito" "Caricamento MMU fallito"
# #MSG_MMU_LOAD_FAILS c=14
"MMU load fails" "MMU load fails"
"Caricamenti MMU falliti" "Caricamenti MMU falliti"
@ -834,7 +834,7 @@
"Pause" "Pause"
"Pausa" "Pausa"
# #MSG_POWER_FAILURES c=14
"Power failures" "Power failures"
"Mancanza corrente" "Mancanza corrente"

6
lang/lang_en_pl.txt
View File

@ -598,7 +598,7 @@
"Measured skew" "Measured skew"
"Zmierzony skos" "Zmierzony skos"
# #MSG_MMU_FAILS c=14
"MMU fails" "MMU fails"
"Bledy MMU" "Bledy MMU"
@ -606,7 +606,7 @@
"MMU load failed " "MMU load failed "
"Blad ladowania MMU" "Blad ladowania MMU"
# #MSG_MMU_LOAD_FAILS c=14
"MMU load fails" "MMU load fails"
"Bledy ladow. MMU" "Bledy ladow. MMU"
@ -834,7 +834,7 @@
"Pause" "Pause"
"Pauza" "Pauza"
# #MSG_POWER_FAILURES c=14
"Power failures" "Power failures"
"Zaniki zasilania" "Zaniki zasilania"