diff --git a/Firmware/messages.c b/Firmware/messages.c index aa05ad990..8aaa90ec7 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -116,6 +116,8 @@ const char MSG_WIZARD_CALIBRATION_FAILED[] PROGMEM_I1 = ISTR("Please check our h const char MSG_WIZARD_DONE[] PROGMEM_I1 = ISTR("All is done. Happy printing!"); ////c=20 r=8 const char MSG_WIZARD_HEATING[] PROGMEM_I1 = ISTR("Preheating nozzle. Please wait."); ////c=20 r=3 const char MSG_WIZARD_QUIT[] PROGMEM_I1 = ISTR("You can always resume the Wizard from Calibration -> Wizard."); ////c=20 r=8 +const char MSG_WIZARD_WELCOME[] PROGMEM_I1 = ISTR("Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?"); //// c=20 r=7 +const char MSG_WIZARD_WELCOME_SHIPPING[] PROGMEM_I1 = ISTR("Hi, I am your Original Prusa i3 printer. I will guide you through a short setup process, in which the Z-axis will be calibrated. Then, you will be ready to print."); ////c=20 r=16 const char MSG_YES[] PROGMEM_I1 = ISTR("Yes"); //// const char MSG_V2_CALIBRATION[] PROGMEM_I1 = ISTR("First layer cal."); ////c=18 const char WELCOME_MSG[] PROGMEM_I1 = ISTR(CUSTOM_MENDEL_NAME " OK."); ////c=20 diff --git a/Firmware/messages.h b/Firmware/messages.h index a5b672fa2..9fe6da4d3 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -116,6 +116,8 @@ extern const char MSG_WIZARD_CALIBRATION_FAILED[]; extern const char MSG_WIZARD_DONE[]; extern const char MSG_WIZARD_HEATING[]; extern const char MSG_WIZARD_QUIT[]; +extern const char MSG_WIZARD_WELCOME[]; +extern const char MSG_WIZARD_WELCOME_SHIPPING[]; extern const char MSG_YES[]; extern const char MSG_V2_CALIBRATION[]; extern const char WELCOME_MSG[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 09414c1bb..155640296 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4987,10 +4987,10 @@ void lcd_wizard(WizState state) saved_printing = false; if( eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE)==2){ - lcd_show_fullscreen_message_and_wait_P(_i("Hi, I am your Original Prusa i3 printer. I will guide you through a short setup process, in which the Z-axis will be calibrated. Then, you will be ready to print."));////MSG_WIZARD_WELCOME_SHIPPING c=20 r=7 + lcd_show_fullscreen_message_and_wait_P(MSG_WIZARD_WELCOME_SHIPPING); state = S::Restore; } else { - wizard_event = lcd_show_multiscreen_message_yes_no_and_wait_P(_i("Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?"), false, true);////MSG_WIZARD_WELCOME c=20 r=7 + wizard_event = lcd_show_multiscreen_message_yes_no_and_wait_P(MSG_WIZARD_WELCOME, false, true); if (wizard_event) { state = S::Restore; eeprom_update_byte((uint8_t*)EEPROM_WIZARD_ACTIVE, 1); diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 295f8c8df..e7e2a2818 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -385,7 +385,7 @@ #MSG_LAST_PRINT_FAILURES c=20 "Last print failures" -# +#MSG_WIZARD_WELCOME_SHIPPING c=20 r=16 "Hi, I am your Original Prusa i3 printer. I will guide you through a short setup process, in which the Z-axis will be calibrated. Then, you will be ready to print." # diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 7bc1e6bbe..7fbdaf4b2 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -514,7 +514,7 @@ "Last print failures" "Selhani posl. tisku" -# +#MSG_WIZARD_WELCOME_SHIPPING c=20 r=16 "Hi, I am your Original Prusa i3 printer. I will guide you through a short setup process, in which the Z-axis will be calibrated. Then, you will be ready to print." "Ahoj, jsem vase tiskarna Original Prusa i3. Provedu vas kratkym procesem nastaveni, ve kterem zkalibrujeme osu Z. Pak budete moct zacit tisknout." diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 402ed9816..3a92a2724 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -514,7 +514,7 @@ "Last print failures" "Letzte Druckfehler" -# +#MSG_WIZARD_WELCOME_SHIPPING c=20 r=16 "Hi, I am your Original Prusa i3 printer. I will guide you through a short setup process, in which the Z-axis will be calibrated. Then, you will be ready to print." "Hallo, ich bin Ihr Original Prusa i3 Drucker. Ich werde Sie durch einen kurzen Einrichtungsprozess fuehren, bei dem die Z-Achse kalibriert wird. Danach sind Sie bereit fuer den Druck." diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 800bf52da..967c6d107 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -514,7 +514,7 @@ "Last print failures" "Ultimos imp. fallos" -# +#MSG_WIZARD_WELCOME_SHIPPING c=20 r=16 "Hi, I am your Original Prusa i3 printer. I will guide you through a short setup process, in which the Z-axis will be calibrated. Then, you will be ready to print." "Hola, soy tu impresora Original Prusa i3. Te guiare a traves de un breve proceso de configuracion, en el que se calibrara el eje Z. Despues, estaras listo para imprimir." diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 398083268..9c96b3b1b 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -514,7 +514,7 @@ "Last print failures" "Echecs derniere imp." -# +#MSG_WIZARD_WELCOME_SHIPPING c=20 r=16 "Hi, I am your Original Prusa i3 printer. I will guide you through a short setup process, in which the Z-axis will be calibrated. Then, you will be ready to print." "Bonjour, je suis votre imprimante Original Prusa i3. Je vais vous accompagner au cours d'un bref processus de reglage, qui permettra de calibrer le Z-axis. Apres cela, tout sera pret pour imprimer." diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 6fae68a1b..904714889 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -514,7 +514,7 @@ "Last print failures" "Errori ultima stampa" -# +#MSG_WIZARD_WELCOME_SHIPPING c=20 r=16 "Hi, I am your Original Prusa i3 printer. I will guide you through a short setup process, in which the Z-axis will be calibrated. Then, you will be ready to print." "Ciao, sono la tua stampante Original Prusa i3. Ti guidero attraverso un rapido processo in cui verra calibrato l'asse Z. Poi, sarai pronto a stampare." diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 65f25dcd5..3b2d9e882 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -514,7 +514,7 @@ "Last print failures" "Ostatnie bledy druku" -# +#MSG_WIZARD_WELCOME_SHIPPING c=20 r=16 "Hi, I am your Original Prusa i3 printer. I will guide you through a short setup process, in which the Z-axis will be calibrated. Then, you will be ready to print." "Czesc, jestem Twoja drukarka Original Prusa i3. Przeprowadze Cie przez krotka kalibracje osi Z, po ktorej mozesz rozpoczac drukowanie."