diff --git a/Firmware/messages.c b/Firmware/messages.c index c77c4c343..2fa3796c7 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -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 diff --git a/Firmware/messages.h b/Firmware/messages.h index 8e5d733de..f544c6073 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -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[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 92e612b20..26cb63bfd 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -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 diff --git a/lang/lang_en.txt b/lang/lang_en.txt index e2596e199..89996f85d 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -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 diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 97409c2dd..a06822541 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -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?" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 2c72bea50..7df5e9ecb 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -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?" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 9dc3ce647..02cd82a0b 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -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?" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index db1b9afad..a117bb6be 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -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?" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index bba041728..256e2ecff 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -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?" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 621bd9db4..4659053ef 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -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?"