0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[2.0.x] Reset LCD status to fallbacks (#10470)

Browse source 
* Remove obsolete strings
* Tweak some static consts
* Reset LCD status to fallbacks
This commit is contained in:
Scott Lahteine 2018-04-22 00:16:30 -05:00 committed by GitHub
parent d58450c82a
commit 3396671011
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
36 changed files with 67 additions and 138 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
View file

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

4
Marlin/src/feature/tmc_util.cpp
View file

@ -217,12 +217,12 @@ bool report_tmc_status = false;
#endif // MONITOR_DRIVER_STATUS #endif // MONITOR_DRIVER_STATUS
void _tmc_say_axis(const TMC_AxisEnum axis) { 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_X2[] PROGMEM = "X2", ext_Y2[] PROGMEM = "Y2", ext_Z2[] PROGMEM = "Z2",
ext_E0[] PROGMEM = "E0", ext_E1[] PROGMEM = "E1", ext_E0[] PROGMEM = "E0", ext_E1[] PROGMEM = "E1",
ext_E2[] PROGMEM = "E2", ext_E3[] PROGMEM = "E3", ext_E2[] PROGMEM = "E2", ext_E3[] PROGMEM = "E3",
ext_E4[] PROGMEM = "E4"; 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])); serialprintPGM((char*)pgm_read_ptr(&tmc_axes[axis]));
} }

2
Marlin/src/gcode/calibrate/G33.cpp
View file

