3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-23 12:04:19 +00:00
Code Issues Releases Wiki Activity

[1.1.x] Reset LCD status to fallbacks (#10467)

Browse Source 
* Remove obsolete strings
* Tweak some static consts
* Reset LCD status to fallbacks

When paused, "Print paused..."
When SD printing, the filename
When host printing, "Printing..."
When idle, "MyPrinter ready."
This commit is contained in:
Scott Lahteine 2018-04-22 00:15:57 -05:00 committed by GitHub
parent 38c97dc975
commit 6f176d1d64
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
40 changed files with 82 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Marlin/Marlin_main.cpp
View File

@ -5827,7 +5827,7 @@ void home_all_axes() { gcode_G28(true); }
_opposite_results = (_4p_calibration && !towers_set) || probe_points >= 3,
_endstop_results = probe_points != 1 && probe_points != -1 && probe_points != 0,
_angle_results = probe_points >= 3 && towers_set;
const static char save_message[] PROGMEM = "Save with M500 and/or copy to Configuration.h";
static const char save_message[] PROGMEM = "Save with M500 and/or copy to Configuration.h";
int8_t iterations = 0;
float test_precision,
zero_std_dev = (verbose_level ? 999.0 : 0.0), // 0.0 in dry-run mode : forced end
@ -6339,12 +6339,9 @@ inline void gcode_G92() {
ms += millis(); // wait until this time for a click
while (PENDING(millis(), ms) && wait_for_user) idle();
}
else {
#if ENABLED(ULTIPANEL)
if (lcd_detected())
#endif
while (wait_for_user) idle();
}
else
while (wait_for_user) idle();
#if ENABLED(PRINTER_EVENT_LEDS) && ENABLED(SDSUPPORT)
if (lights_off_after_print) {
@ -6353,11 +6350,7 @@ inline void gcode_G92() {
}
#endif
#if ENABLED(ULTIPANEL)
if (lcd_detected()) {
print_job_timer.isPaused() ? LCD_MESSAGEPGM(WELCOME_MSG) : LCD_MESSAGEPGM(MSG_RESUMING);
}
#endif
lcd_reset_status();
wait_for_user = false;
KEEPALIVE_STATE(IN_HANDLER);
@ -8121,7 +8114,7 @@ inline void gcode_M109() {
} while (wait_for_heatup && TEMP_CONDITIONS);
if (wait_for_heatup) {
lcd_setstatusPGM(wants_to_cool ? PSTR(MSG_COOLING_COMPLETE) : PSTR(MSG_HEATING_COMPLETE));
lcd_reset_status();
#if ENABLED(PRINTER_EVENT_LEDS)
leds.set_white();
#endif
@ -8258,7 +8251,7 @@ inline void gcode_M109() {
} while (wait_for_heatup && TEMP_BED_CONDITIONS);
if (wait_for_heatup) LCD_MESSAGEPGM(MSG_BED_DONE);
if (wait_for_heatup) lcd_reset_status();
#if DISABLED(BUSY_WHILE_HEATING)
KEEPALIVE_STATE(IN_HANDLER);
#endif
@ -8279,7 +8272,7 @@ inline void gcode_M110() {
inline void gcode_M111() {
if (parser.seen('S')) marlin_debug_flags = parser.byteval('S');
const static char str_debug_1[] PROGMEM = MSG_DEBUG_ECHO,
static const char str_debug_1[] PROGMEM = MSG_DEBUG_ECHO,
str_debug_2[] PROGMEM = MSG_DEBUG_INFO,
str_debug_4[] PROGMEM = MSG_DEBUG_ERRORS,
str_debug_8[] PROGMEM = MSG_DEBUG_DRYRUN,
@ -8289,7 +8282,7 @@ inline void gcode_M111() {
#endif
;
const static char* const debug_strings[] PROGMEM = {
static const char* const debug_strings[] PROGMEM = {
str_debug_1, str_debug_2, str_debug_4, str_debug_8, str_debug_16
#if ENABLED(DEBUG_LEVELING_FEATURE)
, str_debug_32
@ -8820,7 +8813,12 @@ inline void gcode_M115() {
/**
* M117: Set LCD Status Message
*/
inline void gcode_M117() { lcd_setstatus(parser.string_arg); }
inline void gcode_M117() {
if (parser.string_arg[0])
lcd_setstatus(parser.string_arg);
else
lcd_reset_status();
}
/**
* M118: Display a message in the host console.

3
Marlin/language_an.h
View File

@ -149,7 +149,6 @@
#define MSG_NO_CARD _UxGT("No i hai tarcheta")
#define MSG_DWELL _UxGT("Reposo...")
#define MSG_USERWAIT _UxGT("Aguardand ordines")
#define MSG_RESUMING _UxGT("Contin. impresion")
#define MSG_PRINT_ABORTED _UxGT("Impres. cancelada")
#define MSG_NO_MOVE _UxGT("Sin movimiento")
#define MSG_KILLED _UxGT("Aturada d'emerch.")
@ -189,9 +188,7 @@
#define MSG_SHORT_HOUR _UxGT("h")
#define MSG_SHORT_MINUTE _UxGT("m")
#define MSG_HEATING _UxGT("Calentando...")
#define MSG_HEATING_COMPLETE _UxGT("Calentamiento listo")
#define MSG_BED_HEATING _UxGT("Calentando base...")
#define MSG_BED_DONE _UxGT("Base calient")
#define MSG_DELTA_CALIBRATE _UxGT("Calibracion Delta")
#define MSG_DELTA_CALIBRATE_X _UxGT("Calibrar X")
#define MSG_DELTA_CALIBRATE_Y _UxGT("Calibrar Y")

1
Marlin/language_bg.h
View File

@ -119,7 +119,6 @@
#define MSG_NO_CARD _UxGT("Няма карта")
#define MSG_DWELL _UxGT("Почивка...")
#define MSG_USERWAIT _UxGT("Изчакване")
#define MSG_RESUMING _UxGT("Продълж. печата")
#define MSG_PRINT_ABORTED _UxGT("Печатът е прекъснат")
#define MSG_NO_MOVE _UxGT("Няма движение")
#define MSG_KILLED _UxGT("УБИТО.")

5
Marlin/language_ca.h
View File

@ -153,7 +153,6 @@
#define MSG_NO_CARD _UxGT("No hi ha targeta")
#define MSG_DWELL _UxGT("En repos...")
#define MSG_USERWAIT _UxGT("Esperant usuari..")
#define MSG_RESUMING _UxGT("Reprenent imp.")
#define MSG_PRINT_ABORTED _UxGT("Imp. cancelada")
#define MSG_NO_MOVE _UxGT("Sense moviment.")
#define MSG_KILLED _UxGT("MATAT.")
@ -192,9 +191,7 @@
#define MSG_SHORT_HOUR _UxGT("h") // One character only
#define MSG_SHORT_MINUTE _UxGT("m") // One character only
#define MSG_HEATING _UxGT("Escalfant...")
#define MSG_HEATING_COMPLETE _UxGT("Escalfament fet.")
#define MSG_BED_HEATING _UxGT("Escalfant llit")
#define MSG_BED_DONE _UxGT("Llit fet.")
#define MSG_BED_HEATING _UxGT("Escalfant llit...")
#define MSG_DELTA_CALIBRATE _UxGT("Calibratge Delta")
#define MSG_DELTA_CALIBRATE_X _UxGT("Calibra X")
#define MSG_DELTA_CALIBRATE_Y _UxGT("Calibra Y")

1
Marlin/language_cn.h
View File

@ -132,7 +132,6 @@
#define MSG_NO_CARD "\xf9\xa8"
#define MSG_DWELL "Sleep..."
#define MSG_USERWAIT "Wait for user..."
#define MSG_RESUMING "Resuming print"
#define MSG_PRINT_ABORTED "Print aborted"
#define MSG_NO_MOVE "No move."
#define MSG_KILLED "KILLED. "

5
Marlin/language_cz.h
View File

@ -255,7 +255,6 @@
#define MSG_DWELL _UxGT("Uspano...")
#define MSG_USERWAIT _UxGT("Cekani na uziv...")
#define MSG_PRINT_PAUSED _UxGT("Tisk pozastaven")
#define MSG_RESUMING _UxGT("Obnovovani tisku")
#define MSG_PRINT_ABORTED _UxGT("Tisk zrusen")
#define MSG_NO_MOVE _UxGT("Zadny pohyb.")
#define MSG_KILLED _UxGT("PRERUSENO. ")
@ -304,9 +303,7 @@
#define MSG_SHORT_HOUR _UxGT("h")
#define MSG_SHORT_MINUTE _UxGT("m")
#define MSG_HEATING _UxGT("Zahrivani...")
#define MSG_HEATING_COMPLETE _UxGT("Zahrati hotovo.")
#define MSG_BED_HEATING _UxGT("Zahrivani podl.")
#define MSG_BED_DONE _UxGT("Podlozka hotova.")
#define MSG_BED_HEATING _UxGT("Zahrivani podl...")
#define MSG_DELTA_CALIBRATE _UxGT("Delta Kalibrace")
#define MSG_DELTA_CALIBRATE_X _UxGT("Kalibrovat X")
#define MSG_DELTA_CALIBRATE_Y _UxGT("Kalibrovat Y")

5
Marlin/language_cz_utf8.h
View File

@ -258,7 +258,6 @@
#define MSG_DWELL _UxGT("Uspáno...")
#define MSG_USERWAIT _UxGT("Čekání na uživ...")
#define MSG_PRINT_PAUSED _UxGT("Tisk pozastaven")
#define MSG_RESUMING _UxGT("Obnovování tisku")
#define MSG_PRINT_ABORTED _UxGT("Tisk zrušen")
#define MSG_NO_MOVE _UxGT("Žádný pohyb.")
#define MSG_KILLED _UxGT("PŘERUSENO. ")
@ -307,9 +306,7 @@
#define MSG_SHORT_HOUR _UxGT("h")
#define MSG_SHORT_MINUTE _UxGT("m")
#define MSG_HEATING _UxGT("Zahřívání...")
#define MSG_HEATING_COMPLETE _UxGT("Zahřáti hotovo.")
#define MSG_BED_HEATING _UxGT("Zahřívání podl.")
#define MSG_BED_DONE _UxGT("Podložka hotova.")
#define MSG_BED_HEATING _UxGT("Zahřívání podl...")
#define MSG_DELTA_CALIBRATE _UxGT("Delta Kalibrace")
#define MSG_DELTA_CALIBRATE_X _UxGT("Kalibrovat X")
#define MSG_DELTA_CALIBRATE_Y _UxGT("Kalibrovat Y")

5
Marlin/language_da.h
View File

@ -150,7 +150,6 @@
#define MSG_NO_CARD _UxGT("Intet SD kort")
#define MSG_DWELL _UxGT("Dvale...")
#define MSG_USERWAIT _UxGT("Venter på bruger...")
#define MSG_RESUMING _UxGT("Forsætter printet")
#define MSG_PRINT_ABORTED _UxGT("Print annulleret")
#define MSG_NO_MOVE _UxGT("Ingen bevægelse.")
#define MSG_KILLED _UxGT("DRÆBT. ")
@ -190,9 +189,7 @@
#define MSG_SHORT_HOUR _UxGT("h") // Kun et bogstav
#define MSG_SHORT_MINUTE _UxGT("m") // Kun et bogstav
#define MSG_HEATING _UxGT("Opvarmer...")
#define MSG_HEATING_COMPLETE _UxGT("Opvarmet")
#define MSG_BED_HEATING _UxGT("Opvarmer plade")
#define MSG_BED_DONE _UxGT("Plade opvarmet")
#define MSG_BED_HEATING _UxGT("Opvarmer plade...")
#define MSG_DELTA_CALIBRATE _UxGT("Delta Kalibrering")
#define MSG_DELTA_CALIBRATE_X _UxGT("Kalibrer X")
#define MSG_DELTA_CALIBRATE_Y _UxGT("Kalibrer Y")

3
Marlin/language_de.h
View File

@ -171,7 +171,6 @@
#define MSG_DWELL _UxGT("Warten...")
#define MSG_USERWAIT _UxGT("Warte auf Nutzer")
#define MSG_PRINT_PAUSED _UxGT("Druck pausiert")
#define MSG_RESUMING _UxGT("Druckfortsetzung")
#define MSG_PRINT_ABORTED _UxGT("Druck abgebrochen")
#define MSG_NO_MOVE _UxGT("Motoren eingeschaltet")
#define MSG_KILLED _UxGT("ABGEBROCHEN")
@ -220,9 +219,7 @@
#define MSG_SHORT_HOUR _UxGT("h") // One character only
#define MSG_SHORT_MINUTE _UxGT("m") // One character only
#define MSG_HEATING _UxGT("Extr. heizt...")
#define MSG_HEATING_COMPLETE _UxGT("Extr. aufgeheizt")
#define MSG_BED_HEATING _UxGT("Bett heizt...")
#define MSG_BED_DONE _UxGT("Bett aufgeheizt")
#define MSG_DELTA_CALIBRATE _UxGT("Delta kalibrieren")
#define MSG_DELTA_CALIBRATE_X _UxGT("Kalibriere X")
#define MSG_DELTA_CALIBRATE_Y _UxGT("Kalibriere Y")

7
Marlin/language_el-gr.h
View File

@ -147,9 +147,8 @@
#define MSG_STOP_PRINT _UxGT("Διακοπή εκτύπωσης")
#define MSG_CARD_MENU _UxGT("Εκτύπωση από SD")
#define MSG_NO_CARD _UxGT("Δεν βρέθηκε SD")
#define MSG_DWELL _UxGT("Αναστολή λειτουργίας...")
#define MSG_DWELL _UxGT("Αναστολή λειτουργίας…")
#define MSG_USERWAIT _UxGT("Αναμονή για χρήστη…")
#define MSG_RESUMING _UxGT("Συνεχίζεται η εκτύπωση")
#define MSG_PRINT_ABORTED _UxGT("Διακόπτεται η εκτύπωση")
#define MSG_NO_MOVE _UxGT("Καμία κίνηση.")
#define MSG_KILLED _UxGT("ΤΕΡΜΑΤΙΣΜΟΣ. ")
@ -181,9 +180,7 @@
#define MSG_ERR_MAXTEMP_BED _UxGT("Λάθος: ΜΕΓΙΣΤΗ ΘΕΡΜΟΤΗΤΑ ΚΛΙΝΗΣ")
#define MSG_ERR_MINTEMP_BED _UxGT("Λάθος: ΕΛΑΧΙΣΤΗ ΘΕΡΜΟΤΗΤΑ ΚΛΙΝΗΣ")
#define MSG_HEATING _UxGT("Θερμαίνεται…")
#define MSG_HEATING_COMPLETE _UxGT("Η θέρμανση ολοκληρώθηκε.")
#define MSG_BED_HEATING _UxGT("Θέρμανση κλίνης.")
#define MSG_BED_DONE _UxGT("Η κλίνη ολοκληρώθηκε.")
#define MSG_BED_HEATING _UxGT("Θέρμανση κλίνης…")
#define MSG_DELTA_CALIBRATE _UxGT("Βαθμονόμηση Delta")
#define MSG_DELTA_CALIBRATE_X _UxGT("Βαθμονόμηση X")
#define MSG_DELTA_CALIBRATE_Y _UxGT("Βαθμονόμηση Y")

3
Marlin/language_el.h
View File

@ -149,7 +149,6 @@
#define MSG_NO_CARD _UxGT("Δεν βρέθηκε SD")
#define MSG_DWELL _UxGT("Αναστολή λειτουργίας")
#define MSG_USERWAIT _UxGT("Αναμονή για χρήστη")
#define MSG_RESUMING _UxGT("Συνεχίζεται η εκτύπωση") //SHORTEN
#define MSG_PRINT_ABORTED _UxGT("Διακόπτεται η εκτύπωση") //SHORTEN
#define MSG_NO_MOVE _UxGT("Καμία κίνηση.")
#define MSG_KILLED _UxGT("ΤΕΡΜΑΤΙΣΜΟΣ. ")
@ -182,9 +181,7 @@
#define MSG_ERR_MINTEMP_BED _UxGT("ΕΛΑΧΙΣΤΗ ΘΕΡΜΟΚΡΑΣΙΑΣ ΕΠ. ΕΚΤΥΠΩΣΗΣ") //SHORTEN
#define MSG_HALTED _UxGT("H εκτύπωση διακόπηκε")
#define MSG_HEATING _UxGT("Θερμαίνεται…")
#define MSG_HEATING_COMPLETE _UxGT("Η θέρμανση ολοκληρώθηκε.") //SHORTEN
#define MSG_BED_HEATING _UxGT("Θέρμανση ΕΠ. Εκτύπωσης") //SHORTEN
#define MSG_BED_DONE _UxGT("Η Επ. Εκτύπωσης ολοκληρώθηκε") //SHORTEN
#define MSG_DELTA_CALIBRATE _UxGT("Βαθμονόμηση Delta")
#define MSG_DELTA_CALIBRATE_X _UxGT("Βαθμονόμηση X")
#define MSG_DELTA_CALIBRATE_Y _UxGT("Βαθμονόμηση Y")

17
Marlin/language_en.h
View File

@ -681,8 +681,8 @@
#ifndef MSG_PRINT_PAUSED
#define MSG_PRINT_PAUSED _UxGT("Print paused")
#endif
#ifndef MSG_RESUMING
#define MSG_RESUMING _UxGT("Resuming print")
#ifndef MSG_PRINTING
#define MSG_PRINTING _UxGT("Printing...")
#endif
#ifndef MSG_PRINT_ABORTED
#define MSG_PRINT_ABORTED _UxGT("Print aborted")
@ -831,23 +831,14 @@
#ifndef MSG_HEATING
#define MSG_HEATING _UxGT("Heating...")
#endif
#ifndef MSG_HEATING_COMPLETE
#define MSG_HEATING_COMPLETE _UxGT("Heating done.")
#endif
#ifndef MSG_COOLING
#define MSG_COOLING _UxGT("Cooling...")
#endif
#ifndef MSG_COOLING_COMPLETE
#define MSG_COOLING_COMPLETE _UxGT("Cooling done.")
#endif
#ifndef MSG_BED_HEATING
#define MSG_BED_HEATING _UxGT("Bed heating.")
#define MSG_BED_HEATING _UxGT("Bed heating...")
#endif
#ifndef MSG_BED_COOLING
#define MSG_BED_COOLING _UxGT("Bed cooling.")
#endif
#ifndef MSG_BED_DONE
#define MSG_BED_DONE _UxGT("Bed done.")
#define MSG_BED_COOLING _UxGT("Bed cooling...")
#endif
#ifndef MSG_DELTA_CALIBRATE
#define MSG_DELTA_CALIBRATE _UxGT("Delta Calibration")

3
Marlin/language_es.h
View File

@ -166,7 +166,6 @@
#define MSG_NO_CARD _UxGT("No hay tarjeta SD")
#define MSG_DWELL _UxGT("Reposo...")
#define MSG_USERWAIT _UxGT("Esperando ordenes")
#define MSG_RESUMING _UxGT("Resumiendo impre.")
#define MSG_PRINT_ABORTED _UxGT("Impresion cancelada")
#define MSG_NO_MOVE _UxGT("Sin movimiento")
#define MSG_KILLED _UxGT("Parada de emergencia")
@ -206,9 +205,7 @@
#define MSG_SHORT_HOUR _UxGT("h") // One character only
#define MSG_SHORT_MINUTE _UxGT("m") // One character only
#define MSG_HEATING _UxGT("Calentando...")
#define MSG_HEATING_COMPLETE _UxGT("Calentamiento listo")
#define MSG_BED_HEATING _UxGT("Calentando Plat...")
#define MSG_BED_DONE _UxGT("Plataforma Caliente")
#define MSG_DELTA_CALIBRATE _UxGT("Calibracion Delta")
#define MSG_DELTA_CALIBRATE_X _UxGT("Calibrar X")
#define MSG_DELTA_CALIBRATE_Y _UxGT("Calibrar Y")

3
Marlin/language_es_utf8.h
View File

@ -156,7 +156,6 @@
#define MSG_NO_CARD _UxGT("No hay tarjeta SD")
#define MSG_DWELL _UxGT("Reposo...")
#define MSG_USERWAIT _UxGT("Esperando órdenes")
#define MSG_RESUMING _UxGT("Resumiendo impresión")
#define MSG_PRINT_ABORTED _UxGT("Impresión cancelada")
#define MSG_NO_MOVE _UxGT("Sin movimiento")
#define MSG_KILLED _UxGT("Parada de emergencia")
@ -196,9 +195,7 @@
#define MSG_SHORT_HOUR _UxGT("h") // One character only
#define MSG_SHORT_MINUTE _UxGT("m") // One character only
#define MSG_HEATING _UxGT("Calentando...")
#define MSG_HEATING_COMPLETE _UxGT("Calentamiento listo")
#define MSG_BED_HEATING _UxGT("Calentando Cama...")
#define MSG_BED_DONE _UxGT("Cama Caliente")
#define MSG_DELTA_CALIBRATE _UxGT("Calibración Delta")
#define MSG_DELTA_CALIBRATE_X _UxGT("Calibrar X")
#define MSG_DELTA_CALIBRATE_Y _UxGT("Calibrar Y")

5
Marlin/language_eu.h
View File

@ -249,7 +249,6 @@
#define MSG_DWELL _UxGT("Lo egin...")
#define MSG_USERWAIT _UxGT("Aginduak zain...")
#define MSG_PRINT_PAUSED _UxGT("Inprim. geldi.")
#define MSG_RESUMING _UxGT("Inprim. jarraitu.")
#define MSG_PRINT_ABORTED _UxGT("Inprim. deusezta.")
#define MSG_NO_MOVE _UxGT("Mugimendu gabe.")
#define MSG_KILLED _UxGT("AKABATUTA. ")
@ -297,9 +296,7 @@
#define MSG_SHORT_HOUR _UxGT("h") // One character only
#define MSG_SHORT_MINUTE _UxGT("m") // One character only
#define MSG_HEATING _UxGT("Berotzen...")
#define MSG_HEATING_COMPLETE _UxGT("Berotzea prest.")
#define MSG_BED_HEATING _UxGT("Ohea Berotzen.")
#define MSG_BED_DONE _UxGT("Ohea Berotuta.")
#define MSG_BED_HEATING _UxGT("Ohea Berotzen...")
#define MSG_DELTA_CALIBRATE _UxGT("Delta Kalibraketa")
#define MSG_DELTA_CALIBRATE_X _UxGT("Kalibratu X")
#define MSG_DELTA_CALIBRATE_Y _UxGT("Kalibratu Y")

1
Marlin/language_fi.h
View File

@ -140,7 +140,6 @@
#define MSG_NO_CARD _UxGT("Ei korttia")
#define MSG_DWELL _UxGT("Nukkumassa...")
#define MSG_USERWAIT _UxGT("Odotet. valintaa")
#define MSG_RESUMING _UxGT("Jatke. tulostusta")
#define MSG_PRINT_ABORTED _UxGT("Print aborted")
#define MSG_NO_MOVE _UxGT("Ei liiketta.")
#define MSG_KILLED _UxGT("KILLED. ")

5
Marlin/language_fr.h
View File

@ -253,7 +253,6 @@
#define MSG_DWELL _UxGT("Repos...")
#define MSG_USERWAIT _UxGT("Atten. de l'util.")
#define MSG_PRINT_PAUSED _UxGT("Impr. en pause")
#define MSG_RESUMING _UxGT("Repri. de l'impr.")
#define MSG_PRINT_ABORTED _UxGT("Impr. Annulee")
#define MSG_NO_MOVE _UxGT("Moteurs bloques.")
#define MSG_KILLED _UxGT("MORT.")
@ -302,9 +301,7 @@
#define MSG_SHORT_MINUTE _UxGT("m") // One character only
#define MSG_HEATING _UxGT("En chauffe...")
#define MSG_HEATING_COMPLETE _UxGT("Chauffe terminee")
#define MSG_BED_HEATING _UxGT("Lit en chauffe..")
#define MSG_BED_DONE _UxGT("Chauffe lit terminee")
#define MSG_BED_HEATING _UxGT("Lit en chauffe...")
#define MSG_DELTA_CALIBRATE _UxGT("Calibration Delta")
#define MSG_DELTA_CALIBRATE_X _UxGT("Calibrer X")
#define MSG_DELTA_CALIBRATE_Y _UxGT("Calibrer Y")

3
Marlin/language_fr_utf8.h
View File

@ -254,7 +254,6 @@
#define MSG_DWELL _UxGT("Repos...")
#define MSG_USERWAIT _UxGT("Atten. de l'util.")
#define MSG_PRINT_PAUSED _UxGT("Impr. en pause")
#define MSG_RESUMING _UxGT("Repri. de l'impr.")
#define MSG_PRINT_ABORTED _UxGT("Impr. Annulée")
#define MSG_NO_MOVE _UxGT("Moteurs bloqués.")
#define MSG_KILLED _UxGT("MORT.")
@ -303,9 +302,7 @@
#define MSG_SHORT_MINUTE _UxGT("m") // One character only
#define MSG_HEATING _UxGT("En chauffe...")
#define MSG_HEATING_COMPLETE _UxGT("Chauffe terminée")
#define MSG_BED_HEATING _UxGT("Lit en chauffe...")
#define MSG_BED_DONE _UxGT("Chauffe lit terminée")
#define MSG_DELTA_CALIBRATE _UxGT("Calibration Delta")
#define MSG_DELTA_CALIBRATE_X _UxGT("Calibrer X")
#define MSG_DELTA_CALIBRATE_Y _UxGT("Calibrer Y")

5
Marlin/language_gl.h
View File

@ -149,7 +149,6 @@
#define MSG_NO_CARD _UxGT("Sen tarxeta SD")
#define MSG_DWELL _UxGT("En repouso...")
#define MSG_USERWAIT _UxGT("A espera...")
#define MSG_RESUMING _UxGT("Imprimindo...")
#define MSG_PRINT_ABORTED _UxGT("Impre. cancelada")
#define MSG_NO_MOVE _UxGT("Sen movemento.")
#define MSG_KILLED _UxGT("PROGRAMA MORTO")
@ -189,9 +188,7 @@
#define MSG_SHORT_HOUR _UxGT("h") // One character only
#define MSG_SHORT_MINUTE _UxGT("m") // One character only
#define MSG_HEATING _UxGT("Quentando...")
#define MSG_HEATING_COMPLETE _UxGT("Xa esta quente")
#define MSG_BED_HEATING _UxGT("Quentando cama")
#define MSG_BED_DONE _UxGT("Cama esta quente")
#define MSG_BED_HEATING _UxGT("Quentando cama...")
#define MSG_DELTA_CALIBRATE _UxGT("Calibracion Delta")
#define MSG_DELTA_CALIBRATE_X _UxGT("Calibrar X")
#define MSG_DELTA_CALIBRATE_Y _UxGT("Calibrar Y")

5
Marlin/language_hr.h
View File

@ -148,7 +148,6 @@
#define MSG_NO_CARD _UxGT("Nema SD kartice")
#define MSG_DWELL _UxGT("Sleep...")
#define MSG_USERWAIT _UxGT("Čekaj korisnika...")
#define MSG_RESUMING _UxGT("Nastavljam print")
#define MSG_PRINT_ABORTED _UxGT("Print otkazan")
#define MSG_NO_MOVE _UxGT("No move.")
#define MSG_KILLED _UxGT("KILLED. ")
@ -188,9 +187,7 @@
#define MSG_SHORT_HOUR _UxGT("h") // One character only
#define MSG_SHORT_MINUTE _UxGT("m") // One character only
#define MSG_HEATING _UxGT("Grijanje...")
#define MSG_HEATING_COMPLETE _UxGT("Grijanje gotovo.")
#define MSG_BED_HEATING _UxGT("Grijanje Bed-a.")
#define MSG_BED_DONE _UxGT("Bed gotov.")
#define MSG_BED_HEATING _UxGT("Grijanje Bed-a...")
#define MSG_DELTA_CALIBRATE _UxGT("Delta Kalibracija")
#define MSG_DELTA_CALIBRATE_X _UxGT("Kalibriraj X")
#define MSG_DELTA_CALIBRATE_Y _UxGT("Kalibriraj Y")

4
Marlin/language_it.h
View File

@ -252,7 +252,6 @@
#define MSG_DWELL _UxGT("Sospensione...")
#define MSG_USERWAIT _UxGT("Premi tasto..")
#define MSG_PRINT_PAUSED _UxGT("Stampa sospesa")
#define MSG_RESUMING _UxGT("Riprendi Stampa")
#define MSG_PRINT_ABORTED _UxGT("Stampa annullata")
#define MSG_NO_MOVE _UxGT("Nessun Movimento")
#define MSG_KILLED _UxGT("UCCISO. ")
@ -301,12 +300,9 @@
#define MSG_SHORT_HOUR _UxGT("h") // One character only
#define MSG_SHORT_MINUTE _UxGT("m") // One character only
#define MSG_HEATING _UxGT("Riscaldamento...")
#define MSG_HEATING_COMPLETE _UxGT("Risc. completato")
#define MSG_COOLING _UxGT("Raffreddamento..")
#define MSG_COOLING_COMPLETE _UxGT("Raff.completato.")
#define MSG_BED_HEATING _UxGT("Risc. piatto...")
#define MSG_BED_COOLING _UxGT("Raffr. piatto...")
#define MSG_BED_DONE _UxGT("Piatto pronto")
#define MSG_DELTA_CALIBRATE _UxGT("Calibraz. Delta")
#define MSG_DELTA_CALIBRATE_X _UxGT("Calibra X")
#define MSG_DELTA_CALIBRATE_Y _UxGT("Calibra Y")

5
Marlin/language_kana.h
View File

@ -201,7 +201,6 @@
#define MSG_NO_CARD "SD\xb6\xb0\xc4\xde\xb6\xde\xb1\xd8\xcf\xbe\xdd" // "SDｶｰﾄﾞｶﾞｱﾘﾏｾﾝ" ("No SD card")
#define MSG_DWELL "\xb7\xad\xb3\xbc" // "ｷｭｳｼ" ("Sleep...")
#define MSG_USERWAIT "\xbc\xca\xde\xd7\xb8\xb5\xcf\xc1\xb8\xc0\xde\xbb\xb2" // "ｼﾊﾞﾗｸｵﾏﾁｸﾀﾞｻｲ" ("Wait for user...")
#define MSG_RESUMING "\xcc\xdf\xd8\xdd\xc4\xbb\xb2\xb6\xb2" // "ﾌﾟﾘﾝﾄｻｲｶｲ" ("Resuming print")
#define MSG_PRINT_ABORTED "\xcc\xdf\xd8\xdd\xc4\xb6\xde\xc1\xad\xb3\xbc\xbb\xda\xcf\xbc\xc0" // "ﾌﾟﾘﾝﾄｶﾞﾁｭｳｼｻﾚﾏｼﾀ" ("Print aborted")
#define MSG_NO_MOVE "\xb3\xba\xde\xb7\xcf\xbe\xdd" // "ｳｺﾞｷﾏｾﾝ" ("No move.")
#define MSG_KILLED "\xcb\xbc\xde\xae\xb3\xc3\xb2\xbc" // "ﾋｼﾞｮｳﾃｲｼ" ("KILLED. ")
@ -272,9 +271,7 @@
#define MSG_SHORT_HOUR "h" // One character only
#define MSG_SHORT_MINUTE "m" // One character only
#define MSG_HEATING "\xb6\xc8\xc2\xc1\xad\xb3" // "ｶﾈﾂﾁｭｳ" ("Heating...")
#define MSG_HEATING_COMPLETE "\xb6\xc8\xc2\xb6\xdd\xd8\xae\xb3" // "ｶﾈﾂｶﾝﾘｮｳ" ("Heating done.")
#define MSG_BED_HEATING "\xcd\xde\xaf\xc4\xde\x20\xb6\xc8\xc2\xc1\xad\xb3" // "ﾍﾞｯﾄﾞ ｶﾈﾂﾁｭｳ" ("Bed Heating.")
#define MSG_BED_DONE "\xcd\xde\xaf\xc4\xde\x20\xb6\xc8\xc2\xb6\xdd\xd8\xae\xb3" // "ﾍﾞｯﾄﾞ ｶﾈﾂｶﾝﾘｮｳ" ("Bed done.")
#define MSG_BED_HEATING "\xcd\xde\xaf\xc4\xde\x20\xb6\xc8\xc2\xc1\xad\xb3" // "ﾍﾞｯﾄﾞ ｶﾈﾂﾁｭｳ" ("Bed Heating...")
#define MSG_DELTA_CALIBRATE "\xc3\xde\xd9\xc0\x20\xba\xb3\xbe\xb2" // "ﾃﾞﾙﾀ ｺｳｾｲ" ("Delta Calibration")
#define MSG_DELTA_CALIBRATE_X "X\xbc\xde\xb8\x20\xba\xb3\xbe\xb2" // "Xｼﾞｸ ｺｳｾｲ" ("Calibrate X")
#define MSG_DELTA_CALIBRATE_Y "Y\xbc\xde\xb8\x20\xba\xb3\xbe\xb2" // "Yｼﾞｸ ｺｳｾｲ" ("Calibrate Y")

13
Marlin/language_kana_utf8.h
View File

@ -78,7 +78,7 @@
#define MSG_MOVE_AXIS _UxGT("ジクイドウ") // "Move axis"
#define MSG_BED_LEVELING _UxGT("ベッドレベリング") // "Bed leveling"
#define MSG_LEVEL_BED _UxGT("ベッドレベリング") // "Level bed"
#define MSG_MOVING _UxGT("イドウチュウ") // "Moving..."
#define MSG_MOVING _UxGT("イドウチュウ...") // "Moving..."
#define MSG_FREE_XY _UxGT("XYジク カイホウ") // "Free XY"
#define MSG_MOVE_X _UxGT("Xジク イドウ") // "Move X"
#define MSG_MOVE_Y _UxGT("Yジク イドウ") // "Move Y"
@ -142,9 +142,8 @@
#define MSG_STOP_PRINT _UxGT("プリントテイシ") // "Stop print"
#define MSG_CARD_MENU _UxGT("SDカードカラプリント") // "Print from SD"
#define MSG_NO_CARD _UxGT("SDカードガアリマセン") // "No SD card"
#define MSG_DWELL _UxGT("キュウシ") // "Sleep..."
#define MSG_USERWAIT _UxGT("シバラクオマチクダサイ") // "Wait for user..."
#define MSG_RESUMING _UxGT("プリントサイカイ") // "Resuming print"
#define MSG_DWELL _UxGT("キュウシ...") // "Sleep..."
#define MSG_USERWAIT _UxGT("シバラクオマチクダサイ...") // "Wait for user..."
#define MSG_PRINT_ABORTED _UxGT("プリントガチュウシサレマシタ") // "Print aborted"
#define MSG_NO_MOVE _UxGT("ウゴキマセン") // "No move."
#define MSG_KILLED _UxGT("ヒジョウテイシ") // "KILLED. "
@ -183,10 +182,8 @@
#define MSG_SHORT_DAY _UxGT("d") // One character only
#define MSG_SHORT_HOUR _UxGT("h") // One character only
#define MSG_SHORT_MINUTE _UxGT("m") // One character only
#define MSG_HEATING _UxGT("カネツチュウ") // "Heating..."
#define MSG_HEATING_COMPLETE _UxGT("カネツカンリョウ") // "Heating done."
#define MSG_BED_HEATING _UxGT("ベッド カネツチュウ") // "Bed Heating."
#define MSG_BED_DONE _UxGT("ベッド カネツカンリョウ") // "Bed done."
#define MSG_HEATING _UxGT("カネツチュウ...") // "Heating..."
#define MSG_BED_HEATING _UxGT("ベッド カネツチュウ...") // "Bed Heating..."
#define MSG_DELTA_CALIBRATE _UxGT("デルタ コウセイ") // "Delta Calibration"
#define MSG_DELTA_CALIBRATE_X _UxGT("Xジク コウセイ") // "Calibrate X"
#define MSG_DELTA_CALIBRATE_Y _UxGT("Yジク コウセイ") // "Calibrate Y"

5
Marlin/language_nl.h
View File

@ -156,7 +156,6 @@
#define MSG_NO_CARD _UxGT("Geen SD kaart")
#define MSG_DWELL _UxGT("Slapen...")
#define MSG_USERWAIT _UxGT("Wachten...")
#define MSG_RESUMING _UxGT("Print hervatten")
#define MSG_PRINT_ABORTED _UxGT("Print afgebroken")
#define MSG_NO_MOVE _UxGT("Geen beweging.")
#define MSG_KILLED _UxGT("Afgebroken. ")
@ -196,9 +195,7 @@
#define MSG_SHORT_HOUR _UxGT("h") // One character only
#define MSG_SHORT_MINUTE _UxGT("m") // One character only
#define MSG_HEATING _UxGT("Voorwarmen...")
#define MSG_HEATING_COMPLETE _UxGT("Voorverw. kompl.")
#define MSG_BED_HEATING _UxGT("Bed voorverw.")
#define MSG_BED_DONE _UxGT("Bed is voorverw.")
#define MSG_BED_HEATING _UxGT("Bed voorverw...")
#define MSG_DELTA_CALIBRATE _UxGT("Delta Calibratie")
#define MSG_DELTA_CALIBRATE_X _UxGT("Kalibreer X")
#define MSG_DELTA_CALIBRATE_Y _UxGT("Kalibreer Y")

3
Marlin/language_pl-DOGM.h
View File

@ -145,7 +145,6 @@
#define MSG_NO_CARD _UxGT("Brak karty")
#define MSG_DWELL _UxGT("Uśpij...")
#define MSG_USERWAIT _UxGT("Oczekiwanie...")
#define MSG_RESUMING _UxGT("Wznawianie druku")
#define MSG_PRINT_ABORTED _UxGT("Druk przerwany")
#define MSG_NO_MOVE _UxGT("Brak ruchu")
#define MSG_KILLED _UxGT("Ubity. ")
@ -185,9 +184,7 @@
#define MSG_SHORT_HOUR _UxGT("g") // One character only
#define MSG_SHORT_MINUTE _UxGT("m") // One character only
#define MSG_HEATING _UxGT("Rozgrzewanie...")
#define MSG_HEATING_COMPLETE _UxGT("Rozgrzano")
#define MSG_BED_HEATING _UxGT("Rozgrzewanie stołu...")
#define MSG_BED_DONE _UxGT("Rozgrzano stół")
#define MSG_DELTA_CALIBRATE _UxGT("Kalibrowanie Delty")
#define MSG_DELTA_CALIBRATE_X _UxGT("Kalibruj X")
#define MSG_DELTA_CALIBRATE_Y _UxGT("Kalibruj Y")

3
Marlin/language_pl-HD44780.h
View File

@ -146,7 +146,6 @@
#define MSG_NO_CARD _UxGT("Brak karty")
#define MSG_DWELL _UxGT("Uspij...")
#define MSG_USERWAIT _UxGT("Oczekiwanie...")
#define MSG_RESUMING _UxGT("Wznawianie druku")
#define MSG_PRINT_ABORTED _UxGT("Druk przerwany")
#define MSG_NO_MOVE _UxGT("Brak ruchu")
#define MSG_KILLED _UxGT("Ubity. ")
@ -186,9 +185,7 @@
#define MSG_SHORT_HOUR _UxGT("g") // One character only
#define MSG_SHORT_MINUTE _UxGT("m") // One character only
#define MSG_HEATING _UxGT("Rozgrzewanie...")
#define MSG_HEATING_COMPLETE _UxGT("Rozgrzano")
#define MSG_BED_HEATING _UxGT("Rozgrzewanie stolu...")
#define MSG_BED_DONE _UxGT("Rozgrzano stol")
#define MSG_DELTA_CALIBRATE _UxGT("Kalibrowanie Delty")
#define MSG_DELTA_CALIBRATE_X _UxGT("Kalibruj X")
#define MSG_DELTA_CALIBRATE_Y _UxGT("Kalibruj Y")

5
Marlin/language_pt-br.h
View File

@ -256,7 +256,6 @@
#define MSG_NO_CARD _UxGT("Sem cartao SD")
#define MSG_DWELL _UxGT("ZzZzZz...")
#define MSG_USERWAIT _UxGT("Clique para retomar")
#define MSG_RESUMING _UxGT("Resumindo Impressao")
#define MSG_PRINT_ABORTED _UxGT("Impressao Abortada")
#define MSG_NO_MOVE _UxGT("Sem movimento")
#define MSG_KILLED _UxGT("PARADA DE EMERGENCIA")
@ -295,9 +294,7 @@
#define MSG_ERR_MAXTEMP_BED _UxGT("Erro:Temp Mesa Max")
#define MSG_ERR_MINTEMP_BED _UxGT("Erro:Temp Mesa Min")
#define MSG_HEATING _UxGT("Aquecendo...")
#define MSG_HEATING_COMPLETE _UxGT("Aquecida.")
#define MSG_BED_HEATING _UxGT("Aquecendo base..")
#define MSG_BED_DONE _UxGT("Base aquecida.")
#define MSG_BED_HEATING _UxGT("Aquecendo base...")
#define MSG_DELTA_CALIBRATE _UxGT("Calibrar Delta")
#define MSG_DELTA_CALIBRATE_X _UxGT("Calibrar X")
#define MSG_DELTA_CALIBRATE_Y _UxGT("Calibrar Y")

5
Marlin/language_pt-br_utf8.h
View File

@ -258,7 +258,6 @@
#define MSG_NO_CARD _UxGT("Sem cartão SD")
#define MSG_DWELL _UxGT("ZzZzZz...")
#define MSG_USERWAIT _UxGT("Clique para retomar")
#define MSG_RESUMING _UxGT("Resumindo Impressão")
#define MSG_PRINT_ABORTED _UxGT("Impressão Abortada")
#define MSG_NO_MOVE _UxGT("Sem movimento")
#define MSG_KILLED _UxGT("PARADA DE EMERGÊNCIA")
@ -297,9 +296,7 @@
#define MSG_ERR_MAXTEMP_BED _UxGT("Erro:Temp Mesa Máx")
#define MSG_ERR_MINTEMP_BED _UxGT("Erro:Temp Mesa Mín")
#define MSG_HEATING _UxGT("Aquecendo...")
#define MSG_HEATING_COMPLETE _UxGT("Aquecida.")
#define MSG_BED_HEATING _UxGT("Aquecendo base..")
#define MSG_BED_DONE _UxGT("Base aquecida.")
#define MSG_BED_HEATING _UxGT("Aquecendo base...")
#define MSG_DELTA_CALIBRATE _UxGT("Calibrar Delta")
#define MSG_DELTA_CALIBRATE_X _UxGT("Calibrar X")
#define MSG_DELTA_CALIBRATE_Y _UxGT("Calibrar Y")

3
Marlin/language_pt.h
View File

@ -144,7 +144,6 @@
#define MSG_NO_CARD "Sem cartao SD"
#define MSG_DWELL "Em espera..."
#define MSG_USERWAIT "A espera de ordem"
#define MSG_RESUMING "Retomando impressao"
#define MSG_PRINT_ABORTED "Impressao cancelada"
#define MSG_NO_MOVE "Sem movimento"
#define MSG_KILLED "EMERGENCIA. "
@ -176,9 +175,7 @@
#define MSG_ERR_MAXTEMP_BED "Err: T Base Maxima"
#define MSG_ERR_MINTEMP_BED "Err: T Base Minima"
#define MSG_HEATING "Aquecendo..."
#define MSG_HEATING_COMPLETE "Aquecida."
#define MSG_BED_HEATING "Aquecendo base.."
#define MSG_BED_DONE "Base aquecida."
#define MSG_DELTA_CALIBRATE "Calibracao Delta"
#define MSG_DELTA_CALIBRATE_X "Calibrar X"
#define MSG_DELTA_CALIBRATE_Y "Calibrar Y"

5
Marlin/language_pt_utf8.h
View File

@ -146,7 +146,6 @@
#define MSG_NO_CARD _UxGT("Sem cartão SD")
#define MSG_DWELL _UxGT("Em espera...")
#define MSG_USERWAIT _UxGT("Á espera de ordem")
#define MSG_RESUMING _UxGT("Retomando impressão")
#define MSG_PRINT_ABORTED _UxGT("Impressão cancelada")
#define MSG_NO_MOVE _UxGT("Sem movimento")
#define MSG_KILLED _UxGT("EMERGÊNCIA. ")
@ -178,9 +177,7 @@
#define MSG_ERR_MAXTEMP_BED _UxGT("Err: T Base Máxima")
#define MSG_ERR_MINTEMP_BED _UxGT("Err: T Base Mínima")
#define MSG_HEATING _UxGT("Aquecendo...")
#define MSG_HEATING_COMPLETE _UxGT("Aquecida.")
#define MSG_BED_HEATING _UxGT("Aquecendo base..")
#define MSG_BED_DONE _UxGT("Base aquecida.")
#define MSG_BED_HEATING _UxGT("Aquecendo base...")
#define MSG_DELTA_CALIBRATE _UxGT("Calibração Delta")
#define MSG_DELTA_CALIBRATE_X _UxGT("Calibrar X")
#define MSG_DELTA_CALIBRATE_Y _UxGT("Calibrar Y")

8
Marlin/language_ru.h
View File

@ -253,7 +253,6 @@
#define MSG_DWELL _UxGT("Сон...")
#define MSG_USERWAIT _UxGT("Продолжить...")
#define MSG_PRINT_PAUSED _UxGT("Печать на паузе")
#define MSG_RESUMING _UxGT("Возобновление...")
#define MSG_PRINT_ABORTED _UxGT("Печать отменена")
#define MSG_NO_MOVE _UxGT("Нет движения.")
#define MSG_KILLED _UxGT("УБИТО. ")
@ -303,12 +302,9 @@
#define MSG_SHORT_HOUR _UxGT("ч") // One character only
#define MSG_SHORT_MINUTE _UxGT("м") // One character only
#define MSG_HEATING _UxGT("Нагрев...")
#define MSG_HEATING_COMPLETE _UxGT("Нагрев выполнен")
#define MSG_COOLING _UxGT("Охлаждение...")
#define MSG_COOLING_COMPLETE _UxGT("Охлаждение выполнено")
#define MSG_BED_HEATING _UxGT("Нагрев стола")
#define MSG_BED_COOLING _UxGT("Охлаждение стола")
#define MSG_BED_DONE _UxGT("Стол разогрет")
#define MSG_BED_HEATING _UxGT("Нагрев стола...")
#define MSG_BED_COOLING _UxGT("Охлаждение стола...")
#define MSG_DELTA_CALIBRATE _UxGT("Калибровка Delta")
#define MSG_DELTA_CALIBRATE_X _UxGT("Калибровать X")
#define MSG_DELTA_CALIBRATE_Y _UxGT("Калибровать Y")

8
Marlin/language_sk_utf8.h
View File

@ -257,7 +257,6 @@
#define MSG_DWELL _UxGT("Spím...")
#define MSG_USERWAIT _UxGT("Čakám...")
#define MSG_PRINT_PAUSED _UxGT("Tlač pozastavená")
#define MSG_RESUMING _UxGT("Obnovovanie tlače")
#define MSG_PRINT_ABORTED _UxGT("Tlač zrušená")
#define MSG_NO_MOVE _UxGT("Žiadny pohyb.")
#define MSG_KILLED _UxGT("PRERUŠENÉ. ")
@ -308,12 +307,9 @@
#define MSG_SHORT_HOUR _UxGT("h")
#define MSG_SHORT_MINUTE _UxGT("m")
#define MSG_HEATING _UxGT("Ohrev...")
#define MSG_HEATING_COMPLETE _UxGT("Ohrev prebehol.")
#define MSG_COOLING _UxGT("Ochladzovanie...")
#define MSG_COOLING_COMPLETE _UxGT("Ochladzovanie prebehlo.")
#define MSG_BED_HEATING _UxGT("Ohrev podl.")
#define MSG_BED_COOLING _UxGT("Ochladzovanie podl.")
#define MSG_BED_DONE _UxGT("Podložka hotová.")
#define MSG_BED_HEATING _UxGT("Ohrev podl...")
#define MSG_BED_COOLING _UxGT("Ochladzovanie podl...")
#define MSG_DELTA_CALIBRATE _UxGT("Delta Kalibrácia")
#define MSG_DELTA_CALIBRATE_X _UxGT("Kalibrovať X")
#define MSG_DELTA_CALIBRATE_Y _UxGT("Kalibrovať Y")

5
Marlin/language_tr.h
View File

@ -161,7 +161,6 @@
#define MSG_NO_CARD _UxGT("SD Kart Yok") // SD Kart Yok
#define MSG_DWELL _UxGT("Uyku...") // Uyku...
#define MSG_USERWAIT _UxGT("Operatör bekleniyor...") // Operatör bekleniyor...
#define MSG_RESUMING _UxGT("Baskı Sürdürülüyor") // Baskı Sürdürülüyor
#define MSG_PRINT_ABORTED _UxGT("Baskı Durduruldu") // Baskı Durduruldu
#define MSG_NO_MOVE _UxGT("İşlem yok.") // İşlem yok.
#define MSG_KILLED _UxGT("Kilitlendi. ") // Kilitlendi.
@ -201,9 +200,7 @@
#define MSG_SHORT_HOUR _UxGT("S") // One character only // S
#define MSG_SHORT_MINUTE _UxGT("D") // One character only // D
#define MSG_HEATING _UxGT("Isınıyor...") // Isınıyor...
#define MSG_HEATING_COMPLETE _UxGT("Isınma tamam.") // Isınma tamam.
#define MSG_BED_HEATING _UxGT("Tabla Isınıyor.") // Tabla Isınıyor.
#define MSG_BED_DONE _UxGT("Tabla hazır.") // Tabla hazır.
#define MSG_BED_HEATING _UxGT("Tabla Isınıyor...") // Tabla Isınıyor...
#define MSG_DELTA_CALIBRATE _UxGT("Delta Kalibrasyonu") // Delta Kalibrasyonu
#define MSG_DELTA_CALIBRATE_X _UxGT("Ayarla X") // Ayarla X
#define MSG_DELTA_CALIBRATE_Y _UxGT("Ayarla Y") // Ayarla Y

5
Marlin/language_uk.h
View File

@ -149,7 +149,6 @@
#define MSG_NO_CARD _UxGT("Відсутня SD карт.")
#define MSG_DWELL _UxGT("Сплячка...")
#define MSG_USERWAIT _UxGT("Очікування дій...")
#define MSG_RESUMING _UxGT("Відновлення друку")
#define MSG_PRINT_ABORTED _UxGT("Друк скасовано")
#define MSG_NO_MOVE _UxGT("Немає руху.")
#define MSG_KILLED _UxGT("ПЕРЕРВАНО. ")
@ -176,9 +175,7 @@
#define MSG_SHORT_HOUR _UxGT("г") // One character only
#define MSG_SHORT_MINUTE _UxGT("х") // One character only
#define MSG_HEATING _UxGT("Нагрівання...")
#define MSG_HEATING_COMPLETE _UxGT("Нагріто.")
#define MSG_BED_HEATING _UxGT("Нагрівання столу.")
#define MSG_BED_DONE _UxGT("Стіл нагрітий.")
#define MSG_BED_HEATING _UxGT("Нагрівання столу...")
#define MSG_DELTA_CALIBRATE _UxGT("Калібр. Delta")
#define MSG_DELTA_CALIBRATE_X _UxGT("Калібрування X")
#define MSG_DELTA_CALIBRATE_Y _UxGT("Калібрування Y")

5
Marlin/language_zh_CN.h
View File

@ -249,7 +249,6 @@
#define MSG_DWELL _UxGT("休眠中 ...") //"Sleep..."
#define MSG_USERWAIT _UxGT("点击继续 ...") //"Click to resume..."
#define MSG_PRINT_PAUSED _UxGT("暫停打印") // "Print paused"
#define MSG_RESUMING _UxGT("恢复打印中") //"Resuming print"
#define MSG_PRINT_ABORTED _UxGT("已取消打印") //"Print aborted"
#define MSG_NO_MOVE _UxGT("无移动") //"No move."
#define MSG_KILLED _UxGT("已杀掉") //"KILLED. "
@ -297,9 +296,7 @@
#define MSG_SHORT_HOUR _UxGT("时") //"h" // One character only
#define MSG_SHORT_MINUTE _UxGT("分") //"m" // One character only
#define MSG_HEATING _UxGT("加热中 ...") //"Heating..."
#define MSG_HEATING_COMPLETE _UxGT("加热完成") //"Heating done."
#define MSG_BED_HEATING _UxGT("加热热床中") //"Bed Heating."
#define MSG_BED_DONE _UxGT("完成加热热床") //"Bed done."
#define MSG_BED_HEATING _UxGT("加热热床中...") //"Bed Heating..."
#define MSG_DELTA_CALIBRATE _UxGT("⊿校准") //"Delta Calibration"
#define MSG_DELTA_CALIBRATE_X _UxGT("⊿校准X") //"Calibrate X"
#define MSG_DELTA_CALIBRATE_Y _UxGT("⊿校准Y") //"Calibrate Y"

5
Marlin/language_zh_TW.h
View File

@ -249,7 +249,6 @@
#define MSG_DWELL _UxGT("休眠 ...") //"Sleep..."
#define MSG_USERWAIT _UxGT("點擊繼續 ...") //"Click to resume..."
#define MSG_PRINT_PAUSED _UxGT("列印已暫停") // "Print paused"
#define MSG_RESUMING _UxGT("恢復列印中") //"Resuming print"
#define MSG_PRINT_ABORTED _UxGT("已取消列印") //"Print aborted"
#define MSG_NO_MOVE _UxGT("無移動") //"No move."
#define MSG_KILLED _UxGT("已砍掉") //"KILLED. "
@ -297,9 +296,7 @@
#define MSG_SHORT_HOUR _UxGT("時") //"h" // One character only
#define MSG_SHORT_MINUTE _UxGT("分") //"m" // One character only
#define MSG_HEATING _UxGT("加熱中 ...") //"Heating..."
#define MSG_HEATING_COMPLETE _UxGT("加熱完成") //"Heating done."
#define MSG_BED_HEATING _UxGT("加熱熱床中") //"Bed Heating."
#define MSG_BED_DONE _UxGT("完成加熱熱床") //"Bed done."
#define MSG_BED_HEATING _UxGT("加熱熱床中...") //"Bed Heating..."
#define MSG_DELTA_CALIBRATE _UxGT("⊿校準") //"Delta Calibration"
#define MSG_DELTA_CALIBRATE_X _UxGT("⊿校準X") //"Calibrate X"
#define MSG_DELTA_CALIBRATE_Y _UxGT("⊿校準Y") //"Calibrate Y"

4
Marlin/tmc_util.cpp
View File

@ -215,12 +215,12 @@ bool report_tmc_status = false;
#endif // MONITOR_DRIVER_STATUS
void _tmc_say_axis(const TMC_AxisEnum axis) {
const static char ext_X[] PROGMEM = "X", ext_Y[] PROGMEM = "Y", ext_Z[] PROGMEM = "Z",
static const char ext_X[] PROGMEM = "X", ext_Y[] PROGMEM = "Y", ext_Z[] PROGMEM = "Z",
ext_X2[] PROGMEM = "X2", ext_Y2[] PROGMEM = "Y2", ext_Z2[] PROGMEM = "Z2",
ext_E0[] PROGMEM = "E0", ext_E1[] PROGMEM = "E1",
ext_E2[] PROGMEM = "E2", ext_E3[] PROGMEM = "E3",
ext_E4[] PROGMEM = "E4";
const static char* const tmc_axes[] PROGMEM = { ext_X, ext_Y, ext_Z, ext_X2, ext_Y2, ext_Z2, ext_E0, ext_E1, ext_E2, ext_E3, ext_E4 };
static const char* const tmc_axes[] PROGMEM = { ext_X, ext_Y, ext_Z, ext_X2, ext_Y2, ext_Z2, ext_E0, ext_E1, ext_E2, ext_E3, ext_E4 };
serialprintPGM((char*)pgm_read_ptr(&tmc_axes[axis]));
}

2
Marlin/ubl_G29.cpp
View File

@ -621,8 +621,8 @@
#if ENABLED(NEWPANEL)
lcd_reset_alert_level();
LCD_MESSAGEPGM("");
lcd_quick_feedback(true);
lcd_reset_status();
lcd_external_control = false;
#endif

40
Marlin/ultralcd.cpp
View File

@ -743,7 +743,27 @@ void lcd_status_screen() {
lcd_implementation_status_screen();
}
void lcd_reset_status() { lcd_setstatusPGM(PSTR(""), -1); }
/**
* Reset the status message
*/
void lcd_reset_status() {
static const char paused[] PROGMEM = MSG_PRINT_PAUSED;
static const char printing[] PROGMEM = MSG_PRINTING;
static const char welcome[] PROGMEM = WELCOME_MSG;
const char *msg;
if (print_job_timer.isPaused())
msg = paused;
#if ENABLED(SDSUPPORT)
else if (card.sdprinting)
return lcd_setstatus(card.longFilename[0] ? card.longFilename : card.filename, true);
#endif
else if (print_job_timer.isRunning())
msg = printing;
else
msg = welcome;
lcd_setstatusPGM(msg, -1);
}
/**
*
@ -774,7 +794,7 @@ void kill_screen(const char* lcd_msg) {
}
void lcd_quick_feedback(const bool clear_buttons) {
lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW;
lcd_refresh();
if (clear_buttons) buttons = 0;
next_button_update_ms = millis() + 500;
@ -812,7 +832,7 @@ void kill_screen(const char* lcd_msg) {
#if ENABLED(PARK_HEAD_ON_PAUSE)
enqueue_and_echo_commands_P(PSTR("M125"));
#endif
lcd_setstatusPGM(PSTR(MSG_PRINT_PAUSED), -1);
lcd_reset_status();
}
void lcd_sdcard_resume() {
@ -3836,7 +3856,7 @@ void kill_screen(const char* lcd_msg) {
encoderPosition = card.updir() ? ENCODER_STEPS_PER_MENU_ITEM : 0;
encoderTopLine = 0;
screen_changed = true;
lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW;
lcd_refresh();
}
/**
@ -4697,8 +4717,7 @@ void kill_screen(const char* lcd_msg) {
void menu_edit_callback_ ## _name() { if (_menu_edit_ ## _name()) (*callbackFunc)(); } \
void _menu_action_setting_edit_ ## _name(const char * const pstr, _type* const ptr, const _type minValue, const _type maxValue) { \
lcd_save_previous_screen(); \
\
lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; \
lcd_refresh(); \
\
editLabel = pstr; \
editValue = ptr; \
@ -4838,6 +4857,7 @@ void kill_screen(const char* lcd_msg) {
UNUSED(longFilename);
card.openAndPrintFile(filename);
lcd_return_to_status();
lcd_reset_status();
}
void menu_action_sddirectory(const char* filename, char* longFilename) {
@ -4849,12 +4869,12 @@ void kill_screen(const char* lcd_msg) {
#if ENABLED(DOGLCD)
drawing_screen = false;
#endif
lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW;
lcd_refresh();
}
#endif // SDSUPPORT
void menu_action_setting_edit_bool(const char* pstr, bool* ptr) { UNUSED(pstr); *ptr ^= true; lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; }
void menu_action_setting_edit_bool(const char* pstr, bool* ptr) { UNUSED(pstr); *ptr ^= true; lcd_refresh(); }
void menu_action_setting_edit_callback_bool(const char* pstr, bool* ptr, screenFunc_t callback) {
menu_action_setting_edit_bool(pstr, ptr);
(*callback)();
@ -5045,7 +5065,7 @@ void lcd_update() {
if (old_sd_status != 2) LCD_MESSAGEPGM(MSG_SD_REMOVED);
}
lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW;
lcd_refresh();
lcd_implementation_init( // to maybe revive the LCD if static electricity killed it.
#if ENABLED(LCD_PROGRESS_BAR)
currentScreen == lcd_status_screen ? CHARSET_INFO : CHARSET_MENU
@ -5290,7 +5310,7 @@ void lcd_finishstatus(const bool persist=false) {
expire_status_ms = persist ? 0 : progress_bar_ms + PROGRESS_MSG_EXPIRE;
#endif
#endif
lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW;
lcd_refresh();
#if ENABLED(FILAMENT_LCD_DISPLAY) && ENABLED(SDSUPPORT)
previous_lcd_status_ms = millis(); //get status message to show up for a while

4
Marlin/ultralcd.h
View File

@ -56,6 +56,7 @@
void lcd_setstatusPGM(const char* message, const int8_t level=0);
void lcd_setalertstatusPGM(const char* message);
void lcd_reset_alert_level();
void lcd_reset_status();
void lcd_status_printf_P(const uint8_t level, const char * const fmt, ...);
void lcd_kill_screen();
void kill_screen(const char* lcd_msg);
@ -242,14 +243,13 @@
inline void lcd_status_printf_P(const uint8_t level, const char * const fmt, ...) { UNUSED(level); UNUSED(fmt); }
inline void lcd_setalertstatusPGM(const char* message) { UNUSED(message); }
inline void lcd_reset_alert_level() {}
inline void lcd_reset_status() {}
#endif // ULTRA_LCD
#define LCD_MESSAGEPGM(x) lcd_setstatusPGM(PSTR(x))
#define LCD_ALERTMESSAGEPGM(x) lcd_setalertstatusPGM(PSTR(x))
void lcd_reset_status();
#if ENABLED(SD_REPRINT_LAST_SELECTED_FILE)
void lcd_reselect_last_file();
#endif