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

Remove duplicate string `G-code sliced for a different printer type. Please re-slice the model again. Print cancelled.` using `MSG_GCODE_DIFF_PRINTER_CANCELLED`

This commit is contained in:
3d-gussner 2021-01-26 11:01:50 +01:00
parent 51d1e0bd8a
commit c555907a12
10 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Firmware/messages.c
View File

@ -131,6 +131,7 @@ const char MSG_MODEL[] PROGMEM_I1 = ISTR("Model"); ////
const char MSG_FIRMWARE[] PROGMEM_I1 = ISTR("Firmware"); //// const char MSG_FIRMWARE[] PROGMEM_I1 = ISTR("Firmware"); ////
const char MSG_GCODE[] PROGMEM_I1 = ISTR("Gcode"); //// const char MSG_GCODE[] PROGMEM_I1 = ISTR("Gcode"); ////
const char MSG_GCODE_DIFF_PRINTER_CONTINUE[] PROGMEM_I1 = ISTR("G-code sliced for a different printer type. Continue?"); ////c=20 r=5 const char MSG_GCODE_DIFF_PRINTER_CONTINUE[] PROGMEM_I1 = ISTR("G-code sliced for a different printer type. Continue?"); ////c=20 r=5
const char MSG_GCODE_DIFF_PRINTER_CANCELLED[] PROGMEM_I1 =ISTR("G-code sliced for a different printer type. Please re-slice the model again. Print cancelled."); ////c=20 r=6
const char MSG_NOZZLE_DIAMETER[] PROGMEM_I1 = ISTR("Nozzle d."); //// const char MSG_NOZZLE_DIAMETER[] PROGMEM_I1 = ISTR("Nozzle d."); ////
const char MSG_MMU_MODE[] PROGMEM_I1 = ISTR("MMU Mode"); //// const char MSG_MMU_MODE[] PROGMEM_I1 = ISTR("MMU Mode"); ////
const char MSG_SD_CARD[] PROGMEM_I1 = ISTR("SD card"); //// const char MSG_SD_CARD[] PROGMEM_I1 = ISTR("SD card"); ////

1
Firmware/messages.h
View File

@ -131,6 +131,7 @@ extern const char MSG_MODEL[];
extern const char MSG_FIRMWARE[]; extern const char MSG_FIRMWARE[];
extern const char MSG_GCODE[]; extern const char MSG_GCODE[];
extern const char MSG_GCODE_DIFF_PRINTER_CONTINUE[]; extern const char MSG_GCODE_DIFF_PRINTER_CONTINUE[];
extern const char MSG_GCODE_DIFF_PRINTER_CANCELLED[];
extern const char MSG_NOZZLE_DIAMETER[]; extern const char MSG_NOZZLE_DIAMETER[];
extern const char MSG_MMU_MODE[]; extern const char MSG_MMU_MODE[];
extern const char MSG_SD_CARD[]; extern const char MSG_SD_CARD[];

4
Firmware/util.cpp
View File

@ -434,7 +434,7 @@ lcd_wait_for_click_delay(MSG_PRINT_CHECKING_FAILED_TIMEOUT);
lcd_update_enable(true); // display / status-line recovery lcd_update_enable(true); // display / status-line recovery
break; break;
case ClCheckModel::_Strict: case ClCheckModel::_Strict:
lcd_show_fullscreen_message_and_wait_P(_i("G-code sliced for a different printer type. Please re-slice the model again. Print cancelled.")); lcd_show_fullscreen_message_and_wait_P(_T(MSG_GCODE_DIFF_PRINTER_CANCELLED));
lcd_print_stop(); lcd_print_stop();
break; break;
case ClCheckModel::_None: case ClCheckModel::_None:
@ -583,7 +583,7 @@ lcd_wait_for_click_delay(MSG_PRINT_CHECKING_FAILED_TIMEOUT);
lcd_update_enable(true); // display / status-line recovery lcd_update_enable(true); // display / status-line recovery
break; break;
case ClCheckModel::_Strict: case ClCheckModel::_Strict:
lcd_show_fullscreen_message_and_wait_P(_i("G-code sliced for a different printer type. Please re-slice the model again. Print cancelled.")); lcd_show_fullscreen_message_and_wait_P(_T(MSG_GCODE_DIFF_PRINTER_CANCELLED));
lcd_print_stop(); lcd_print_stop();
break; break;
case ClCheckModel::_None: case ClCheckModel::_None:

