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

Define and update #MSG_PRINT_TIME c=19, #MSG_FILAMENT_USED c=19, #MSG_TOTAL_FILAMENT c=19, #MSG_TOTAL_PRINT_TIME c=19

This commit is contained in:
3d-gussner 2021-03-31 07:16:36 +02:00
parent 7a88ce89e4
commit 982153fee1
9 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Firmware/ultralcd.cpp
View File

@ -2592,9 +2592,9 @@ static void lcd_LoadFilament()
//! //!
//! @code{.unparsed} //! @code{.unparsed}
//! |01234567890123456789| //! |01234567890123456789|
//! |Filament used: | c=19 //! |Filament used: | MSG_FILAMENT_USED c=19
//! | 0000.00m | //! | 0000.00m |
//! |Print time: | c=19 r=1 //! |Print time: | MSG_PRINT_TIME c=19
//! | 00h 00m 00s | //! | 00h 00m 00s |
//! ---------------------- //! ----------------------
//! @endcode //! @endcode
@ -2603,9 +2603,9 @@ static void lcd_LoadFilament()
//! //!
//! @code{.unparsed} //! @code{.unparsed}
//! |01234567890123456789| //! |01234567890123456789|
//! |Total filament: | c=19 r=1 //! |Total filament: | MSG_TOTAL_FILAMENT c=19
//! | 0000.00m | //! | 0000.00m |
//! |Total print time: | c=19 r=1 //! |Total print time: | MSG_TOTAL_PRINT_TIME c=19
//! | 00d 00h 00m | //! | 00d 00h 00m |
//! ---------------------- //! ----------------------
//! @endcode //! @endcode
@ -2628,8 +2628,8 @@ void lcd_menu_statistics()
"%S:\n" "%S:\n"
"%10ldh %02hhdm %02hhds" "%10ldh %02hhdm %02hhds"
), ),
_i("Filament used"), _met, ////c=19 _i("Filament used"), _met, ////MSG_FILAMENT_USED c=19
_i("Print time"), _h, _m, _s); ////c=19 r=1 _i("Print time"), _h, _m, _s); ////MSG_PRINT_TIME c=19
menu_back_if_clicked_fb(); menu_back_if_clicked_fb();
} }
else else
@ -2650,8 +2650,8 @@ void lcd_menu_statistics()
"%S:\n" "%S:\n"
"%10ldd %02hhdh %02hhdm" "%10ldd %02hhdh %02hhdm"
), ),
_i("Total filament"), _filament_m, ////c=19 r=1 _i("Total filament"), _filament_m, ////MSG_TOTAL_FILAMENT c=19
_i("Total print time"), _days, _hours, _minutes); ////c=19 r=1 _i("Total print time"), _days, _hours, _minutes); ////MSG_TOTAL_PRINT_TIME c=19
menu_back_if_clicked_fb(); menu_back_if_clicked_fb();
} }
} }

4
lang/lang_en.txt
View File

@ -859,10 +859,10 @@
#MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 #MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9
"There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow." "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow."
# #MSG_TOTAL_FILAMENT c=19
"Total filament" "Total filament"
# #MSG_TOTAL_PRINT_TIME c=19
"Total print time" "Total print time"
#MSG_TUNE c=18 #MSG_TUNE c=18

4
lang/lang_en_cz.txt
View File

@ -1146,11 +1146,11 @@
"There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow." "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow."
"Je potreba kalibrovat osu Z. Prosim postupujte dle prirucky, kapitola Zaciname, sekce Postup kalibrace." "Je potreba kalibrovat osu Z. Prosim postupujte dle prirucky, kapitola Zaciname, sekce Postup kalibrace."
# #MSG_TOTAL_FILAMENT c=19
"Total filament" "Total filament"
"Filament celkem" "Filament celkem"
# #MSG_TOTAL_PRINT_TIME c=19
"Total print time" "Total print time"
"Celkovy cas tisku" "Celkovy cas tisku"

4
lang/lang_en_de.txt
View File

