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

Simplify home_z_safely, respect HOME_AFTER_DEACTIVATE

Browse Source
This commit is contained in:
Scott Lahteine 2020-07-05 18:00:37 -05:00
parent c02451b602
commit a6b8b12a6a
26 changed files with 5 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Marlin/src/core/language.h
View File

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

9
Marlin/src/gcode/calibrate/G28.cpp
View File

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

1
Marlin/src/lcd/language/language_an.h
View File

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

1
Marlin/src/lcd/language/language_ca.h
View File

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

1
Marlin/src/lcd/language/language_cz.h
View File

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

1
Marlin/src/lcd/language/language_da.h
View File

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

1
Marlin/src/lcd/language/language_de.h
View File

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

1
Marlin/src/lcd/language/language_en.h
View File

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

1
Marlin/src/lcd/language/language_es.h
View File

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

1
Marlin/src/lcd/language/language_eu.h
View File

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

1
Marlin/src/lcd/language/language_fr.h
View File

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

1
Marlin/src/lcd/language/language_gl.h
View File

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

1
Marlin/src/lcd/language/language_hu.h
View File

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

1
Marlin/src/lcd/language/language_it.h
View File

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

1
Marlin/src/lcd/language/language_jp_kana.h
View File

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

1
Marlin/src/lcd/language/language_nl.h
View File

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

1
Marlin/src/lcd/language/language_pl.h
View File

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

1
Marlin/src/lcd/language/language_pt_br.h
View File

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

1
Marlin/src/lcd/language/language_ro.h
View File

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

1
Marlin/src/lcd/language/language_ru.h
View File

@ -536,7 +536,6 @@ namespace Language_ru {
PROGMEM Language_Str MSG_ERR_MINTEMP_BED = _UxGT("Ошибка: Т стола мин.");
PROGMEM Language_Str MSG_ERR_MAXTEMP_CHAMBER = _UxGT("Ошибка:Т камеры макс");
PROGMEM Language_Str MSG_ERR_MINTEMP_CHAMBER = _UxGT("Ошибка:Т камеры мин.");
PROGMEM Language_Str MSG_ERR_Z_HOMING = _UxGT("Паркуй XY сначала");
PROGMEM Language_Str MSG_HALTED = _UxGT("ПРИНТЕР ОСТАНОВЛЕН");
PROGMEM Language_Str MSG_PLEASE_RESET = _UxGT("Сделайте сброс");
PROGMEM Language_Str MSG_SHORT_DAY = _UxGT("д"); // One character only

1
Marlin/src/lcd/language/language_sk.h
View File

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

1
Marlin/src/lcd/language/language_tr.h
View File

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

1
Marlin/src/lcd/language/language_uk.h
View File

@ -533,7 +533,6 @@ namespace Language_uk {
PROGMEM Language_Str MSG_ERR_MINTEMP_BED = _UxGT("МІНІМАЛЬНА Т") LCD_STR_DEGREE _UxGT(" СТОЛУ");
PROGMEM Language_Str MSG_ERR_MAXTEMP_CHAMBER = _UxGT("ПЕРЕГРІВ КАМЕРИ");
PROGMEM Language_Str MSG_ERR_MINTEMP_CHAMBER = _UxGT("МІНІМАЛЬНА Т") LCD_STR_DEGREE _UxGT(" КАМЕРИ");
PROGMEM Language_Str MSG_ERR_Z_HOMING = _UxGT("Першим дім по XY");
PROGMEM Language_Str MSG_HALTED = _UxGT("ПРИНТЕР ЗУПИНЕНО");
PROGMEM Language_Str MSG_PLEASE_RESET = _UxGT("Перезавантажте");
PROGMEM Language_Str MSG_SHORT_DAY = _UxGT("д"); // One character only

1
Marlin/src/lcd/language/language_vi.h
View File

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

1
Marlin/src/lcd/language/language_zh_CN.h
View File

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

1
Marlin/src/lcd/language/language_zh_TW.h
View File

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