Browse Source

Remove duplicate string `Fil. runouts ` using `MSG_FIL_RUNOUTS`

3d-gussner 3 years ago
parent
commit
d117a299f7

+ 1 - 0
Firmware/messages.c

@@ -26,6 +26,7 @@ const char MSG_CRASH_DETECTED[] PROGMEM_I1 = ISTR("Crash detected."); ////c=20 r
 const char MSG_CRASHDETECT[] PROGMEM_I1 = ISTR("Crash det."); ////c=13
 const char MSG_ERROR[] PROGMEM_I1 = ISTR("ERROR:"); ////
 const char MSG_EXTRUDER[] PROGMEM_I1 = ISTR("Extruder"); ////c=17 r=1
+const char MSG_FIL_RUNOUTS[] PROGMEM_I1 = ISTR("Fil. runouts"); ////c=14
 const char MSG_FILAMENT[] PROGMEM_I1 = ISTR("Filament"); ////c=17 r=1
 const char MSG_FAN_SPEED[] PROGMEM_I1 = ISTR("Fan speed"); ////c=14
 const char MSG_FILAMENT_CLEAN[] PROGMEM_I1 = ISTR("Filament extruding & with correct color?"); ////c=20 r=2

+ 1 - 0
Firmware/messages.h

@@ -27,6 +27,7 @@ extern const char MSG_CRASH_DETECTED[];
 extern const char MSG_CRASHDETECT[];
 extern const char MSG_ERROR[];
 extern const char MSG_EXTRUDER[];
+extern const char MSG_FIL_RUNOUTS[];
 extern const char MSG_FILAMENT[];
 extern const char MSG_FAN_SPEED[];
 extern const char MSG_FILAMENT_CLEAN[];

+ 9 - 9
Firmware/ultralcd.cpp

@@ -1711,7 +1711,7 @@ static const char failStatsFmt[] PROGMEM = "%S\n" " %-16.16S%-3d\n" " %-16.16S%-
 //! |01234567890123456789|
 //! |Total failures      |	MSG_TOTAL_FAILURES c=20
 //! | Power failures: 000|	MSG_POWER_FAILURES c=14
-//! | Filam. runouts: 000|	c=14 r=1
+//! | Fil. runouts  : 000|	MSG_FIL_RUNOUTS c=14
 //! | Crash   X:000 Y:000|	MSG_CRASH c=7
 //! ----------------------
 //! @endcode
@@ -1727,7 +1727,7 @@ static void lcd_menu_fails_stats_total()
     lcd_printf_P(failStatsFmt, 
         _T(MSG_TOTAL_FAILURES),   ////c=20
         _T(MSG_POWER_FAILURES), power,   ////c=14
-        _i("Filam. runouts"), filam,   ////c=14 r=1
+        _T(MSG_FIL_RUNOUTS), filam,   ////c=14
         _T(MSG_CRASH), crashX, crashY);  ////c=7
     menu_back_if_clicked_fb();
 }
@@ -1738,7 +1738,7 @@ static void lcd_menu_fails_stats_total()
 //! |01234567890123456789|
 //! |Last print failures |	MSG_LAST_PRINT_FAILURES c=20
 //! | Power failures  000|	MSG_POWER_FAILURES c=14
-//! | Filam. runouts  000|	c=14 r=1
+//! | Fil. runouts    000|	MSG_FIL_RUNOUTS c=14
 //! | Crash   X:000 Y:000|	MSG_CRASH c=7
 //! ----------------------
 //! @endcode
@@ -1755,7 +1755,7 @@ static void lcd_menu_fails_stats_print()
     lcd_printf_P(failStatsFmt,
         _T(MSG_LAST_PRINT_FAILURES),  ////c=20
         _T(MSG_POWER_FAILURES), power,  ////c=14
-        _i("Filam. runouts"), filam,  ////c=14 r=1
+        _T(MSG_FIL_RUNOUTS), filam,  ////c=14
         _T(MSG_CRASH), crashX, crashY);  ////c=7
 #else
     // On the MK3 include detailed PAT9125 statistics about soft failures
@@ -1806,10 +1806,10 @@ static const char failStatsFmt[] PROGMEM = "%S\n" " %-16.16S%-3d\n" "%S\n" " %-1
 //! Example screen:
 //! @code{.unparsed}
 //! |01234567890123456789|
