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

Remove duplicate string Reset using MSG_RESET

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

1
Firmware/messages.c
View File

@ -79,6 +79,7 @@ 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_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_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_SELFTEST_COOLING_FAN[] PROGMEM_I1 = ISTR("Front print fan?"); ////c=20

1
Firmware/messages.h
View File

@ -77,6 +77,7 @@ extern const char MSG_PRESS_TO_UNLOAD[];
extern const char MSG_PRINT_ABORTED[];
extern const char MSG_PULL_OUT_FILAMENT[];
extern const char MSG_RECOVER_PRINT[];
extern const char MSG_RESET[];
extern const char MSG_REFRESH[];
extern const char MSG_REMOVE_STEEL_SHEET[];
extern const char MSG_RESUMING_PRINT[];

6
Firmware/ultralcd.cpp
View File

@ -3189,7 +3189,7 @@ void lcd_adjust_bed(void)
MENU_ITEM_EDIT_int3_P(_i("Right side[um]"), &_md->right, -BED_ADJUSTMENT_UM_MAX, BED_ADJUSTMENT_UM_MAX);////MSG_BED_CORRECTION_RIGHT c=14 r=1
MENU_ITEM_EDIT_int3_P(_i("Front side[um]"), &_md->front, -BED_ADJUSTMENT_UM_MAX, BED_ADJUSTMENT_UM_MAX);////MSG_BED_CORRECTION_FRONT c=14 r=1
MENU_ITEM_EDIT_int3_P(_i("Rear side [um]"), &_md->rear, -BED_ADJUSTMENT_UM_MAX, BED_ADJUSTMENT_UM_MAX);////MSG_BED_CORRECTION_REAR c=14 r=1
MENU_ITEM_FUNCTION_P(_i("Reset"), lcd_adjust_bed_reset);////MSG_BED_CORRECTION_RESET
MENU_ITEM_FUNCTION_P(_T(MSG_RESET), lcd_adjust_bed_reset);////MSG_RESET c=14
MENU_END();
}
@ -5795,7 +5795,7 @@ static void lcd_calibration_menu()
//MENU_ITEM_FUNCTION_P(_i("Calibrate E"), lcd_calibrate_extruder);////MSG_CALIBRATE_E c=20 r=1
#endif
// "Mesh Bed Leveling"
MENU_ITEM_SUBMENU_P(_T(MSG_MESH_BED_LEVELING), lcd_mesh_bedleveling);////MSG_MESH_BED_LEVELING
MENU_ITEM_SUBMENU_P(_T(MSG_MESH_BED_LEVELING), lcd_mesh_bedleveling);
#endif //MK1BP
@ -6572,7 +6572,7 @@ static void lcd_sheet_menu()
MENU_ITEM_SUBMENU_P(_T(MSG_V2_CALIBRATION), activate_calibrate_sheet);////MSG_V2_CALIBRATION c=18
}
MENU_ITEM_SUBMENU_P(_i("Rename"), lcd_rename_sheet_menu); //// c=18
MENU_ITEM_FUNCTION_P(_i("Reset"), lcd_reset_sheet); //// c=18
MENU_ITEM_FUNCTION_P(_T(MSG_RESET), lcd_reset_sheet); ////MSG_RESET c=14
MENU_END();
}

2
lang/lang_en.txt
View File

@ -691,7 +691,7 @@
#MSG_CALIBRATE_BED_RESET
"Reset XYZ calibr."
#MSG_BED_CORRECTION_RESET
#MSG_RESET c=14
"Reset"
#MSG_RESUME_PRINT

2
lang/lang_en_cz.txt
View File

@ -922,7 +922,7 @@
"Reset XYZ calibr."
"Reset XYZ kalibr."
#MSG_BED_CORRECTION_RESET
#MSG_RESET c=14
"Reset"
"\x00"

2
lang/lang_en_de.txt
View File

@ -922,7 +922,7 @@
"Reset XYZ calibr."
"Reset XYZ Kalibr."
#MSG_BED_CORRECTION_RESET
#MSG_RESET c=14
"Reset"
"Ruecksetzen"

2
lang/lang_en_es.txt
View File

@ -922,7 +922,7 @@
"Reset XYZ calibr."
"\x00"
#MSG_BED_CORRECTION_RESET
#MSG_RESET c=14
"Reset"
"\x00"

2
lang/lang_en_fr.txt
View File

@ -922,7 +922,7 @@
"Reset XYZ calibr."
"Reinit. calib. XYZ"
#MSG_BED_CORRECTION_RESET
#MSG_RESET c=14
"Reset"
"Reinitialiser"

2
lang/lang_en_it.txt
View File

@ -922,7 +922,7 @@
"Reset XYZ calibr."
"Reset calibrazione XYZ."
#MSG_BED_CORRECTION_RESET
#MSG_RESET c=14
"Reset"
"\x00"

2
lang/lang_en_pl.txt
View File

@ -922,7 +922,7 @@
"Reset XYZ calibr."
"Reset kalibr. XYZ"
#MSG_BED_CORRECTION_RESET
#MSG_RESET c=14
"Reset"
"\x00"