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

Remove duplicate string Is filament loaded? using MSG_FILAMENT_LOADED

Browse source
This commit is contained in:
3d-gussner 2021-01-25 16:44:55 +01:00
parent 223f32deae
commit 7891d12a32
10 changed files with 12 additions and 10 deletions

1
Firmware/messages.c
View file

@ -28,6 +28,7 @@ const char MSG_EXTRUDER[] PROGMEM_I1 = ISTR("Extruder"); ////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_FILAMENT_CLEAN[] PROGMEM_I1 = ISTR("Filament extruding & with correct color?"); ////c=20 r=2
const char MSG_FILAMENT_LOADED[] PROGMEM_I1 = ISTR("Is filament loaded?"); ////c=20 r=2
const char MSG_FILAMENT_LOADING_T0[] PROGMEM_I1 = ISTR("Insert filament into extruder 1. Click when done."); ////c=20 r=4
const char MSG_FILAMENT_LOADING_T1[] PROGMEM_I1 = ISTR("Insert filament into extruder 2. Click when done."); ////c=20 r=4
const char MSG_FILAMENT_LOADING_T2[] PROGMEM_I1 = ISTR("Insert filament into extruder 3. Click when done."); ////c=20 r=4

1
Firmware/messages.h
View file

@ -29,6 +29,7 @@ extern const char MSG_EXTRUDER[];
extern const char MSG_FILAMENT[];
extern const char MSG_FAN_SPEED[];
extern const char MSG_FILAMENT_CLEAN[];
extern const char MSG_FILAMENT_LOADED[];
extern const char MSG_FILAMENT_LOADING_T0[];
extern const char MSG_FILAMENT_LOADING_T1[];
extern const char MSG_FILAMENT_LOADING_T2[];

6
Firmware/ultralcd.cpp
View file

@ -4733,7 +4733,7 @@ void lcd_v2_calibration()
}
else
{
loaded = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Is filament loaded?"), false, true);////MSG_PLA_FILAMENT_LOADED c=20 r=2
loaded = lcd_show_fullscreen_message_yes_no_and_wait_P(_T(MSG_FILAMENT_LOADED), false, true);
lcd_update_enabled = true;
}
@ -4986,10 +4986,10 @@ void lcd_wizard(WizState state)
setTargetBed(PLA_PREHEAT_HPB_TEMP);
if (mmu_enabled)
{
wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Is filament loaded?"), true);////c=20 r=2
wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(_T(MSG_FILAMENT_LOADED), true);
} else
{
wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Is filament loaded?"), true);////MSG_WIZARD_FILAMENT_LOADED c=20 r=2
wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(_T(MSG_FILAMENT_LOADED), true);
}
if (wizard_event) state = S::Lay1CalCold;
else

2
lang/lang_en.txt
View file

@ -373,7 +373,7 @@
#MSG_INSERT_FILAMENT c=20
"Insert filament"
#MSG_WIZARD_FILAMENT_LOADED c=20 r=2
#MSG_FILAMENT_LOADED c=20 r=2
"Is filament loaded?"
#MSG_STEEL_SHEET_CHECK c=20 r=2

2
lang/lang_en_cz.txt
View file

@ -498,7 +498,7 @@
"Insert filament"
"Vlozte filament"
#MSG_WIZARD_FILAMENT_LOADED c=20 r=2
#MSG_FILAMENT_LOADED c=20 r=2
"Is filament loaded?"
"Je filament zaveden?"

2
lang/lang_en_de.txt
View file

@ -498,7 +498,7 @@
"Insert filament"
"Filament einlegen"
#MSG_WIZARD_FILAMENT_LOADED c=20 r=2
#MSG_FILAMENT_LOADED c=20 r=2
"Is filament loaded?"
"Ist das Filament geladen?"

2
lang/lang_en_es.txt
View file

@ -498,7 +498,7 @@
"Insert filament"
"Introducir filamento"
#MSG_WIZARD_FILAMENT_LOADED c=20 r=2
#MSG_FILAMENT_LOADED c=20 r=2
"Is filament loaded?"
"Esta el filamento cargado?"

2
lang/lang_en_fr.txt
View file

@ -498,7 +498,7 @@
"Insert filament"
"Inserez le filament"
#MSG_WIZARD_FILAMENT_LOADED c=20 r=2
#MSG_FILAMENT_LOADED c=20 r=2
"Is filament loaded?"
"Fil. est-il charge?"

2
lang/lang_en_it.txt
View file

@ -498,7 +498,7 @@
"Insert filament"
"Inserire filamento"
#MSG_WIZARD_FILAMENT_LOADED c=20 r=2
#MSG_FILAMENT_LOADED c=20 r=2
"Is filament loaded?"
"Il filamento e' stato caricato?"

2
lang/lang_en_pl.txt
View file

@ -498,7 +498,7 @@
"Insert filament"
"Wprowadz filament"
#MSG_WIZARD_FILAMENT_LOADED c=20 r=2
#MSG_FILAMENT_LOADED c=20 r=2
"Is filament loaded?"
"Filament jest zaladowany?"