Browse Source

universalize axis_unhomed_error()

AnHardt 8 years ago
parent
commit
39883d03fc

+ 43
- 44
Marlin/Marlin_main.cpp View File

@@ -1723,17 +1723,30 @@ static void clean_up_after_endstop_or_probe_move() {
1723 1723
 #endif //HAS_BED_PROBE
1724 1724
 
1725 1725
 #if ENABLED(Z_PROBE_SLED) || ENABLED(Z_SAFE_HOMING) || HAS_PROBING_PROCEDURE
1726
-  static void axis_unhomed_error(bool xyz=false) {
1727
-    if (xyz) {
1728
-      LCD_MESSAGEPGM(MSG_XYZ_UNHOMED);
1726
+  static bool axis_unhomed_error(const bool x, const bool y, const bool z) {
1727
+    const bool xx = x && !axis_homed[X_AXIS],
1728
+               yy = y && !axis_homed[Y_AXIS],
1729
+               zz = z && !axis_homed[Z_AXIS];
1730
+    if (xx || yy || zz) {
1729 1731
       SERIAL_ECHO_START;
1730
-      SERIAL_ECHOLNPGM(MSG_XYZ_UNHOMED);
1731
-    }
1732
-    else {
1733
-      LCD_MESSAGEPGM(MSG_YX_UNHOMED);
1734
-      SERIAL_ECHO_START;
1735
-      SERIAL_ECHOLNPGM(MSG_YX_UNHOMED);
1732
+      SERIAL_ECHOPGM(MSG_HOME " ");
1733
+      if (xx) SERIAL_ECHOPGM(MSG_X);
1734
+      if (yy) SERIAL_ECHOPGM(MSG_Y);
1735
+      if (zz) SERIAL_ECHOPGM(MSG_Z);
1736
+      SERIAL_ECHOLNPGM(" " MSG_FIRST);
1737
+
1738
+      #if ENABLED(ULTRA_LCD)
1739
+        char message[3 * (LCD_WIDTH) + 1] = ""; // worst case is kana.utf with up to 3*LCD_WIDTH+1
1740
+        strcat_P(message, PSTR(MSG_HOME " "));
1741
+        if (xx) strcat_P(message, PSTR(MSG_X));
1742
+        if (yy) strcat_P(message, PSTR(MSG_Y));
1743
+        if (zz) strcat_P(message, PSTR(MSG_Z));
1744
+        strcat_P(message, PSTR(" " MSG_FIRST));
1745
+        lcd_setstatus(message);
1746
+      #endif
1747
+      return true;
1736 1748
     }
1749
+    return false;
1737 1750
   }
1738 1751
 #endif
1739 1752
 
@@ -1757,10 +1770,7 @@ static void clean_up_after_endstop_or_probe_move() {
1757 1770
       }
1758 1771
     #endif
1759 1772
 
1760
-    if (!axis_homed[X_AXIS]) {
1761
-      axis_unhomed_error(true);
1762
-      return;
1763
-    }
1773
+    if (axis_unhomed_error(true, false, false)) return;
1764 1774
 
1765 1775
     float oldXpos = current_position[X_AXIS]; // save x position
1766 1776
 
@@ -3000,32 +3010,27 @@ inline void gcode_G28() {
3000 3010
           else if (homeZ) { // Don't need to Home Z twice
3001 3011
 
3002 3012
             // Let's see if X and Y are homed
3003
-            if (axis_homed[X_AXIS] && axis_homed[Y_AXIS]) {
3004
-
3005
-              /**
3006
-               * Make sure the Z probe is within the physical limits
3007
-               * NOTE: This doesn't necessarily ensure the Z probe is also
3008
-               * within the bed!
3009
-               */
3010
-              float cpx = current_position[X_AXIS], cpy = current_position[Y_AXIS];
3011
-              if (   cpx >= X_MIN_POS - (X_PROBE_OFFSET_FROM_EXTRUDER)
3012
-                  && cpx <= X_MAX_POS - (X_PROBE_OFFSET_FROM_EXTRUDER)
3013
-                  && cpy >= Y_MIN_POS - (Y_PROBE_OFFSET_FROM_EXTRUDER)
3014
-                  && cpy <= Y_MAX_POS - (Y_PROBE_OFFSET_FROM_EXTRUDER)) {
3015
-
3016
-                // Home the Z axis
3017
-                HOMEAXIS(Z);
3018
-              }
3019
-              else {
3020
-                LCD_MESSAGEPGM(MSG_ZPROBE_OUT);
3021
-                SERIAL_ECHO_START;
3022
-                SERIAL_ECHOLNPGM(MSG_ZPROBE_OUT);
3023
-              }
3013
+            if (axis_unhomed_error(true, true, false)) return;
3014
+
3015
+            /**
3016
+             * Make sure the Z probe is within the physical limits
3017
+             * NOTE: This doesn't necessarily ensure the Z probe is also
3018
+             * within the bed!
3019
+             */
3020
+            float cpx = current_position[X_AXIS], cpy = current_position[Y_AXIS];
3021
+            if (   cpx >= X_MIN_POS - (X_PROBE_OFFSET_FROM_EXTRUDER)
3022
+                && cpx <= X_MAX_POS - (X_PROBE_OFFSET_FROM_EXTRUDER)
3023
+                && cpy >= Y_MIN_POS - (Y_PROBE_OFFSET_FROM_EXTRUDER)
3024
+                && cpy <= Y_MAX_POS - (Y_PROBE_OFFSET_FROM_EXTRUDER)) {
3025
+
3026
+              // Home the Z axis
3027
+              HOMEAXIS(Z);
3024 3028
             }
3025 3029
             else {
3026
-              axis_unhomed_error();
3030
+              LCD_MESSAGEPGM(MSG_ZPROBE_OUT);
3031
+              SERIAL_ECHO_START;
3032
+              SERIAL_ECHOLNPGM(MSG_ZPROBE_OUT);
3027 3033
             }
3028
-
3029 3034
           } // !home_all_axes && homeZ
3030 3035
 
3031 3036
           #if ENABLED(DEBUG_LEVELING_FEATURE)
@@ -3366,10 +3371,7 @@ inline void gcode_G28() {
3366 3371
     #endif
3367 3372
 
3368 3373
     // Don't allow auto-leveling without homing first
3369
-    if (!axis_homed[X_AXIS] || !axis_homed[Y_AXIS] || !axis_homed[Z_AXIS]) {
3370
-      axis_unhomed_error(true);
3371
-      return;
3372
-    }
3374
+    if (axis_unhomed_error(true, true, true)) return;
3373 3375
 
3374 3376
     int verbose_level = code_seen('V') ? code_value_int() : 1;
3375 3377
     if (verbose_level < 0 || verbose_level > 4) {
@@ -4121,10 +4123,7 @@ inline void gcode_M42() {
4121 4123
    */
4122 4124
   inline void gcode_M48() {
4123 4125
 
4124
-    if (!axis_homed[X_AXIS] || !axis_homed[Y_AXIS] || !axis_homed[Z_AXIS]) {
4125
-      axis_unhomed_error(true);
4126
-      return;
4127
-    }
4126
+    if (axis_unhomed_error(true, true, true)) return;
4128 4127
 
4129 4128
     int8_t verbose_level = code_seen('V') ? code_value_byte() : 1;
4130 4129
     if (verbose_level < 0 || verbose_level > 4) {

+ 2
- 1
Marlin/language_an.h View File

@@ -142,7 +142,8 @@
142 142
 #define MSG_INIT_SDCARD                     "Encetan. tarcheta"
143 143
 #define MSG_CNG_SDCARD                      "Cambiar tarcheta"
144 144
 #define MSG_ZPROBE_OUT                      "Z probe out. bed"
145
-#define MSG_YX_UNHOMED                      "Home X/Y before Z"
145
+#define MSG_HOME                            "Home"  // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
146
+#define MSG_FIRST                           "first"
146 147
 #define MSG_ZPROBE_ZOFFSET                  "Z Offset"
147 148
 #define MSG_BABYSTEP_X                      "Babystep X"
148 149
 #define MSG_BABYSTEP_Y                      "Babystep Y"

+ 2
- 1
Marlin/language_bg.h View File

@@ -143,7 +143,8 @@
143 143
 #define MSG_INIT_SDCARD                     "Иниц. SD-Карта"
144 144
 #define MSG_CNG_SDCARD                      "Смяна SD-Карта"
145 145
 #define MSG_ZPROBE_OUT                      "Z-сондата е извадена"
146
-#define MSG_YX_UNHOMED                      "Задайте X/Y преди Z"
146
+#define MSG_HOME                            "Home"  // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
147
+#define MSG_FIRST                           "first"
147 148
 #define MSG_ZPROBE_ZOFFSET                  "Z Отстояние"
148 149
 #define MSG_BABYSTEP_X                      "Министъпка X"
149 150
 #define MSG_BABYSTEP_Y                      "Министъпка Y"

+ 2
- 1
Marlin/language_ca.h View File

@@ -143,7 +143,8 @@
143 143
 #define MSG_INIT_SDCARD                     "Iniciant SD"
144 144
 #define MSG_CNG_SDCARD                      "Canviar SD"
145 145
 #define MSG_ZPROBE_OUT                      "Z probe out. bed"
146
-#define MSG_YX_UNHOMED                      "Home X/Y abans Z"
146
+#define MSG_HOME                            "Home"  // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
147
+#define MSG_FIRST                           "first"
147 148
 #define MSG_ZPROBE_ZOFFSET                  "Z Offset"
148 149
 #define MSG_BABYSTEP_X                      "Babystep X"
149 150
 #define MSG_BABYSTEP_Y                      "Babystep Y"

+ 2
- 1
Marlin/language_cn.h View File

@@ -142,7 +142,8 @@
142 142
 #define MSG_INIT_SDCARD                     "Init. SD card"
143 143
 #define MSG_CNG_SDCARD                      "Change SD card"
144 144
 #define MSG_ZPROBE_OUT                      "Z probe out. bed"
145
-#define MSG_YX_UNHOMED                      "Home X/Y before Z"
145
+#define MSG_HOME                            "Home"  // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
146
+#define MSG_FIRST                           "first"
146 147
 #define MSG_ZPROBE_ZOFFSET                  "Z Offset"
147 148
 #define MSG_BABYSTEP_X                      "Babystep X"
148 149
 #define MSG_BABYSTEP_Y                      "Babystep Y"

+ 2
- 2
Marlin/language_cz.h View File

@@ -174,8 +174,8 @@
174 174
 #define MSG_INIT_SDCARD                     "Nacist SD kartu"
175 175
 #define MSG_CNG_SDCARD                      "Vymenit SD kartu"
176 176
 #define MSG_ZPROBE_OUT                      "Sonda Z mimo podl"
177
-#define MSG_YX_UNHOMED                      "Domu X/Y pred Z"
178
-#define MSG_XYZ_UNHOMED                     "Domu XYZ prvni"
177
+#define MSG_HOME                            "Home"  // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
178
+#define MSG_FIRST                           "first"
179 179
 #define MSG_ZPROBE_ZOFFSET                  "Z ofset"
180 180
 #define MSG_BABYSTEP_X                      "Babystep X"
181 181
 #define MSG_BABYSTEP_Y                      "Babystep Y"

+ 2
- 2
Marlin/language_da.h View File

@@ -170,8 +170,8 @@
170 170
 #define MSG_INIT_SDCARD                     "Init. SD card"
171 171
 #define MSG_CNG_SDCARD                      "Skift SD kort"
172 172
 #define MSG_ZPROBE_OUT                      "Probe udenfor plade"
173
-#define MSG_YX_UNHOMED                      "Home X/Y før Z"
174
-#define MSG_XYZ_UNHOMED                     "Home XYZ first"
173
+#define MSG_HOME                            "Home"  // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
174
+#define MSG_FIRST                           "first"
175 175
 #define MSG_ZPROBE_ZOFFSET                  "Z Offset"
176 176
 #define MSG_BABYSTEP_X                      "Babystep X"
177 177
 #define MSG_BABYSTEP_Y                      "Babystep Y"

+ 2
- 1
Marlin/language_de.h View File

@@ -145,7 +145,8 @@
145 145
 #define MSG_INIT_SDCARD                     "SD-Karte erkennen"  // Manually initialize the SD-card via user interface
146 146
 #define MSG_CNG_SDCARD                      "SD-Karte getauscht" // SD-card changed by user. For machines with no autocarddetect. Both send "M21"
147 147
 #define MSG_ZPROBE_OUT                      "Sensor ausserhalb"
148
-#define MSG_YX_UNHOMED                      "X/Y vor Z homen!"
148
+#define MSG_HOME                            "Vorher"  // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
149
+#define MSG_FIRST                           "homen"
149 150
 #define MSG_ZPROBE_ZOFFSET                  "Z Offset"
150 151
 #define MSG_BABYSTEP_X                      "Babystep X"
151 152
 #define MSG_BABYSTEP_Y                      "Babystep Y"

+ 4
- 4
Marlin/language_en.h View File

@@ -445,11 +445,11 @@
445 445
 #ifndef MSG_ZPROBE_OUT
446 446
   #define MSG_ZPROBE_OUT                      "Z probe out. bed"
447 447
 #endif
448
-#ifndef MSG_YX_UNHOMED
449
-  #define MSG_YX_UNHOMED                      "Home X/Y before Z"
448
+#ifndef MSG_HOME
449
+  #define MSG_HOME                            "Home"  // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
450 450
 #endif
451
-#ifndef MSG_XYZ_UNHOMED
452
-  #define MSG_XYZ_UNHOMED                     "Home XYZ first"
451
+#ifndef MSG_FIRST
452
+  #define MSG_FIRST                           "first"
453 453
 #endif
454 454
 #ifndef MSG_ZPROBE_ZOFFSET
455 455
   #define MSG_ZPROBE_ZOFFSET                  "Z Offset"

+ 2
- 2
Marlin/language_es.h View File

@@ -169,8 +169,8 @@
169 169
 #define MSG_INIT_SDCARD                     "Iniciando tarjeta"
170 170
 #define MSG_CNG_SDCARD                      "Cambiar tarjeta"
171 171
 #define MSG_ZPROBE_OUT                      "Sonda Z fuera"
172
-#define MSG_YX_UNHOMED                      "Reiniciar X/Y y Z"
173
-#define MSG_XYZ_UNHOMED                     "Reiniciar XYZ"
172
+#define MSG_HOME                            "Home"  // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
173
+#define MSG_FIRST                           "first"
174 174
 #define MSG_ZPROBE_ZOFFSET                  "Desfase Z"
175 175
 #define MSG_BABYSTEP_X                      "Micropaso X"
176 176
 #define MSG_BABYSTEP_Y                      "Micropaso Y"

+ 2
- 1
Marlin/language_eu.h View File

@@ -142,7 +142,8 @@
142 142
 #define MSG_INIT_SDCARD                     "Hasieratu txartela"
143 143
 #define MSG_CNG_SDCARD                      "Aldatu txartela"
144 144
 #define MSG_ZPROBE_OUT                      "Z ohe hasiera"
145
-#define MSG_YX_UNHOMED                      "Posizio ezezaguna"
145
+#define MSG_HOME                            "Home"  // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
146
+#define MSG_FIRST                           "first"
146 147
 #define MSG_ZPROBE_ZOFFSET                  "Z konpentsatu"
147 148
 #define MSG_BABYSTEP_X                      "Babystep X"
148 149
 #define MSG_BABYSTEP_Y                      "Babystep Y"

+ 2
- 1
Marlin/language_fi.h View File

@@ -142,7 +142,8 @@
142 142
 #define MSG_INIT_SDCARD                     "Init. SD-Card"
143 143
 #define MSG_CNG_SDCARD                      "Change SD-Card"
144 144
 #define MSG_ZPROBE_OUT                      "Z probe out. bed"
145
-#define MSG_YX_UNHOMED                      "Home X/Y before Z"
145
+#define MSG_HOME                            "Home"  // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
146
+#define MSG_FIRST                           "first"
146 147
 #define MSG_ZPROBE_ZOFFSET                  "Z Offset"
147 148
 #define MSG_BABYSTEP_X                      "Babystep X"
148 149
 #define MSG_BABYSTEP_Y                      "Babystep Y"

+ 2
- 1
Marlin/language_fr.h View File

@@ -145,7 +145,8 @@
145 145
 #define MSG_INIT_SDCARD                     "Init. la carte SD"
146 146
 #define MSG_CNG_SDCARD                      "Changer de carte"
147 147
 #define MSG_ZPROBE_OUT                      "Z sonde exte. lit"
148
-#define MSG_YX_UNHOMED                      "Rev. dans XY av.Z"
148
+#define MSG_HOME                            "Home"  // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
149
+#define MSG_FIRST                           "first"
149 150
 #define MSG_ZPROBE_ZOFFSET                  "Decalage Z"
150 151
 #define MSG_BABYSTEP_X                      "Babystep X"
151 152
 #define MSG_BABYSTEP_Y                      "Babystep Y"

+ 2
- 2
Marlin/language_gl.h View File

@@ -170,8 +170,8 @@
170 170
 #define MSG_INIT_SDCARD                     "Iniciando SD"
171 171
 #define MSG_CNG_SDCARD                      "Cambiar SD"
172 172
 #define MSG_ZPROBE_OUT                      "Sonda-Z sen cama"
173
-#define MSG_YX_UNHOMED                      "X/Y antes que Z"
174
-#define MSG_XYZ_UNHOMED                     "Orixe XYZ antes"
173
+#define MSG_HOME                            "Home"  // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
174
+#define MSG_FIRST                           "first"
175 175
 #define MSG_ZPROBE_ZOFFSET                  "Offset Z"
176 176
 #define MSG_BABYSTEP_X                      "Micropaso X"
177 177
 #define MSG_BABYSTEP_Y                      "Micropaso Y"

+ 2
- 2
Marlin/language_hr.h View File

@@ -171,8 +171,8 @@
171 171
 #define MSG_INIT_SDCARD                     "Init. SD karticu"
172 172
 #define MSG_CNG_SDCARD                      "Promijeni SD karticu"
173 173
 #define MSG_ZPROBE_OUT                      "Z probe out. bed"
174
-#define MSG_YX_UNHOMED                      "Home-aj X/Y prije Z"
175
-#define MSG_XYZ_UNHOMED                     "Home-aj XYZ prvo"
174
+#define MSG_HOME                            "Home"  // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
175
+#define MSG_FIRST                           "first"
176 176
 #define MSG_ZPROBE_ZOFFSET                  "Z Offset"
177 177
 #define MSG_BABYSTEP_X                      "Babystep X"
178 178
 #define MSG_BABYSTEP_Y                      "Babystep Y"

+ 2
- 2
Marlin/language_it.h View File

@@ -150,8 +150,8 @@
150 150
 #define MSG_INIT_SDCARD                     "Iniz. SD-Card"
151 151
 #define MSG_CNG_SDCARD                      "Cambia SD-Card"
152 152
 #define MSG_ZPROBE_OUT                      "Z probe out. bed"
153
-#define MSG_YX_UNHOMED                      "Home X/Y prima di Z"
154
-#define MSG_XYZ_UNHOMED                     "Home XYZ prima"
153
+#define MSG_HOME                            "Home"  // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
154
+#define MSG_FIRST                           "first"
155 155
 #define MSG_ZPROBE_ZOFFSET                  "Z Offset"
156 156
 #define MSG_BABYSTEP_X                      "Babystep X"
157 157
 #define MSG_BABYSTEP_Y                      "Babystep Y"

+ 5
- 0
Marlin/language_kana.h View File

@@ -184,6 +184,10 @@
184 184
 #define MSG_INIT_SDCARD                     "SD\xb6\xb0\xc4\xde\xbb\xb2\xd6\xd0\xba\xd0"                       // "SDカードサイヨミコミ" ("Init. SD card")
185 185
 #define MSG_CNG_SDCARD                      "SD\xb6\xb0\xc4\xde\xba\xb3\xb6\xdd"                               // "SDカードコウカン" ("Change SD card")
186 186
 #define MSG_ZPROBE_OUT                      "Z\xcc\xdf\xdb\xb0\xcc\xde\x20\xcd\xde\xaf\xc4\xde\xb6\xde\xb2"    // "Zプローブ ベッドガイ" ("Z probe out. bed")
187
+
188
+#define MSG_HOME                            "Home"  // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
189
+#define MSG_FIRST                           "first"
190
+/*
187 191
 #if LCD_WIDTH < 20
188 192
   #define MSG_YX_UNHOMED                    "\xbb\xb7\xc6X/Y\xa6\xcc\xaf\xb7\xbb\xbe\xd6"                                   // "サキニX/Yヲフッキサセヨ" ("Home X/Y before Z")
189 193
   #define MSG_XYZ_UNHOMED                   "\xbb\xb7\xc6\xb9\xde\xdd\xc3\xdd\xcc\xaf\xb7\xa6\xbe\xd6"                      // "サキニゲンテンフッキヲセヨ" ("Home XYZ first")
@@ -191,6 +195,7 @@
191 195
   #define MSG_YX_UNHOMED                    "\xbb\xb7\xc6X/Y\xa6\xcc\xaf\xb7\xbb\xbe\xc3\xb8\xc0\xde\xbb\xb2"               // "サキニX/Yヲフッキサセテクダサイ" ("Home X/Y before Z")
192 196
   #define MSG_XYZ_UNHOMED                   "\xbb\xb7\xc6\xb9\xde\xdd\xc3\xdd\xcc\xaf\xb7\xa6\xbc\xc3\xb8\xc0\xde\xbb\xb2"  // "サキニゲンテンフッキヲシテクダサイ" ("Home XYZ first")
193 197
 #endif
198
+*/
194 199
 #define MSG_ZPROBE_ZOFFSET                  "Z\xb5\xcc\xbe\xaf\xc4"                                            // "Zオフセット" ("Z Offset")
195 200
 #define MSG_BABYSTEP_X                      "X\xbc\xde\xb8\x20\xcb\xde\xc4\xde\xb3"                            // "Xジク ビドウ" ("Babystep X")
196 201
 #define MSG_BABYSTEP_Y                      "Y\xbc\xde\xb8\x20\xcb\xde\xc4\xde\xb3"                            // "Yジク ビドウ" ("Babystep Y")

+ 2
- 2
Marlin/language_kana_utf8.h View File

@@ -155,8 +155,8 @@
155 155
 #define MSG_INIT_SDCARD                     "SDカードサイヨミコミ"             // "Init. SD card"
156 156
 #define MSG_CNG_SDCARD                      "SDカードコウカン"               // "Change SD card"
157 157
 #define MSG_ZPROBE_OUT                      "Zプローブ ベッドガイ"            // "Z probe out. bed"
158
-#define MSG_YX_UNHOMED                      "サキニX/Yヲフッキサセテクダサイ"    // "Home X/Y before Z"
159
-#define MSG_XYZ_UNHOMED                     "サキニゲンテンフッキヲシテクダサイ"   // "Home XYZ first"
158
+#define MSG_HOME                            "Home"  // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
159
+#define MSG_FIRST                           "first"
160 160
 #define MSG_ZPROBE_ZOFFSET                  "Zオフセット"                   // "Z Offset"
161 161
 #define MSG_BABYSTEP_X                      "Xジク ビドウ"                  // "Babystep X"
162 162
 #define MSG_BABYSTEP_Y                      "Yジク ビドウ"                  // "Babystep Y"

+ 2
- 1
Marlin/language_nl.h View File

@@ -144,7 +144,8 @@
144 144
 #define MSG_INIT_SDCARD                     "Init. SD kaart"
145 145
 #define MSG_CNG_SDCARD                      "Verv. SD Kaart"
146 146
 #define MSG_ZPROBE_OUT                      "Z probe uit. bed"
147
-#define MSG_YX_UNHOMED                      "Home X/Y voor Z"
147
+#define MSG_HOME                            "Home"  // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
148
+#define MSG_FIRST                           "first"
148 149
 #define MSG_ZPROBE_ZOFFSET                  "Z Offset"
149 150
 #define MSG_BABYSTEP_X                      "Babystap X"
150 151
 #define MSG_BABYSTEP_Y                      "Babystap Y"

+ 2
- 1
Marlin/language_pl.h View File

@@ -167,7 +167,8 @@
167 167
 #define MSG_INIT_SDCARD                     "Inicjal. karty SD"
168 168
 #define MSG_CNG_SDCARD                      "Zmiana karty SD"
169 169
 #define MSG_ZPROBE_OUT                      "Sonda Z za lozem"
170
-#define MSG_YX_UNHOMED                      "Wroc w XY przed Z"
170
+#define MSG_HOME                            "Home"  // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
171
+#define MSG_FIRST                           "first"
171 172
 #define MSG_ZPROBE_ZOFFSET                  "Offset Z"
172 173
 #define MSG_BABYSTEP_X                      "Babystep X"
173 174
 #define MSG_BABYSTEP_Y                      "Babystep Y"

+ 2
- 1
Marlin/language_pt-br.h View File

@@ -144,7 +144,8 @@
144 144
 #define MSG_INIT_SDCARD                     "Iniciar SD"
145 145
 #define MSG_CNG_SDCARD                      "Trocar SD"
146 146
 #define MSG_ZPROBE_OUT                      "Son. fora da mesa"
147
-#define MSG_YX_UNHOMED                      "Pos. Desconhecida"
147
+#define MSG_HOME                            "Home"  // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
148
+#define MSG_FIRST                           "first"
148 149
 #define MSG_ZPROBE_ZOFFSET                  "Deslocamento no Z"
149 150
 #define MSG_BABYSTEP_X                      "Passinho X"
150 151
 #define MSG_BABYSTEP_Y                      "Passinho Y"

+ 2
- 1
Marlin/language_pt-br_utf8.h View File

@@ -144,7 +144,8 @@
144 144
 #define MSG_INIT_SDCARD                     "Iniciar SD"
145 145
 #define MSG_CNG_SDCARD                      "Trocar SD"
146 146
 #define MSG_ZPROBE_OUT                      "Son. fora da mesa"
147
-#define MSG_YX_UNHOMED                      "Pos. Desconhecida"
147
+#define MSG_HOME                            "Home"  // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
148
+#define MSG_FIRST                           "first"
148 149
 #define MSG_ZPROBE_ZOFFSET                  "Deslocamento no Z"
149 150
 #define MSG_BABYSTEP_X                      "Passinho X"
150 151
 #define MSG_BABYSTEP_Y                      "Passinho Y"

+ 2
- 1
Marlin/language_pt.h View File

@@ -152,7 +152,8 @@
152 152
 #define MSG_INIT_SDCARD                     "Inici. cartao SD"
153 153
 #define MSG_CNG_SDCARD                      "Trocar cartao SD"
154 154
 #define MSG_ZPROBE_OUT                      "Sensor fora/base"
155
-#define MSG_YX_UNHOMED                      "XY antes de Z"
155
+#define MSG_HOME                            "Home"  // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
156
+#define MSG_FIRST                           "first"
156 157
 #define MSG_ZPROBE_ZOFFSET                  "Desvio Z"
157 158
 #define MSG_BABYSTEP_X                      "Babystep X"
158 159
 #define MSG_BABYSTEP_Y                      "Babystep Y"

+ 2
- 1
Marlin/language_pt_utf8.h View File

@@ -152,7 +152,8 @@
152 152
 #define MSG_INIT_SDCARD                     "Inici. cartão SD"
153 153
 #define MSG_CNG_SDCARD                      "Trocar cartão SD"
154 154
 #define MSG_ZPROBE_OUT                      "Sensor fora/base"
155
-#define MSG_YX_UNHOMED                      "XY antes de Z"
155
+#define MSG_HOME                            "Home"  // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
156
+#define MSG_FIRST                           "first"
156 157
 #define MSG_ZPROBE_ZOFFSET                  "Desvio Z"
157 158
 #define MSG_BABYSTEP_X                      "Babystep X"
158 159
 #define MSG_BABYSTEP_Y                      "Babystep Y"

Loading…
Cancel
Save