diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index ce694e23e660afb8af280e559bef131387fad157..d95ad890942eaad3900c74b02bd90f131ae00356 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -843,7 +843,7 @@ void get_command() int hours, minutes; minutes=(t/60)%60; hours=t/60/60; - sprintf_P(time, PSTR("%i hours %i minutes"),hours, minutes); + sprintf_P(time, PSTR("%i "MSG_END_HOUR" %i "MSG_END_MINUTE),hours, minutes); SERIAL_ECHO_START; SERIAL_ECHOLN(time); lcd_setstatus(time, true); diff --git a/Marlin/language_an.h b/Marlin/language_an.h index b8e83d3b3c1165880af56b2f4f24647bb067883a..60309d1aefb39a81c1fda4a460251b7bd5c8ce79 100644 --- a/Marlin/language_an.h +++ b/Marlin/language_an.h @@ -123,6 +123,8 @@ #define MSG_BABYSTEP_Y "Babystep Y" #define MSG_BABYSTEP_Z "Babystep Z" #define MSG_ENDSTOP_ABORT "Endstop abort" +#define MSG_END_HOUR "hours" +#define MSG_END_MINUTE "minutes" #ifdef DELTA_CALIBRATION_MENU #define MSG_DELTA_CALIBRATE "Delta Calibration" diff --git a/Marlin/language_ca.h b/Marlin/language_ca.h index f25fe5789081b275b2759cca244e645c707af930..35eb0382974e9d774581f48442eddd8ff1b495a7 100644 --- a/Marlin/language_ca.h +++ b/Marlin/language_ca.h @@ -124,6 +124,8 @@ #define MSG_BABYSTEP_Y "Babystep Y" #define MSG_BABYSTEP_Z "Babystep Z" #define MSG_ENDSTOP_ABORT "Endstop abort" +#define MSG_END_HOUR "hours" +#define MSG_END_MINUTE "minutes" #ifdef DELTA_CALIBRATION_MENU #define MSG_DELTA_CALIBRATE "Delta Calibration" diff --git a/Marlin/language_de.h b/Marlin/language_de.h index 0f7b832a58b9daea63b00b72c4338f49f1be5bdf..8c8496f02c125cd779e62f301f480e2db24fe053 100644 --- a/Marlin/language_de.h +++ b/Marlin/language_de.h @@ -122,6 +122,8 @@ #define MSG_BABYSTEP_Y "Babystep Y" #define MSG_BABYSTEP_Z "Babystep Z" #define MSG_ENDSTOP_ABORT "Endstop Abbr. Ein" +#define MSG_END_HOUR "Stunden" +#define MSG_END_MINUTE "Minuten" #ifdef DELTA_CALIBRATION_MENU #define MSG_DELTA_CALIBRATE "Delta Kalibrieren" diff --git a/Marlin/language_en.h b/Marlin/language_en.h index 2e76ed4d853b8e6686a31bf41c4b19287be992e2..9d61167cc7cd11c38c670c3054c1b2bd1313288c 100644 --- a/Marlin/language_en.h +++ b/Marlin/language_en.h @@ -417,6 +417,12 @@ #ifndef MSG_ERR_MAXTEMP_BED #define MSG_ERR_MAXTEMP_BED "Err: MAXTEMP BED" #endif +#ifndef MSG_END_HOUR +#define MSG_END_HOUR "hours" +#endif +#ifndef MSG_END_MINUTE +#define MSG_END_MINUTE "minutes" +#endif #ifdef DELTA_CALIBRATION_MENU #ifndef MSG_DELTA_CALIBRATE diff --git a/Marlin/language_es.h b/Marlin/language_es.h index 143a1f4579d1e80a2aa1fcd67669c0b9471da996..92f903cebc18fcbddfd07b5488eb25cd07ebd074 100644 --- a/Marlin/language_es.h +++ b/Marlin/language_es.h @@ -123,6 +123,8 @@ #define MSG_BABYSTEP_Y "Babystep Y" #define MSG_BABYSTEP_Z "Babystep Z" #define MSG_ENDSTOP_ABORT "Endstop abort" +#define MSG_END_HOUR "horas" +#define MSG_END_MINUTE "minutos" #ifdef DELTA_CALIBRATION_MENU #define MSG_DELTA_CALIBRATE "Delta Calibration" diff --git a/Marlin/language_eu.h b/Marlin/language_eu.h index 21cb733a1cc419b7cb2b0cd4ed16edec33babeff..6f6fd8b66019caacf5865f4eb977504f3ea11fe5 100644 --- a/Marlin/language_eu.h +++ b/Marlin/language_eu.h @@ -123,6 +123,8 @@ #define MSG_BABYSTEP_Y "Babystep Y" #define MSG_BABYSTEP_Z "Babystep Z" #define MSG_ENDSTOP_ABORT "Endstop deuseztat" +#define MSG_END_HOUR "hours" +#define MSG_END_MINUTE "minutes" #ifdef DELTA_CALIBRATION_MENU #define MSG_DELTA_CALIBRATE "Delta Calibration" diff --git a/Marlin/language_fi.h b/Marlin/language_fi.h index e1bfbf1af3c218a89ffb7a3938621043a2b90f8d..2bb192ee6b11d04e8a7e966b38634a6828677c27 100644 --- a/Marlin/language_fi.h +++ b/Marlin/language_fi.h @@ -123,6 +123,8 @@ #define MSG_BABYSTEP_Y "Babystep Y" #define MSG_BABYSTEP_Z "Babystep Z" #define MSG_ENDSTOP_ABORT "Endstop abort" +#define MSG_END_HOUR "hours" +#define MSG_END_MINUTE "minutes" #ifdef DELTA_CALIBRATION_MENU #define MSG_DELTA_CALIBRATE "Delta Kalibrointi" @@ -132,4 +134,4 @@ #define MSG_DELTA_CALIBRATE_CENTER "Kalibroi Center" #endif // DELTA_CALIBRATION_MENU -#endif // LANGUAGE_FI_H \ No newline at end of file +#endif // LANGUAGE_FI_H diff --git a/Marlin/language_fr.h b/Marlin/language_fr.h index ed65efdbde90392af0b0fb7ec0ca01de71db4eeb..be526a72351f473a63fcae019f135b61d48868d8 100644 --- a/Marlin/language_fr.h +++ b/Marlin/language_fr.h @@ -124,6 +124,8 @@ #define MSG_BABYSTEP_Y "Babystep Y" #define MSG_BABYSTEP_Z "Babystep Z" #define MSG_ENDSTOP_ABORT "Butee abandon" +#define MSG_END_HOUR "heures" +#define MSG_END_MINUTE "minutes" #ifdef DELTA_CALIBRATION_MENU #define MSG_DELTA_CALIBRATE "Delta Calibration" diff --git a/Marlin/language_it.h b/Marlin/language_it.h index 7fbcb46ac6f30dfea46eee092a19e03f9ac64196..7521073761f67fbce0c7f3f2d0def086f430c80b 100644 --- a/Marlin/language_it.h +++ b/Marlin/language_it.h @@ -124,6 +124,8 @@ #define MSG_BABYSTEP_Y "Babystep Y" #define MSG_BABYSTEP_Z "Babystep Z" #define MSG_ENDSTOP_ABORT "Finecorsa abort" +#define MSG_END_HOUR "ore" +#define MSG_END_MINUTE "minuti" #ifdef DELTA_CALIBRATION_MENU #define MSG_DELTA_CALIBRATE "Calibraz. Delta" diff --git a/Marlin/language_kana.h b/Marlin/language_kana.h index 272440bac6746b79f8aae2c3f26a77e2ff1fdec2..9a05b6bbef14d9ab0f5776fff198182171872a86 100644 --- a/Marlin/language_kana.h +++ b/Marlin/language_kana.h @@ -126,6 +126,8 @@ #define MSG_BABYSTEP_Y "\xcb\xde\xc4\xde\xb3 Y" // "Babystep Y" #define MSG_BABYSTEP_Z "\xcb\xde\xc4\xde\xb3 Z" // "Babystep Z" #define MSG_ENDSTOP_ABORT "Endstop abort" +#define MSG_END_HOUR "hours" +#define MSG_END_MINUTE "minutes" /* These are from language.h. PLEASE DON'T TRANSLATE! All translatable messages can be found in language_en.h #define MSG_HEATING "\xb6\xc8\xc2\xc1\xad\xb3..." // "Heating..." diff --git a/Marlin/language_kana_utf8.h b/Marlin/language_kana_utf8.h index 94ce69bc4f531dea28f32bd5f98b9bcf2338222b..4bb58a1ed0ecb9bfb77275d902ff40525583ff41 100644 --- a/Marlin/language_kana_utf8.h +++ b/Marlin/language_kana_utf8.h @@ -130,6 +130,8 @@ #define MSG_BABYSTEP_Y "ゼドウ Y" // "Babystep Y" #define MSG_BABYSTEP_Z "ゼドウ Z" // "Babystep Z" #define MSG_ENDSTOP_ABORT "Endstop abort" +#define MSG_END_HOUR "hours" +#define MSG_END_MINUTE "minutes" #ifdef DELTA_CALIBRATION_MENU #define MSG_DELTA_CALIBRATE "Delta Calibration" diff --git a/Marlin/language_nl.h b/Marlin/language_nl.h index bc44dcc7ef37073d1b78e920fceaf42e657fac32..4e1ea6de7ead5f9d00694be259cc03ad1ecdba00 100644 --- a/Marlin/language_nl.h +++ b/Marlin/language_nl.h @@ -123,6 +123,8 @@ #define MSG_BABYSTEP_Y "Babystap Y" #define MSG_BABYSTEP_Z "Babystap Z" #define MSG_ENDSTOP_ABORT "Endstop afbr." +#define MSG_END_HOUR "hours" +#define MSG_END_MINUTE "minutes" #ifdef DELTA_CALIBRATION_MENU #define MSG_DELTA_CALIBRATE "Delta Calibration" diff --git a/Marlin/language_pl.h b/Marlin/language_pl.h index f654594bc4801b0b4047bc57b674ba4e3f013125..5e5d02869a9a0107e5e99459dd6d9bdcfc92dae8 100644 --- a/Marlin/language_pl.h +++ b/Marlin/language_pl.h @@ -123,6 +123,9 @@ #define MSG_BABYSTEP_Y "Babystep Y" #define MSG_BABYSTEP_Z "Babystep Z" #define MSG_ENDSTOP_ABORT "Blad wyl. kranc." +#define MSG_END_HOUR "hours" +#define MSG_END_MINUTE "minutes" + #ifdef DELTA_CALIBRATION_MENU #define MSG_DELTA_CALIBRATE "Delta Calibration" diff --git a/Marlin/language_pt-br.h b/Marlin/language_pt-br.h index 060f3ba89b2af6fb460542f8b74078d7b2b2eaeb..90e2ae7ec04afb9b15593a8b53a31290f32cbb42 100644 --- a/Marlin/language_pt-br.h +++ b/Marlin/language_pt-br.h @@ -123,6 +123,8 @@ #define MSG_BABYSTEP_Y "Babystep Y" #define MSG_BABYSTEP_Z "Babystep Z" #define MSG_ENDSTOP_ABORT "Endstop abort" +#define MSG_END_HOUR "horas" +#define MSG_END_MINUTE "minutos" #ifdef DELTA_CALIBRATION_MENU #define MSG_DELTA_CALIBRATE "Delta Calibration" diff --git a/Marlin/language_pt.h b/Marlin/language_pt.h index 9d3ff26540bba3b67c254c8a1ff0663c24d20026..f1335be8a0ff42bb426c5e57a91ce4cc6a3320ff 100644 --- a/Marlin/language_pt.h +++ b/Marlin/language_pt.h @@ -123,6 +123,8 @@ #define MSG_BABYSTEP_Y "Babystep Y" #define MSG_BABYSTEP_Z "Babystep Z" #define MSG_ENDSTOP_ABORT "Endstop abort." +#define MSG_END_HOUR "horas" +#define MSG_END_MINUTE "minutos" #ifdef DELTA_CALIBRATION_MENU #define MSG_DELTA_CALIBRATE "Delta Calibracao" diff --git a/Marlin/language_ru.h b/Marlin/language_ru.h index b961be7eef2868ab8e8c84c46cb9dff58c124ebd..4ab618e1e1e648566b296a53fb7537c34bde5c6b 100644 --- a/Marlin/language_ru.h +++ b/Marlin/language_ru.h @@ -123,6 +123,8 @@ #define MSG_BABYSTEP_Y "Babystep Y" #define MSG_BABYSTEP_Z "Babystep Z" #define MSG_ENDSTOP_ABORT "Endstop abort" +#define MSG_END_HOUR "hours" +#define MSG_END_MINUTE "minutes" #ifdef DELTA_CALIBRATION_MENU #define MSG_DELTA_CALIBRATE "Delta Calibration" diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index a595e56f3dce029be26b0b01ec265a5ab61cec6e..a9930fc14379ea6b7df6b0de5b14dc2f38fec067 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -184,6 +184,7 @@ static void lcd_status_screen(); if (lcdDrawUpdate) \ lcd_implementation_drawmenu_ ## type(itemSelected, _drawLineNr, PSTR(label), ## args); \ if (wasClicked && itemSelected) { \ + lcd_quick_feedback(); \ encoderRateMultiplierEnabled = true; \ lastEncoderMovementMillis = 0; \ menu_action_ ## type(args); \