diff --git a/Firmware/messages.c b/Firmware/messages.c index b07bd3b5c..ce1023c89 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -21,6 +21,7 @@ const char MSG_CALIBRATE_Z_AUTO[] PROGMEM_I1 = ISTR("Calibrating Z"); ////c=20 r const char MSG_CARD_MENU[] PROGMEM_I1 = ISTR("Print from SD"); //// const char MSG_CONFIRM_NOZZLE_CLEAN[] PROGMEM_I1 = ISTR("Please clean the nozzle for calibration. Click when done."); ////c=20 r=8 const char MSG_COOLDOWN[] PROGMEM_I1 = ISTR("Cooldown"); //// +const char MSG_CRASH[] PROGMEM_I1 = ISTR("Crash"); ////c=7 const char MSG_CRASH_DETECTED[] PROGMEM_I1 = ISTR("Crash detected."); ////c=20 r=1 const char MSG_CRASHDETECT[] PROGMEM_I1 = ISTR("Crash det."); ////c=13 const char MSG_ERROR[] PROGMEM_I1 = ISTR("ERROR:"); //// diff --git a/Firmware/messages.h b/Firmware/messages.h index f6947e740..4e29986c0 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -22,6 +22,7 @@ extern const char MSG_CALIBRATE_Z_AUTO[]; extern const char MSG_CARD_MENU[]; extern const char MSG_CONFIRM_NOZZLE_CLEAN[]; extern const char MSG_COOLDOWN[]; +extern const char MSG_CRASH[]; extern const char MSG_CRASH_DETECTED[]; extern const char MSG_CRASHDETECT[]; extern const char MSG_ERROR[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 288a81fe2..a64f7d726 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1712,7 +1712,7 @@ static const char failStatsFmt[] PROGMEM = "%S\n" " %-16.16S%-3d\n" " %-16.16S%- //! |Total failures | MSG_TOTAL_FAILURES c=20 //! | Power failures: 000| MSG_POWER_FAILURES c=14 //! | Filam. runouts: 000| c=14 r=1 -//! | Crash X:000 Y:000| c=7 r=1 +//! | Crash X:000 Y:000| MSG_CRASH c=7 //! ---------------------- //! @endcode //! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations. @@ -1728,7 +1728,7 @@ static void lcd_menu_fails_stats_total() _T(MSG_TOTAL_FAILURES), ////c=20 _T(MSG_POWER_FAILURES), power, ////c=14 _i("Filam. runouts"), filam, ////c=14 r=1 - _i("Crash"), crashX, crashY); ////c=7 r=1 + _T(MSG_CRASH), crashX, crashY); ////c=7 menu_back_if_clicked_fb(); } @@ -1739,7 +1739,7 @@ static void lcd_menu_fails_stats_total() //! |Last print failures | MSG_LAST_PRINT_FAILURES c=20 //! | Power failures 000| MSG_POWER_FAILURES c=14 //! | Filam. runouts 000| c=14 r=1 -//! | Crash X:000 Y:000| c=7 r=1 +//! | Crash X:000 Y:000| MSG_CRASH c=7 //! ---------------------- //! @endcode //! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations. @@ -1756,7 +1756,7 @@ static void lcd_menu_fails_stats_print() _T(MSG_LAST_PRINT_FAILURES), ////c=20 _T(MSG_POWER_FAILURES), power, ////c=14 _i("Filam. runouts"), filam, ////c=14 r=1 - _i("Crash"), crashX, crashY); ////c=7 r=1 + _T(MSG_CRASH), crashX, crashY); ////c=7 #else // On the MK3 include detailed PAT9125 statistics about soft failures lcd_printf_P(PSTR("%S\n" @@ -1766,7 +1766,7 @@ static void lcd_menu_fails_stats_print() _T(MSG_LAST_PRINT_FAILURES), ////c=20 _T(MSG_POWER_FAILURES), power, ////c=14 _i("Runouts"), filam, fsensor_softfail, //c=7 - _i("Crash"), crashX, crashY); ////c=7 r=1 + _T(MSG_CRASH), crashX, crashY); ////c=7 #endif menu_back_if_clicked_fb(); } diff --git a/lang/lang_en.txt b/lang/lang_en.txt index cd2488780..d8f94d159 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -163,7 +163,7 @@ # "Crash detected. Resume print?" -# +#MSG_CRASH c=7 "Crash" #MSG_CURRENT c=19 r=1 diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index ca77d817d..e3b84a40d 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -218,7 +218,7 @@ "Crash detected. Resume print?" "Detekovan naraz. Obnovit tisk?" -# +#MSG_CRASH c=7 "Crash" "Naraz" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 5fa8d2bed..77821b67b 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -218,7 +218,7 @@ "Crash detected. Resume print?" "Crash erkannt. Druck fortfuehren?" -# +#MSG_CRASH c=7 "Crash" "\x00" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 806de2cb0..afeaefce0 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -218,7 +218,7 @@ "Crash detected. Resume print?" "Choque detectado. Continuar impresion?" -# +#MSG_CRASH c=7 "Crash" "Choque" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 0abc7b1c4..ca82fc6f7 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -218,7 +218,7 @@ "Crash detected. Resume print?" "Crash detecte. Poursuivre l'impression?" -# +#MSG_CRASH c=7 "Crash" "\x00" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index c58f4102b..e88a00e01 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -218,7 +218,7 @@ "Crash detected. Resume print?" "Scontro rilevato. Riprendere la stampa?" -# +#MSG_CRASH c=7 "Crash" "Impatto" @@ -508,7 +508,7 @@ #MSG_LAST_PRINT_FAILURES c=20 "Last print failures" -"Ultimi errori stampa" +"Errori ultima stampa" # "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 89bf2b993..050b17a16 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -218,9 +218,9 @@ "Crash detected. Resume print?" "Wykryto zderzenie. Wznowic druk?" -# +#MSG_CRASH c=7 "Crash" -"Zderzenie" +"Zderzen" #MSG_CURRENT c=19 r=1 "Current"