Browse Source

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

* Remove obsolete strings
* Tweak some static consts
* Reset LCD status to fallbacks
Scott Lahteine 6 years ago
parent
commit
3396671011
No account linked to committer's email address
36 changed files with 67 additions and 138 deletions
  1. 1
    1
      Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
  2. 2
    2
      Marlin/src/feature/tmc_util.cpp
  3. 1
    1
      Marlin/src/gcode/calibrate/G33.cpp
  4. 2
    2
      Marlin/src/gcode/control/M111.cpp
  5. 3
    11
      Marlin/src/gcode/lcd/M0_M1.cpp
  6. 1
    1
      Marlin/src/gcode/temperature/M104_M109.cpp
  7. 1
    1
      Marlin/src/gcode/temperature/M140_M190.cpp
  8. 0
    3
      Marlin/src/lcd/language/language_an.h
  9. 0
    1
      Marlin/src/lcd/language/language_bg.h
  10. 1
    4
      Marlin/src/lcd/language/language_ca.h
  11. 1
    4
      Marlin/src/lcd/language/language_cz.h
  12. 1
    4
      Marlin/src/lcd/language/language_da.h
  13. 0
    3
      Marlin/src/lcd/language/language_de.h
  14. 2
    5
      Marlin/src/lcd/language/language_el-gr.h
  15. 0
    3
      Marlin/src/lcd/language/language_el.h
  16. 4
    13
      Marlin/src/lcd/language/language_en.h
  17. 0
    3
      Marlin/src/lcd/language/language_es.h
  18. 1
    4
      Marlin/src/lcd/language/language_eu.h
  19. 0
    1
      Marlin/src/lcd/language/language_fi.h
  20. 0
    3
      Marlin/src/lcd/language/language_fr.h
  21. 1
    4
      Marlin/src/lcd/language/language_gl.h
  22. 1
    4
      Marlin/src/lcd/language/language_hr.h
  23. 0
    3
      Marlin/src/lcd/language/language_it.h
  24. 1
    4
      Marlin/src/lcd/language/language_jp-kana.h
  25. 1
    4
      Marlin/src/lcd/language/language_nl.h
  26. 0
    3
      Marlin/src/lcd/language/language_pl.h
  27. 1
    4
      Marlin/src/lcd/language/language_pt-br.h
  28. 1
    4
      Marlin/src/lcd/language/language_pt.h
  29. 2
    5
      Marlin/src/lcd/language/language_ru.h
  30. 2
    5
      Marlin/src/lcd/language/language_sk.h
  31. 1
    4
      Marlin/src/lcd/language/language_tr.h
  32. 1
    4
      Marlin/src/lcd/language/language_uk.h
  33. 1
    4
      Marlin/src/lcd/language/language_zh_CN.h
  34. 1
    4
      Marlin/src/lcd/language/language_zh_TW.h
  35. 30
    10
      Marlin/src/lcd/ultralcd.cpp
  36. 2
    2
      Marlin/src/lcd/ultralcd.h

+ 1
- 1
Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp View File

@@ -626,8 +626,8 @@
626 626
 
627 627
     #if ENABLED(NEWPANEL)
628 628
       lcd_reset_alert_level();
629
-      LCD_MESSAGEPGM("");
630 629
       lcd_quick_feedback(true);
630
+      lcd_reset_status();
631 631
       lcd_external_control = false;
632 632
     #endif
633 633
 

+ 2
- 2
Marlin/src/feature/tmc_util.cpp View File

@@ -217,12 +217,12 @@ bool report_tmc_status = false;
217 217
 #endif // MONITOR_DRIVER_STATUS
218 218
 
219 219
 void _tmc_say_axis(const TMC_AxisEnum axis) {
220
-  const static char ext_X[]  PROGMEM = "X",  ext_Y[]  PROGMEM = "Y",  ext_Z[]  PROGMEM = "Z",
220
+  static const char ext_X[]  PROGMEM = "X",  ext_Y[]  PROGMEM = "Y",  ext_Z[]  PROGMEM = "Z",
221 221
                     ext_X2[] PROGMEM = "X2", ext_Y2[] PROGMEM = "Y2", ext_Z2[] PROGMEM = "Z2",
222 222
                     ext_E0[] PROGMEM = "E0", ext_E1[] PROGMEM = "E1",
223 223
                     ext_E2[] PROGMEM = "E2", ext_E3[] PROGMEM = "E3",
224 224
                     ext_E4[] PROGMEM = "E4";
225
-  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 };
225
+  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 };
226 226
   serialprintPGM((char*)pgm_read_ptr(&tmc_axes[axis]));