@ -483,7 +483,7 @@ void GcodeSuite::G33() {
_opposite_results = (_4p_calibration && !towers_set) || probe_points >= 3, _opposite_results = (_4p_calibration && !towers_set) || probe_points >= 3,
_endstop_results = probe_points != 1 && probe_points != -1 && probe_points != 0, _endstop_results = probe_points != 1 && probe_points != -1 && probe_points != 0,
_angle_results = probe_points >= 3 && towers_set; _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; int8_t iterations = 0;
float test_precision, float test_precision,
zero_std_dev = (verbose_level ? 999.0 : 0.0), // 0.0 in dry-run mode : forced end zero_std_dev = (verbose_level ? 999.0 : 0.0), // 0.0 in dry-run mode : forced end

4
Marlin/src/gcode/control/M111.cpp
View file

@ -28,7 +28,7 @@
void GcodeSuite::M111() { void GcodeSuite::M111() {
if (parser.seen('S')) marlin_debug_flags = parser.byteval('S'); 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_2[] PROGMEM = MSG_DEBUG_INFO,
str_debug_4[] PROGMEM = MSG_DEBUG_ERRORS, str_debug_4[] PROGMEM = MSG_DEBUG_ERRORS,
str_debug_8[] PROGMEM = MSG_DEBUG_DRYRUN, str_debug_8[] PROGMEM = MSG_DEBUG_DRYRUN,
@ -38,7 +38,7 @@ void GcodeSuite::M111() {
#endif #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 str_debug_1, str_debug_2, str_debug_4, str_debug_8, str_debug_16
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
, str_debug_32 , str_debug_32

12
Marlin/src/gcode/lcd/M0_M1.cpp
View file

@ -87,12 +87,8 @@ void GcodeSuite::M0_M1() {
ms += millis(); // wait until this time for a click ms += millis(); // wait until this time for a click
while (PENDING(millis(), ms) && wait_for_user) idle(); while (PENDING(millis(), ms) && wait_for_user) idle();
} }
else { else
#if ENABLED(ULTIPANEL)
if (lcd_detected())
#endif
while (wait_for_user) idle(); while (wait_for_user) idle();
}
#if ENABLED(PRINTER_EVENT_LEDS) && ENABLED(SDSUPPORT) #if ENABLED(PRINTER_EVENT_LEDS) && ENABLED(SDSUPPORT)
if (lights_off_after_print) { if (lights_off_after_print) {
@ -101,11 +97,7 @@ void GcodeSuite::M0_M1() {
} }
#endif #endif
#if ENABLED(ULTIPANEL) lcd_reset_status();
if (lcd_detected()) {
IS_SD_PRINTING ? LCD_MESSAGEPGM(MSG_RESUMING) : LCD_MESSAGEPGM(WELCOME_MSG);
}
#endif
wait_for_user = false; wait_for_user = false;
KEEPALIVE_STATE(IN_HANDLER); KEEPALIVE_STATE(IN_HANDLER);

2
Marlin/src/gcode/temperature/M104_M109.cpp
View file

@ -243,7 +243,7 @@ void GcodeSuite::M109() {
} while (wait_for_heatup && TEMP_CONDITIONS); } while (wait_for_heatup && TEMP_CONDITIONS);
if (wait_for_heatup) { 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) #if ENABLED(PRINTER_EVENT_LEDS)
leds.set_white(); leds.set_white();
#endif #endif

2
Marlin/src/gcode/temperature/M140_M190.cpp
View file

@ -171,7 +171,7 @@ void GcodeSuite::M190() {
} while (wait_for_heatup && TEMP_BED_CONDITIONS); } 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) #if DISABLED(BUSY_WHILE_HEATING)
KEEPALIVE_STATE(IN_HANDLER); KEEPALIVE_STATE(IN_HANDLER);
#endif #endif

3
Marlin/src/lcd/language/language_an.h
View file

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

1
Marlin/src/lcd/language/language_bg.h
View file

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

5
Marlin/src/lcd/language/language_ca.h
View file

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

5
Marlin/src/lcd/language/language_cz.h
View file

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

5
Marlin/src/lcd/language/language_da.h
View file

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

3
Marlin/src/lcd/language/language_de.h
View file

@ -169,7 +169,6 @@
#define MSG_DWELL _UxGT("Warten...") #define MSG_DWELL _UxGT("Warten...")
#define MSG_USERWAIT _UxGT("Warte auf Nutzer") #define MSG_USERWAIT _UxGT("Warte auf Nutzer")
#define MSG_PRINT_PAUSED _UxGT("Druck pausiert") #define MSG_PRINT_PAUSED _UxGT("Druck pausiert")
#define MSG_RESUMING _UxGT("Druckfortsetzung")
#define MSG_PRINT_ABORTED _UxGT("Druck abgebrochen") #define MSG_PRINT_ABORTED _UxGT("Druck abgebrochen")
#define MSG_NO_MOVE _UxGT("Motoren eingeschaltet") #define MSG_NO_MOVE _UxGT("Motoren eingeschaltet")
#define MSG_KILLED _UxGT("ABGEBROCHEN") #define MSG_KILLED _UxGT("ABGEBROCHEN")
@ -218,9 +217,7 @@
#define MSG_SHORT_HOUR _UxGT("h") // One character only #define MSG_SHORT_HOUR _UxGT("h") // One character only
#define MSG_SHORT_MINUTE _UxGT("m") // One character only #define MSG_SHORT_MINUTE _UxGT("m") // One character only
#define MSG_HEATING _UxGT("Extr. heizt...") #define MSG_HEATING _UxGT("Extr. heizt...")
#define MSG_HEATING_COMPLETE _UxGT("Extr. aufgeheizt")
#define MSG_BED_HEATING _UxGT("Bett heizt...") #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 _UxGT("Delta kalibrieren")
#define MSG_DELTA_CALIBRATE_X _UxGT("Kalibriere X") #define MSG_DELTA_CALIBRATE_X _UxGT("Kalibriere X")
#define MSG_DELTA_CALIBRATE_Y _UxGT("Kalibriere Y") #define MSG_DELTA_CALIBRATE_Y _UxGT("Kalibriere Y")

7
Marlin/src/lcd/language/language_el-gr.h
View file

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

3
Marlin/src/lcd/language/language_el.h
View file

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

17
Marlin/src/lcd/language/language_en.h
View file

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

3
Marlin/src/lcd/language/language_es.h
View file

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

5
Marlin/src/lcd/language/language_eu.h
View file

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

1
Marlin/src/lcd/language/language_fi.h
View file

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

3
Marlin/src/lcd/language/language_fr.h
View file

@ -253,7 +253,6 @@
#define MSG_DWELL _UxGT("Repos...") #define MSG_DWELL _UxGT("Repos...")
#define MSG_USERWAIT _UxGT("Atten. de l'util.") #define MSG_USERWAIT _UxGT("Atten. de l'util.")
#define MSG_PRINT_PAUSED _UxGT("Impr. en pause") #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_PRINT_ABORTED _UxGT("Impr. Annulée")
#define MSG_NO_MOVE _UxGT("Moteurs bloqués.") #define MSG_NO_MOVE _UxGT("Moteurs bloqués.")
#define MSG_KILLED _UxGT("MORT.") #define MSG_KILLED _UxGT("MORT.")
@ -303,9 +302,7 @@
#define MSG_SHORT_MINUTE _UxGT("m") // One character only #define MSG_SHORT_MINUTE _UxGT("m") // One character only
#define MSG_HEATING _UxGT("En chauffe...") #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_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 _UxGT("Calibration Delta")
#define MSG_DELTA_CALIBRATE_X _UxGT("Calibrer X") #define MSG_DELTA_CALIBRATE_X _UxGT("Calibrer X")
#define MSG_DELTA_CALIBRATE_Y _UxGT("Calibrer Y") #define MSG_DELTA_CALIBRATE_Y _UxGT("Calibrer Y")

5
Marlin/src/lcd/language/language_gl.h
View file

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

5
Marlin/src/lcd/language/language_hr.h
View file

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

3
Marlin/src/lcd/language/language_it.h
View file

@ -251,7 +251,6 @@
#define MSG_DWELL _UxGT("Sospensione...") #define MSG_DWELL _UxGT("Sospensione...")
#define MSG_USERWAIT _UxGT("Premi tasto..") #define MSG_USERWAIT _UxGT("Premi tasto..")
#define MSG_PRINT_PAUSED _UxGT("Stampa sospesa") #define MSG_PRINT_PAUSED _UxGT("Stampa sospesa")
#define MSG_RESUMING _UxGT("Riprendi Stampa")
#define MSG_PRINT_ABORTED _UxGT("Stampa annullata") #define MSG_PRINT_ABORTED _UxGT("Stampa annullata")
#define MSG_NO_MOVE _UxGT("Nessun Movimento") #define MSG_NO_MOVE _UxGT("Nessun Movimento")
#define MSG_KILLED _UxGT("UCCISO. ") #define MSG_KILLED _UxGT("UCCISO. ")
@ -300,12 +299,10 @@
#define MSG_SHORT_HOUR _UxGT("h") // One character only #define MSG_SHORT_HOUR _UxGT("h") // One character only
#define MSG_SHORT_MINUTE _UxGT("m") // One character only #define MSG_SHORT_MINUTE _UxGT("m") // One character only
#define MSG_HEATING _UxGT("Riscaldamento...") #define MSG_HEATING _UxGT("Riscaldamento...")
#define MSG_HEATING_COMPLETE _UxGT("Risc. completato")
#define MSG_COOLING _UxGT("Raffreddamento..") #define MSG_COOLING _UxGT("Raffreddamento..")
#define MSG_COOLING_COMPLETE _UxGT("Raff.completato.") #define MSG_COOLING_COMPLETE _UxGT("Raff.completato.")
#define MSG_BED_HEATING _UxGT("Risc. piatto...") #define MSG_BED_HEATING _UxGT("Risc. piatto...")
#define MSG_BED_COOLING _UxGT("Raffr. 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 _UxGT("Calibraz. Delta")
#define MSG_DELTA_CALIBRATE_X _UxGT("Calibra X") #define MSG_DELTA_CALIBRATE_X _UxGT("Calibra X")
#define MSG_DELTA_CALIBRATE_Y _UxGT("Calibra Y") #define MSG_DELTA_CALIBRATE_Y _UxGT("Calibra Y")

5
Marlin/src/lcd/language/language_jp-kana.h
View file

@ -143,7 +143,6 @@
#define MSG_NO_CARD _UxGT("SDカードガアリマセン") // "No SD card" #define MSG_NO_CARD _UxGT("SDカードガアリマセン") // "No SD card"
#define MSG_DWELL _UxGT("キュウシ") // "Sleep..." #define MSG_DWELL _UxGT("キュウシ") // "Sleep..."
#define MSG_USERWAIT _UxGT("シバラクオマチクダサイ") // "Wait for user..." #define MSG_USERWAIT _UxGT("シバラクオマチクダサイ") // "Wait for user..."
#define MSG_RESUMING _UxGT("プリントサイカイ") // "Resuming print"
#define MSG_PRINT_ABORTED _UxGT("プリントガチュウシサレマシタ") // "Print aborted" #define MSG_PRINT_ABORTED _UxGT("プリントガチュウシサレマシタ") // "Print aborted"
#define MSG_NO_MOVE _UxGT("ウゴキマセン") // "No move." #define MSG_NO_MOVE _UxGT("ウゴキマセン") // "No move."
#define MSG_KILLED _UxGT("ヒジョウテイシ") // "KILLED. " #define MSG_KILLED _UxGT("ヒジョウテイシ") // "KILLED. "
@ -183,9 +182,7 @@
#define MSG_SHORT_HOUR _UxGT("h") // One character only #define MSG_SHORT_HOUR _UxGT("h") // One character only
#define MSG_SHORT_MINUTE _UxGT("m") // One character only #define MSG_SHORT_MINUTE _UxGT("m") // One character only
#define MSG_HEATING _UxGT("カネツチュウ") // "Heating..." #define MSG_HEATING _UxGT("カネツチュウ") // "Heating..."
#define MSG_HEATING_COMPLETE _UxGT("カネツカンリョウ") // "Heating done." #define MSG_BED_HEATING _UxGT("ベッド カネツチュウ") // "Bed Heating..."
#define MSG_BED_HEATING _UxGT("ベッド カネツチュウ") // "Bed Heating."
#define MSG_BED_DONE _UxGT("ベッド カネツカンリョウ") // "Bed done."
#define MSG_DELTA_CALIBRATE _UxGT("デルタ コウセイ") // "Delta Calibration" #define MSG_DELTA_CALIBRATE _UxGT("デルタ コウセイ") // "Delta Calibration"
#define MSG_DELTA_CALIBRATE_X _UxGT("Xジク コウセイ") // "Calibrate X" #define MSG_DELTA_CALIBRATE_X _UxGT("Xジク コウセイ") // "Calibrate X"
#define MSG_DELTA_CALIBRATE_Y _UxGT("Yジク コウセイ") // "Calibrate Y" #define MSG_DELTA_CALIBRATE_Y _UxGT("Yジク コウセイ") // "Calibrate Y"

5
Marlin/src/lcd/language/language_nl.h
View file

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

3
Marlin/src/lcd/language/language_pl.h
View file

@ -148,7 +148,6 @@
#define MSG_NO_CARD _UxGT("Brak karty") #define MSG_NO_CARD _UxGT("Brak karty")
#define MSG_DWELL _UxGT("Uśpij...") #define MSG_DWELL _UxGT("Uśpij...")
#define MSG_USERWAIT _UxGT("Oczekiwanie...") #define MSG_USERWAIT _UxGT("Oczekiwanie...")
#define MSG_RESUMING _UxGT("Wznawianie druku")
#define MSG_PRINT_ABORTED _UxGT("Druk przerwany") #define MSG_PRINT_ABORTED _UxGT("Druk przerwany")
#define MSG_NO_MOVE _UxGT("Brak ruchu") #define MSG_NO_MOVE _UxGT("Brak ruchu")
#define MSG_KILLED _UxGT("Ubity. ") #define MSG_KILLED _UxGT("Ubity. ")
@ -188,9 +187,7 @@
#define MSG_SHORT_HOUR _UxGT("g") // One character only #define MSG_SHORT_HOUR _UxGT("g") // One character only
#define MSG_SHORT_MINUTE _UxGT("m") // One character only #define MSG_SHORT_MINUTE _UxGT("m") // One character only
#define MSG_HEATING _UxGT("Rozgrzewanie...") #define MSG_HEATING _UxGT("Rozgrzewanie...")
#define MSG_HEATING_COMPLETE _UxGT("Rozgrzano")
#define MSG_BED_HEATING _UxGT("Rozgrzewanie stołu...") #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 _UxGT("Kalibrowanie Delty")
#define MSG_DELTA_CALIBRATE_X _UxGT("Kalibruj X") #define MSG_DELTA_CALIBRATE_X _UxGT("Kalibruj X")
#define MSG_DELTA_CALIBRATE_Y _UxGT("Kalibruj Y") #define MSG_DELTA_CALIBRATE_Y _UxGT("Kalibruj Y")

5
Marlin/src/lcd/language/language_pt-br.h
View file

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

5
Marlin/src/lcd/language/language_pt.h
View file

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

7
Marlin/src/lcd/language/language_ru.h
View file

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

7
Marlin/src/lcd/language/language_sk.h
View file

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

5
Marlin/src/lcd/language/language_tr.h
View file

@ -156,7 +156,6 @@
#define MSG_NO_CARD _UxGT("SD Kart Yok") // SD Kart Yok #define MSG_NO_CARD _UxGT("SD Kart Yok") // SD Kart Yok
#define MSG_DWELL _UxGT("Uyku...") // Uyku... #define MSG_DWELL _UxGT("Uyku...") // Uyku...
#define MSG_USERWAIT _UxGT("Operatör bekleniyor...") // Operatör bekleniyor... #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_PRINT_ABORTED _UxGT("Baskı Durduruldu") // Baskı Durduruldu
#define MSG_NO_MOVE _UxGT("İşlem yok.") // İşlem yok. #define MSG_NO_MOVE _UxGT("İşlem yok.") // İşlem yok.
#define MSG_KILLED _UxGT("Kilitlendi. ") // Kilitlendi. #define MSG_KILLED _UxGT("Kilitlendi. ") // Kilitlendi.
@ -196,9 +195,7 @@
#define MSG_SHORT_HOUR _UxGT("S") // One character only // S #define MSG_SHORT_HOUR _UxGT("S") // One character only // S
#define MSG_SHORT_MINUTE _UxGT("D") // One character only // D #define MSG_SHORT_MINUTE _UxGT("D") // One character only // D
#define MSG_HEATING _UxGT("Isınıyor...") // Isınıyor... #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_HEATING _UxGT("Tabla Isınıyor.") // Tabla Isınıyor.
#define MSG_BED_DONE _UxGT("Tabla hazır.") // Tabla hazır.
#define MSG_DELTA_CALIBRATE _UxGT("Delta Kalibrasyonu") // Delta Kalibrasyonu #define MSG_DELTA_CALIBRATE _UxGT("Delta Kalibrasyonu") // Delta Kalibrasyonu
#define MSG_DELTA_CALIBRATE_X _UxGT("Ayarla X") // Ayarla X #define MSG_DELTA_CALIBRATE_X _UxGT("Ayarla X") // Ayarla X
#define MSG_DELTA_CALIBRATE_Y _UxGT("Ayarla Y") // Ayarla Y #define MSG_DELTA_CALIBRATE_Y _UxGT("Ayarla Y") // Ayarla Y

5
Marlin/src/lcd/language/language_uk.h
View file

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

5
Marlin/src/lcd/language/language_zh_CN.h
View file

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

5
Marlin/src/lcd/language/language_zh_TW.h
View file

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

40
Marlin/src/lcd/ultralcd.cpp
View file

@ -754,7 +754,27 @@ void lcd_status_screen() {
lcd_implementation_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);
}
/** /**
* *
@ -785,7 +805,7 @@ void kill_screen(const char* lcd_msg) {
} }
void lcd_quick_feedback(const bool clear_buttons) { void lcd_quick_feedback(const bool clear_buttons) {
lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; lcd_refresh();
if (clear_buttons) buttons = 0; if (clear_buttons) buttons = 0;
next_button_update_ms = millis() + 500; next_button_update_ms = millis() + 500;
@ -823,7 +843,7 @@ void kill_screen(const char* lcd_msg) {
#if ENABLED(PARK_HEAD_ON_PAUSE) #if ENABLED(PARK_HEAD_ON_PAUSE)
enqueue_and_echo_commands_P(PSTR("M125")); enqueue_and_echo_commands_P(PSTR("M125"));
#endif #endif
lcd_setstatusPGM(PSTR(MSG_PRINT_PAUSED), -1); lcd_reset_status();
} }
void lcd_sdcard_resume() { void lcd_sdcard_resume() {
@ -3846,7 +3866,7 @@ void kill_screen(const char* lcd_msg) {
encoderPosition = card.updir() ? ENCODER_STEPS_PER_MENU_ITEM : 0; encoderPosition = card.updir() ? ENCODER_STEPS_PER_MENU_ITEM : 0;
encoderTopLine = 0; encoderTopLine = 0;
screen_changed = true; screen_changed = true;
lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; lcd_refresh();
} }
/** /**
@ -4707,8 +4727,7 @@ void kill_screen(const char* lcd_msg) {
void menu_edit_callback_ ## _name() { if (_menu_edit_ ## _name()) (*callbackFunc)(); } \ 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) { \ void _menu_action_setting_edit_ ## _name(const char * const pstr, _type* const ptr, const _type minValue, const _type maxValue) { \
lcd_save_previous_screen(); \ lcd_save_previous_screen(); \
\ lcd_refresh(); \
lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; \
\ \
editLabel = pstr; \ editLabel = pstr; \
editValue = ptr; \ editValue = ptr; \
@ -4848,6 +4867,7 @@ void kill_screen(const char* lcd_msg) {
UNUSED(longFilename); UNUSED(longFilename);
card.openAndPrintFile(filename); card.openAndPrintFile(filename);
lcd_return_to_status(); lcd_return_to_status();
lcd_reset_status();
} }
void menu_action_sddirectory(const char* filename, char* longFilename) { void menu_action_sddirectory(const char* filename, char* longFilename) {
@ -4859,12 +4879,12 @@ void kill_screen(const char* lcd_msg) {
#if ENABLED(DOGLCD) #if ENABLED(DOGLCD)
drawing_screen = false; drawing_screen = false;
#endif #endif
lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; lcd_refresh();
} }
#endif // SDSUPPORT #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) { void menu_action_setting_edit_callback_bool(const char* pstr, bool* ptr, screenFunc_t callback) {
menu_action_setting_edit_bool(pstr, ptr); menu_action_setting_edit_bool(pstr, ptr);
(*callback)(); (*callback)();
@ -5037,7 +5057,7 @@ void lcd_update() {
if (old_sd_status != 2) LCD_MESSAGEPGM(MSG_SD_REMOVED); 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. lcd_implementation_init( // to maybe revive the LCD if static electricity killed it.
#if ENABLED(LCD_PROGRESS_BAR) #if ENABLED(LCD_PROGRESS_BAR)
currentScreen == lcd_status_screen ? CHARSET_INFO : CHARSET_MENU currentScreen == lcd_status_screen ? CHARSET_INFO : CHARSET_MENU
@ -5282,7 +5302,7 @@ void lcd_finishstatus(const bool persist=false) {
expire_status_ms = persist ? 0 : progress_bar_ms + PROGRESS_MSG_EXPIRE; expire_status_ms = persist ? 0 : progress_bar_ms + PROGRESS_MSG_EXPIRE;
#endif #endif
#endif #endif
lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; lcd_refresh();
#if ENABLED(FILAMENT_LCD_DISPLAY) && ENABLED(SDSUPPORT) #if ENABLED(FILAMENT_LCD_DISPLAY) && ENABLED(SDSUPPORT)
previous_lcd_status_ms = millis(); //get status message to show up for a while previous_lcd_status_ms = millis(); //get status message to show up for a while

4
Marlin/src/lcd/ultralcd.h
View file

@ -58,6 +58,7 @@
void lcd_setstatusPGM(const char* message, const int8_t level=0); void lcd_setstatusPGM(const char* message, const int8_t level=0);
void lcd_setalertstatusPGM(const char* message); void lcd_setalertstatusPGM(const char* message);
void lcd_reset_alert_level(); void lcd_reset_alert_level();
void lcd_reset_status();
void lcd_status_printf_P(const uint8_t level, const char * const fmt, ...); void lcd_status_printf_P(const uint8_t level, const char * const fmt, ...);
void lcd_kill_screen(); void lcd_kill_screen();
void kill_screen(const char* lcd_msg); void kill_screen(const char* lcd_msg);
@ -244,14 +245,13 @@
inline void lcd_status_printf_P(const uint8_t level, const char * const fmt, ...) { UNUSED(level); UNUSED(fmt); } 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_setalertstatusPGM(const char* message) { UNUSED(message); }
inline void lcd_reset_alert_level() {} inline void lcd_reset_alert_level() {}
inline void lcd_reset_status() {}
#endif // ULTRA_LCD #endif // ULTRA_LCD
#define LCD_MESSAGEPGM(x) lcd_setstatusPGM(PSTR(x)) #define LCD_MESSAGEPGM(x) lcd_setstatusPGM(PSTR(x))
#define LCD_ALERTMESSAGEPGM(x) lcd_setalertstatusPGM(PSTR(x)) #define LCD_ALERTMESSAGEPGM(x) lcd_setalertstatusPGM(PSTR(x))
void lcd_reset_status();
// For i2c define BUZZ to use lcd_buzz // For i2c define BUZZ to use lcd_buzz
#if ENABLED(LCD_USE_I2C_BUZZER) #if ENABLED(LCD_USE_I2C_BUZZER)
#define BUZZ(d,f) lcd_buzz(d, f) #define BUZZ(d,f) lcd_buzz(d, f)