diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 8baaa7cdd7..d4e3bc2fe1 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -1848,7 +1848,7 @@ static void setup_for_endstop_move() { float zpos = current_position[Z_AXIS], z_dest = Z_RAISE_BEFORE_PROBING; // The zprobe_zoffset is negative any switch below the nozzle, so // multiply by Z_HOME_DIR (-1) to move enough away from bed for the probe - z_dest += axis_known_position[Z_AXIS] ? zprobe_zoffset * Z_HOME_DIR : zpos; + z_dest += axis_homed[Z_AXIS] ? zprobe_zoffset * Z_HOME_DIR : zpos; if (zpos < z_dest) do_blocking_move_to_z(z_dest); // also updates current_position } @@ -1856,10 +1856,10 @@ static void setup_for_endstop_move() { #endif // AUTO_BED_LEVELING_FEATURE -static void unknown_position_error() { - LCD_MESSAGEPGM(MSG_POSITION_UNKNOWN); +static void axis_unhomed_error() { + LCD_MESSAGEPGM(MSG_YX_UNHOMED); SERIAL_ECHO_START; - SERIAL_ECHOLNPGM(MSG_POSITION_UNKNOWN); + SERIAL_ECHOLNPGM(MSG_YX_UNHOMED); } #if ENABLED(Z_PROBE_SLED) @@ -1884,8 +1884,8 @@ static void unknown_position_error() { if (z_probe_is_active == dock) return; - if (!axis_known_position[X_AXIS] || !axis_known_position[Y_AXIS]) { - unknown_position_error(); + if (!axis_homed[X_AXIS] || !axis_homed[Y_AXIS]) { + axis_unhomed_error(); return; } @@ -2616,7 +2616,7 @@ inline void gcode_G28() { else if (homeZ) { // Don't need to Home Z twice // Let's see if X and Y are homed - if (axis_known_position[X_AXIS] && axis_known_position[Y_AXIS]) { + if (axis_homed[X_AXIS] && axis_homed[Y_AXIS]) { // Make sure the Z probe is within the physical limits // NOTE: This doesn't necessarily ensure the Z probe is also within the bed! @@ -2636,7 +2636,7 @@ inline void gcode_G28() { } } else { - unknown_position_error(); + axis_unhomed_error(); } } // !home_all_axes && homeZ @@ -2908,8 +2908,8 @@ inline void gcode_G28() { #endif // Don't allow auto-leveling without homing first - if (!axis_known_position[X_AXIS] || !axis_known_position[Y_AXIS]) { - unknown_position_error(); + if (!axis_homed[X_AXIS] || !axis_homed[Y_AXIS]) { + axis_unhomed_error(); return; } @@ -3711,8 +3711,8 @@ inline void gcode_M42() { */ inline void gcode_M48() { - if (!axis_known_position[X_AXIS] || !axis_known_position[Y_AXIS] || !axis_known_position[Z_AXIS]) { - unknown_position_error(); + if (!axis_homed[X_AXIS] || !axis_homed[Y_AXIS] || !axis_homed[Z_AXIS]) { + axis_unhomed_error(); return; } @@ -5431,7 +5431,7 @@ inline void gcode_M428() { memcpy(new_pos, current_position, sizeof(new_pos)); memcpy(new_offs, home_offset, sizeof(new_offs)); for (int8_t i = X_AXIS; i <= Z_AXIS; i++) { - if (axis_known_position[i]) { + if (axis_homed[i]) { float base = (new_pos[i] > (min_pos[i] + max_pos[i]) / 2) ? base_home_pos(i) : 0, diff = new_pos[i] - base; if (diff > -20 && diff < 20) { diff --git a/Marlin/language_an.h b/Marlin/language_an.h index ab93671dc0..59678c0e34 100644 --- a/Marlin/language_an.h +++ b/Marlin/language_an.h @@ -138,7 +138,7 @@ #define MSG_INIT_SDCARD "Encetan. tarcheta" #define MSG_CNG_SDCARD "Cambiar tarcheta" #define MSG_ZPROBE_OUT "Z probe out. bed" -#define MSG_POSITION_UNKNOWN "Home X/Y before Z" +#define MSG_YX_UNHOMED "Home X/Y before Z" #define MSG_ZPROBE_ZOFFSET "Z Offset" #define MSG_BABYSTEP_X "Babystep X" #define MSG_BABYSTEP_Y "Babystep Y" diff --git a/Marlin/language_bg.h b/Marlin/language_bg.h index c6007dba36..f13b46e9a5 100644 --- a/Marlin/language_bg.h +++ b/Marlin/language_bg.h @@ -139,7 +139,7 @@ #define MSG_INIT_SDCARD "Иниц. SD-Карта" #define MSG_CNG_SDCARD "Смяна SD-Карта" #define MSG_ZPROBE_OUT "Z-сондата е извадена" -#define MSG_POSITION_UNKNOWN "Задайте X/Y преди Z" +#define MSG_YX_UNHOMED "Задайте X/Y преди Z" #define MSG_ZPROBE_ZOFFSET "Z Отстояние" #define MSG_BABYSTEP_X "Министъпка X" #define MSG_BABYSTEP_Y "Министъпка Y" diff --git a/Marlin/language_ca.h b/Marlin/language_ca.h index f08e29e32b..248af1f67e 100644 --- a/Marlin/language_ca.h +++ b/Marlin/language_ca.h @@ -139,7 +139,7 @@ #define MSG_INIT_SDCARD "Iniciant SD" #define MSG_CNG_SDCARD "Canviar SD" #define MSG_ZPROBE_OUT "Z probe out. bed" -#define MSG_POSITION_UNKNOWN "Home X/Y abans Z" +#define MSG_YX_UNHOMED "Home X/Y abans Z" #define MSG_ZPROBE_ZOFFSET "Z Offset" #define MSG_BABYSTEP_X "Babystep X" #define MSG_BABYSTEP_Y "Babystep Y" diff --git a/Marlin/language_cn.h b/Marlin/language_cn.h index e6a0ccf0af..0e4589fda0 100644 --- a/Marlin/language_cn.h +++ b/Marlin/language_cn.h @@ -138,7 +138,7 @@ #define MSG_INIT_SDCARD "Init. SD card" #define MSG_CNG_SDCARD "Change SD card" #define MSG_ZPROBE_OUT "Z probe out. bed" -#define MSG_POSITION_UNKNOWN "Home X/Y before Z" +#define MSG_YX_UNHOMED "Home X/Y before Z" #define MSG_ZPROBE_ZOFFSET "Z Offset" #define MSG_BABYSTEP_X "Babystep X" #define MSG_BABYSTEP_Y "Babystep Y" diff --git a/Marlin/language_cz.h b/Marlin/language_cz.h index 6555aa01ea..d916b6f6e7 100644 --- a/Marlin/language_cz.h +++ b/Marlin/language_cz.h @@ -144,7 +144,7 @@ #define MSG_INIT_SDCARD "Nacist SD kartu" #define MSG_CNG_SDCARD "Vymenit SD kartu" #define MSG_ZPROBE_OUT "Sonda Z mimo podl" -#define MSG_POSITION_UNKNOWN "Domu X/Y pred Z" +#define MSG_YX_UNHOMED "Domu X/Y pred Z" #define MSG_ZPROBE_ZOFFSET "Z ofset" #define MSG_BABYSTEP_X "Babystep X" #define MSG_BABYSTEP_Y "Babystep Y" diff --git a/Marlin/language_da.h b/Marlin/language_da.h index e47fd1c8fa..e05eb6433f 100644 --- a/Marlin/language_da.h +++ b/Marlin/language_da.h @@ -140,7 +140,7 @@ #define MSG_FILAMENTCHANGE "Skift filament" #define MSG_INIT_SDCARD "Init. SD card" #define MSG_CNG_SDCARD "Skift SD kort" -#define MSG_POSITION_UNKNOWN "Home X/Y før Z" +#define MSG_YX_UNHOMED "Home X/Y før Z" #define MSG_ZPROBE_ZOFFSET "Z Offset" #define MSG_BABYSTEP_X "Babystep X" #define MSG_BABYSTEP_Y "Babystep Y" diff --git a/Marlin/language_de.h b/Marlin/language_de.h index 3d791e2d35..0f8298b5bd 100644 --- a/Marlin/language_de.h +++ b/Marlin/language_de.h @@ -137,7 +137,7 @@ #define MSG_INIT_SDCARD "SDKarte erkennen"// Manually initialize the SD-card via user interface #define MSG_CNG_SDCARD "SDKarte erkennen"// SD-card changed by user. For machines with no autocarddetect. Both send "M21" #define MSG_ZPROBE_OUT "Sensor ausserhalb" -#define MSG_POSITION_UNKNOWN "X/Y vor Z homen." +#define MSG_YX_UNHOMED "X/Y vor Z homen." #define MSG_ZPROBE_ZOFFSET "Z Offset" #define MSG_BABYSTEP_X "Babystep X" #define MSG_BABYSTEP_Y "Babystep Y" diff --git a/Marlin/language_en.h b/Marlin/language_en.h index b4eb6d5cdf..b08f73ebf1 100644 --- a/Marlin/language_en.h +++ b/Marlin/language_en.h @@ -415,8 +415,8 @@ #ifndef MSG_ZPROBE_OUT #define MSG_ZPROBE_OUT "Z probe out. bed" #endif -#ifndef MSG_POSITION_UNKNOWN - #define MSG_POSITION_UNKNOWN "Home X/Y before Z" +#ifndef MSG_YX_UNHOMED + #define MSG_YX_UNHOMED "Home X/Y before Z" #endif #ifndef MSG_ZPROBE_ZOFFSET #define MSG_ZPROBE_ZOFFSET "Z Offset" diff --git a/Marlin/language_es.h b/Marlin/language_es.h index a8c4fc803c..54351176f1 100644 --- a/Marlin/language_es.h +++ b/Marlin/language_es.h @@ -139,7 +139,7 @@ #define MSG_INIT_SDCARD "Iniciando tarjeta" #define MSG_CNG_SDCARD "Cambiar tarjeta" #define MSG_ZPROBE_OUT "Sonda Z fuera" -#define MSG_POSITION_UNKNOWN "Reiniciar X/Y y Z" +#define MSG_YX_UNHOMED "Reiniciar X/Y y Z" #define MSG_ZPROBE_ZOFFSET "Offset Z" #define MSG_BABYSTEP_X "Micropaso X" #define MSG_BABYSTEP_Y "Micropaso Y" diff --git a/Marlin/language_eu.h b/Marlin/language_eu.h index 28e0e0c034..19ed22581c 100644 --- a/Marlin/language_eu.h +++ b/Marlin/language_eu.h @@ -138,7 +138,7 @@ #define MSG_INIT_SDCARD "Hasieratu txartela" #define MSG_CNG_SDCARD "Aldatu txartela" #define MSG_ZPROBE_OUT "Z ohe hasiera" -#define MSG_POSITION_UNKNOWN "Posizio ezezaguna" +#define MSG_YX_UNHOMED "Posizio ezezaguna" #define MSG_ZPROBE_ZOFFSET "Z konpentsatu" #define MSG_BABYSTEP_X "Babystep X" #define MSG_BABYSTEP_Y "Babystep Y" diff --git a/Marlin/language_fi.h b/Marlin/language_fi.h index b6f7de6fd8..73aba64fe3 100644 --- a/Marlin/language_fi.h +++ b/Marlin/language_fi.h @@ -138,7 +138,7 @@ #define MSG_INIT_SDCARD "Init. SD-Card" #define MSG_CNG_SDCARD "Change SD-Card" #define MSG_ZPROBE_OUT "Z probe out. bed" -#define MSG_POSITION_UNKNOWN "Home X/Y before Z" +#define MSG_YX_UNHOMED "Home X/Y before Z" #define MSG_ZPROBE_ZOFFSET "Z Offset" #define MSG_BABYSTEP_X "Babystep X" #define MSG_BABYSTEP_Y "Babystep Y" diff --git a/Marlin/language_fr.h b/Marlin/language_fr.h index 11aaf95754..3524c05ee5 100644 --- a/Marlin/language_fr.h +++ b/Marlin/language_fr.h @@ -140,7 +140,7 @@ #define MSG_INIT_SDCARD "Init. la carte SD" #define MSG_CNG_SDCARD "Changer de carte" #define MSG_ZPROBE_OUT "Z sonde exte. lit" -#define MSG_POSITION_UNKNOWN "Rev. dans XY av.Z" +#define MSG_YX_UNHOMED "Rev. dans XY av.Z" #define MSG_ZPROBE_ZOFFSET "Offset Z" #define MSG_BABYSTEP_X "Babystep X" #define MSG_BABYSTEP_Y "Babystep Y" diff --git a/Marlin/language_gl.h b/Marlin/language_gl.h index 2a15935309..11f21ac0e5 100644 --- a/Marlin/language_gl.h +++ b/Marlin/language_gl.h @@ -142,7 +142,7 @@ #define MSG_INIT_SDCARD "Iniciando SD" #define MSG_CNG_SDCARD "Cambiar SD" #define MSG_ZPROBE_OUT "Sonda-Z sen cama" -#define MSG_POSITION_UNKNOWN "X/Y antes que Z" +#define MSG_YX_UNHOMED "X/Y antes que Z" #define MSG_ZPROBE_ZOFFSET "Offset Z" #define MSG_BABYSTEP_X "Micropaso X" #define MSG_BABYSTEP_Y "Micropaso Y" diff --git a/Marlin/language_it.h b/Marlin/language_it.h index 23ad7c6c56..32526cba16 100644 --- a/Marlin/language_it.h +++ b/Marlin/language_it.h @@ -139,7 +139,7 @@ #define MSG_INIT_SDCARD "Iniz. SD-Card" #define MSG_CNG_SDCARD "Cambia SD-Card" #define MSG_ZPROBE_OUT "Z probe out. bed" -#define MSG_POSITION_UNKNOWN "Home X/Y before Z" +#define MSG_YX_UNHOMED "Home X/Y before Z" #define MSG_ZPROBE_ZOFFSET "Z Offset" #define MSG_BABYSTEP_X "Babystep X" #define MSG_BABYSTEP_Y "Babystep Y" diff --git a/Marlin/language_kana.h b/Marlin/language_kana.h index fca13e9294..c100594979 100644 --- a/Marlin/language_kana.h +++ b/Marlin/language_kana.h @@ -142,7 +142,7 @@ #define MSG_INIT_SDCARD "SD\xb6\xb0\xc4\xde\xbb\xb2\xd6\xd0\xba\xd0" // "Init. SD card" #define MSG_CNG_SDCARD "SD\xb6\xb0\xc4\xde\xba\xb3\xb6\xdd" // "Change SD card" #define MSG_ZPROBE_OUT "Z\xcc\xdf\xdb\xb0\xcc\xde\x20\xcd\xde\xaf\xc4\xde\xb6\xde\xb2" // "Z probe out. bed" -#define MSG_POSITION_UNKNOWN "\xb9\xde\xdd\xc3\xdd\xcaXY\xb2\xc4\xde\xb3\xba\xdeZ" // "Home X/Y before Z" +#define MSG_YX_UNHOMED "\xb9\xde\xdd\xc3\xdd\xcaXY\xb2\xc4\xde\xb3\xba\xdeZ" // "Home X/Y before Z" #define MSG_ZPROBE_ZOFFSET "Z\xb5\xcc\xbe\xaf\xc4" // "Z Offset" #define MSG_BABYSTEP_X "X\xbc\xde\xb8\x20\xcb\xde\xc4\xde\xb3" // "Babystep X" #define MSG_BABYSTEP_Y "Y\xbc\xde\xb8\x20\xcb\xde\xc4\xde\xb3" // "Babystep Y" diff --git a/Marlin/language_kana_utf8.h b/Marlin/language_kana_utf8.h index 4ca47a8e73..80d146ca18 100644 --- a/Marlin/language_kana_utf8.h +++ b/Marlin/language_kana_utf8.h @@ -146,7 +146,7 @@ #define MSG_INIT_SDCARD "SDカードサイヨミコミ" // "Init. SD card" #define MSG_CNG_SDCARD "SDカードコウカン" // "Change SD card" #define MSG_ZPROBE_OUT "Zプローブ ベッドガイ" // "Z probe out. bed" -#define MSG_POSITION_UNKNOWN "ゲンテンハXYイドウゴZ" // "Home X/Y before Z" +#define MSG_YX_UNHOMED "ゲンテンハXYイドウゴZ" // "Home X/Y before Z" #define MSG_ZPROBE_ZOFFSET "Zオフセット" // "Z Offset" #define MSG_BABYSTEP_X "Xジク ビドウ" // "Babystep X" #define MSG_BABYSTEP_Y "Yジク ビドウ" // "Babystep Y" diff --git a/Marlin/language_nl.h b/Marlin/language_nl.h index 27aefee013..a7304da1f8 100644 --- a/Marlin/language_nl.h +++ b/Marlin/language_nl.h @@ -138,7 +138,7 @@ #define MSG_INIT_SDCARD "Init. SD kaart" #define MSG_CNG_SDCARD "Verv. SD card" #define MSG_ZPROBE_OUT "Z probe uit. bed" -#define MSG_POSITION_UNKNOWN "Home X/Y voor Z" +#define MSG_YX_UNHOMED "Home X/Y voor Z" #define MSG_ZPROBE_ZOFFSET "Z Offset" #define MSG_BABYSTEP_X "Babystap X" #define MSG_BABYSTEP_Y "Babystap Y" diff --git a/Marlin/language_pl.h b/Marlin/language_pl.h index 37586f53a2..8ee914c99a 100644 --- a/Marlin/language_pl.h +++ b/Marlin/language_pl.h @@ -138,7 +138,7 @@ #define MSG_INIT_SDCARD "Inicjal. karty SD" #define MSG_CNG_SDCARD "Zmiana karty SD" #define MSG_ZPROBE_OUT "Sonda Z za lozem" -#define MSG_POSITION_UNKNOWN "Wroc w XY przed Z" +#define MSG_YX_UNHOMED "Wroc w XY przed Z" #define MSG_ZPROBE_ZOFFSET "Offset Z" #define MSG_BABYSTEP_X "Babystep X" #define MSG_BABYSTEP_Y "Babystep Y" diff --git a/Marlin/language_pt-br.h b/Marlin/language_pt-br.h index 3e882635fc..8a3fed3500 100644 --- a/Marlin/language_pt-br.h +++ b/Marlin/language_pt-br.h @@ -138,7 +138,7 @@ #define MSG_INIT_SDCARD "Iniciar SD" #define MSG_CNG_SDCARD "Trocar SD" #define MSG_ZPROBE_OUT "Son. fora da mesa" -#define MSG_POSITION_UNKNOWN "Pos. Desconhecida" +#define MSG_YX_UNHOMED "Pos. Desconhecida" #define MSG_ZPROBE_ZOFFSET "Deslocamento no Z" #define MSG_BABYSTEP_X "Passinho X" #define MSG_BABYSTEP_Y "Passinho Y" diff --git a/Marlin/language_pt-br_utf8.h b/Marlin/language_pt-br_utf8.h index 7b6639bd04..a3eea1de9f 100644 --- a/Marlin/language_pt-br_utf8.h +++ b/Marlin/language_pt-br_utf8.h @@ -138,7 +138,7 @@ #define MSG_INIT_SDCARD "Iniciar SD" #define MSG_CNG_SDCARD "Trocar SD" #define MSG_ZPROBE_OUT "Son. fora da mesa" -#define MSG_POSITION_UNKNOWN "Pos. Desconhecida" +#define MSG_YX_UNHOMED "Pos. Desconhecida" #define MSG_ZPROBE_ZOFFSET "Deslocamento no Z" #define MSG_BABYSTEP_X "Passinho X" #define MSG_BABYSTEP_Y "Passinho Y" diff --git a/Marlin/language_pt.h b/Marlin/language_pt.h index 5070c93eac..e65a162c45 100644 --- a/Marlin/language_pt.h +++ b/Marlin/language_pt.h @@ -142,7 +142,7 @@ #define MSG_INIT_SDCARD "Inici. cartao SD" #define MSG_CNG_SDCARD "Trocar cartao SD" #define MSG_ZPROBE_OUT "Sensor fora/base" -#define MSG_POSITION_UNKNOWN "XY antes de Z" +#define MSG_YX_UNHOMED "XY antes de Z" #define MSG_ZPROBE_ZOFFSET "Desvio Z" #define MSG_BABYSTEP_X "Babystep X" #define MSG_BABYSTEP_Y "Babystep Y" diff --git a/Marlin/language_pt_utf8.h b/Marlin/language_pt_utf8.h index 64da9645d0..60e38663c8 100644 --- a/Marlin/language_pt_utf8.h +++ b/Marlin/language_pt_utf8.h @@ -142,7 +142,7 @@ #define MSG_INIT_SDCARD "Inici. cartão SD" #define MSG_CNG_SDCARD "Trocar cartão SD" #define MSG_ZPROBE_OUT "Sensor fora/base" -#define MSG_POSITION_UNKNOWN "XY antes de Z" +#define MSG_YX_UNHOMED "XY antes de Z" #define MSG_ZPROBE_ZOFFSET "Desvio Z" #define MSG_BABYSTEP_X "Babystep X" #define MSG_BABYSTEP_Y "Babystep Y" diff --git a/Marlin/language_ru.h b/Marlin/language_ru.h index fe04c03aae..39692d8b34 100644 --- a/Marlin/language_ru.h +++ b/Marlin/language_ru.h @@ -139,7 +139,7 @@ #define MSG_INIT_SDCARD "Иниц. карту" #define MSG_CNG_SDCARD "Сменить карту" #define MSG_ZPROBE_OUT "Z датчик вне стола" -#define MSG_POSITION_UNKNOWN "Паркуй X/Y перед Z" +#define MSG_YX_UNHOMED "Паркуй X/Y перед Z" #define MSG_ZPROBE_ZOFFSET "Смещение Z" #define MSG_BABYSTEP_X "Babystep X" #define MSG_BABYSTEP_Y "Babystep Y"