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

Remove duplicate string Resume print using MSG_RESUME_PRINT

Browse Source
This commit is contained in:
3d-gussner 2021-01-26 09:23:55 +01:00
parent c6a01b3806
commit ba8386573a
10 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Firmware/messages.c
View File

@ -79,9 +79,10 @@ const char MSG_PRINT_ABORTED[] PROGMEM_I1 = ISTR("Print aborted"); ////c=20
const char MSG_PULL_OUT_FILAMENT[] PROGMEM_I1 = ISTR("Please pull out filament immediately"); ////c=20 r=4 const char MSG_PULL_OUT_FILAMENT[] PROGMEM_I1 = ISTR("Please pull out filament immediately"); ////c=20 r=4
const char MSG_RECOVER_PRINT[] PROGMEM_I1 = ISTR("Blackout occurred. Recover print?"); ////c=20 r=2 const char MSG_RECOVER_PRINT[] PROGMEM_I1 = ISTR("Blackout occurred. Recover print?"); ////c=20 r=2
const char MSG_REFRESH[] PROGMEM_I1 = ISTR("\xF8" "Refresh"); //// const char MSG_REFRESH[] PROGMEM_I1 = ISTR("\xF8" "Refresh"); ////
const char MSG_RESET[] PROGMEM_I1 = ISTR("Reset"); ////c=14
const char MSG_RESUMING_PRINT[] PROGMEM_I1 = ISTR("Resuming print"); ////
const char MSG_REMOVE_STEEL_SHEET[] PROGMEM_I1 = ISTR("Please remove steel sheet from heatbed."); ////c=20 r=4 const char MSG_REMOVE_STEEL_SHEET[] PROGMEM_I1 = ISTR("Please remove steel sheet from heatbed."); ////c=20 r=4
const char MSG_RESET[] PROGMEM_I1 = ISTR("Reset"); ////c=14
const char MSG_RESUME_PRINT[] PROGMEM_I1 = ISTR("Resume print"); ////c=18
const char MSG_RESUMING_PRINT[] PROGMEM_I1 = ISTR("Resuming print"); ////
const char MSG_SELFTEST_COOLING_FAN[] PROGMEM_I1 = ISTR("Front print fan?"); ////c=20 const char MSG_SELFTEST_COOLING_FAN[] PROGMEM_I1 = ISTR("Front print fan?"); ////c=20
const char MSG_SELFTEST_EXTRUDER_FAN[] PROGMEM_I1 = ISTR("Left hotend fan?"); ////c=20 const char MSG_SELFTEST_EXTRUDER_FAN[] PROGMEM_I1 = ISTR("Left hotend fan?"); ////c=20
const char MSG_SELFTEST_FAILED[] PROGMEM_I1 = ISTR("Selftest failed "); ////c=20 const char MSG_SELFTEST_FAILED[] PROGMEM_I1 = ISTR("Selftest failed "); ////c=20

3
Firmware/messages.h
View File

@ -77,9 +77,10 @@ extern const char MSG_PRESS_TO_UNLOAD[];
extern const char MSG_PRINT_ABORTED[]; extern const char MSG_PRINT_ABORTED[];
extern const char MSG_PULL_OUT_FILAMENT[]; extern const char MSG_PULL_OUT_FILAMENT[];
extern const char MSG_RECOVER_PRINT[]; extern const char MSG_RECOVER_PRINT[];
extern const char MSG_RESET[];
extern const char MSG_REFRESH[]; extern const char MSG_REFRESH[];
extern const char MSG_REMOVE_STEEL_SHEET[]; extern const char MSG_REMOVE_STEEL_SHEET[];
extern const char MSG_RESET[];
extern const char MSG_RESUME_PRINT[];
extern const char MSG_RESUMING_PRINT[]; extern const char MSG_RESUMING_PRINT[];
extern const char MSG_SD_WORKDIR_FAIL[]; extern const char MSG_SD_WORKDIR_FAIL[];
extern const char MSG_SELFTEST_COOLING_FAN[]; extern const char MSG_SELFTEST_COOLING_FAN[];

8
Firmware/ultralcd.cpp
View File

