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

Remove duplicate string `Fans check` using `MSG_FANS_CHECK`

This commit is contained in:
3d-gussner 2021-01-25 20:13:12 +01:00
parent d117a299f7
commit 2d1e1e4cee
10 changed files with 11 additions and 9 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_CRASHDETECT[] PROGMEM_I1 = ISTR("Crash det."); ////c=13
const char MSG_ERROR[] PROGMEM_I1 = ISTR("ERROR:"); //// const char MSG_ERROR[] PROGMEM_I1 = ISTR("ERROR:"); ////
const char MSG_EXTRUDER[] PROGMEM_I1 = ISTR("Extruder"); ////c=17 r=1 const char MSG_EXTRUDER[] PROGMEM_I1 = ISTR("Extruder"); ////c=17 r=1
const char MSG_FANS_CHECK[] PROGMEM_I1 = ISTR("Fans check"); ////c=13
const char MSG_FIL_RUNOUTS[] PROGMEM_I1 = ISTR("Fil. runouts"); ////c=14 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_FILAMENT[] PROGMEM_I1 = ISTR("Filament"); ////c=17 r=1
const char MSG_FAN_SPEED[] PROGMEM_I1 = ISTR("Fan speed"); ////c=14 const char MSG_FAN_SPEED[] PROGMEM_I1 = ISTR("Fan speed"); ////c=14

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_CRASHDETECT[];
extern const char MSG_ERROR[]; extern const char MSG_ERROR[];
extern const char MSG_EXTRUDER[]; extern const char MSG_EXTRUDER[];
extern const char MSG_FANS_CHECK[];
extern const char MSG_FIL_RUNOUTS[]; extern const char MSG_FIL_RUNOUTS[];
extern const char MSG_FILAMENT[]; extern const char MSG_FILAMENT[];
extern const char MSG_FAN_SPEED[]; extern const char MSG_FAN_SPEED[];

4
Firmware/ultralcd.cpp
View File

@ -5688,7 +5688,7 @@ static void lcd_settings_menu()
SETTINGS_CUTTER; SETTINGS_CUTTER;
MENU_ITEM_TOGGLE_P(_i("Fans check"), fans_check_enabled ? _T(MSG_ON) : _T(MSG_OFF), lcd_set_fan_check); MENU_ITEM_TOGGLE_P(_T(MSG_FANS_CHECK), fans_check_enabled ? _T(MSG_ON) : _T(MSG_OFF), lcd_set_fan_check);
SETTINGS_SILENT_MODE; SETTINGS_SILENT_MODE;
@ -6911,7 +6911,7 @@ static void lcd_tune_menu()
if(farm_mode) if(farm_mode)
{ {
MENU_ITEM_TOGGLE_P(_i("Fans check"), fans_check_enabled ? _T(MSG_ON) : _T(MSG_OFF), lcd_set_fan_check); MENU_ITEM_TOGGLE_P(_T(MSG_FANS_CHECK), fans_check_enabled ? _T(MSG_ON) : _T(MSG_OFF), lcd_set_fan_check);
} }
#ifdef TMC2130 #ifdef TMC2130

2
lang/lang_en.txt
View File

@ -247,7 +247,7 @@
#MSG_SELFTEST_FAN c=20 #MSG_SELFTEST_FAN c=20
"Fan test" "Fan test"
#MSG_FANS_CHECK #MSG_FANS_CHECK c=13
"Fans check" "Fans check"
#MSG_FSENSOR #MSG_FSENSOR

2
lang/lang_en_cz.txt
View File

@ -330,7 +330,7 @@
"Fan test" "Fan test"
"Test ventilatoru" "Test ventilatoru"
#MSG_FANS_CHECK #MSG_FANS_CHECK c=13
"Fans check" "Fans check"
"Kontr. vent." "Kontr. vent."

2
lang/lang_en_de.txt
View File

@ -330,7 +330,7 @@
"Fan test" "Fan test"
"Lueftertest" "Lueftertest"
#MSG_FANS_CHECK #MSG_FANS_CHECK c=13
"Fans check" "Fans check"
"Luefter Chk." "Luefter Chk."

2
lang/lang_en_es.txt
View File

@ -330,7 +330,7 @@
"Fan test" "Fan test"
"Test ventiladores" "Test ventiladores"
#MSG_FANS_CHECK #MSG_FANS_CHECK c=13
"Fans check" "Fans check"
"Comprob.vent" "Comprob.vent"

2
lang/lang_en_fr.txt
View File

@ -330,7 +330,7 @@
"Fan test" "Fan test"
"Test du ventilateur" "Test du ventilateur"
#MSG_FANS_CHECK #MSG_FANS_CHECK c=13
"Fans check" "Fans check"
"Verif vent." "Verif vent."

2
lang/lang_en_it.txt
View File

@ -330,7 +330,7 @@
"Fan test" "Fan test"
"Test ventola" "Test ventola"
#MSG_FANS_CHECK #MSG_FANS_CHECK c=13
"Fans check" "Fans check"
"Control.vent" "Control.vent"

2
lang/lang_en_pl.txt
View File

@ -330,7 +330,7 @@
"Fan test" "Fan test"
"Test wentylatora" "Test wentylatora"
#MSG_FANS_CHECK #MSG_FANS_CHECK c=13
"Fans check" "Fans check"
"Sprawd.went." "Sprawd.went."