227 227
 }
228 228
 

+ 1
- 1
Marlin/src/gcode/calibrate/G33.cpp View File

@@ -483,7 +483,7 @@ void GcodeSuite::G33() {
483 483
              _opposite_results    = (_4p_calibration && !towers_set) || probe_points >= 3,
484 484
              _endstop_results     = probe_points != 1 && probe_points != -1 && probe_points != 0,
485 485
              _angle_results       = probe_points >= 3  && towers_set;
486
-  const static char save_message[] PROGMEM = "Save with M500 and/or copy to Configuration.h";
486
+  static const char save_message[] PROGMEM = "Save with M500 and/or copy to Configuration.h";
487 487
   int8_t iterations = 0;
488 488
   float test_precision,
489 489
         zero_std_dev = (verbose_level ? 999.0 : 0.0), // 0.0 in dry-run mode : forced end

+ 2
- 2
Marlin/src/gcode/control/M111.cpp View File

@@ -28,7 +28,7 @@
28 28
 void GcodeSuite::M111() {
29 29
   if (parser.seen('S')) marlin_debug_flags = parser.byteval('S');
30 30
 
31
-  const static char str_debug_1[] PROGMEM = MSG_DEBUG_ECHO,
31
+  static const char str_debug_1[] PROGMEM = MSG_DEBUG_ECHO,
32 32
                     str_debug_2[] PROGMEM = MSG_DEBUG_INFO,
33 33
                     str_debug_4[] PROGMEM = MSG_DEBUG_ERRORS,
34 34
                     str_debug_8[] PROGMEM = MSG_DEBUG_DRYRUN,
@@ -38,7 +38,7 @@ void GcodeSuite::M111() {
38 38
                     #endif
39 39
                     ;
40 40
 
41
-  const static char* const debug_strings[] PROGMEM = {
41
+  static const char* const debug_strings[] PROGMEM = {
42 42
     str_debug_1, str_debug_2, str_debug_4, str_debug_8, str_debug_16
43 43
     #if ENABLED(DEBUG_LEVELING_FEATURE)
44 44
       , str_debug_32

+ 3
- 11
Marlin/src/gcode/lcd/M0_M1.cpp View File

@@ -87,12 +87,8 @@ void GcodeSuite::M0_M1() {
87 87
     ms += millis();  // wait until this time for a click
88 88
     while (PENDING(millis(), ms) && wait_for_user) idle();
89 89
   }
90
-  else {
91
-    #if ENABLED(ULTIPANEL)
92
-      if (lcd_detected())
93
-    #endif
94
-        while (wait_for_user) idle();
95
-  }
90
+  else
91
+    while (wait_for_user) idle();
96 92
 
97 93
   #if ENABLED(PRINTER_EVENT_LEDS) && ENABLED(SDSUPPORT)
98 94
     if (lights_off_after_print) {
@@ -101,11 +97,7 @@ void GcodeSuite::M0_M1() {
101 97
     }
102 98
   #endif
103 99
 
104
-  #if ENABLED(ULTIPANEL)
105
-    if (lcd_detected()) {
106
-      IS_SD_PRINTING ? LCD_MESSAGEPGM(MSG_RESUMING) : LCD_MESSAGEPGM(WELCOME_MSG);
107
-    }
108
-  #endif
100
+  lcd_reset_status();
109 101
 
110 102
   wait_for_user = false;
111 103
   KEEPALIVE_STATE(IN_HANDLER);

+ 1
- 1
Marlin/src/gcode/temperature/M104_M109.cpp View File

@@ -243,7 +243,7 @@ void GcodeSuite::M109() {
243 243
   } while (wait_for_heatup && TEMP_CONDITIONS);
244 244
 
245 245
   if (wait_for_heatup) {
246
-    lcd_setstatusPGM(wants_to_cool ? PSTR(MSG_COOLING_COMPLETE) : PSTR(MSG_HEATING_COMPLETE));
246
+    lcd_reset_status();
247 247
     #if ENABLED(PRINTER_EVENT_LEDS)
248 248
       leds.set_white();
249 249
     #endif

+ 1
- 1
Marlin/src/gcode/temperature/M140_M190.cpp View File

@@ -171,7 +171,7 @@ void GcodeSuite::M190() {
171 171
 
172 172
   } while (wait_for_heatup && TEMP_BED_CONDITIONS);
173 173
 
174
-  if (wait_for_heatup) LCD_MESSAGEPGM(MSG_BED_DONE);
174
+  if (wait_for_heatup) lcd_reset_status();
175 175
   #if DISABLED(BUSY_WHILE_HEATING)
176 176
     KEEPALIVE_STATE(IN_HANDLER);
177 177
   #endif

+ 0
- 3
Marlin/src/lcd/language/language_an.h View File

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

+ 0
- 1
Marlin/src/lcd/language/language_bg.h View File

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

+ 1
- 4
Marlin/src/lcd/language/language_ca.h View File

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

+ 1
- 4
Marlin/src/lcd/language/language_cz.h View File

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

+ 1
- 4
Marlin/src/lcd/language/language_da.h View File

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

+ 0
- 3
Marlin/src/lcd/language/language_de.h View File

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

+ 2
- 5
Marlin/src/lcd/language/language_el-gr.h View File

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

+ 0
- 3
Marlin/src/lcd/language/language_el.h View File

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

+ 4
- 13
Marlin/src/lcd/language/language_en.h View File

@@ -681,8 +681,8 @@
681 681
 #ifndef MSG_PRINT_PAUSED
682 682
   #define MSG_PRINT_PAUSED                    _UxGT("Print paused")
683 683
 #endif
684
-#ifndef MSG_RESUMING
685
-  #define MSG_RESUMING                        _UxGT("Resuming print")
684
+#ifndef MSG_PRINTING
685
+  #define MSG_PRINTING                        _UxGT("Printing...")
686 686
 #endif
687 687
 #ifndef MSG_PRINT_ABORTED
688 688
   #define MSG_PRINT_ABORTED                   _UxGT("Print aborted")
@@ -831,23 +831,14 @@
831 831
 #ifndef MSG_HEATING
832 832
   #define MSG_HEATING                         _UxGT("Heating...")
833 833
 #endif
834
-#ifndef MSG_HEATING_COMPLETE
835
-  #define MSG_HEATING_COMPLETE                _UxGT("Heating done.")
836
-#endif
837 834
 #ifndef MSG_COOLING
838 835
   #define MSG_COOLING                         _UxGT("Cooling...")
839 836
 #endif
840
-#ifndef MSG_COOLING_COMPLETE
841
-  #define MSG_COOLING_COMPLETE                _UxGT("Cooling done.")
842
-#endif
843 837
 #ifndef MSG_BED_HEATING
844
-  #define MSG_BED_HEATING                     _UxGT("Bed heating.")
838
+  #define MSG_BED_HEATING                     _UxGT("Bed heating...")
845 839
 #endif
846 840
 #ifndef MSG_BED_COOLING
847
-  #define MSG_BED_COOLING                     _UxGT("Bed cooling.")
848
-#endif
849
-#ifndef MSG_BED_DONE
850
-  #define MSG_BED_DONE                        _UxGT("Bed done.")
841
+  #define MSG_BED_COOLING                     _UxGT("Bed cooling...")
851 842
 #endif
852 843
 #ifndef MSG_DELTA_CALIBRATE
853 844
   #define MSG_DELTA_CALIBRATE                 _UxGT("Delta Calibration")

+ 0
- 3
Marlin/src/lcd/language/language_es.h View File

@@ -145,7 +145,6 @@
145 145
 #define MSG_NO_CARD                         _UxGT("No hay tarjeta SD")
146 146
 #define MSG_DWELL                           _UxGT("Reposo...")
147 147
 #define MSG_USERWAIT                        _UxGT("Esperando órdenes")
148
-#define MSG_RESUMING                        _UxGT("Resumiendo impresión")
149 148
 #define MSG_PRINT_ABORTED                   _UxGT("Impresión cancelada")
150 149
 #define MSG_NO_MOVE                         _UxGT("Sin movimiento")
151 150
 #define MSG_KILLED                          _UxGT("Parada de emergencia")
@@ -185,9 +184,7 @@
185 184
 #define MSG_SHORT_HOUR                      _UxGT("h") // One character only
186 185
 #define MSG_SHORT_MINUTE                    _UxGT("m") // One character only
187 186
 #define MSG_HEATING                         _UxGT("Calentando...")
188
-#define MSG_HEATING_COMPLETE                _UxGT("Calentamiento listo")
189 187
 #define MSG_BED_HEATING                     _UxGT("Calentando Cama...")
190
-#define MSG_BED_DONE                        _UxGT("Cama Caliente")
191 188
 #define MSG_DELTA_CALIBRATE                 _UxGT("Calibración Delta")
192 189
 #define MSG_DELTA_CALIBRATE_X               _UxGT("Calibrar X")
193 190
 #define MSG_DELTA_CALIBRATE_Y               _UxGT("Calibrar Y")

+ 1
- 4
Marlin/src/lcd/language/language_eu.h View File

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

+ 0
- 1
Marlin/src/lcd/language/language_fi.h View File

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

+ 0
- 3
Marlin/src/lcd/language/language_fr.h View File

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

+ 1
- 4
Marlin/src/lcd/language/language_gl.h View File

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

+ 1
- 4
Marlin/src/lcd/language/language_hr.h View File

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

+ 0
- 3
Marlin/src/lcd/language/language_it.h View File

@@ -251,7 +251,6 @@
251 251
 #define MSG_DWELL                           _UxGT("Sospensione...")
252 252
 #define MSG_USERWAIT                        _UxGT("Premi tasto..")
253 253
 #define MSG_PRINT_PAUSED                    _UxGT("Stampa sospesa")
254
-#define MSG_RESUMING                        _UxGT("Riprendi Stampa")
255 254
 #define MSG_PRINT_ABORTED                   _UxGT("Stampa annullata")
256 255
 #define MSG_NO_MOVE                         _UxGT("Nessun Movimento")
257 256
 #define MSG_KILLED                          _UxGT("UCCISO. ")
@@ -300,12 +299,10 @@
300 299
 #define MSG_SHORT_HOUR                      _UxGT("h") // One character only
301 300
 #define MSG_SHORT_MINUTE                    _UxGT("m") // One character only
302 301
 #define MSG_HEATING                         _UxGT("Riscaldamento...")
303
-#define MSG_HEATING_COMPLETE                _UxGT("Risc. completato")
304 302
 #define MSG_COOLING                         _UxGT("Raffreddamento..")
305 303
 #define MSG_COOLING_COMPLETE                _UxGT("Raff.completato.")
306 304
 #define MSG_BED_HEATING                     _UxGT("Risc. piatto...")
307 305
 #define MSG_BED_COOLING                     _UxGT("Raffr. piatto...")
308
-#define MSG_BED_DONE                        _UxGT("Piatto pronto")
309 306
 #define MSG_DELTA_CALIBRATE                 _UxGT("Calibraz. Delta")
310 307
 #define MSG_DELTA_CALIBRATE_X               _UxGT("Calibra X")
311 308
 #define MSG_DELTA_CALIBRATE_Y               _UxGT("Calibra Y")

+ 1
- 4
Marlin/src/lcd/language/language_jp-kana.h View File

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

+ 1
- 4
Marlin/src/lcd/language/language_nl.h View File

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

+ 0
- 3
Marlin/src/lcd/language/language_pl.h View File

@@ -148,7 +148,6 @@
148 148
 #define MSG_NO_CARD                         _UxGT("Brak karty")
149 149
 #define MSG_DWELL                           _UxGT("Uśpij...")
150 150
 #define MSG_USERWAIT                        _UxGT("Oczekiwanie...")
151
-#define MSG_RESUMING                        _UxGT("Wznawianie druku")
152 151
 #define MSG_PRINT_ABORTED                   _UxGT("Druk przerwany")
153 152
 #define MSG_NO_MOVE                         _UxGT("Brak ruchu")
154 153
 #define MSG_KILLED                          _UxGT("Ubity. ")
@@ -188,9 +187,7 @@
188 187
 #define MSG_SHORT_HOUR                      _UxGT("g") // One character only
189 188
 #define MSG_SHORT_MINUTE                    _UxGT("m") // One character only
190 189
 #define MSG_HEATING                         _UxGT("Rozgrzewanie...")
191
-#define MSG_HEATING_COMPLETE                _UxGT("Rozgrzano")
192 190
 #define MSG_BED_HEATING                     _UxGT("Rozgrzewanie stołu...")
193
-#define MSG_BED_DONE                        _UxGT("Rozgrzano stół")
194 191
 #define MSG_DELTA_CALIBRATE                 _UxGT("Kalibrowanie Delty")
195 192
 #define MSG_DELTA_CALIBRATE_X               _UxGT("Kalibruj X")
196 193
 #define MSG_DELTA_CALIBRATE_Y               _UxGT("Kalibruj Y")

+ 1
- 4
Marlin/src/lcd/language/language_pt-br.h View File

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

+ 1
- 4
Marlin/src/lcd/language/language_pt.h View File

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

+ 2
- 5
Marlin/src/lcd/language/language_ru.h View File

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

+ 2
- 5
Marlin/src/lcd/language/language_sk.h View File

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

+ 1
- 4
Marlin/src/lcd/language/language_tr.h View File

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

+ 1
- 4
Marlin/src/lcd/language/language_uk.h View File

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

+ 1
- 4
Marlin/src/lcd/language/language_zh_CN.h View File

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

+ 1
- 4
Marlin/src/lcd/language/language_zh_TW.h View File

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

+ 30
- 10
Marlin/src/lcd/ultralcd.cpp View File

@@ -754,7 +754,27 @@ void lcd_status_screen() {
754 754
   lcd_implementation_status_screen();
755 755
 }
756 756
 
757
-void lcd_reset_status() { lcd_setstatusPGM(PSTR(""), -1); }
757
+/**
758
+ * Reset the status message
759
+ */
760
+void lcd_reset_status() {
761
+  static const char paused[] PROGMEM = MSG_PRINT_PAUSED;
762
+  static const char printing[] PROGMEM = MSG_PRINTING;
763
+  static const char welcome[] PROGMEM = WELCOME_MSG;
764
+  const char *msg;
765
+  if (print_job_timer.isPaused())
766
+    msg = paused;
767
+  #if ENABLED(SDSUPPORT)
768
+    else if (card.sdprinting)
769
+      return lcd_setstatus(card.longFilename[0] ? card.longFilename : card.filename, true);
770
+  #endif
771
+  else if (print_job_timer.isRunning())
772
+    msg = printing;
773
+  else
774
+    msg = welcome;
775
+
776
+  lcd_setstatusPGM(msg, -1);
777
+}
758 778
 
759 779
 /**
760 780
  *
@@ -785,7 +805,7 @@ void kill_screen(const char* lcd_msg) {
785 805
   }
786 806
 
787 807
   void lcd_quick_feedback(const bool clear_buttons) {
788
-    lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW;
808
+    lcd_refresh();
789 809
     if (clear_buttons) buttons = 0;
790 810
     next_button_update_ms = millis() + 500;
791 811
 
@@ -823,7 +843,7 @@ void kill_screen(const char* lcd_msg) {
823 843
       #if ENABLED(PARK_HEAD_ON_PAUSE)
824 844
         enqueue_and_echo_commands_P(PSTR("M125"));
825 845
       #endif
826
-      lcd_setstatusPGM(PSTR(MSG_PRINT_PAUSED), -1);
846
+      lcd_reset_status();
827 847
     }
828 848
 
829 849
     void lcd_sdcard_resume() {
@@ -3846,7 +3866,7 @@ void kill_screen(const char* lcd_msg) {
3846 3866
       encoderPosition = card.updir() ? ENCODER_STEPS_PER_MENU_ITEM : 0;
3847 3867
       encoderTopLine = 0;
3848 3868
       screen_changed = true;
3849
-      lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW;
3869
+      lcd_refresh();
3850 3870
     }
3851 3871
 
3852 3872
     /**
@@ -4707,8 +4727,7 @@ void kill_screen(const char* lcd_msg) {
4707 4727
     void menu_edit_callback_ ## _name() { if (_menu_edit_ ## _name()) (*callbackFunc)(); } \
4708 4728
     void _menu_action_setting_edit_ ## _name(const char * const pstr, _type* const ptr, const _type minValue, const _type maxValue) { \
4709 4729
       lcd_save_previous_screen(); \
4710
-      \
4711
-      lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; \
4730
+      lcd_refresh(); \
4712 4731
       \
4713 4732
       editLabel = pstr; \
4714 4733
       editValue = ptr; \
@@ -4848,6 +4867,7 @@ void kill_screen(const char* lcd_msg) {
4848 4867
       UNUSED(longFilename);
4849 4868
       card.openAndPrintFile(filename);
4850 4869
       lcd_return_to_status();
4870
+      lcd_reset_status();
4851 4871
     }
4852 4872
 
4853 4873
     void menu_action_sddirectory(const char* filename, char* longFilename) {
@@ -4859,12 +4879,12 @@ void kill_screen(const char* lcd_msg) {
4859 4879
       #if ENABLED(DOGLCD)
4860 4880
         drawing_screen = false;
4861 4881
       #endif
4862
-      lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW;
4882
+      lcd_refresh();
4863 4883
     }
4864 4884
 
4865 4885
   #endif // SDSUPPORT
4866 4886
 
4867
-  void menu_action_setting_edit_bool(const char* pstr, bool* ptr) { UNUSED(pstr); *ptr ^= true; lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; }
4887
+  void menu_action_setting_edit_bool(const char* pstr, bool* ptr) { UNUSED(pstr); *ptr ^= true; lcd_refresh(); }
4868 4888
   void menu_action_setting_edit_callback_bool(const char* pstr, bool* ptr, screenFunc_t callback) {
4869 4889
     menu_action_setting_edit_bool(pstr, ptr);
4870 4890
     (*callback)();
@@ -5037,7 +5057,7 @@ void lcd_update() {
5037 5057
         if (old_sd_status != 2) LCD_MESSAGEPGM(MSG_SD_REMOVED);
5038 5058
       }
5039 5059
 
5040
-      lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW;
5060
+      lcd_refresh();
5041 5061
       lcd_implementation_init( // to maybe revive the LCD if static electricity killed it.
5042 5062
         #if ENABLED(LCD_PROGRESS_BAR)
5043 5063
           currentScreen == lcd_status_screen ? CHARSET_INFO : CHARSET_MENU
@@ -5282,7 +5302,7 @@ void lcd_finishstatus(const bool persist=false) {
5282 5302
       expire_status_ms = persist ? 0 : progress_bar_ms + PROGRESS_MSG_EXPIRE;
5283 5303
     #endif
5284 5304
   #endif
5285
-  lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW;
5305
+  lcd_refresh();
5286 5306
 
5287 5307
   #if ENABLED(FILAMENT_LCD_DISPLAY) && ENABLED(SDSUPPORT)
5288 5308
     previous_lcd_status_ms = millis();  //get status message to show up for a while

+ 2
- 2
Marlin/src/lcd/ultralcd.h View File

@@ -58,6 +58,7 @@
58 58
   void lcd_setstatusPGM(const char* message, const int8_t level=0);
59 59
   void lcd_setalertstatusPGM(const char* message);
60 60
   void lcd_reset_alert_level();
61
+  void lcd_reset_status();
61 62
   void lcd_status_printf_P(const uint8_t level, const char * const fmt, ...);
62 63
   void lcd_kill_screen();
63 64
   void kill_screen(const char* lcd_msg);
@@ -244,14 +245,13 @@
244 245
   inline void lcd_status_printf_P(const uint8_t level, const char * const fmt, ...) { UNUSED(level); UNUSED(fmt); }
245 246
   inline void lcd_setalertstatusPGM(const char* message) { UNUSED(message); }
246 247
   inline void lcd_reset_alert_level() {}
248
+  inline void lcd_reset_status() {}
247 249
 
248 250
 #endif // ULTRA_LCD
249 251
 
250 252
 #define LCD_MESSAGEPGM(x)      lcd_setstatusPGM(PSTR(x))
251 253
 #define LCD_ALERTMESSAGEPGM(x) lcd_setalertstatusPGM(PSTR(x))
252 254
 
253
-void lcd_reset_status();
254
-
255 255
 // For i2c define BUZZ to use lcd_buzz
256 256
 #if ENABLED(LCD_USE_I2C_BUZZER)
257 257
   #define BUZZ(d,f) lcd_buzz(d, f)

Loading…
Cancel
Save