@ -6620,9 +6620,9 @@ static void lcd_main_menu()
{ {
#ifdef FANCHECK #ifdef FANCHECK
if((fan_check_error == EFCE_FIXED) || (fan_check_error == EFCE_OK)) if((fan_check_error == EFCE_FIXED) || (fan_check_error == EFCE_OK))
MENU_ITEM_SUBMENU_P(_i("Resume print"), lcd_resume_print);////MSG_RESUME_PRINT MENU_ITEM_SUBMENU_P(_T(MSG_RESUME_PRINT), lcd_resume_print);////MSG_RESUME_PRINT c=18
#else #else
MENU_ITEM_SUBMENU_P(_i("Resume print"), lcd_resume_print);////MSG_RESUME_PRINT MENU_ITEM_SUBMENU_P(_T(MSG_RESUME_PRINT), lcd_resume_print);////MSG_RESUME_PRINT c=18
#endif #endif
} }
@ -6640,9 +6640,9 @@ static void lcd_main_menu()
{ {
#ifdef FANCHECK #ifdef FANCHECK
if((fan_check_error == EFCE_FIXED) || (fan_check_error == EFCE_OK)) if((fan_check_error == EFCE_FIXED) || (fan_check_error == EFCE_OK))
MENU_ITEM_SUBMENU_P(_i("Resume print"), lcd_resume_print);////MSG_RESUME_PRINT MENU_ITEM_SUBMENU_P(_T(MSG_RESUME_PRINT), lcd_resume_print);////MSG_RESUME_PRINT c=18
#else #else
MENU_ITEM_SUBMENU_P(_i("Resume print"), lcd_resume_print);////MSG_RESUME_PRINT MENU_ITEM_SUBMENU_P(_T(MSG_RESUME_PRINT), lcd_resume_print);////MSG_RESUME_PRINT c=18
#endif #endif
} }

2
lang/lang_en.txt
View File

@ -694,7 +694,7 @@
#MSG_RESET c=14 #MSG_RESET c=14
"Reset" "Reset"
#MSG_RESUME_PRINT #MSG_RESUME_PRINT c=18
"Resume print" "Resume print"
#MSG_RESUMING_PRINT c=20 #MSG_RESUMING_PRINT c=20

2
lang/lang_en_cz.txt
View File

@ -926,7 +926,7 @@
"Reset" "Reset"
"\x00" "\x00"
#MSG_RESUME_PRINT #MSG_RESUME_PRINT c=18
"Resume print" "Resume print"
"Pokracovat" "Pokracovat"

2
lang/lang_en_de.txt
View File

@ -926,7 +926,7 @@
"Reset" "Reset"
"Ruecksetzen" "Ruecksetzen"
#MSG_RESUME_PRINT #MSG_RESUME_PRINT c=18
"Resume print" "Resume print"
"Druck fortsetzen" "Druck fortsetzen"

2
lang/lang_en_es.txt
View File

@ -926,7 +926,7 @@
"Reset" "Reset"
"\x00" "\x00"
#MSG_RESUME_PRINT #MSG_RESUME_PRINT c=18
"Resume print" "Resume print"
"Reanudar impres." "Reanudar impres."

2
lang/lang_en_fr.txt
View File

@ -926,7 +926,7 @@
"Reset" "Reset"
"Reinitialiser" "Reinitialiser"
#MSG_RESUME_PRINT #MSG_RESUME_PRINT c=18
"Resume print" "Resume print"
"Reprendre impression" "Reprendre impression"

2
lang/lang_en_it.txt
View File

@ -926,7 +926,7 @@
"Reset" "Reset"
"\x00" "\x00"
#MSG_RESUME_PRINT #MSG_RESUME_PRINT c=18
"Resume print" "Resume print"
"Riprendi stampa" "Riprendi stampa"

2
lang/lang_en_pl.txt
View File

@ -926,7 +926,7 @@
"Reset" "Reset"
"\x00" "\x00"
#MSG_RESUME_PRINT #MSG_RESUME_PRINT c=18
"Resume print" "Resume print"
"Wznowic wydruk" "Wznowic wydruk"