2
lang/lang_en.txt
View File

@ -1048,7 +1048,7 @@
#MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=5 #MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=5
"G-code sliced for a different printer type. Continue?" "G-code sliced for a different printer type. Continue?"
# #MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=6
"G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled."
# #

2
lang/lang_en_cz.txt
View File

@ -1398,7 +1398,7 @@
"G-code sliced for a different printer type. Continue?" "G-code sliced for a different printer type. Continue?"
"G-code je pripraven pro jiny typ tiskarny. Pokracovat?" "G-code je pripraven pro jiny typ tiskarny. Pokracovat?"
# #MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=6
"G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled."
"G-code je pripraven pro jiny typ tiskarny. Prosim preslicujte model znovu. Tisk zrusen." "G-code je pripraven pro jiny typ tiskarny. Prosim preslicujte model znovu. Tisk zrusen."

2
lang/lang_en_de.txt
View File

@ -1398,7 +1398,7 @@
"G-code sliced for a different printer type. Continue?" "G-code sliced for a different printer type. Continue?"
"G-Code ist fuer einen anderen Drucker geslict. Fortfahren?" "G-Code ist fuer einen anderen Drucker geslict. Fortfahren?"
# #MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=6
"G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled."
"G-Code ist fuer einen anderen Drucker geslict. Bitte slicen Sie das Modell erneut. Druck abgebrochen." "G-Code ist fuer einen anderen Drucker geslict. Bitte slicen Sie das Modell erneut. Druck abgebrochen."

2
lang/lang_en_es.txt
View File

@ -1398,7 +1398,7 @@
"G-code sliced for a different printer type. Continue?" "G-code sliced for a different printer type. Continue?"
"Codigo G laminado para un tipo de impresora diferente. ?Continuar?" "Codigo G laminado para un tipo de impresora diferente. ?Continuar?"
# #MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=6
"G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled."
"Codigo G laminado para una impresora diferente. Por favor relamina el modelo de nuevo. Impresion cancelada." "Codigo G laminado para una impresora diferente. Por favor relamina el modelo de nuevo. Impresion cancelada."

2
lang/lang_en_fr.txt
View File

@ -1398,7 +1398,7 @@
"G-code sliced for a different printer type. Continue?" "G-code sliced for a different printer type. Continue?"
"Le G-code a ete prepare pour une autre version de l'imprimante. Continuer?" "Le G-code a ete prepare pour une autre version de l'imprimante. Continuer?"
# #MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=6
"G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled."
"Le G-code a ete prepare pour une autre version de l'imprimante. Veuillez decouper le modele a nouveau. L'impression a ete annulee." "Le G-code a ete prepare pour une autre version de l'imprimante. Veuillez decouper le modele a nouveau. L'impression a ete annulee."

2
lang/lang_en_it.txt
View File

@ -1398,7 +1398,7 @@
"G-code sliced for a different printer type. Continue?" "G-code sliced for a different printer type. Continue?"
"G-code processato per una stampante diversa. Continuare?" "G-code processato per una stampante diversa. Continuare?"
# #MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=6
"G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled."
"G-code processato per una stampante diversa. Per favore esegui nuovamente lo slice del modello. Stampa annullata." "G-code processato per una stampante diversa. Per favore esegui nuovamente lo slice del modello. Stampa annullata."

2
lang/lang_en_pl.txt
View File

@ -1398,7 +1398,7 @@
"G-code sliced for a different printer type. Continue?" "G-code sliced for a different printer type. Continue?"
"G-code pociety dla innej drukarki. Kontynuowac?" "G-code pociety dla innej drukarki. Kontynuowac?"
# #MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=6
"G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled."
"G-code pociety dla drukarki innego typu. Potnij model ponownie. Druk anulowany." "G-code pociety dla drukarki innego typu. Potnij model ponownie. Druk anulowany."