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

Define #MSG_GCODE_DIFF_CONTINUE c=20 r=4, #MSG_GCODE_DIFF_CANCELLED c=20 r=7

This commit is contained in:
3d-gussner 2021-03-30 18:58:04 +02:00
parent e9750a7312
commit 669ab0f7f7
9 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Firmware/util.cpp
View File

@ -512,13 +512,13 @@ switch(oCheckGcode)
{ {
case ClCheckGcode::_Warn: case ClCheckGcode::_Warn:
// lcd_show_fullscreen_message_and_wait_P(_i("Printer G-code level differs from the G-code. Continue?")); // lcd_show_fullscreen_message_and_wait_P(_i("Printer G-code level differs from the G-code. Continue?"));
lcd_display_message_fullscreen_P(_i("G-code sliced for a different level. Continue?"));////c=20 r=4 lcd_display_message_fullscreen_P(_i("G-code sliced for a different level. Continue?"));////MSG_GCODE_DIFF_CONTINUE c=20 r=4
lcd_wait_for_click_delay(MSG_PRINT_CHECKING_FAILED_TIMEOUT); lcd_wait_for_click_delay(MSG_PRINT_CHECKING_FAILED_TIMEOUT);
//???custom_message_type=CUSTOM_MSG_TYPE_STATUS; // display / status-line recovery //???custom_message_type=CUSTOM_MSG_TYPE_STATUS; // display / status-line recovery
lcd_update_enable(true); // display / status-line recovery lcd_update_enable(true); // display / status-line recovery
break; break;
case ClCheckGcode::_Strict: case ClCheckGcode::_Strict:
lcd_show_fullscreen_message_and_wait_P(_i("G-code sliced for a different level. Please re-slice the model again. Print cancelled."));////c=20 r=7 lcd_show_fullscreen_message_and_wait_P(_i("G-code sliced for a different level. Please re-slice the model again. Print cancelled."));////MSG_GCODE_DIFF_CANCELLED c=20 r=7
lcd_print_stop(); lcd_print_stop();
break; break;
case ClCheckGcode::_None: case ClCheckGcode::_None:

4
lang/lang_en.txt
View File

@ -1033,10 +1033,10 @@
#MSG_NOZZLE_DIAMETER c=10 #MSG_NOZZLE_DIAMETER c=10
"Nozzle d." "Nozzle d."
# c=20 r=4 #MSG_GCODE_DIFF_CONTINUE c=20 r=4
"G-code sliced for a different level. Continue?" "G-code sliced for a different level. Continue?"
# c=20 r=7 #MSG_GCODE_DIFF_CANCELLED c=20 r=7
"G-code sliced for a different level. Please re-slice the model again. Print cancelled." "G-code sliced for a different level. Please re-slice the model again. Print cancelled."
#MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=5 #MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=5

4
lang/lang_en_cz.txt
View File

@ -1378,11 +1378,11 @@
"Nozzle d." "Nozzle d."
"Tryska" "Tryska"
# c=20 r=4 #MSG_GCODE_DIFF_CONTINUE c=20 r=4
"G-code sliced for a different level. Continue?" "G-code sliced for a different level. Continue?"
"\x00" "\x00"
# c=20 r=7 #MSG_GCODE_DIFF_CANCELLED c=20 r=7
"G-code sliced for a different level. Please re-slice the model again. Print cancelled." "G-code sliced for a different level. Please re-slice the model again. Print cancelled."
"\x00" "\x00"

4
lang/lang_en_de.txt
View File

@ -1378,11 +1378,11 @@
"Nozzle d." "Nozzle d."
"Duese D." "Duese D."
# c=20 r=4 #MSG_GCODE_DIFF_CONTINUE c=20 r=4
"G-code sliced for a different level. Continue?" "G-code sliced for a different level. Continue?"
"G-Code ist fuer einen anderen Level geslict. Fortfahren?" "G-Code ist fuer einen anderen Level geslict. Fortfahren?"
# c=20 r=7 #MSG_GCODE_DIFF_CANCELLED c=20 r=7
"G-code sliced for a different level. Please re-slice the model again. Print cancelled." "G-code sliced for a different level. Please re-slice the model again. Print cancelled."
"G-Code ist fuer einen anderen Level geslict. Bitte slicen Sie das Modell erneut. Druck abgebrochen." "G-Code ist fuer einen anderen Level geslict. Bitte slicen Sie das Modell erneut. Druck abgebrochen."

4
lang/lang_en_es.txt
View File

@ -1378,11 +1378,11 @@
"Nozzle d." "Nozzle d."
"Diam. nozzl" "Diam. nozzl"
# c=20 r=4 #MSG_GCODE_DIFF_CONTINUE c=20 r=4
"G-code sliced for a different level. Continue?" "G-code sliced for a different level. Continue?"
"Codigo G laminado para un nivel diferente. ?Continuar?" "Codigo G laminado para un nivel diferente. ?Continuar?"
# c=20 r=7 #MSG_GCODE_DIFF_CANCELLED c=20 r=7
"G-code sliced for a different level. Please re-slice the model again. Print cancelled." "G-code sliced for a different level. Please re-slice the model again. Print cancelled."
"Codigo G laminado para un nivel diferente. Por favor relamina el modelo de nuevo. Impresion cancelada." "Codigo G laminado para un nivel diferente. Por favor relamina el modelo de nuevo. Impresion cancelada."

4
lang/lang_en_fr.txt
View File

@ -1378,11 +1378,11 @@
"Nozzle d." "Nozzle d."
"Diam. buse" "Diam. buse"
# c=20 r=4 #MSG_GCODE_DIFF_CONTINUE c=20 r=4
"G-code sliced for a different level. Continue?" "G-code sliced for a different level. Continue?"
"Le G-code a ete prepare pour un niveau different. Continuer?" "Le G-code a ete prepare pour un niveau different. Continuer?"
# c=20 r=7 #MSG_GCODE_DIFF_CANCELLED c=20 r=7
"G-code sliced for a different level. Please re-slice the model again. Print cancelled." "G-code sliced for a different level. Please re-slice the model again. Print cancelled."
"Le G-code a ete prepare pour un niveau different. Veuillez decouper le modele a nouveau. L'impression a ete annulee." "Le G-code a ete prepare pour un niveau different. Veuillez decouper le modele a nouveau. L'impression a ete annulee."

4
lang/lang_en_it.txt
View File

@ -1378,11 +1378,11 @@
"Nozzle d." "Nozzle d."
"Diam.Ugello" "Diam.Ugello"
# c=20 r=4 #MSG_GCODE_DIFF_CONTINUE c=20 r=4
"G-code sliced for a different level. Continue?" "G-code sliced for a different level. Continue?"
"G-code processato per un livello diverso. Continuare?" "G-code processato per un livello diverso. Continuare?"
# c=20 r=7 #MSG_GCODE_DIFF_CANCELLED c=20 r=7
"G-code sliced for a different level. Please re-slice the model again. Print cancelled." "G-code sliced for a different level. Please re-slice the model again. Print cancelled."
"G-code processato per un livello diverso. Per favore esegui nuovamente lo slice del modello. Stampa annullata." "G-code processato per un livello diverso. Per favore esegui nuovamente lo slice del modello. Stampa annullata."

4
lang/lang_en_nl.txt
View File

@ -1378,11 +1378,11 @@
"Nozzle d." "Nozzle d."
"Tuit d." "Tuit d."
# c=20 r=4 #MSG_GCODE_DIFF_CONTINUE c=20 r=4
"G-code sliced for a different level. Continue?" "G-code sliced for a different level. Continue?"
"G-Code is voor een ander niveau geslict. Doorgaan?" "G-Code is voor een ander niveau geslict. Doorgaan?"
# c=20 r=7 #MSG_GCODE_DIFF_CANCELLED c=20 r=7
"G-code sliced for a different level. Please re-slice the model again. Print cancelled." "G-code sliced for a different level. Please re-slice the model again. Print cancelled."
"G-Code is voor een ander niveau geslict. Slice het model opniew alsjeblieft. Druk geannuleerd." "G-Code is voor een ander niveau geslict. Slice het model opniew alsjeblieft. Druk geannuleerd."

4
lang/lang_en_pl.txt
View File

@ -1378,11 +1378,11 @@
"Nozzle d." "Nozzle d."
"Sr. dyszy" "Sr. dyszy"
# c=20 r=4 #MSG_GCODE_DIFF_CONTINUE c=20 r=4
"G-code sliced for a different level. Continue?" "G-code sliced for a different level. Continue?"
"G-code pociety dla innej wersji. Kontynuowac?" "G-code pociety dla innej wersji. Kontynuowac?"
# c=20 r=7 #MSG_GCODE_DIFF_CANCELLED c=20 r=7
"G-code sliced for a different level. Please re-slice the model again. Print cancelled." "G-code sliced for a different level. Please re-slice the model again. Print cancelled."
"G-code pociety na innym poziomie. Potnij model ponownie. Druk anulowany." "G-code pociety na innym poziomie. Potnij model ponownie. Druk anulowany."