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

Remove duplicate string `Steel sheets` and `Total` using `MSG_STEEL_SHEETS` and `MSG_TOTAL`

This commit is contained in:
3d-gussner 2021-01-25 17:58:51 +01:00
parent 7222cf05cf
commit 8f0a45e8a4
10 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/messages.c
View File

@ -55,6 +55,7 @@ const char MSG_M117_V2_CALIBRATION[] PROGMEM_I1 = ISTR("M117 First layer cal.");
const char MSG_MAIN[] PROGMEM_I1 = ISTR("Main"); //// const char MSG_MAIN[] PROGMEM_I1 = ISTR("Main"); ////
const char MSG_BACK[] PROGMEM_I1 = ISTR("Back"); //// const char MSG_BACK[] PROGMEM_I1 = ISTR("Back"); ////
const char MSG_SHEET[] PROGMEM_I1 = ISTR("Sheet"); ////c=10 const char MSG_SHEET[] PROGMEM_I1 = ISTR("Sheet"); ////c=10
const char MSG_STEEL_SHEETS[] PROGMEM_I1 = ISTR("Steel sheets"); ////c=18
const char MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1[] PROGMEM_I1 = ISTR("Measuring reference height of calibration point"); ////c=60 const char MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1[] PROGMEM_I1 = ISTR("Measuring reference height of calibration point"); ////c=60
const char MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2[] PROGMEM_I1 = ISTR(" of 9"); ////c=14 const char MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2[] PROGMEM_I1 = ISTR(" of 9"); ////c=14
const char MSG_MENU_CALIBRATION[] PROGMEM_I1 = ISTR("Calibration"); //// const char MSG_MENU_CALIBRATION[] PROGMEM_I1 = ISTR("Calibration"); ////
@ -86,6 +87,7 @@ const char MSG_SELFTEST_MOTOR[] PROGMEM_I1 = ISTR("Motor"); ////
const char MSG_SELFTEST_FILAMENT_SENSOR[] PROGMEM_I1 = ISTR("Filament sensor"); ////c=17 const char MSG_SELFTEST_FILAMENT_SENSOR[] PROGMEM_I1 = ISTR("Filament sensor"); ////c=17
const char MSG_SELFTEST_WIRINGERROR[] PROGMEM_I1 = ISTR("Wiring error"); //// const char MSG_SELFTEST_WIRINGERROR[] PROGMEM_I1 = ISTR("Wiring error"); ////
const char MSG_SETTINGS[] PROGMEM_I1 = ISTR("Settings"); //// const char MSG_SETTINGS[] PROGMEM_I1 = ISTR("Settings"); ////
const char MSG_TOTAL[] PROGMEM_I1 = ISTR("Total"); ////c=6
const char MSG_HW_SETUP[] PROGMEM_I1 = ISTR("HW Setup"); ////c=18 const char MSG_HW_SETUP[] PROGMEM_I1 = ISTR("HW Setup"); ////c=18
const char MSG_MODE[] PROGMEM_I1 = ISTR("Mode"); //// const char MSG_MODE[] PROGMEM_I1 = ISTR("Mode"); ////
const char MSG_HIGH_POWER[] PROGMEM_I1 = ISTR("High power"); //// const char MSG_HIGH_POWER[] PROGMEM_I1 = ISTR("High power"); ////

2
Firmware/messages.h
View File

@ -54,6 +54,7 @@ extern const char MSG_M117_V2_CALIBRATION[];
extern const char MSG_MAIN[]; extern const char MSG_MAIN[];
extern const char MSG_BACK[]; extern const char MSG_BACK[];
extern const char MSG_SHEET[]; extern const char MSG_SHEET[];
extern const char MSG_STEEL_SHEETS[];
extern const char MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1[]; extern const char MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1[];
extern const char MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2[]; extern const char MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2[];
extern const char MSG_MENU_CALIBRATION[]; extern const char MSG_MENU_CALIBRATION[];
@ -86,6 +87,7 @@ extern const char MSG_SELFTEST_MOTOR[];
extern const char MSG_SELFTEST_FILAMENT_SENSOR[]; extern const char MSG_SELFTEST_FILAMENT_SENSOR[];
extern const char MSG_SELFTEST_WIRINGERROR[]; extern const char MSG_SELFTEST_WIRINGERROR[];
extern const char MSG_SETTINGS[]; extern const char MSG_SETTINGS[];
extern const char MSG_TOTAL[];
extern const char MSG_HW_SETUP[]; extern const char MSG_HW_SETUP[];
extern const char MSG_MODE[]; extern const char MSG_MODE[];
extern const char MSG_HIGH_POWER[]; extern const char MSG_HIGH_POWER[];

