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

Remove duplicate string Fil. runouts using MSG_FIL_RUNOUTS

Browse Source
This commit is contained in:
3d-gussner 2021-01-25 20:04:18 +01:00
parent 10bbd64b41
commit d117a299f7
10 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Firmware/messages.c
View File

@ -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
Firmware/messages.h
View File

@ -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[];

18
Firmware/ultralcd.cpp
View File

@ -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();
}

4
lang/lang_en.txt
View File

@ -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?"

4
lang/lang_en_cz.txt
View File

@ -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

6
lang/lang_en_de.txt
View File

@ -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?"

6
lang/lang_en_es.txt
View File

@ -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?"

6
lang/lang_en_fr.txt
View File

@ -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?"

6
lang/lang_en_it.txt
View File

@ -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?"

4
lang/lang_en_pl.txt
View File

@ -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