@ -1146,11 +1146,11 @@
"There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow." "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow."
"Es ist noch not- wendig die Z- Kalibrierung aus- zufuehren. Bitte befolgen Sie das Handbuch, Kapitel Erste Schritte, Abschnitt Kalibrierablauf." "Es ist noch not- wendig die Z- Kalibrierung aus- zufuehren. Bitte befolgen Sie das Handbuch, Kapitel Erste Schritte, Abschnitt Kalibrierablauf."
# #MSG_TOTAL_FILAMENT c=19
"Total filament" "Total filament"
"Gesamtes Filament" "Gesamtes Filament"
# #MSG_TOTAL_PRINT_TIME c=19
"Total print time" "Total print time"
"Gesamte Druckzeit" "Gesamte Druckzeit"

4
lang/lang_en_es.txt
View File

@ -1146,11 +1146,11 @@
"There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow." "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow."
"Todavia es necesario hacer una calibracion Z. Por favor siga el manual, capitulo Primeros pasos, seccion Calibracion del flujo." "Todavia es necesario hacer una calibracion Z. Por favor siga el manual, capitulo Primeros pasos, seccion Calibracion del flujo."
# #MSG_TOTAL_FILAMENT c=19
"Total filament" "Total filament"
"Filamento total" "Filamento total"
# #MSG_TOTAL_PRINT_TIME c=19
"Total print time" "Total print time"
"Tiempo total" "Tiempo total"

4
lang/lang_en_fr.txt
View File

@ -1146,11 +1146,11 @@
"There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow." "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow."
"Il faut toujours effectuer la Calibration Z. Veuillez suivre le manuel, chapitre Premiers pas, section Processus de calibration." "Il faut toujours effectuer la Calibration Z. Veuillez suivre le manuel, chapitre Premiers pas, section Processus de calibration."
# #MSG_TOTAL_FILAMENT c=19
"Total filament" "Total filament"
"Filament total" "Filament total"
# #MSG_TOTAL_PRINT_TIME c=19
"Total print time" "Total print time"
"Temps total impr." "Temps total impr."

4
lang/lang_en_it.txt
View File

@ -1146,11 +1146,11 @@
"There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow." "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow."
"E ancora necessario effettuare la calibrazione Z. Segui il manuale, capitolo Primi Passi, sezione Sequenza di Calibrazione. " "E ancora necessario effettuare la calibrazione Z. Segui il manuale, capitolo Primi Passi, sezione Sequenza di Calibrazione. "
# #MSG_TOTAL_FILAMENT c=19
"Total filament" "Total filament"
"Filamento totale" "Filamento totale"
# #MSG_TOTAL_PRINT_TIME c=19
"Total print time" "Total print time"
"Tempo stampa totale" "Tempo stampa totale"

4
lang/lang_en_nl.txt
View File

@ -1146,11 +1146,11 @@
"There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow." "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow."
"Er is nog steeds een noodzaak om de Z-kalibratie uit te voeren. Volg de handleiding, hoofdstuk First steps, section Calibration flow." "Er is nog steeds een noodzaak om de Z-kalibratie uit te voeren. Volg de handleiding, hoofdstuk First steps, section Calibration flow."
# #MSG_TOTAL_FILAMENT c=19
"Total filament" "Total filament"
"Totaal fil. " "Totaal fil. "
# #MSG_TOTAL_PRINT_TIME c=19
"Total print time" "Total print time"
"Totaal printtijd" "Totaal printtijd"

4
lang/lang_en_pl.txt
View File

@ -1146,11 +1146,11 @@
"There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow." "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow."
"Musimy przeprowadzic kalibracje Z. Kieruj sie Samouczkiem: rozdzial Pierwsze Kroki, sekcja Kalibracja." "Musimy przeprowadzic kalibracje Z. Kieruj sie Samouczkiem: rozdzial Pierwsze Kroki, sekcja Kalibracja."
# #MSG_TOTAL_FILAMENT c=19
"Total filament" "Total filament"
"Zuzycie filamentu" "Zuzycie filamentu"
# #MSG_TOTAL_PRINT_TIME c=19
"Total print time" "Total print time"
"Laczny czas druku" "Laczny czas druku"