Browse Source

Simplify home_z_safely, respect HOME_AFTER_DEACTIVATE

Scott Lahteine 5 years ago
parent
commit
a6b8b12a6a

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

@@ -205,7 +205,6 @@
205 205
 #define STR_ERR_COLD_EXTRUDE_STOP           " cold extrusion prevented"
206 206
 #define STR_ERR_LONG_EXTRUDE_STOP           " too long extrusion prevented"
207 207
 #define STR_ERR_HOTEND_TOO_COLD             "Hotend too cold"
208
-#define STR_ERR_Z_HOMING_SER                "Home XY first"
209 208
 #define STR_ERR_EEPROM_WRITE                "Error writing to EEPROM!"
210 209
 
211 210
 #define STR_FILAMENT_CHANGE_HEAT_LCD        "Press button to heat nozzle"

+ 2
- 7
Marlin/src/gcode/calibrate/G28.cpp View File

@@ -115,13 +115,8 @@
115 115
 #if ENABLED(Z_SAFE_HOMING)
116 116
 
117 117
   inline void home_z_safely() {
118
-
119
-    // Disallow Z homing if X or Y are unknown
120
-    if (!TEST(axis_known_position, X_AXIS) || !TEST(axis_known_position, Y_AXIS)) {
121
-      LCD_MESSAGEPGM(MSG_ERR_Z_HOMING);
122
-      SERIAL_ECHO_MSG(STR_ERR_Z_HOMING_SER);
123
-      return;
124
-    }
118
+    // Disallow Z homing if X or Y homing is needed
119
+    if (axis_unhomed_error(_BV(X_AXIS) | _BV(Y_AXIS))) return;
125 120
 
126 121
     if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("home_z_safely >>>");
127 122
 

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

@@ -165,7 +165,6 @@ namespace Language_an {
165 165
   PROGMEM Language_Str MSG_THERMAL_RUNAWAY                 = _UxGT("Error de temperatura");
166 166
   PROGMEM Language_Str MSG_ERR_MAXTEMP                     = _UxGT("Error: Temp Max");
167 167
   PROGMEM Language_Str MSG_ERR_MINTEMP                     = _UxGT("Error: Temp Min");
168
-  PROGMEM Language_Str MSG_ERR_Z_HOMING                    = _UxGT("Home XY first");
169 168
   PROGMEM Language_Str MSG_HALTED                          = _UxGT("IMPRESORA ATURADA");
170 169
   PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("Per favor reinic.");
171 170
   PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("d");

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

@@ -156,7 +156,6 @@ namespace Language_ca {
156 156
   PROGMEM Language_Str MSG_THERMAL_RUNAWAY                 = _UxGT("THERMAL RUNAWAY");
157 157
   PROGMEM Language_Str MSG_ERR_MAXTEMP                     = _UxGT("Err: TEMP MAXIMA");
158 158
   PROGMEM Language_Str MSG_ERR_MINTEMP                     = _UxGT("Err: TEMP MINIMA");
159
-  PROGMEM Language_Str MSG_ERR_Z_HOMING                    = _UxGT("Home XY primer");
160 159
   PROGMEM Language_Str MSG_HALTED                          = _UxGT("IMPRESSORA PARADA");
161 160
   PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("Reinicieu");
162 161
   PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("d"); // One character only

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

@@ -413,7 +413,6 @@ namespace Language_cz {
413 413
   PROGMEM Language_Str MSG_ERR_MINTEMP_BED                 = _UxGT("NÍZ. TEPL. PODL.");
414 414
   PROGMEM Language_Str MSG_ERR_MAXTEMP_CHAMBER             = _UxGT("Err: MAXTEMP KOMORA");
415 415
   PROGMEM Language_Str MSG_ERR_MINTEMP_CHAMBER             = _UxGT("Err: MINTEMP KOMORA");
416
-  PROGMEM Language_Str MSG_ERR_Z_HOMING                    = _UxGT("Domů XY první");
417 416
   PROGMEM Language_Str MSG_HALTED                          = _UxGT("TISK. ZASTAVENA");
418 417
   PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("Proveďte reset");
419 418
   PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("d");

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

@@ -141,7 +141,6 @@ namespace Language_da {
141 141
   PROGMEM Language_Str MSG_ERR_MINTEMP                     = _UxGT("Fejl: Min temp");
142 142
   PROGMEM Language_Str MSG_ERR_MAXTEMP_BED                 = _UxGT("Fejl: Maks Plade temp");
143 143
   PROGMEM Language_Str MSG_ERR_MINTEMP_BED                 = _UxGT("Fejl: Min Plade temp");
144
-  PROGMEM Language_Str MSG_ERR_Z_HOMING                    = _UxGT("Home XY først");
145 144
   PROGMEM Language_Str MSG_HALTED                          = _UxGT("PRINTER STOPPET");
146 145
   PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("Reset Venligst");
147 146
   PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("d"); // Kun et bogstav

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

@@ -404,7 +404,6 @@ namespace Language_de {
404 404
   PROGMEM Language_Str MSG_ERR_MINTEMP_BED                 = _UxGT("BETT ") LCD_STR_THERMOMETER _UxGT(" UNTERSCHRITTEN");
405 405
   PROGMEM Language_Str MSG_ERR_MAXTEMP_CHAMBER             = _UxGT("Err:Gehäuse max Temp");
406 406
   PROGMEM Language_Str MSG_ERR_MINTEMP_CHAMBER             = _UxGT("Err:Gehäuse min Temp");
407
-  PROGMEM Language_Str MSG_ERR_Z_HOMING                    = _UxGT("Vorher XY homen");
408 407
   PROGMEM Language_Str MSG_HALTED                          = _UxGT("DRUCKER GESTOPPT");
409 408
   PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("Bitte neustarten");
410 409
   PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("t"); // One character only

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

@@ -455,7 +455,6 @@ namespace Language_en {
455 455
   PROGMEM Language_Str MSG_ERR_MINTEMP_BED                 = _UxGT("Err: MINTEMP BED");
456 456
   PROGMEM Language_Str MSG_ERR_MAXTEMP_CHAMBER             = _UxGT("Err: MAXTEMP CHAMBER");
457 457
   PROGMEM Language_Str MSG_ERR_MINTEMP_CHAMBER             = _UxGT("Err: MINTEMP CHAMBER");
458
-  PROGMEM Language_Str MSG_ERR_Z_HOMING                    = _UxGT("Home XY First");
459 458
   PROGMEM Language_Str MSG_HALTED                          = _UxGT("PRINTER HALTED");
460 459
   PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("Please Reset");
461 460
   PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("d"); // One character only

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

@@ -424,7 +424,6 @@ namespace Language_es {
424 424
   PROGMEM Language_Str MSG_ERR_MINTEMP_BED                 = _UxGT("Err:TEMP. MIN CAMA");
425 425
   PROGMEM Language_Str MSG_ERR_MAXTEMP_CHAMBER             = _UxGT("Err:TEMP. MÁX CÁMARA");
426 426
   PROGMEM Language_Str MSG_ERR_MINTEMP_CHAMBER             = _UxGT("Err:TEMP. MIN CÁMARA");
427
-  PROGMEM Language_Str MSG_ERR_Z_HOMING                    = _UxGT("Origen XY Primero");
428 427
   PROGMEM Language_Str MSG_HALTED                          = _UxGT("IMPRESORA DETENIDA");
429 428
   PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("Por favor, reinicie");
430 429
   PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("d"); // One character only

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

@@ -243,7 +243,6 @@ namespace Language_eu {
243 243
   PROGMEM Language_Str MSG_ERR_MINTEMP                     = _UxGT("Err: Tenp Minimoa");
244 244
   PROGMEM Language_Str MSG_ERR_MAXTEMP_BED                 = _UxGT("Err: Ohe Tenp Max");
245 245
   PROGMEM Language_Str MSG_ERR_MINTEMP_BED                 = _UxGT("Err: Ohe Tenp Min");
246
-  PROGMEM Language_Str MSG_ERR_Z_HOMING                    = _UxGT("Etxera XY lehenengo");
247 246
   PROGMEM Language_Str MSG_HALTED                          = _UxGT("INPRIMA. GELDIRIK");
248 247
   PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("Berrabia. Mesedez");
249 248
   PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("d"); // One character only

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

@@ -399,7 +399,6 @@ namespace Language_fr {
399 399
   PROGMEM Language_Str MSG_THERMAL_RUNAWAY                 = _UxGT("Err THERMIQUE");
400 400
   PROGMEM Language_Str MSG_ERR_MAXTEMP                     = _UxGT("Err TEMP. MAX");
401 401
   PROGMEM Language_Str MSG_ERR_MINTEMP                     = _UxGT("Err TEMP. MIN");
402
-  PROGMEM Language_Str MSG_ERR_Z_HOMING                    = _UxGT("Origine XY Premier");
403 402
 
404 403
   PROGMEM Language_Str MSG_HALTED                          = _UxGT("IMPR. STOPPÉE");
405 404
   PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("Redémarrer SVP");

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

@@ -446,7 +446,6 @@ namespace Language_gl {
446 446
   PROGMEM Language_Str MSG_ERR_MINTEMP_BED                 = _UxGT("Erro:TEMP MÍN CAMA");
447 447
   PROGMEM Language_Str MSG_ERR_MAXTEMP_CHAMBER             = _UxGT("Erro:TEMP MÁX CÁMARA");
448 448
   PROGMEM Language_Str MSG_ERR_MINTEMP_CHAMBER             = _UxGT("Erro:TEMP MÍN CÁMARA");
449
-  PROGMEM Language_Str MSG_ERR_Z_HOMING                    = _UxGT("Orixe XY Primeiro");
450 449
   PROGMEM Language_Str MSG_HALTED                          = _UxGT("IMPRESORA DETIDA");
451 450
   PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("Debe reiniciar!");
452 451
   PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("d"); // One character only

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

@@ -448,7 +448,6 @@ namespace Language_hu {
448 448
   PROGMEM Language_Str MSG_ERR_MINTEMP_BED                 = _UxGT("Hiba: MIN ÁGY HÖFOK");
449 449
   PROGMEM Language_Str MSG_ERR_MAXTEMP_CHAMBER             = _UxGT("Hiba: MAX KAMRA HÖFOK");
450 450
   PROGMEM Language_Str MSG_ERR_MINTEMP_CHAMBER             = _UxGT("Hiba: MIN KAMRA HÖFOK");
451
-  PROGMEM Language_Str MSG_ERR_Z_HOMING                    = _UxGT("XY Kezdöpont");
452 451
   PROGMEM Language_Str MSG_HALTED                          = _UxGT("A NYOMTATÓ LEFAGYOTT");
453 452
   PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("Indítsd újra!");
454 453
   PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("n"); // Csak egy karakter

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

@@ -453,7 +453,6 @@ namespace Language_it {
453 453
   PROGMEM Language_Str MSG_ERR_MINTEMP_BED                 = _UxGT("Err: TEMP MIN PIATTO");
454 454
   PROGMEM Language_Str MSG_ERR_MAXTEMP_CHAMBER             = _UxGT("Err: TEMP MAX CAMERA");
455 455
   PROGMEM Language_Str MSG_ERR_MINTEMP_CHAMBER             = _UxGT("Err: TEMP MIN CAMERA");
456
-  PROGMEM Language_Str MSG_ERR_Z_HOMING                    = _UxGT("Home XY prima");
457 456
   PROGMEM Language_Str MSG_HALTED                          = _UxGT("STAMPANTE FERMATA");
458 457
   PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("Riavviare prego");
459 458
   PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("g"); // Un solo carattere

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

@@ -183,7 +183,6 @@ namespace Language_jp_kana {
183 183
   PROGMEM Language_Str MSG_ERR_MINTEMP                     = _UxGT("エラー:サイテイオンミマン");          // "Err: MINTEMP"
184 184
   PROGMEM Language_Str MSG_ERR_MAXTEMP_BED                 = _UxGT("エラー:ベッド サイコウオンチョウカ");    // "Err: MAXTEMP BED"
185 185
   PROGMEM Language_Str MSG_ERR_MINTEMP_BED                 = _UxGT("エラー:ベッド サイテイオンミマン");     // "Err: MINTEMP BED"
186
-  PROGMEM Language_Str MSG_ERR_Z_HOMING                    = _UxGT("サキニ XY ヲフッキサセテクダサイ");     // "Home XY first"
187 186
   PROGMEM Language_Str MSG_HALTED                          = _UxGT("プリンターハテイシシマシタ");         // "PRINTER HALTED"
188 187
   PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("リセットシテクダサイ");              // "Please reset"
189 188
   PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("d");                          // One character only

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

@@ -163,7 +163,6 @@ namespace Language_nl {
163 163
   PROGMEM Language_Str MSG_ERR_MINTEMP                     = _UxGT("Err: Min. temp");
164 164
   PROGMEM Language_Str MSG_ERR_MAXTEMP_BED                 = _UxGT("Err: Max.tmp bed");
165 165
   PROGMEM Language_Str MSG_ERR_MINTEMP_BED                 = _UxGT("Err: Min.tmp bed");
166
-  PROGMEM Language_Str MSG_ERR_Z_HOMING                    = _UxGT("Home XY Eerst");
167 166
   PROGMEM Language_Str MSG_HALTED                          = _UxGT("PRINTER GESTOPT");
168 167
   PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("Reset A.U.B.");
169 168
   PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("d"); //  One character only. Keep English standard

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

@@ -394,7 +394,6 @@ namespace Language_pl {
394 394
   PROGMEM Language_Str MSG_ERR_MINTEMP_BED                 = _UxGT("Błąd: MINTEMP STÓŁ");
395 395
   PROGMEM Language_Str MSG_ERR_MAXTEMP_CHAMBER             = _UxGT("Błąd: MAXTEMP KOMORA");
396 396
   PROGMEM Language_Str MSG_ERR_MINTEMP_CHAMBER             = _UxGT("Błąd: MINTEMP KOMORA");
397
-  PROGMEM Language_Str MSG_ERR_Z_HOMING                    = _UxGT("Najpierw Home XY");
398 397
   PROGMEM Language_Str MSG_HALTED                          = _UxGT("Drukarka zatrzym.");
399 398
   PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("Proszę zresetować");
400 399
   PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("d"); // One character only

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

@@ -360,7 +360,6 @@ namespace Language_pt_br {
360 360
   PROGMEM Language_Str MSG_ERR_MINTEMP_BED                 = _UxGT("Erro:Temp Mesa Mín");
361 361
   PROGMEM Language_Str MSG_ERR_MAXTEMP_CHAMBER             = _UxGT("Erro:Temp Câmara Máx");
362 362
   PROGMEM Language_Str MSG_ERR_MINTEMP_CHAMBER             = _UxGT("Erro:Temp Câmara Min");
363
-  PROGMEM Language_Str MSG_ERR_Z_HOMING                    = _UxGT("Home XY Primeiro");
364 363
   PROGMEM Language_Str MSG_HALTED                          = _UxGT("IMPRESSORA PAROU");
365 364
   PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("Favor resetar");
366 365
   PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("d");

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

@@ -451,7 +451,6 @@ namespace Language_ro {
451 451
   PROGMEM Language_Str MSG_ERR_MINTEMP_BED                 = _UxGT("Err: MINTEMP BED");
452 452
   PROGMEM Language_Str MSG_ERR_MAXTEMP_CHAMBER             = _UxGT("Err: MAXTEMP CHAMBER");
453 453
   PROGMEM Language_Str MSG_ERR_MINTEMP_CHAMBER             = _UxGT("Err: MINTEMP CHAMBER");
454
-  PROGMEM Language_Str MSG_ERR_Z_HOMING                    = _UxGT("Home XY First");
455 454
   PROGMEM Language_Str MSG_HALTED                          = _UxGT("PRINTER HALTED");
456 455
   PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("Please Reset");
457 456
   PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("d"); // One character only

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

@@ -413,7 +413,7 @@ namespace Language_ru {
413 413
   PROGMEM Language_Str MSG_BUTTON_DONE                     = _UxGT("Готово");
414 414
   PROGMEM Language_Str MSG_BUTTON_BACK                     = _UxGT("Назад");
415 415
   PROGMEM Language_Str MSG_BUTTON_PROCEED                  = _UxGT("Продолжить");
416
-  
416
+
417 417
   PROGMEM Language_Str MSG_PAUSE_PRINT                     = _UxGT("Пауза печати");
418 418
   PROGMEM Language_Str MSG_RESUME_PRINT                    = _UxGT("Продолжить печать");
419 419
   PROGMEM Language_Str MSG_STOP_PRINT                      = _UxGT("Остановить печать");
@@ -536,7 +536,6 @@ namespace Language_ru {
536 536
   PROGMEM Language_Str MSG_ERR_MINTEMP_BED                 = _UxGT("Ошибка: Т стола мин.");
537 537
   PROGMEM Language_Str MSG_ERR_MAXTEMP_CHAMBER             = _UxGT("Ошибка:Т камеры макс");
538 538
   PROGMEM Language_Str MSG_ERR_MINTEMP_CHAMBER             = _UxGT("Ошибка:Т камеры мин.");
539
-  PROGMEM Language_Str MSG_ERR_Z_HOMING                    = _UxGT("Паркуй XY сначала");
540 539
   PROGMEM Language_Str MSG_HALTED                          = _UxGT("ПРИНТЕР ОСТАНОВЛЕН");
541 540
   PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("Сделайте сброс");
542 541
   PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("д"); // One character only

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

@@ -439,7 +439,6 @@ namespace Language_sk {
439 439
   PROGMEM Language_Str MSG_ERR_MINTEMP_BED                 = _UxGT("Chyba: MINTEMP PODL.");
440 440
   PROGMEM Language_Str MSG_ERR_MAXTEMP_CHAMBER             = _UxGT("Chyba: MAXTEMP KOMO.");
441 441
   PROGMEM Language_Str MSG_ERR_MINTEMP_CHAMBER             = _UxGT("Chyba: MINTEMP KOMO.");
442
-  PROGMEM Language_Str MSG_ERR_Z_HOMING                    = _UxGT("Najskôr os XY domov");
443 442
   PROGMEM Language_Str MSG_HALTED                          = _UxGT("TLAČIAREŇ ZASTAVENÁ");
444 443
   PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("Reštartuje ju");
445 444
   PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("d");

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

@@ -423,7 +423,6 @@ namespace Language_tr {
423 423
   PROGMEM Language_Str MSG_ERR_MINTEMP_BED                 = _UxGT("Hata: MIN.SIC. TABLA");
424 424
   PROGMEM Language_Str MSG_ERR_MAXTEMP_CHAMBER             = _UxGT("Hata: MAX.SIC ODA");
425 425
   PROGMEM Language_Str MSG_ERR_MINTEMP_CHAMBER             = _UxGT("Hata: MIN.SIC ODA");
426
-  PROGMEM Language_Str MSG_ERR_Z_HOMING                    = _UxGT("Önce XY Sıfırla");
427 426
   PROGMEM Language_Str MSG_HALTED                          = _UxGT("YAZICI DURDURULDU");
428 427
   PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("Lütfen Resetleyin");
429 428
   PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("G"); // One character only

+ 2
- 3
Marlin/src/lcd/language/language_uk.h View File

@@ -148,7 +148,7 @@ namespace Language_uk {
148 148
   PROGMEM Language_Str MSG_HOTEND_OFFSET_X                 = _UxGT("Друге сопло X");
149 149
   PROGMEM Language_Str MSG_HOTEND_OFFSET_Y                 = _UxGT("Друге сопло Y");
150 150
   PROGMEM Language_Str MSG_HOTEND_OFFSET_Z                 = _UxGT("Друге сопло Z");
151
-  
151
+
152 152
   PROGMEM Language_Str MSG_UBL_DOING_G29                   = _UxGT("Виконується G29");
153 153
   PROGMEM Language_Str MSG_UBL_TOOLS                       = _UxGT("Інструменти UBL");
154 154
   PROGMEM Language_Str MSG_UBL_LEVEL_BED                   = _UxGT("Налаштування UBL");
@@ -533,7 +533,6 @@ namespace Language_uk {
533 533
   PROGMEM Language_Str MSG_ERR_MINTEMP_BED                 = _UxGT("МІНІМАЛЬНА Т") LCD_STR_DEGREE _UxGT(" СТОЛУ");
534 534
   PROGMEM Language_Str MSG_ERR_MAXTEMP_CHAMBER             = _UxGT("ПЕРЕГРІВ КАМЕРИ");
535 535
   PROGMEM Language_Str MSG_ERR_MINTEMP_CHAMBER             = _UxGT("МІНІМАЛЬНА Т") LCD_STR_DEGREE _UxGT(" КАМЕРИ");
536
-  PROGMEM Language_Str MSG_ERR_Z_HOMING                    = _UxGT("Першим дім по XY");
537 536
   PROGMEM Language_Str MSG_HALTED                          = _UxGT("ПРИНТЕР ЗУПИНЕНО");
538 537
   PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("Перезавантажте");
539 538
   PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("д"); // One character only
@@ -651,7 +650,7 @@ namespace Language_uk {
651 650
   PROGMEM Language_Str MSG_KILL_HOMING_FAILED              = _UxGT("Помилка паркування");
652 651
   PROGMEM Language_Str MSG_LCD_PROBING_FAILED              = _UxGT("Помилка зондування");
653 652
   PROGMEM Language_Str MSG_M600_TOO_COLD                   = _UxGT("M600: низька Т") LCD_STR_DEGREE;
654
-  
653
+
655 654
   PROGMEM Language_Str MSG_MMU2_CHOOSE_FILAMENT_HEADER     = _UxGT("ОБЕРІТЬ ПРУТОК");
656 655
   PROGMEM Language_Str MSG_MMU2_MENU                       = _UxGT("Налаштування MMU");
657 656
   PROGMEM Language_Str MSG_KILL_MMU2_FIRMWARE              = _UxGT("Понови прошивку MMU!");

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

@@ -335,7 +335,6 @@ namespace Language_vi {
335 335
   PROGMEM Language_Str MSG_ERR_MINTEMP                     = _UxGT("Điều sai: nhiệt độ tối thiểu");         // Err: MINTEMP
336 336
   PROGMEM Language_Str MSG_ERR_MAXTEMP_BED                 = _UxGT("Điều sai: nhiệt độ bàn tối đa");        // Err: MAXTEMP BED
337 337
   PROGMEM Language_Str MSG_ERR_MINTEMP_BED                 = _UxGT("Điều sai: nhiệt độ bàn tối thiểu");     // Err: MINTEMP BED
338
-  PROGMEM Language_Str MSG_ERR_Z_HOMING                    = _UxGT("Về nhà XY Trước");                      // Home XY First
339 338
   PROGMEM Language_Str MSG_HALTED                          = _UxGT("MÁY IN ĐÃ DỪNG LẠI");                   // PRINTER HALTED
340 339
   PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("Xin bặt lại");                          // Please reset
341 340
   PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("n");                                    // d - ngày - One character only

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

@@ -444,7 +444,6 @@ namespace Language_zh_CN {
444 444
   PROGMEM Language_Str MSG_ERR_MINTEMP_BED                 = _UxGT("错误:最低热床温度");     //"Err: MINTEMP BED"
445 445
   PROGMEM Language_Str MSG_ERR_MAXTEMP_CHAMBER             = _UxGT("错误:最高机箱温度");
446 446
   PROGMEM Language_Str MSG_ERR_MINTEMP_CHAMBER             = _UxGT("错误:最低机箱温度");
447
-  PROGMEM Language_Str MSG_ERR_Z_HOMING                    = _UxGT("归位 XY 先");     // "Home XY First"
448 447
   PROGMEM Language_Str MSG_HALTED                          = _UxGT("打印停机");     //"PRINTER HALTED"
449 448
   PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("请重置");     //"Please reset"
450 449
   PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("天");     //"d" // One character only

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

@@ -391,7 +391,6 @@ namespace Language_zh_TW {
391 391
   PROGMEM Language_Str MSG_ERR_MINTEMP_BED                 = _UxGT("錯誤:最低熱床溫度");     //"Err: MINTEMP BED"
392 392
   PROGMEM Language_Str MSG_ERR_MAXTEMP_CHAMBER             = _UxGT("錯誤:最高機箱溫度");   //"Err: MAXTEMP CHAMBER"
393 393
   PROGMEM Language_Str MSG_ERR_MINTEMP_CHAMBER             = _UxGT("錯誤:最低機箱溫度");   //"Err: MINTEMP CHAMBER"
394
-  PROGMEM Language_Str MSG_ERR_Z_HOMING                    = _UxGT("歸位 XY 先");     //"Home XY First"
395 394
   PROGMEM Language_Str MSG_HALTED                          = _UxGT("印表機停機");     //"PRINTER HALTED"
396 395
   PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("請重置");     //"Please reset"
397 396
   PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("天");     //"d" // One character only

Loading…
Cancel
Save