-//! |Last print failures |	c=20 r=1
-//! | Filam. runouts  000|	c=14 r=1
+//! |Last print failures |	MSG_LAST_PRINT_FAILURES c=20
+//! | Fil.   runouts  000|	MSG_FIL_RUNOUTS c=14
 //! |Total failures      |	MSG_TOTAL_FAILURES c=20
-//! | Filam. runouts  000|	c=14 r=1
+//! | Fil. runouts    000|	MSG_FIL_RUNOUTS c=14
 //! ----------------------
 //! @endcode
 //! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations.
@@ -1821,9 +1821,9 @@ static void lcd_menu_fails_stats()
 	lcd_home();
 	lcd_printf_P(failStatsFmt, 
         _T(MSG_LAST_PRINT_FAILURES),   ////c=20
-        _i("Filam. runouts"), filamentLast,   ////c=14 r=1
+        _T(MSG_FIL_RUNOUTS), filamentLast,   ////c=14
         _T(MSG_TOTAL_FAILURES),  ////c=20
-        _i("Filam. runouts"), filamentTotal);   ////c=14 r=1
+        _T(MSG_FIL_RUNOUTS), filamentTotal);   ////c=14
 
 	menu_back_if_clicked();
 }

+ 2 - 2
lang/lang_en.txt

@@ -253,8 +253,8 @@
 #MSG_FSENSOR
 "Fil. sensor"
 
-# c=14
-"Filam. runouts"
+#MSG_FIL_RUNOUTS c=14
+"Fil. runouts  "
 
 #MSG_FILAMENT_CLEAN c=20 r=2
 "Filament extruding & with correct color?"

+ 2 - 2
lang/lang_en_cz.txt

@@ -338,8 +338,8 @@
 "Fil. sensor"
 "Fil. senzor"
 
-# c=14
-"Filam. runouts"
+#MSG_FIL_RUNOUTS c=14
+"Fil. runouts  "
 "Vypadky filam."
 
 #MSG_FILAMENT_CLEAN c=20 r=2

+ 3 - 3
lang/lang_en_de.txt

@@ -338,9 +338,9 @@
 "Fil. sensor"
 "Fil. Sensor"
 
-# c=14
-"Filam. runouts"
-"Filam. Maengel"
+#MSG_FIL_RUNOUTS c=14
+"Fil. runouts  "
+"Fil. Maengel  "
 
 #MSG_FILAMENT_CLEAN c=20 r=2
 "Filament extruding & with correct color?"

+ 3 - 3
lang/lang_en_es.txt

@@ -338,9 +338,9 @@
 "Fil. sensor"
 "Sensor Fil."
 
-# c=14
-"Filam. runouts"
-"Filam. acabado"
+#MSG_FIL_RUNOUTS c=14
+"Fil. runouts  "
+"Fil. acabado  "
 
 #MSG_FILAMENT_CLEAN c=20 r=2
 "Filament extruding & with correct color?"

+ 3 - 3
lang/lang_en_fr.txt

@@ -338,9 +338,9 @@
 "Fil. sensor"
 "Capteur Fil."
 
-# c=14
-"Filam. runouts"
-"Fins filament"
+#MSG_FIL_RUNOUTS c=14
+"Fil. runouts  "
+"Fins filament "
 
 #MSG_FILAMENT_CLEAN c=20 r=2
 "Filament extruding & with correct color?"

+ 3 - 3
lang/lang_en_it.txt

@@ -338,9 +338,9 @@
 "Fil. sensor"
 "Sensore fil."
 
-# c=14
-"Filam. runouts"
-"Fil. esauriti"
+#MSG_FIL_RUNOUTS c=14
+"Fil. runouts  "
+"Fil. esauriti "
 
 #MSG_FILAMENT_CLEAN c=20 r=2
 "Filament extruding & with correct color?"

+ 2 - 2
lang/lang_en_pl.txt

@@ -338,8 +338,8 @@
 "Fil. sensor"
 "Czuj. filam."
 
-# c=14
-"Filam. runouts"
+#MSG_FIL_RUNOUTS c=14
+"Fil. runouts  "
 "Konc.filamentu"
 
 #MSG_FILAMENT_CLEAN c=20 r=2