12
Firmware/ultralcd.cpp
View File

@ -1639,7 +1639,7 @@ void lcd_menu_extruder_info() // NOT static due to using ins
//! |01234567890123456789| //! |01234567890123456789|
//! | Main | c=18 r=1 //! | Main | c=18 r=1
//! | Last print | MSG_LAST_PRINT c=18 //! | Last print | MSG_LAST_PRINT c=18
//! | Total | c=18 r=1 //! | Total | MSG_TOTAL c=6
//! | | //! | |
//! ---------------------- //! ----------------------
//! @endcode //! @endcode
@ -1648,7 +1648,7 @@ static void lcd_menu_fails_stats_mmu()
MENU_BEGIN(); MENU_BEGIN();
MENU_ITEM_BACK_P(_T(MSG_MAIN)); MENU_ITEM_BACK_P(_T(MSG_MAIN));
MENU_ITEM_SUBMENU_P(_T(MSG_LAST_PRINT), lcd_menu_fails_stats_mmu_print); MENU_ITEM_SUBMENU_P(_T(MSG_LAST_PRINT), lcd_menu_fails_stats_mmu_print);
MENU_ITEM_SUBMENU_P(_i("Total"), lcd_menu_fails_stats_mmu_total); ////c=18 r=1 MENU_ITEM_SUBMENU_P(_T(MSG_TOTAL), lcd_menu_fails_stats_mmu_total); ////c=18 r=1
MENU_END(); MENU_END();
} }
@ -1781,7 +1781,7 @@ static void lcd_menu_fails_stats_print()
//! |01234567890123456789| //! |01234567890123456789|
//! | Main | c=18 r=1 //! | Main | c=18 r=1
//! | Last print | MSG_LAST_PRINT c=18 //! | Last print | MSG_LAST_PRINT c=18
//! | Total | c=18 r=1 //! | Total | MSG_TOTAL c=6
//! | | //! | |
//! ---------------------- //! ----------------------
//! @endcode //! @endcode
@ -1791,7 +1791,7 @@ static void lcd_menu_fails_stats()
MENU_BEGIN(); MENU_BEGIN();
MENU_ITEM_BACK_P(_T(MSG_MAIN)); MENU_ITEM_BACK_P(_T(MSG_MAIN));
MENU_ITEM_SUBMENU_P(_T(MSG_LAST_PRINT), lcd_menu_fails_stats_print); ////c=18 r=1 MENU_ITEM_SUBMENU_P(_T(MSG_LAST_PRINT), lcd_menu_fails_stats_print); ////c=18 r=1
MENU_ITEM_SUBMENU_P(_i("Total"), lcd_menu_fails_stats_total); ////c=18 r=1 MENU_ITEM_SUBMENU_P(_T(MSG_TOTAL), lcd_menu_fails_stats_total); ////c=18 r=1
MENU_END(); MENU_END();
} }
@ -5642,7 +5642,7 @@ void lcd_hw_setup_menu(void) // can not be "static"
MENU_BEGIN(); MENU_BEGIN();
MENU_ITEM_BACK_P(_T(bSettings?MSG_SETTINGS:MSG_BACK)); // i.e. default menu-item / menu-item after checking mismatch MENU_ITEM_BACK_P(_T(bSettings?MSG_SETTINGS:MSG_BACK)); // i.e. default menu-item / menu-item after checking mismatch
MENU_ITEM_SUBMENU_P(_i("Steel sheets"), sheets_menu); ////MSG_STEEL_SHEETS c=18 MENU_ITEM_SUBMENU_P(_T(MSG_STEEL_SHEETS), sheets_menu);
SETTINGS_NOZZLE; SETTINGS_NOZZLE;
MENU_ITEM_SUBMENU_P(_i("Checks"), lcd_checking_menu); MENU_ITEM_SUBMENU_P(_i("Checks"), lcd_checking_menu);
@ -6561,7 +6561,7 @@ static void activate_calibrate_sheet()
static void lcd_sheet_menu() static void lcd_sheet_menu()
{ {
MENU_BEGIN(); MENU_BEGIN();
MENU_ITEM_BACK_P(_i("Steel sheets")); ////MSG_STEEL_SHEETS c=18 MENU_ITEM_BACK_P(_T(MSG_STEEL_SHEETS));
if(eeprom_is_sheet_initialized(selected_sheet)){ if(eeprom_is_sheet_initialized(selected_sheet)){
MENU_ITEM_SUBMENU_P(_i("Select"), change_sheet); //// c=18 MENU_ITEM_SUBMENU_P(_i("Select"), change_sheet); //// c=18

4
lang/lang_en.txt
View File

@ -886,7 +886,7 @@
#MSG_UNLOADING_FILAMENT c=20 r=1 #MSG_UNLOADING_FILAMENT c=20 r=1
"Unloading filament" "Unloading filament"
# #MSG_TOTAL c=6
"Total" "Total"
#MSG_USED c=19 r=1 #MSG_USED c=19 r=1
@ -1093,7 +1093,7 @@
#MSG_SOUND_BLIND #MSG_SOUND_BLIND
"Assist" "Assist"
# c=18 #MSG_STEEL_SHEET c=18
"Steel sheets" "Steel sheets"
#MSG_Z_CORRECTION c=13 #MSG_Z_CORRECTION c=13

4
lang/lang_en_cz.txt
View File

@ -1182,7 +1182,7 @@
"Unloading filament" "Unloading filament"
"Vysouvam filament" "Vysouvam filament"
# #MSG_TOTAL c=6
"Total" "Total"
"Celkem" "Celkem"
@ -1458,7 +1458,7 @@
"Assist" "Assist"
"Asist." "Asist."
# c=18 #MSG_STEEL_SHEET c=18
"Steel sheets" "Steel sheets"
"Tiskove platy" "Tiskove platy"

4
lang/lang_en_de.txt
View File

@ -1182,7 +1182,7 @@
"Unloading filament" "Unloading filament"
"Filament auswerfen" "Filament auswerfen"
# #MSG_TOTAL c=6
"Total" "Total"
"Gesamt" "Gesamt"
@ -1458,7 +1458,7 @@
"Assist" "Assist"
"\x00" "\x00"
# c=18 #MSG_STEEL_SHEET c=18
"Steel sheets" "Steel sheets"
"Stahlbleche" "Stahlbleche"

4
lang/lang_en_es.txt
View File

@ -1182,7 +1182,7 @@
"Unloading filament" "Unloading filament"
"Soltando filamento" "Soltando filamento"
# #MSG_TOTAL c=6
"Total" "Total"
"\x00" "\x00"
@ -1458,7 +1458,7 @@
"Assist" "Assist"
"Asistido" "Asistido"
# c=18 #MSG_STEEL_SHEET c=18
"Steel sheets" "Steel sheets"
"Lamina de acero" "Lamina de acero"

4
lang/lang_en_fr.txt
View File

@ -1182,7 +1182,7 @@
"Unloading filament" "Unloading filament"
"Dechargement fil." "Dechargement fil."
# #MSG_TOTAL c=6
"Total" "Total"
"Totale" "Totale"
@ -1458,7 +1458,7 @@
"Assist" "Assist"
"\x00" "\x00"
# c=18 #MSG_STEEL_SHEET c=18
"Steel sheets" "Steel sheets"
"Plaques en acier" "Plaques en acier"

4
lang/lang_en_it.txt
View File

@ -1182,7 +1182,7 @@
"Unloading filament" "Unloading filament"
"Scaricando filamento" "Scaricando filamento"
# #MSG_TOTAL c=6
"Total" "Total"
"Totale" "Totale"
@ -1458,7 +1458,7 @@
"Assist" "Assist"
"Assist." "Assist."
# c=18 #MSG_STEEL_SHEET c=18
"Steel sheets" "Steel sheets"
"Piani d'acciaio" "Piani d'acciaio"

4
lang/lang_en_pl.txt
View File

@ -1182,7 +1182,7 @@
"Unloading filament" "Unloading filament"
"Rozladowuje filament" "Rozladowuje filament"
# #MSG_TOTAL c=6
"Total" "Total"
"Suma" "Suma"
@ -1458,7 +1458,7 @@
"Assist" "Assist"
"Asyst." "Asyst."
# c=18 #MSG_STEEL_SHEET c=18
"Steel sheets" "Steel sheets"
"Plyty stalowe" "Plyty stalowe"