Browse Source

Remove duplicate string `Total failures` using `MSG_TOTAL_FAILURES`

3d-gussner 3 years ago
parent
commit
99867c8fbd

+ 1 - 0
Firmware/messages.c

@@ -88,6 +88,7 @@ const char MSG_SELFTEST_FILAMENT_SENSOR[] PROGMEM_I1 = ISTR("Filament sensor");
 const char MSG_SELFTEST_WIRINGERROR[] PROGMEM_I1 = ISTR("Wiring error"); ////
 const char MSG_SETTINGS[] PROGMEM_I1 = ISTR("Settings"); ////
 const char MSG_TOTAL[] PROGMEM_I1 = ISTR("Total"); ////c=6
+const char MSG_TOTAL_FAILURES[] PROGMEM_I1 = ISTR("Total failures"); ////c=20
 const char MSG_HW_SETUP[] PROGMEM_I1 = ISTR("HW Setup"); ////c=18
 const char MSG_MODE[] PROGMEM_I1 = ISTR("Mode"); ////
 const char MSG_HIGH_POWER[] PROGMEM_I1 = ISTR("High power"); ////

+ 1 - 0
Firmware/messages.h

@@ -88,6 +88,7 @@ extern const char MSG_SELFTEST_FILAMENT_SENSOR[];
 extern const char MSG_SELFTEST_WIRINGERROR[];
 extern const char MSG_SETTINGS[];
 extern const char MSG_TOTAL[];
+extern const char MSG_TOTAL_FAILURES[];
 extern const char MSG_HW_SETUP[];
 extern const char MSG_MODE[];
 extern const char MSG_HIGH_POWER[];

+ 9 - 9
Firmware/ultralcd.cpp

@@ -1680,7 +1680,7 @@ static void lcd_menu_fails_stats_mmu_print()
 //!
 //! @code{.unparsed}
 //! |01234567890123456789|
-//! |Total failures      |	c=20 r=1
+//! |Total failures      |	MSG_TOTAL_FAILURES c=20
 //! | MMU fails:      000|	MSG_MMU_FAILS c=14
 //! | MMU load fails: 000|	MSG_MMU_LOAD_FAILS c=14
 //! | MMU power fails:000|	c=14 r=1
@@ -1695,9 +1695,9 @@ static void lcd_menu_fails_stats_mmu_total()
     uint16_t load_fails = eeprom_read_byte((uint8_t*)EEPROM_MMU_LOAD_FAIL_TOT);
     lcd_home();
     lcd_printf_P(PSTR("%S\n" " %-16.16S%-3d\n" " %-16.16S%-3d\n" " %-16.16S%-3d"), 
-        _i("Total failures"), ////c=20 r=1
-        _T(MSG_MMU_FAILS), fails, ////c=14 r=1
-        _T(MSG_MMU_LOAD_FAILS), load_fails, ////c=14 r=1
+        _T(MSG_TOTAL_FAILURES), ////c=20
+        _T(MSG_MMU_FAILS), fails, ////c=14
+        _T(MSG_MMU_LOAD_FAILS), load_fails, ////c=14
         _i("MMU power fails"), mmu_power_failures); ////c=14 r=1
     menu_back_if_clicked_fb();
 }
@@ -1709,7 +1709,7 @@ static const char failStatsFmt[] PROGMEM = "%S\n" " %-16.16S%-3d\n" " %-16.16S%-
 //!
 //! @code{.unparsed}
 //! |01234567890123456789|
-//! |Total failures      |	c=20 r=1
+//! |Total failures      |	MSG_TOTAL_FAILURES c=20
 //! | Power failures: 000|	MSG_POWER_FAILURES c=14
 //! | Filam. runouts: 000|	c=14 r=1
 //! | Crash   X:000 Y:000|	c=7 r=1
@@ -1725,8 +1725,8 @@ static void lcd_menu_fails_stats_total()
     uint16_t crashY = eeprom_read_word((uint16_t*)EEPROM_CRASH_COUNT_Y_TOT);
     lcd_home();
     lcd_printf_P(failStatsFmt, 
-        _i("Total failures"),   ////c=20 r=1
-        _T(MSG_POWER_FAILURES), power,   ////c=14 r=1
+        _T(MSG_TOTAL_FAILURES),   ////c=20
+        _T(MSG_POWER_FAILURES), power,   ////c=14
         _i("Filam. runouts"), filam,   ////c=14 r=1
         _i("Crash"), crashX, crashY);  ////c=7 r=1
     menu_back_if_clicked_fb();
@@ -1808,7 +1808,7 @@ static const char failStatsFmt[] PROGMEM = "%S\n" " %-16.16S%-3d\n" "%S\n" " %-1
 //! |01234567890123456789|
 //! |Last print failures |	c=20 r=1
 //! | Filam. runouts  000|	c=14 r=1
-//! |Total failures      |	c=20 r=1
+//! |Total failures      |	MSG_TOTAL_FAILURES c=20
 //! | Filam. runouts  000|	c=14 r=1
 //! ----------------------
 //! @endcode
@@ -1822,7 +1822,7 @@ static void lcd_menu_fails_stats()
 	lcd_printf_P(failStatsFmt, 
         _i("Last print failures"),   ////c=20 r=1
         _i("Filam. runouts"), filamentLast,   ////c=14 r=1
-        _i("Total failures"),  ////c=20 r=1
+        _T(MSG_TOTAL_FAILURES),  ////c=20
         _i("Filam. runouts"), filamentTotal);   ////c=14 r=1
 
 	menu_back_if_clicked();

+ 1 - 1
lang/lang_en.txt

@@ -871,7 +871,7 @@
 #
 "Unload"
 
-#
+#MSG_TOTAL_FAILURES c=20
 "Total failures"
 
 #

+ 1 - 1
lang/lang_en_cz.txt

@@ -1162,7 +1162,7 @@
 "Unload"
 "Vysunout"
 
-#
+#MSG_TOTAL_FAILURES c=20
 "Total failures"
 "Celkem selhani"
 

+ 1 - 1
lang/lang_en_de.txt

@@ -1162,7 +1162,7 @@
 "Unload"
 "Entladen"
 
-#
+#MSG_TOTAL_FAILURES c=20
 "Total failures"
 "Gesamte Fehler"
 

+ 1 - 1
lang/lang_en_es.txt

@@ -1162,7 +1162,7 @@
 "Unload"
 "Descargar"
 
-#
+#MSG_TOTAL_FAILURES c=20
 "Total failures"
 "Fallos totales"
 

+ 1 - 1
lang/lang_en_fr.txt

@@ -1162,7 +1162,7 @@
 "Unload"
 "Decharger"
 
-#
+#MSG_TOTAL_FAILURES c=20
 "Total failures"
 "Total des echecs"
 

+ 1 - 1
lang/lang_en_it.txt

@@ -1162,7 +1162,7 @@
 "Unload"
 "Scarica"
 
-#
+#MSG_TOTAL_FAILURES c=20
 "Total failures"
 "Totale fallimenti"
 

+ 1 - 1
lang/lang_en_pl.txt

@@ -1162,7 +1162,7 @@
 "Unload"
 "Rozladuj"
 
-#
+#MSG_TOTAL_FAILURES c=20
 "Total failures"
 "Suma bledow"