Same fix

MarlinKimbra/language.h

@@ -166,17 +166,12 @@
 #define MSG_BABYSTEPPING_Y                  "Babystepping Y"
 #define MSG_BABYSTEPPING_Z                  "Babystepping Z"
 #define MSG_SERIAL_ERROR_MENU_STRUCTURE     "Error in menu structure"
-#define MSG_MICROSTEP_MS1_MS2                "MS1,MS2 Pins"
-#define MSG_MICROSTEP_X                      "X:"
-#define MSG_MICROSTEP_Y                      "Y:"
-#define MSG_MICROSTEP_Z                      "Z:"
-#define MSG_MICROSTEP_E0                     "E0:"
-#define MSG_MICROSTEP_E1                     "E1:"
-#define MSG_ENDSTOP_X                        " X:"
-#define MSG_ENDSTOP_Y                        " Y:"
-#define MSG_ENDSTOP_Z                        " Z:"
-#define MSG_ENDSTOP_E                        " E:"
-#define MSG_ENDSTOP_ZP                       " ZP:"
+#define MSG_MICROSTEP_MS1_MS2               "MS1,MS2 Pins"
+#define MSG_MICROSTEP_X                     "X:"
+#define MSG_MICROSTEP_Y                     "Y:"
+#define MSG_MICROSTEP_Z                     "Z:"
+#define MSG_MICROSTEP_E0                    "E0:"
+#define MSG_MICROSTEP_E1                    "E1:"
 
 #define MSG_ERR_EEPROM_WRITE                "Error writing to EEPROM!"
 
@@ -219,6 +214,18 @@
 #define MSG_T_MAXTEMP                       "MAXTEMP triggered"
 #define MSG_T_MINTEMP                       "MINTEMP triggered"
 
+// Move
+#define MSG_MOVE_X                          "X"
+#define MSG_MOVE_y                          "Y"
+#define MSG_MOVE_Z                          "Z"
+#define MSG_MOVE_E                          "Extruder"
+
+// Endstop
+#define MSG_ENDSTOP_X                       " X:"
+#define MSG_ENDSTOP_Y                       " Y:"
+#define MSG_ENDSTOP_Z                       " Z:"
+#define MSG_ENDSTOP_E                       " E:"
+#define MSG_ENDSTOP_ZP                      " ZP:"
 #define MSG_ENDSTOP_XS                      "X"
 #define MSG_ENDSTOP_YS                      "Y"
 #define MSG_ENDSTOP_ZS                      "Z"
@@ -234,7 +241,6 @@
 #define MSG_BED_LEVELLING_Z                 " Z: "
 
 // LCD Menu Messages
-
 #if !(defined( DISPLAY_CHARSET_HD44780_JAPAN ) || defined( DISPLAY_CHARSET_HD44780_WESTERN ) || defined( DISPLAY_CHARSET_HD44780_CYRILLIC ))
   #define DISPLAY_CHARSET_HD44780_JAPAN
 #endif

MarlinKimbra/sanitycheck.h

@@ -138,10 +138,10 @@
      */
     #if defined(Z_PROBE_ENDSTOP)
       #ifndef Z_PROBE_PIN
-        #error You must have a Z_PROBE_PIN defined in your pins_XXXX.h file if you enable Z_PROBE_ENDSTOP
+        #error You must have a Z_PROBE_PIN defined in pins2tool.h file if you enable Z_PROBE_ENDSTOP.
       #endif
       #if Z_PROBE_PIN == -1
-        #error You must set Z_PROBE_PIN to a valid pin if you enable Z_PROBE_ENDSTOP
+        #error You must set Z_PROBE_PIN to a valid pin if you enable Z_PROBE_ENDSTOP.
       #endif
 // Forcing Servo definitions can break some hall effect sensor setups. Leaving these here for further comment.
 //      #ifndef NUM_SERVOS
@@ -161,7 +161,12 @@
      * Check if Probe_Offset * Grid Points is greater than Probing Range
      */
     #ifdef AUTO_BED_LEVELING_GRID
-
+      // Be sure points are in the right order
+      #if LEFT_PROBE_BED_POSITION > RIGHT_PROBE_BED_POSITION
+        #error LEFT_PROBE_BED_POSITION must be less than RIGHT_PROBE_BED_POSITION.
+      #elif FRONT_PROBE_BED_POSITION > BACK_PROBE_BED_POSITION
+        #error BACK_PROBE_BED_POSITION must be less than FRONT_PROBE_BED_POSITION.
+      #endif
       // Make sure probing points are reachable
       #if LEFT_PROBE_BED_POSITION < MIN_PROBE_X
         #error "The given LEFT_PROBE_BED_POSITION can't be reached by the probe."

MarlinKimbra/ultralcd.cpp

@@ -860,9 +860,9 @@ static void _lcd_move(const char *name, AxisEnum axis, int min, int max) {
   if (lcdDrawUpdate) lcd_implementation_drawedit(name, ftostr31(current_position[axis]));
   if (LCD_CLICKED) lcd_goto_menu(lcd_move_menu_axis);
 }
-static void lcd_move_x() { _lcd_move(PSTR("X"), X_AXIS, X_MIN_POS, X_MAX_POS); }
-static void lcd_move_y() { _lcd_move(PSTR("Y"), Y_AXIS, Y_MIN_POS, Y_MAX_POS); }
-static void lcd_move_z() { _lcd_move(PSTR("Z"), Z_AXIS, Z_MIN_POS, Z_MAX_POS); }
+static void lcd_move_x() { _lcd_move(PSTR(MSG_MOVE_X), X_AXIS, X_MIN_POS, X_MAX_POS); }
+static void lcd_move_y() { _lcd_move(PSTR(MSG_MOVE_Y), Y_AXIS, Y_MIN_POS, Y_MAX_POS); }
+static void lcd_move_z() { _lcd_move(PSTR(MSG_MOVE_Z), Z_AXIS, Z_MIN_POS, Z_MAX_POS); }
 static void lcd_move_e() {
   if (encoderPosition != 0) {
     current_position[E_AXIS] += float((int)encoderPosition) * move_menu_scale;
@@ -870,7 +870,7 @@ static void lcd_move_e() {
     line_to_current(E_AXIS);
     lcdDrawUpdate = 1;
   }
-  if (lcdDrawUpdate) lcd_implementation_drawedit(PSTR("Extruder"), ftostr31(current_position[E_AXIS]));
+  if (lcdDrawUpdate) lcd_implementation_drawedit(PSTR(MSG_MOVE_E), ftostr31(current_position[E_AXIS]));
   if (LCD_CLICKED) lcd_goto_menu(lcd_move_menu_axis);
 }