Univeral Bed Leveling - configuration

8 years ago · cf94688925
parent 03aa424ccb
commit cf94688925
31 changed files with 9070 additions and 797 deletions
--- a/Marlin/Conditionals_post.h
+++ b/Marlin/Conditionals_post.h
@ -667,7 +667,7 @@
   */
  #define ABL_PLANAR (ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_3POINT))
  #define ABL_GRID   (ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR))
-  #define HAS_ABL    (ABL_PLANAR || ABL_GRID)
+  #define HAS_ABL    (ABL_PLANAR || ABL_GRID || ENABLED(AUTO_BED_LEVELING_UBL))
  #define PLANNER_LEVELING      (HAS_ABL || ENABLED(MESH_BED_LEVELING))
  #define HAS_PROBING_PROCEDURE (HAS_ABL || ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST))
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@ -231,6 +231,7 @@
 *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
 *    66 : 4.7M High Temperature thermistor from Dyze Design
 *    70 : the 100K thermistor found in the bq Hephestos 2
 *    75 : 100k Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor
 *
 *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
 *                              (but gives greater accuracy and more stable PID)
@ -603,8 +604,7 @@
 //
 // To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN.
 //
-// For a servo-based Z probe, you must set up servo support below, including
+// For a servo-based Z probe, just set Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES above.
 // NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES.
 //
 // - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin.
 // - Use 5V for powered (usu. inductive) sensors.
@ -742,34 +742,7 @@
 #endif
 //===========================================================================
-//============================ Mesh Bed Leveling ============================
+//=============================== Bed Leveling ==============================
 //===========================================================================
 //#define MESH_BED_LEVELING    // Enable mesh bed leveling.
 #if ENABLED(MESH_BED_LEVELING)
  #define MESH_INSET 10        // Mesh inset margin on print area
  #define MESH_NUM_X_POINTS 3  // Don't use more than 7 points per axis, implementation limited.
  #define MESH_NUM_Y_POINTS 3
  #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS
  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
  #if ENABLED(MANUAL_BED_LEVELING)
    #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
  #endif  // MANUAL_BED_LEVELING
  // Gradually reduce leveling correction until a set height is reached,
  // at which point movement will be level to the machine's XY plane.
  // The height can be set with M420 Z<height>
  #define ENABLE_LEVELING_FADE_HEIGHT
 #endif  // MESH_BED_LEVELING
 //===========================================================================
 //============================ Auto Bed Leveling ============================
 //===========================================================================
 // @section bedlevel
@ -793,10 +766,23 @@
 *   Probe several points in a grid.
 *   You specify the rectangle and the density of sample points.
 *   The result is a mesh, best for large or uneven beds.
 *
 * - UBL Unified Bed Leveling
 *   A comprehensive bed leveling system that combines features and benefits from previous
 *   bed leveling system.  The UBL Bed Leveling System also includes an integrated and easy to use
 *   Mesh Generation, Mesh Validation and Mesh Editing system.
 *     - Currently, the UBL Bed Leveling System is only checked out for Cartesian Printers.  But with
 *       that said, it was primarily designed to handle poor quality Delta Printers.  If you feel
 *       adventurous and have a Delta, please post an issue if something doesn't work correctly.
 *       Initially, you will need to reduce your declared bed size so you have a rectangular area to
 *       test on.
 */
 //#define AUTO_BED_LEVELING_3POINT
 //#define AUTO_BED_LEVELING_LINEAR
 //#define AUTO_BED_LEVELING_BILINEAR
 //#define MESH_BED_LEVELING
 //#define AUTO_BED_LEVELING_UBL
 /**
 * Enable detailed logging of G28, G29, M48, etc.
@ -805,6 +791,13 @@
 */
 //#define DEBUG_LEVELING_FEATURE
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
  // Gradually reduce leveling correction until a set height is reached,
  // at which point movement will be level to the machine's XY plane.
  // The height can be set with M420 Z<height>
  #define ENABLE_LEVELING_FADE_HEIGHT
 #endif
 #if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
  // Set the number of grid points per dimension.
@ -825,11 +818,6 @@
  #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
    // Gradually reduce leveling correction until a set height is reached,
    // at which point movement will be level to the machine's XY plane.
    // The height can be set with M420 Z<height>
    #define ENABLE_LEVELING_FADE_HEIGHT
    //
    // Experimental Subdivision of the grid by Catmull-Rom method.
    // Synthesizes intermediate points to produce a more detailed mesh.
@ -853,7 +841,42 @@
  #define ABL_PROBE_PT_3_X 170
  #define ABL_PROBE_PT_3_Y 20
-#endif
+#elif ENABLED(MESH_BED_LEVELING)
 //===========================================================================
 //=================================== Mesh ==================================
 //===========================================================================
  #define MANUAL_PROBE_Z_RANGE 4 // Z after Home, bed somewhere below but above 0.0.
  #define MESH_INSET 10          // Mesh inset margin on print area
  #define MESH_NUM_X_POINTS 3    // Don't use more than 7 points per axis, implementation limited.
  #define MESH_NUM_Y_POINTS 3
  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest at origin [0,0,0]
  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
  #if ENABLED(MANUAL_BED_LEVELING)
    #define MBL_Z_STEP 0.025     // Step size while manually probing Z axis.
  #endif  // MANUAL_BED_LEVELING
 #elif ENABLED(AUTO_BED_LEVELING_UBL)
 //===========================================================================
 //========================= Unified Bed Leveling ============================
 //===========================================================================
  #define UBL_MESH_INSET 1          // Mesh inset margin on print area
  #define UBL_MESH_NUM_X_POINTS 10  // Don't use more than 15 points per axis, implementation limited.
  #define UBL_MESH_NUM_Y_POINTS 10
  #define UBL_PROBE_PT_1_X 39       // These set the probe locations for when UBL does a 3-Point leveling
  #define UBL_PROBE_PT_1_Y 180      // of the mesh.
  #define UBL_PROBE_PT_2_X 39
  #define UBL_PROBE_PT_2_Y 20
  #define UBL_PROBE_PT_3_X 180
  #define UBL_PROBE_PT_3_Y 20
 #endif  // BED_LEVELING
 /**
 * Commands to execute at the end of G29 probing.
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@ -631,6 +631,13 @@
  #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
 #endif
 #if ENABLED(AUTO_BED_LEVELING_UBL)
  #define UBL_MESH_MIN_X (X_MIN_POS + UBL_MESH_INSET)
  #define UBL_MESH_MAX_X (X_MAX_POS - (UBL_MESH_INSET))
  #define UBL_MESH_MIN_Y (Y_MIN_POS + UBL_MESH_INSET)
  #define UBL_MESH_MAX_Y (Y_MAX_POS - (UBL_MESH_INSET))
 #endif
 // @section extras
 // Arc interpretation settings:
@ -1036,7 +1043,7 @@
 #define I2C_SLAVE_ADDRESS  0 // Set a value from 8 to 127 to act as a slave
 /**
- * Add M43 command for pins info and testing
+ * Add M43, M44 and M45 commands for pins info and testing
 */
 //#define PINS_DEBUGGING
--- a/Marlin/SanityCheck.h
+++ b/Marlin/SanityCheck.h
@ -388,10 +388,13 @@ static_assert(1 >= 0
  #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
    + 1
  #endif
  #if ENABLED(AUTO_BED_LEVELING_UBL)
    + 1
  #endif
  #if ENABLED(MESH_BED_LEVELING)
    + 1
  #endif
-  , "Select only one of: MESH_BED_LEVELING, AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_3POINT, or AUTO_BED_LEVELING_BILINEAR."
+  , "Select only one of: MESH_BED_LEVELING, AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_3POINT, AUTO_BED_LEVELING_BILINEAR or AUTO_BED_LEVELING_UBL."
 );
 /**
@ -403,6 +406,21 @@ static_assert(1 >= 0
  #elif MESH_NUM_X_POINTS > 9 || MESH_NUM_Y_POINTS > 9
    #error "MESH_NUM_X_POINTS and MESH_NUM_Y_POINTS must be less than 10."
  #endif
 #elif ENABLED(MANUAL_BED_LEVELING)
  #error "MANUAL_BED_LEVELING only applies to MESH_BED_LEVELING."
 #endif
 /**
 * Unified Bed Leveling
 */
 #if ENABLED(AUTO_BED_LEVELING_UBL)
  #if ENABLED(DELTA)
    #error "AUTO_BED_LEVELING_UBL does not yet support DELTA printers."
  #elif DISABLED(NEWPANEL)
    #error "AUTO_BED_LEVELING_UBL requires an LCD controller."
  #elif UBL_MESH_NUM_X_POINTS > 15 || UBL_MESH_NUM_Y_POINTS > 15
    #error "UBL_MESH_NUM_X_POINTS and UBL_MESH_NUM_Y_POINTS must be less than 16."
  #endif
 #endif
 /**
@ -434,6 +452,7 @@ static_assert(1 >= 0
  , "Please enable only one probe: PROBE_MANUALLY, FIX_MOUNTED_PROBE, Z Servo, BLTOUCH, Z_PROBE_ALLEN_KEY, or Z_PROBE_SLED."
 );
 #if PROBE_SELECTED
  /**
@ -577,21 +596,26 @@ static_assert(1 >= 0
      #endif
    #endif
  #else // !ABL_GRID
-
+    #if ENABLED(AUTO_BED_LEVELING_UBL)
-    // Check the triangulation points
+      #ifndef EEPROM_SETTINGS
-    #if ABL_PROBE_PT_1_X < MIN_PROBE_X || ABL_PROBE_PT_1_X > MAX_PROBE_X
+        #error "AUTO_BED_LEVELING_UBL requires EEPROM_SETTINGS. Please update your configuration."
-      #error "The given ABL_PROBE_PT_1_X can't be reached by the Z probe."
+      #endif
-    #elif ABL_PROBE_PT_2_X < MIN_PROBE_X || ABL_PROBE_PT_2_X > MAX_PROBE_X
+    #else // !UBL
-      #error "The given ABL_PROBE_PT_2_X can't be reached by the Z probe."
+      // Check the triangulation points
-    #elif ABL_PROBE_PT_3_X < MIN_PROBE_X || ABL_PROBE_PT_3_X > MAX_PROBE_X
+      #if ABL_PROBE_PT_1_X < MIN_PROBE_X || ABL_PROBE_PT_1_X > MAX_PROBE_X
-      #error "The given ABL_PROBE_PT_3_X can't be reached by the Z probe."
+        #error "The given ABL_PROBE_PT_1_X can't be reached by the Z probe."
-    #elif ABL_PROBE_PT_1_Y < MIN_PROBE_Y || ABL_PROBE_PT_1_Y > MAX_PROBE_Y
+      #elif ABL_PROBE_PT_2_X < MIN_PROBE_X || ABL_PROBE_PT_2_X > MAX_PROBE_X
-      #error "The given ABL_PROBE_PT_1_Y can't be reached by the Z probe."
+        #error "The given ABL_PROBE_PT_2_X can't be reached by the Z probe."
-    #elif ABL_PROBE_PT_2_Y < MIN_PROBE_Y || ABL_PROBE_PT_2_Y > MAX_PROBE_Y
+      #elif ABL_PROBE_PT_3_X < MIN_PROBE_X || ABL_PROBE_PT_3_X > MAX_PROBE_X
-      #error "The given ABL_PROBE_PT_2_Y can't be reached by the Z probe."
+        #error "The given ABL_PROBE_PT_3_X can't be reached by the Z probe."
-    #elif ABL_PROBE_PT_3_Y < MIN_PROBE_Y || ABL_PROBE_PT_3_Y > MAX_PROBE_Y
+      #elif ABL_PROBE_PT_1_Y < MIN_PROBE_Y || ABL_PROBE_PT_1_Y > MAX_PROBE_Y
-      #error "The given ABL_PROBE_PT_3_Y can't be reached by the Z probe."
+        #error "The given ABL_PROBE_PT_1_Y can't be reached by the Z probe."
-    #endif
+      #elif ABL_PROBE_PT_2_Y < MIN_PROBE_Y || ABL_PROBE_PT_2_Y > MAX_PROBE_Y
        #error "The given ABL_PROBE_PT_2_Y can't be reached by the Z probe."
      #elif ABL_PROBE_PT_3_Y < MIN_PROBE_Y || ABL_PROBE_PT_3_Y > MAX_PROBE_Y
        #error "The given ABL_PROBE_PT_3_Y can't be reached by the Z probe."
      #endif
    #endif // !AUTO_BED_LEVEING_UBL
  #endif // !ABL_GRID
--- a/Marlin/example_configurations/Cartesio/Configuration.h
+++ b/Marlin/example_configurations/Cartesio/Configuration.h
@ -232,6 +232,7 @@
 *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
 *    66 : 4.7M High Temperature thermistor from Dyze Design
 *    70 : the 100K thermistor found in the bq Hephestos 2
 *    75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor
 *
 *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
 *                              (but gives greater accuracy and more stable PID)
@ -603,8 +604,7 @@
 //
 // To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN.
 //
-// For a servo-based Z probe, you must set up servo support below, including
+// For a servo-based Z probe, just set Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES above.
 // NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES.
 //
 // - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin.
 // - Use 5V for powered (usu. inductive) sensors.
@ -741,35 +741,9 @@
  #define FILAMENT_RUNOUT_SCRIPT "M600"
 #endif
 //===========================================================================
 //============================ Mesh Bed Leveling ============================
 //===========================================================================
 //#define MESH_BED_LEVELING    // Enable mesh bed leveling.
 #if ENABLED(MESH_BED_LEVELING)
  #define MESH_INSET 10        // Mesh inset margin on print area
  #define MESH_NUM_X_POINTS 3  // Don't use more than 7 points per axis, implementation limited.
  #define MESH_NUM_Y_POINTS 3
  #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS
  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
  #if ENABLED(MANUAL_BED_LEVELING)
    #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
  #endif  // MANUAL_BED_LEVELING
  // Gradually reduce leveling correction until a set height is reached,
  // at which point movement will be level to the machine's XY plane.
  // The height can be set with M420 Z<height>
  #define ENABLE_LEVELING_FADE_HEIGHT
 #endif  // MESH_BED_LEVELING
 //===========================================================================
-//============================ Auto Bed Leveling ============================
+//=============================== Bed Leveling ==============================
 //===========================================================================
 // @section bedlevel
@ -793,10 +767,22 @@
 *   Probe several points in a grid.
 *   You specify the rectangle and the density of sample points.
 *   The result is a mesh, best for large or uneven beds.
 *
 * - UBL Unified Bed Leveling
 *   A comprehensive bed leveling system that combines features and benefits from previous
 *   bed leveling system.  The UBL Bed Leveling System also includes an integrated and easy to use
 *   Mesh Generation, Mesh Validation and Mesh Editing system.
 *     - Currently, the UBL Bed Leveling System is only checked out for Cartesian Printers.  But with
 *       that said, it was primarily designed to handle poor quality Delta Printers.  If you feel
 *       adventurous and have a Delta, please post an issue if something doesn't work correctly.
 *       Initially, you will need to reduce your declared bed size so you have a rectangular area to
 *       test on.
 */
 //#define AUTO_BED_LEVELING_3POINT
 //#define AUTO_BED_LEVELING_LINEAR
 //#define AUTO_BED_LEVELING_BILINEAR
 //#define MESH_BED_LEVELING
 //#define AUTO_BED_LEVELING_UBL
 /**
 * Enable detailed logging of G28, G29, M48, etc.
@ -805,6 +791,13 @@
 */
 //#define DEBUG_LEVELING_FEATURE
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
  // Gradually reduce leveling correction until a set height is reached,
  // at which point movement will be level to the machine's XY plane.
  // The height can be set with M420 Z<height>
  #define ENABLE_LEVELING_FADE_HEIGHT
 #endif
 #if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
  // Set the number of grid points per dimension.
@ -825,11 +818,6 @@
  #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
    // Gradually reduce leveling correction until a set height is reached,
    // at which point movement will be level to the machine's XY plane.
    // The height can be set with M420 Z<height>
    #define ENABLE_LEVELING_FADE_HEIGHT
    //
    // Experimental Subdivision of the grid by Catmull-Rom method.
    // Synthesizes intermediate points to produce a more detailed mesh.
@ -853,7 +841,42 @@
  #define ABL_PROBE_PT_3_X 170
  #define ABL_PROBE_PT_3_Y 20
-#endif
+#elif ENABLED(MESH_BED_LEVELING)
 //===========================================================================
 //=================================== Mesh ==================================
 //===========================================================================
  #define MANUAL_PROBE_Z_RANGE 4 // Z after Home, bed somewhere below but above 0.0.
  #define MESH_INSET 10          // Mesh inset margin on print area
  #define MESH_NUM_X_POINTS 3    // Don't use more than 7 points per axis, implementation limited.
  #define MESH_NUM_Y_POINTS 3
  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest at origin [0,0,0]
  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
  #if ENABLED(MANUAL_BED_LEVELING)
    #define MBL_Z_STEP 0.025     // Step size while manually probing Z axis.
  #endif  // MANUAL_BED_LEVELING
 #elif ENABLED(AUTO_BED_LEVELING_UBL)
 //===========================================================================
 //========================= Unified Bed Leveling ============================
 //===========================================================================
  #define UBL_MESH_INSET 1          // Mesh inset margin on print area
  #define UBL_MESH_NUM_X_POINTS 10  // Don't use more than 15 points per axis, implementation limited.
  #define UBL_MESH_NUM_Y_POINTS 10
  #define UBL_PROBE_PT_1_X 39       // These set the probe locations for when UBL does a 3-Point leveling
  #define UBL_PROBE_PT_1_Y 180      // of the mesh.
  #define UBL_PROBE_PT_2_X 39
  #define UBL_PROBE_PT_2_Y 20
  #define UBL_PROBE_PT_3_X 180
  #define UBL_PROBE_PT_3_Y 20
 #endif  // BED_LEVELING
 /**
 * Commands to execute at the end of G29 probing.
--- a/Marlin/example_configurations/Felix/Configuration.h
+++ b/Marlin/example_configurations/Felix/Configuration.h
@ -231,6 +231,7 @@
 *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
 *    66 : 4.7M High Temperature thermistor from Dyze Design
 *    70 : the 100K thermistor found in the bq Hephestos 2
 *    75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor
 *
 *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
 *                              (but gives greater accuracy and more stable PID)
@ -586,8 +587,7 @@
 //
 // To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN.
 //
-// For a servo-based Z probe, you must set up servo support below, including
+// For a servo-based Z probe, just set Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES above.
 // NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES.
 //
 // - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin.
 // - Use 5V for powered (usu. inductive) sensors.
@ -724,35 +724,9 @@
  #define FILAMENT_RUNOUT_SCRIPT "M600"
 #endif
 //===========================================================================
 //============================ Mesh Bed Leveling ============================
 //===========================================================================
 //#define MESH_BED_LEVELING    // Enable mesh bed leveling.
 #if ENABLED(MESH_BED_LEVELING)
  #define MESH_INSET 10        // Mesh inset margin on print area
  #define MESH_NUM_X_POINTS 3  // Don't use more than 7 points per axis, implementation limited.
  #define MESH_NUM_Y_POINTS 3
  #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS
  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
  #if ENABLED(MANUAL_BED_LEVELING)
    #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
  #endif  // MANUAL_BED_LEVELING
  // Gradually reduce leveling correction until a set height is reached,
  // at which point movement will be level to the machine's XY plane.
  // The height can be set with M420 Z<height>
  #define ENABLE_LEVELING_FADE_HEIGHT
 #endif  // MESH_BED_LEVELING
 //===========================================================================
-//============================ Auto Bed Leveling ============================
+//=============================== Bed Leveling ==============================
 //===========================================================================
 // @section bedlevel
@ -776,10 +750,22 @@
 *   Probe several points in a grid.
 *   You specify the rectangle and the density of sample points.
 *   The result is a mesh, best for large or uneven beds.
 *
 * - UBL Unified Bed Leveling
 *   A comprehensive bed leveling system that combines features and benefits from previous
 *   bed leveling system.  The UBL Bed Leveling System also includes an integrated and easy to use
 *   Mesh Generation, Mesh Validation and Mesh Editing system.
 *     - Currently, the UBL Bed Leveling System is only checked out for Cartesian Printers.  But with
 *       that said, it was primarily designed to handle poor quality Delta Printers.  If you feel
 *       adventurous and have a Delta, please post an issue if something doesn't work correctly.
 *       Initially, you will need to reduce your declared bed size so you have a rectangular area to
 *       test on.
 */
 //#define AUTO_BED_LEVELING_3POINT
 //#define AUTO_BED_LEVELING_LINEAR
 //#define AUTO_BED_LEVELING_BILINEAR
 //#define MESH_BED_LEVELING
 //#define AUTO_BED_LEVELING_UBL
 /**
 * Enable detailed logging of G28, G29, M48, etc.
@ -788,6 +774,13 @@
 */
 //#define DEBUG_LEVELING_FEATURE
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
  // Gradually reduce leveling correction until a set height is reached,
  // at which point movement will be level to the machine's XY plane.
  // The height can be set with M420 Z<height>
  #define ENABLE_LEVELING_FADE_HEIGHT
 #endif
 #if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
  // Set the number of grid points per dimension.
@ -808,11 +801,6 @@
  #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
    // Gradually reduce leveling correction until a set height is reached,
    // at which point movement will be level to the machine's XY plane.
    // The height can be set with M420 Z<height>
    #define ENABLE_LEVELING_FADE_HEIGHT
    //
    // Experimental Subdivision of the grid by Catmull-Rom method.
    // Synthesizes intermediate points to produce a more detailed mesh.
--- a/Marlin/example_configurations/Felix/DUAL/Configuration.h
+++ b/Marlin/example_configurations/Felix/DUAL/Configuration.h
@ -231,6 +231,7 @@
 *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
 *    66 : 4.7M High Temperature thermistor from Dyze Design
 *    70 : the 100K thermistor found in the bq Hephestos 2
 *    75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor
 *
 *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
 *                              (but gives greater accuracy and more stable PID)
@ -586,8 +587,7 @@
 //
 // To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN.
 //
-// For a servo-based Z probe, you must set up servo support below, including
+// For a servo-based Z probe, just set Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES above.
 // NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES.
 //
 // - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin.
 // - Use 5V for powered (usu. inductive) sensors.
@ -724,35 +724,9 @@
  #define FILAMENT_RUNOUT_SCRIPT "M600"
 #endif
 //===========================================================================
 //============================ Mesh Bed Leveling ============================
 //===========================================================================
 //#define MESH_BED_LEVELING    // Enable mesh bed leveling.
 #if ENABLED(MESH_BED_LEVELING)
  #define MESH_INSET 10        // Mesh inset margin on print area
  #define MESH_NUM_X_POINTS 3  // Don't use more than 7 points per axis, implementation limited.
  #define MESH_NUM_Y_POINTS 3
  #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS
  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
  #if ENABLED(MANUAL_BED_LEVELING)
    #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
  #endif  // MANUAL_BED_LEVELING
  // Gradually reduce leveling correction until a set height is reached,
  // at which point movement will be level to the machine's XY plane.
  // The height can be set with M420 Z<height>
  #define ENABLE_LEVELING_FADE_HEIGHT
 #endif  // MESH_BED_LEVELING
 //===========================================================================
-//============================ Auto Bed Leveling ============================
+//=============================== Bed Leveling ==============================
 //===========================================================================
 // @section bedlevel
@ -776,10 +750,22 @@
 *   Probe several points in a grid.
 *   You specify the rectangle and the density of sample points.
 *   The result is a mesh, best for large or uneven beds.
 *
 * - UBL Unified Bed Leveling
 *   A comprehensive bed leveling system that combines features and benefits from previous
 *   bed leveling system.  The UBL Bed Leveling System also includes an integrated and easy to use
 *   Mesh Generation, Mesh Validation and Mesh Editing system.
 *     - Currently, the UBL Bed Leveling System is only checked out for Cartesian Printers.  But with
 *       that said, it was primarily designed to handle poor quality Delta Printers.  If you feel
 *       adventurous and have a Delta, please post an issue if something doesn't work correctly.
 *       Initially, you will need to reduce your declared bed size so you have a rectangular area to
 *       test on.
 */
 //#define AUTO_BED_LEVELING_3POINT
 //#define AUTO_BED_LEVELING_LINEAR
 //#define AUTO_BED_LEVELING_BILINEAR
 //#define MESH_BED_LEVELING
 //#define AUTO_BED_LEVELING_UBL
 /**
 * Enable detailed logging of G28, G29, M48, etc.
@ -788,6 +774,13 @@
 */
 //#define DEBUG_LEVELING_FEATURE
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
  // Gradually reduce leveling correction until a set height is reached,
  // at which point movement will be level to the machine's XY plane.
  // The height can be set with M420 Z<height>
  #define ENABLE_LEVELING_FADE_HEIGHT
 #endif
 #if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
  // Set the number of grid points per dimension.
@ -808,11 +801,6 @@
  #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
    // Gradually reduce leveling correction until a set height is reached,
    // at which point movement will be level to the machine's XY plane.
    // The height can be set with M420 Z<height>
    #define ENABLE_LEVELING_FADE_HEIGHT
    //
    // Experimental Subdivision of the grid by Catmull-Rom method.
    // Synthesizes intermediate points to produce a more detailed mesh.
@ -836,7 +824,42 @@
  #define ABL_PROBE_PT_3_X 170
  #define ABL_PROBE_PT_3_Y 20
-#endif
+#elif ENABLED(MESH_BED_LEVELING)
 //===========================================================================
 //=================================== Mesh ==================================
 //===========================================================================
  #define MANUAL_PROBE_Z_RANGE 4 // Z after Home, bed somewhere below but above 0.0.
  #define MESH_INSET 10          // Mesh inset margin on print area
  #define MESH_NUM_X_POINTS 3    // Don't use more than 7 points per axis, implementation limited.
  #define MESH_NUM_Y_POINTS 3
  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest at origin [0,0,0]
  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
  #if ENABLED(MANUAL_BED_LEVELING)
    #define MBL_Z_STEP 0.025     // Step size while manually probing Z axis.
  #endif  // MANUAL_BED_LEVELING
 #elif ENABLED(AUTO_BED_LEVELING_UBL)
 //===========================================================================
 //========================= Unified Bed Leveling ============================
 //===========================================================================
  #define UBL_MESH_INSET 1          // Mesh inset margin on print area
  #define UBL_MESH_NUM_X_POINTS 10  // Don't use more than 15 points per axis, implementation limited.
  #define UBL_MESH_NUM_Y_POINTS 10
  #define UBL_PROBE_PT_1_X 39       // These set the probe locations for when UBL does a 3-Point leveling
  #define UBL_PROBE_PT_1_Y 180      // of the mesh.
  #define UBL_PROBE_PT_2_X 39
  #define UBL_PROBE_PT_2_Y 20
  #define UBL_PROBE_PT_3_X 180
  #define UBL_PROBE_PT_3_Y 20
 #endif  // BED_LEVELING
 /**
 * Commands to execute at the end of G29 probing.
--- a/Marlin/example_configurations/Hephestos/Configuration.h
+++ b/Marlin/example_configurations/Hephestos/Configuration.h
@ -234,6 +234,7 @@
 *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
 *    66 : 4.7M High Temperature thermistor from Dyze Design
 *    70 : the 100K thermistor found in the bq Hephestos 2
 *    75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor
 *
 *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
 *                              (but gives greater accuracy and more stable PID)
@ -595,8 +596,7 @@
 //
 // To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN.
 //
-// For a servo-based Z probe, you must set up servo support below, including
+// For a servo-based Z probe, just set Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES above.
 // NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES.
 //
 // - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin.
 // - Use 5V for powered (usu. inductive) sensors.
@ -733,35 +733,9 @@
  #define FILAMENT_RUNOUT_SCRIPT "M600"
 #endif
 //===========================================================================
 //============================ Mesh Bed Leveling ============================
 //===========================================================================
 //#define MESH_BED_LEVELING    // Enable mesh bed leveling.
 #if ENABLED(MESH_BED_LEVELING)
  #define MESH_INSET 10        // Mesh inset margin on print area
  #define MESH_NUM_X_POINTS 3  // Don't use more than 7 points per axis, implementation limited.
  #define MESH_NUM_Y_POINTS 3
  #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS
  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
  #if ENABLED(MANUAL_BED_LEVELING)
    #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
  #endif  // MANUAL_BED_LEVELING
  // Gradually reduce leveling correction until a set height is reached,
  // at which point movement will be level to the machine's XY plane.
  // The height can be set with M420 Z<height>
  #define ENABLE_LEVELING_FADE_HEIGHT
 #endif  // MESH_BED_LEVELING
 //===========================================================================
-//============================ Auto Bed Leveling ============================
+//=============================== Bed Leveling ==============================
 //===========================================================================
 // @section bedlevel
@ -785,10 +759,22 @@
 *   Probe several points in a grid.
 *   You specify the rectangle and the density of sample points.
 *   The result is a mesh, best for large or uneven beds.
 *
 * - UBL Unified Bed Leveling
 *   A comprehensive bed leveling system that combines features and benefits from previous
 *   bed leveling system.  The UBL Bed Leveling System also includes an integrated and easy to use
 *   Mesh Generation, Mesh Validation and Mesh Editing system.
 *     - Currently, the UBL Bed Leveling System is only checked out for Cartesian Printers.  But with
 *       that said, it was primarily designed to handle poor quality Delta Printers.  If you feel
 *       adventurous and have a Delta, please post an issue if something doesn't work correctly.
 *       Initially, you will need to reduce your declared bed size so you have a rectangular area to
 *       test on.
 */
 //#define AUTO_BED_LEVELING_3POINT
 //#define AUTO_BED_LEVELING_LINEAR
 //#define AUTO_BED_LEVELING_BILINEAR
 //#define MESH_BED_LEVELING
 //#define AUTO_BED_LEVELING_UBL
 /**
 * Enable detailed logging of G28, G29, M48, etc.
@ -797,6 +783,13 @@
 */
 //#define DEBUG_LEVELING_FEATURE
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
  // Gradually reduce leveling correction until a set height is reached,
  // at which point movement will be level to the machine's XY plane.
  // The height can be set with M420 Z<height>
  #define ENABLE_LEVELING_FADE_HEIGHT
 #endif
 #if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
  // Set the number of grid points per dimension.
@ -817,11 +810,6 @@
  #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
    // Gradually reduce leveling correction until a set height is reached,
    // at which point movement will be level to the machine's XY plane.
    // The height can be set with M420 Z<height>
    #define ENABLE_LEVELING_FADE_HEIGHT
    //
    // Experimental Subdivision of the grid by Catmull-Rom method.
    // Synthesizes intermediate points to produce a more detailed mesh.
@ -845,7 +833,42 @@
  #define ABL_PROBE_PT_3_X 170
  #define ABL_PROBE_PT_3_Y 20
-#endif
+#elif ENABLED(MESH_BED_LEVELING)
 //===========================================================================
 //=================================== Mesh ==================================
 //===========================================================================
  #define MANUAL_PROBE_Z_RANGE 4 // Z after Home, bed somewhere below but above 0.0.
  #define MESH_INSET 10          // Mesh inset margin on print area
  #define MESH_NUM_X_POINTS 3    // Don't use more than 7 points per axis, implementation limited.
  #define MESH_NUM_Y_POINTS 3
  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest at origin [0,0,0]
  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
  #if ENABLED(MANUAL_BED_LEVELING)
    #define MBL_Z_STEP 0.025     // Step size while manually probing Z axis.
  #endif  // MANUAL_BED_LEVELING
 #elif ENABLED(AUTO_BED_LEVELING_UBL)
 //===========================================================================
 //========================= Unified Bed Leveling ============================
 //===========================================================================
  #define UBL_MESH_INSET 1          // Mesh inset margin on print area
  #define UBL_MESH_NUM_X_POINTS 10  // Don't use more than 15 points per axis, implementation limited.
  #define UBL_MESH_NUM_Y_POINTS 10
  #define UBL_PROBE_PT_1_X 39       // These set the probe locations for when UBL does a 3-Point leveling
  #define UBL_PROBE_PT_1_Y 180      // of the mesh.
  #define UBL_PROBE_PT_2_X 39
  #define UBL_PROBE_PT_2_Y 20
  #define UBL_PROBE_PT_3_X 180
  #define UBL_PROBE_PT_3_Y 20
 #endif  // BED_LEVELING
 /**
 * Commands to execute at the end of G29 probing.
--- a/Marlin/example_configurations/Hephestos_2/Configuration.h
+++ b/Marlin/example_configurations/Hephestos_2/Configuration.h
@ -231,6 +231,7 @@
 *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
 *    66 : 4.7M High Temperature thermistor from Dyze Design
 *    70 : the 100K thermistor found in the bq Hephestos 2
 *    75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor
 *
 *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
 *                              (but gives greater accuracy and more stable PID)
@ -597,8 +598,7 @@
 //
 // To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN.
 //
-// For a servo-based Z probe, you must set up servo support below, including
+// For a servo-based Z probe, just set Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES above.
 // NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES.
 //
 // - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin.
 // - Use 5V for powered (usu. inductive) sensors.
@ -735,35 +735,9 @@
  #define FILAMENT_RUNOUT_SCRIPT "M600"
 #endif
 //===========================================================================
 //============================ Mesh Bed Leveling ============================
 //===========================================================================
 //#define MESH_BED_LEVELING    // Enable mesh bed leveling.
 #if ENABLED(MESH_BED_LEVELING)
  #define MESH_INSET 10        // Mesh inset margin on print area
  #define MESH_NUM_X_POINTS 3  // Don't use more than 7 points per axis, implementation limited.
  #define MESH_NUM_Y_POINTS 3
  #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS
  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
  #if ENABLED(MANUAL_BED_LEVELING)
    #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
  #endif  // MANUAL_BED_LEVELING
  // Gradually reduce leveling correction until a set height is reached,
  // at which point movement will be level to the machine's XY plane.
  // The height can be set with M420 Z<height>
  #define ENABLE_LEVELING_FADE_HEIGHT
 #endif  // MESH_BED_LEVELING
 //===========================================================================
-//============================ Auto Bed Leveling ============================
+//=============================== Bed Leveling ==============================
 //===========================================================================
 // @section bedlevel
@ -787,10 +761,22 @@
 *   Probe several points in a grid.
 *   You specify the rectangle and the density of sample points.
 *   The result is a mesh, best for large or uneven beds.
 *
 * - UBL Unified Bed Leveling
 *   A comprehensive bed leveling system that combines features and benefits from previous
 *   bed leveling system.  The UBL Bed Leveling System also includes an integrated and easy to use
 *   Mesh Generation, Mesh Validation and Mesh Editing system.
 *     - Currently, the UBL Bed Leveling System is only checked out for Cartesian Printers.  But with
 *       that said, it was primarily designed to handle poor quality Delta Printers.  If you feel
 *       adventurous and have a Delta, please post an issue if something doesn't work correctly.
 *       Initially, you will need to reduce your declared bed size so you have a rectangular area to
 *       test on.
 */
 //#define AUTO_BED_LEVELING_3POINT
-#define AUTO_BED_LEVELING_LINEAR
+//#define AUTO_BED_LEVELING_LINEAR
 //#define AUTO_BED_LEVELING_BILINEAR
 //#define MESH_BED_LEVELING
 //#define AUTO_BED_LEVELING_UBL
 /**
 * Enable detailed logging of G28, G29, M48, etc.
@ -799,6 +785,13 @@
 */
 //#define DEBUG_LEVELING_FEATURE
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
  // Gradually reduce leveling correction until a set height is reached,
  // at which point movement will be level to the machine's XY plane.
  // The height can be set with M420 Z<height>
  #define ENABLE_LEVELING_FADE_HEIGHT
 #endif
 #if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
  // Set the number of grid points per dimension.
@ -819,11 +812,6 @@
  #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
    // Gradually reduce leveling correction until a set height is reached,
    // at which point movement will be level to the machine's XY plane.
    // The height can be set with M420 Z<height>
    #define ENABLE_LEVELING_FADE_HEIGHT
    //
    // Experimental Subdivision of the grid by Catmull-Rom method.
    // Synthesizes intermediate points to produce a more detailed mesh.
@ -847,7 +835,42 @@
  #define ABL_PROBE_PT_3_X ((X_MIN_POS + X_MAX_POS) / 2)
  #define ABL_PROBE_PT_3_Y Y_MAX_POS - (Y_PROBE_OFFSET_FROM_EXTRUDER)
-#endif
+#elif ENABLED(MESH_BED_LEVELING)
 //===========================================================================
 //=================================== Mesh ==================================
 //===========================================================================
  #define MANUAL_PROBE_Z_RANGE 4 // Z after Home, bed somewhere below but above 0.0.
  #define MESH_INSET 10          // Mesh inset margin on print area
  #define MESH_NUM_X_POINTS 3    // Don't use more than 7 points per axis, implementation limited.
  #define MESH_NUM_Y_POINTS 3
  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest at origin [0,0,0]
  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
  #if ENABLED(MANUAL_BED_LEVELING)
    #define MBL_Z_STEP 0.025     // Step size while manually probing Z axis.
  #endif  // MANUAL_BED_LEVELING
 #elif ENABLED(AUTO_BED_LEVELING_UBL)
 //===========================================================================
 //========================= Unified Bed Leveling ============================
 //===========================================================================
  #define UBL_MESH_INSET 1          // Mesh inset margin on print area
  #define UBL_MESH_NUM_X_POINTS 10  // Don't use more than 15 points per axis, implementation limited.
  #define UBL_MESH_NUM_Y_POINTS 10
  #define UBL_PROBE_PT_1_X 39       // These set the probe locations for when UBL does a 3-Point leveling
  #define UBL_PROBE_PT_1_Y 180      // of the mesh.
  #define UBL_PROBE_PT_2_X 39
  #define UBL_PROBE_PT_2_Y 20
  #define UBL_PROBE_PT_3_X 180
  #define UBL_PROBE_PT_3_Y 20
 #endif  // BED_LEVELING
 /**
 * Commands to execute at the end of G29 probing.
--- a/Marlin/example_configurations/K8200/Configuration.h
+++ b/Marlin/example_configurations/K8200/Configuration.h
@ -251,6 +251,7 @@
 *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
 *    66 : 4.7M High Temperature thermistor from Dyze Design
 *    70 : the 100K thermistor found in the bq Hephestos 2
 *    75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor
 *
 *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
 *                              (but gives greater accuracy and more stable PID)
@ -632,8 +633,7 @@
 //
 // To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN.
 //
-// For a servo-based Z probe, you must set up servo support below, including
+// For a servo-based Z probe, just set Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES above.
 // NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES.
 //
 // - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin.
 // - Use 5V for powered (usu. inductive) sensors.
@ -770,35 +770,9 @@
  #define FILAMENT_RUNOUT_SCRIPT "M600"
 #endif
 //===========================================================================
 //============================ Mesh Bed Leveling ============================
 //===========================================================================
 //#define MESH_BED_LEVELING    // Enable mesh bed leveling.
 #if ENABLED(MESH_BED_LEVELING)
  #define MESH_INSET 10        // Mesh inset margin on print area
  #define MESH_NUM_X_POINTS 3  // Don't use more than 7 points per axis, implementation limited.
  #define MESH_NUM_Y_POINTS 3
  #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS
  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
  #if ENABLED(MANUAL_BED_LEVELING)
    #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
  #endif  // MANUAL_BED_LEVELING
  // Gradually reduce leveling correction until a set height is reached,
  // at which point movement will be level to the machine's XY plane.
  // The height can be set with M420 Z<height>
  #define ENABLE_LEVELING_FADE_HEIGHT
 #endif  // MESH_BED_LEVELING
 //===========================================================================
-//============================ Auto Bed Leveling ============================
+//=============================== Bed Leveling ==============================
 //===========================================================================
 // @section bedlevel
@ -822,10 +796,22 @@
 *   Probe several points in a grid.
 *   You specify the rectangle and the density of sample points.
 *   The result is a mesh, best for large or uneven beds.
 *
 * - UBL Unified Bed Leveling
 *   A comprehensive bed leveling system that combines features and benefits from previous
 *   bed leveling system.  The UBL Bed Leveling System also includes an integrated and easy to use
 *   Mesh Generation, Mesh Validation and Mesh Editing system.
 *     - Currently, the UBL Bed Leveling System is only checked out for Cartesian Printers.  But with
 *       that said, it was primarily designed to handle poor quality Delta Printers.  If you feel
 *       adventurous and have a Delta, please post an issue if something doesn't work correctly.
 *       Initially, you will need to reduce your declared bed size so you have a rectangular area to
 *       test on.
 */
 //#define AUTO_BED_LEVELING_3POINT
 //#define AUTO_BED_LEVELING_LINEAR
 //#define AUTO_BED_LEVELING_BILINEAR
 //#define MESH_BED_LEVELING
 //#define AUTO_BED_LEVELING_UBL
 /**
 * Enable detailed logging of G28, G29, M48, etc.
@ -834,6 +820,13 @@
 */
 //#define DEBUG_LEVELING_FEATURE
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
  // Gradually reduce leveling correction until a set height is reached,
  // at which point movement will be level to the machine's XY plane.
  // The height can be set with M420 Z<height>
  #define ENABLE_LEVELING_FADE_HEIGHT
 #endif
 #if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
  // Set the number of grid points per dimension.
@ -854,11 +847,6 @@
  #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
    // Gradually reduce leveling correction until a set height is reached,
    // at which point movement will be level to the machine's XY plane.
    // The height can be set with M420 Z<height>
    #define ENABLE_LEVELING_FADE_HEIGHT
    //
    // Experimental Subdivision of the grid by Catmull-Rom method.
    // Synthesizes intermediate points to produce a more detailed mesh.
@ -882,7 +870,42 @@
  #define ABL_PROBE_PT_3_X 170
  #define ABL_PROBE_PT_3_Y 20
-#endif
+#elif ENABLED(MESH_BED_LEVELING)
 //===========================================================================
 //=================================== Mesh ==================================
 //===========================================================================
  #define MANUAL_PROBE_Z_RANGE 4 // Z after Home, bed somewhere below but above 0.0.
  #define MESH_INSET 10          // Mesh inset margin on print area
  #define MESH_NUM_X_POINTS 3    // Don't use more than 7 points per axis, implementation limited.
  #define MESH_NUM_Y_POINTS 3
  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest at origin [0,0,0]
  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
  #if ENABLED(MANUAL_BED_LEVELING)
    #define MBL_Z_STEP 0.025     // Step size while manually probing Z axis.
  #endif  // MANUAL_BED_LEVELING
 #elif ENABLED(AUTO_BED_LEVELING_UBL)
 //===========================================================================
 //========================= Unified Bed Leveling ============================
 //===========================================================================
  #define UBL_MESH_INSET 1          // Mesh inset margin on print area
  #define UBL_MESH_NUM_X_POINTS 10  // Don't use more than 15 points per axis, implementation limited.
  #define UBL_MESH_NUM_Y_POINTS 10
  #define UBL_PROBE_PT_1_X 39       // These set the probe locations for when UBL does a 3-Point leveling
  #define UBL_PROBE_PT_1_Y 180      // of the mesh.
  #define UBL_PROBE_PT_2_X 39
  #define UBL_PROBE_PT_2_Y 20
  #define UBL_PROBE_PT_3_X 180
  #define UBL_PROBE_PT_3_Y 20
 #endif  // BED_LEVELING
 /**
 * Commands to execute at the end of G29 probing.
--- a/Marlin/example_configurations/K8400/Configuration.h
+++ b/Marlin/example_configurations/K8400/Configuration.h
@ -231,6 +231,7 @@
 *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
 *    66 : 4.7M High Temperature thermistor from Dyze Design
 *    70 : the 100K thermistor found in the bq Hephestos 2
 *    75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor
 *
 *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
 *                              (but gives greater accuracy and more stable PID)
@ -603,8 +604,7 @@
 //
 // To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN.
 //
-// For a servo-based Z probe, you must set up servo support below, including
+// For a servo-based Z probe, just set Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES above.
 // NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES.
 //
 // - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin.
 // - Use 5V for powered (usu. inductive) sensors.
@ -741,35 +741,9 @@
  #define FILAMENT_RUNOUT_SCRIPT "M600"
 #endif
 //===========================================================================
 //============================ Mesh Bed Leveling ============================
 //===========================================================================
 //#define MESH_BED_LEVELING    // Enable mesh bed leveling.
 #if ENABLED(MESH_BED_LEVELING)
  #define MESH_INSET 10        // Mesh inset margin on print area
  #define MESH_NUM_X_POINTS 3  // Don't use more than 7 points per axis, implementation limited.
  #define MESH_NUM_Y_POINTS 3
  #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS
  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
  #if ENABLED(MANUAL_BED_LEVELING)
    #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
  #endif  // MANUAL_BED_LEVELING
  // Gradually reduce leveling correction until a set height is reached,
  // at which point movement will be level to the machine's XY plane.
  // The height can be set with M420 Z<height>
  #define ENABLE_LEVELING_FADE_HEIGHT
 #endif  // MESH_BED_LEVELING
 //===========================================================================
-//============================ Auto Bed Leveling ============================
+//=============================== Bed Leveling ==============================
 //===========================================================================
 // @section bedlevel
@ -793,10 +767,22 @@
 *   Probe several points in a grid.
 *   You specify the rectangle and the density of sample points.
 *   The result is a mesh, best for large or uneven beds.
 *
 * - UBL Unified Bed Leveling
 *   A comprehensive bed leveling system that combines features and benefits from previous
 *   bed leveling system.  The UBL Bed Leveling System also includes an integrated and easy to use
 *   Mesh Generation, Mesh Validation and Mesh Editing system.
 *     - Currently, the UBL Bed Leveling System is only checked out for Cartesian Printers.  But with
 *       that said, it was primarily designed to handle poor quality Delta Printers.  If you feel
 *       adventurous and have a Delta, please post an issue if something doesn't work correctly.
 *       Initially, you will need to reduce your declared bed size so you have a rectangular area to
 *       test on.
 */
 //#define AUTO_BED_LEVELING_3POINT
 //#define AUTO_BED_LEVELING_LINEAR
 //#define AUTO_BED_LEVELING_BILINEAR
 //#define MESH_BED_LEVELING
 //#define AUTO_BED_LEVELING_UBL
 /**
 * Enable detailed logging of G28, G29, M48, etc.
@ -805,6 +791,13 @@
 */
 //#define DEBUG_LEVELING_FEATURE
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
  // Gradually reduce leveling correction until a set height is reached,
  // at which point movement will be level to the machine's XY plane.
  // The height can be set with M420 Z<height>
  #define ENABLE_LEVELING_FADE_HEIGHT
 #endif
 #if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
  // Set the number of grid points per dimension.
@ -825,11 +818,6 @@
  #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
    // Gradually reduce leveling correction until a set height is reached,
    // at which point movement will be level to the machine's XY plane.
    // The height can be set with M420 Z<height>
    #define ENABLE_LEVELING_FADE_HEIGHT
    //
    // Experimental Subdivision of the grid by Catmull-Rom method.
    // Synthesizes intermediate points to produce a more detailed mesh.
@ -853,7 +841,42 @@
  #define ABL_PROBE_PT_3_X 170
  #define ABL_PROBE_PT_3_Y 20
-#endif
+#elif ENABLED(MESH_BED_LEVELING)
 //===========================================================================
 //=================================== Mesh ==================================
 //===========================================================================
  #define MANUAL_PROBE_Z_RANGE 4 // Z after Home, bed somewhere below but above 0.0.
  #define MESH_INSET 10          // Mesh inset margin on print area
  #define MESH_NUM_X_POINTS 3    // Don't use more than 7 points per axis, implementation limited.
  #define MESH_NUM_Y_POINTS 3
  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest at origin [0,0,0]
  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
  #if ENABLED(MANUAL_BED_LEVELING)
    #define MBL_Z_STEP 0.025     // Step size while manually probing Z axis.
  #endif  // MANUAL_BED_LEVELING
 #elif ENABLED(AUTO_BED_LEVELING_UBL)
 //===========================================================================
 //========================= Unified Bed Leveling ============================
 //===========================================================================
  #define UBL_MESH_INSET 1          // Mesh inset margin on print area
  #define UBL_MESH_NUM_X_POINTS 10  // Don't use more than 15 points per axis, implementation limited.
  #define UBL_MESH_NUM_Y_POINTS 10
  #define UBL_PROBE_PT_1_X 39       // These set the probe locations for when UBL does a 3-Point leveling
  #define UBL_PROBE_PT_1_Y 180      // of the mesh.
  #define UBL_PROBE_PT_2_X 39
  #define UBL_PROBE_PT_2_Y 20
  #define UBL_PROBE_PT_3_X 180
  #define UBL_PROBE_PT_3_Y 20
 #endif  // BED_LEVELING
 /**
 * Commands to execute at the end of G29 probing.
--- a/Marlin/example_configurations/K8400/Dual-head/Configuration.h
+++ b/Marlin/example_configurations/K8400/Dual-head/Configuration.h
@ -231,6 +231,7 @@
 *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
 *    66 : 4.7M High Temperature thermistor from Dyze Design
 *    70 : the 100K thermistor found in the bq Hephestos 2
 *    75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor
 *
 *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
 *                              (but gives greater accuracy and more stable PID)
@ -603,8 +604,7 @@
 //
 // To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN.
 //
-// For a servo-based Z probe, you must set up servo support below, including
+// For a servo-based Z probe, just set Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES above.
 // NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES.
 //
 // - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin.
 // - Use 5V for powered (usu. inductive) sensors.
@ -741,35 +741,9 @@
  #define FILAMENT_RUNOUT_SCRIPT "M600"
 #endif
 //===========================================================================
 //============================ Mesh Bed Leveling ============================
 //===========================================================================
 //#define MESH_BED_LEVELING    // Enable mesh bed leveling.
 #if ENABLED(MESH_BED_LEVELING)
  #define MESH_INSET 10        // Mesh inset margin on print area
  #define MESH_NUM_X_POINTS 3  // Don't use more than 7 points per axis, implementation limited.
  #define MESH_NUM_Y_POINTS 3
  #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS
  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
  #if ENABLED(MANUAL_BED_LEVELING)
    #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
  #endif  // MANUAL_BED_LEVELING
  // Gradually reduce leveling correction until a set height is reached,
  // at which point movement will be level to the machine's XY plane.
  // The height can be set with M420 Z<height>
  #define ENABLE_LEVELING_FADE_HEIGHT
 #endif  // MESH_BED_LEVELING
 //===========================================================================
-//============================ Auto Bed Leveling ============================
+//=============================== Bed Leveling ==============================
 //===========================================================================
 // @section bedlevel
@ -793,10 +767,22 @@
 *   Probe several points in a grid.
 *   You specify the rectangle and the density of sample points.
 *   The result is a mesh, best for large or uneven beds.
 *
 * - UBL Unified Bed Leveling
 *   A comprehensive bed leveling system that combines features and benefits from previous
 *   bed leveling system.  The UBL Bed Leveling System also includes an integrated and easy to use
 *   Mesh Generation, Mesh Validation and Mesh Editing system.
 *     - Currently, the UBL Bed Leveling System is only checked out for Cartesian Printers.  But with
 *       that said, it was primarily designed to handle poor quality Delta Printers.  If you feel
 *       adventurous and have a Delta, please post an issue if something doesn't work correctly.
 *       Initially, you will need to reduce your declared bed size so you have a rectangular area to
 *       test on.
 */
 //#define AUTO_BED_LEVELING_3POINT
 //#define AUTO_BED_LEVELING_LINEAR
 //#define AUTO_BED_LEVELING_BILINEAR
 //#define MESH_BED_LEVELING
 //#define AUTO_BED_LEVELING_UBL
 /**
 * Enable detailed logging of G28, G29, M48, etc.
@ -805,6 +791,13 @@
 */
 //#define DEBUG_LEVELING_FEATURE
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
  // Gradually reduce leveling correction until a set height is reached,
  // at which point movement will be level to the machine's XY plane.
  // The height can be set with M420 Z<height>
  #define ENABLE_LEVELING_FADE_HEIGHT
 #endif
 #if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
  // Set the number of grid points per dimension.
@ -825,11 +818,6 @@
  #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
    // Gradually reduce leveling correction until a set height is reached,
    // at which point movement will be level to the machine's XY plane.
    // The height can be set with M420 Z<height>
    #define ENABLE_LEVELING_FADE_HEIGHT
    //
    // Experimental Subdivision of the grid by Catmull-Rom method.
    // Synthesizes intermediate points to produce a more detailed mesh.
@ -853,7 +841,42 @@
  #define ABL_PROBE_PT_3_X 170
  #define ABL_PROBE_PT_3_Y 20
-#endif
+#elif ENABLED(MESH_BED_LEVELING)
 //===========================================================================
 //=================================== Mesh ==================================
 //===========================================================================
  #define MANUAL_PROBE_Z_RANGE 4 // Z after Home, bed somewhere below but above 0.0.
  #define MESH_INSET 10          // Mesh inset margin on print area
  #define MESH_NUM_X_POINTS 3    // Don't use more than 7 points per axis, implementation limited.
  #define MESH_NUM_Y_POINTS 3
  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest at origin [0,0,0]
  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
  #if ENABLED(MANUAL_BED_LEVELING)
    #define MBL_Z_STEP 0.025     // Step size while manually probing Z axis.
  #endif  // MANUAL_BED_LEVELING
 #elif ENABLED(AUTO_BED_LEVELING_UBL)
 //===========================================================================
 //========================= Unified Bed Leveling ============================
 //===========================================================================
  #define UBL_MESH_INSET 1          // Mesh inset margin on print area
  #define UBL_MESH_NUM_X_POINTS 10  // Don't use more than 15 points per axis, implementation limited.
  #define UBL_MESH_NUM_Y_POINTS 10
  #define UBL_PROBE_PT_1_X 39       // These set the probe locations for when UBL does a 3-Point leveling
  #define UBL_PROBE_PT_1_Y 180      // of the mesh.
  #define UBL_PROBE_PT_2_X 39
  #define UBL_PROBE_PT_2_Y 20
  #define UBL_PROBE_PT_3_X 180
  #define UBL_PROBE_PT_3_Y 20
 #endif  // BED_LEVELING
 /**
 * Commands to execute at the end of G29 probing.
--- a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
+++ b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
@ -231,6 +231,7 @@
 *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
 *    66 : 4.7M High Temperature thermistor from Dyze Design
 *    70 : the 100K thermistor found in the bq Hephestos 2
 *    75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor
 *
 *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
 *                              (but gives greater accuracy and more stable PID)
@ -603,8 +604,7 @@
 //
 // To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN.
 //
-// For a servo-based Z probe, you must set up servo support below, including
+// For a servo-based Z probe, just set Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES above.
 // NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES.
 //
 // - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin.
 // - Use 5V for powered (usu. inductive) sensors.
@ -741,35 +741,9 @@
  #define FILAMENT_RUNOUT_SCRIPT "M600"
 #endif
 //===========================================================================
 //============================ Mesh Bed Leveling ============================
 //===========================================================================
 //#define MESH_BED_LEVELING    // Enable mesh bed leveling.
 #if ENABLED(MESH_BED_LEVELING)
  #define MESH_INSET 10        // Mesh inset margin on print area
  #define MESH_NUM_X_POINTS 3  // Don't use more than 7 points per axis, implementation limited.
  #define MESH_NUM_Y_POINTS 3
  #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS
  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
  #if ENABLED(MANUAL_BED_LEVELING)
    #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
  #endif  // MANUAL_BED_LEVELING
  // Gradually reduce leveling correction until a set height is reached,
  // at which point movement will be level to the machine's XY plane.
  // The height can be set with M420 Z<height>
  #define ENABLE_LEVELING_FADE_HEIGHT
 #endif  // MESH_BED_LEVELING
 //===========================================================================
-//============================ Auto Bed Leveling ============================
+//=============================== Bed Leveling ==============================
 //===========================================================================
 // @section bedlevel
@ -793,10 +767,22 @@
 *   Probe several points in a grid.
 *   You specify the rectangle and the density of sample points.
 *   The result is a mesh, best for large or uneven beds.
 *
 * - UBL Unified Bed Leveling
 *   A comprehensive bed leveling system that combines features and benefits from previous
 *   bed leveling system.  The UBL Bed Leveling System also includes an integrated and easy to use
 *   Mesh Generation, Mesh Validation and Mesh Editing system.
 *     - Currently, the UBL Bed Leveling System is only checked out for Cartesian Printers.  But with
 *       that said, it was primarily designed to handle poor quality Delta Printers.  If you feel
 *       adventurous and have a Delta, please post an issue if something doesn't work correctly.
 *       Initially, you will need to reduce your declared bed size so you have a rectangular area to
 *       test on.
 */
 //#define AUTO_BED_LEVELING_3POINT
 //#define AUTO_BED_LEVELING_LINEAR
 //#define AUTO_BED_LEVELING_BILINEAR
 //#define MESH_BED_LEVELING
 //#define AUTO_BED_LEVELING_UBL
 /**
 * Enable detailed logging of G28, G29, M48, etc.
@ -805,6 +791,13 @@
 */
 //#define DEBUG_LEVELING_FEATURE
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
  // Gradually reduce leveling correction until a set height is reached,
  // at which point movement will be level to the machine's XY plane.
  // The height can be set with M420 Z<height>
  #define ENABLE_LEVELING_FADE_HEIGHT
 #endif
 #if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
  // Set the number of grid points per dimension.
@ -825,11 +818,6 @@
  #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
    // Gradually reduce leveling correction until a set height is reached,
    // at which point movement will be level to the machine's XY plane.
    // The height can be set with M420 Z<height>
    #define ENABLE_LEVELING_FADE_HEIGHT
    //
    // Experimental Subdivision of the grid by Catmull-Rom method.
    // Synthesizes intermediate points to produce a more detailed mesh.
@ -853,7 +841,42 @@
  #define ABL_PROBE_PT_3_X 170
  #define ABL_PROBE_PT_3_Y 20
-#endif
+#elif ENABLED(MESH_BED_LEVELING)
 //===========================================================================
 //=================================== Mesh ==================================
 //===========================================================================
  #define MANUAL_PROBE_Z_RANGE 4 // Z after Home, bed somewhere below but above 0.0.
  #define MESH_INSET 10          // Mesh inset margin on print area
  #define MESH_NUM_X_POINTS 3    // Don't use more than 7 points per axis, implementation limited.
  #define MESH_NUM_Y_POINTS 3
  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest at origin [0,0,0]
  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
  #if ENABLED(MANUAL_BED_LEVELING)
    #define MBL_Z_STEP 0.025     // Step size while manually probing Z axis.
  #endif  // MANUAL_BED_LEVELING
 #elif ENABLED(AUTO_BED_LEVELING_UBL)
 //===========================================================================
 //========================= Unified Bed Leveling ============================
 //===========================================================================
  #define UBL_MESH_INSET 1          // Mesh inset margin on print area
  #define UBL_MESH_NUM_X_POINTS 10  // Don't use more than 15 points per axis, implementation limited.
  #define UBL_MESH_NUM_Y_POINTS 10
  #define UBL_PROBE_PT_1_X 39       // These set the probe locations for when UBL does a 3-Point leveling
  #define UBL_PROBE_PT_1_Y 180      // of the mesh.
  #define UBL_PROBE_PT_2_X 39
  #define UBL_PROBE_PT_2_Y 20
  #define UBL_PROBE_PT_3_X 180
  #define UBL_PROBE_PT_3_Y 20
 #endif  // BED_LEVELING
 /**
 * Commands to execute at the end of G29 probing.
--- a/Marlin/example_configurations/RigidBot/Configuration.h
+++ b/Marlin/example_configurations/RigidBot/Configuration.h
@ -234,6 +234,7 @@
 *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
 *    66 : 4.7M High Temperature thermistor from Dyze Design
 *    70 : the 100K thermistor found in the bq Hephestos 2
 *    75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor
 *
 *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
 *                              (but gives greater accuracy and more stable PID)
@ -602,8 +603,7 @@
 //
 // To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN.
 //
-// For a servo-based Z probe, you must set up servo support below, including
+// For a servo-based Z probe, just set Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES above.
 // NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES.
 //
 // - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin.
 // - Use 5V for powered (usu. inductive) sensors.
@ -740,35 +740,9 @@
  #define FILAMENT_RUNOUT_SCRIPT "M600"
 #endif
 //===========================================================================
 //============================ Mesh Bed Leveling ============================
 //===========================================================================
 //#define MESH_BED_LEVELING    // Enable mesh bed leveling.
 #if ENABLED(MESH_BED_LEVELING)
  #define MESH_INSET 10        // Mesh inset margin on print area
  #define MESH_NUM_X_POINTS 3  // Don't use more than 7 points per axis, implementation limited.
  #define MESH_NUM_Y_POINTS 3
  #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS
  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
  #if ENABLED(MANUAL_BED_LEVELING)
    #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
  #endif  // MANUAL_BED_LEVELING
  // Gradually reduce leveling correction until a set height is reached,
  // at which point movement will be level to the machine's XY plane.
  // The height can be set with M420 Z<height>
  #define ENABLE_LEVELING_FADE_HEIGHT
 #endif  // MESH_BED_LEVELING
 //===========================================================================
-//============================ Auto Bed Leveling ============================
+//=============================== Bed Leveling ==============================
 //===========================================================================
 // @section bedlevel
@ -792,10 +766,22 @@
 *   Probe several points in a grid.
 *   You specify the rectangle and the density of sample points.
 *   The result is a mesh, best for large or uneven beds.
 *
 * - UBL Unified Bed Leveling
 *   A comprehensive bed leveling system that combines features and benefits from previous
 *   bed leveling system.  The UBL Bed Leveling System also includes an integrated and easy to use
 *   Mesh Generation, Mesh Validation and Mesh Editing system.
 *     - Currently, the UBL Bed Leveling System is only checked out for Cartesian Printers.  But with
 *       that said, it was primarily designed to handle poor quality Delta Printers.  If you feel
 *       adventurous and have a Delta, please post an issue if something doesn't work correctly.
 *       Initially, you will need to reduce your declared bed size so you have a rectangular area to
 *       test on.
 */
 //#define AUTO_BED_LEVELING_3POINT
 //#define AUTO_BED_LEVELING_LINEAR
 //#define AUTO_BED_LEVELING_BILINEAR
 //#define MESH_BED_LEVELING
 //#define AUTO_BED_LEVELING_UBL
 /**
 * Enable detailed logging of G28, G29, M48, etc.
@ -804,6 +790,13 @@
 */
 //#define DEBUG_LEVELING_FEATURE
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
  // Gradually reduce leveling correction until a set height is reached,
  // at which point movement will be level to the machine's XY plane.
  // The height can be set with M420 Z<height>
  #define ENABLE_LEVELING_FADE_HEIGHT
 #endif
 #if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
  // Set the number of grid points per dimension.
@ -824,11 +817,6 @@
  #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
    // Gradually reduce leveling correction until a set height is reached,
    // at which point movement will be level to the machine's XY plane.
    // The height can be set with M420 Z<height>
    #define ENABLE_LEVELING_FADE_HEIGHT
    //
    // Experimental Subdivision of the grid by Catmull-Rom method.
    // Synthesizes intermediate points to produce a more detailed mesh.
@ -852,7 +840,42 @@
  #define ABL_PROBE_PT_3_X 170
  #define ABL_PROBE_PT_3_Y 20
-#endif
+#elif ENABLED(MESH_BED_LEVELING)
 //===========================================================================
 //=================================== Mesh ==================================
 //===========================================================================
  #define MANUAL_PROBE_Z_RANGE 4 // Z after Home, bed somewhere below but above 0.0.
  #define MESH_INSET 10          // Mesh inset margin on print area
  #define MESH_NUM_X_POINTS 3    // Don't use more than 7 points per axis, implementation limited.
  #define MESH_NUM_Y_POINTS 3
  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest at origin [0,0,0]
  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
  #if ENABLED(MANUAL_BED_LEVELING)
    #define MBL_Z_STEP 0.025     // Step size while manually probing Z axis.
  #endif  // MANUAL_BED_LEVELING
 #elif ENABLED(AUTO_BED_LEVELING_UBL)
 //===========================================================================
 //========================= Unified Bed Leveling ============================
 //===========================================================================
  #define UBL_MESH_INSET 1          // Mesh inset margin on print area
  #define UBL_MESH_NUM_X_POINTS 10  // Don't use more than 15 points per axis, implementation limited.
  #define UBL_MESH_NUM_Y_POINTS 10
  #define UBL_PROBE_PT_1_X 39       // These set the probe locations for when UBL does a 3-Point leveling
  #define UBL_PROBE_PT_1_Y 180      // of the mesh.
  #define UBL_PROBE_PT_2_X 39
  #define UBL_PROBE_PT_2_Y 20
  #define UBL_PROBE_PT_3_X 180
  #define UBL_PROBE_PT_3_Y 20
 #endif  // BED_LEVELING
 /**
 * Commands to execute at the end of G29 probing.
@ -1434,7 +1457,7 @@
 // leaving it undefined or defining as 0 will disable the servo subsystem
 // If unsure, leave commented / disabled
 //
-#define NUM_SERVOS 0 // DGlass3D - Servo index starts with 0 for M280 command
+//#define NUM_SERVOS 3 // Servo index starts with 0 for M280 command
 // Delay (in milliseconds) before the next move will start, to give the servo time to reach its target angle.
 // 300ms is a good value but you can try less delay.
--- a/Marlin/example_configurations/Roxys_printers/Folger_Tech_i3_2020/Configuration.h
+++ b/Marlin/example_configurations/Roxys_printers/Folger_Tech_i3_2020/Configuration.h
--- a/Marlin/example_configurations/Roxys_printers/Folger_Tech_i3_2020/Configuration_adv.h
+++ b/Marlin/example_configurations/Roxys_printers/Folger_Tech_i3_2020/Configuration_adv.h
--- a/Marlin/example_configurations/Roxys_printers/gMax_1.5+/Configuration.h
+++ b/Marlin/example_configurations/Roxys_printers/gMax_1.5+/Configuration.h
--- a/Marlin/example_configurations/Roxys_printers/gMax_1.5+/Configuration_adv.h
+++ b/Marlin/example_configurations/Roxys_printers/gMax_1.5+/Configuration_adv.h
--- a/Marlin/example_configurations/Roxys_printers/original_release_files/Configuration.h
+++ b/Marlin/example_configurations/Roxys_printers/original_release_files/Configuration.h
--- a/Marlin/example_configurations/Roxys_printers/original_release_files/Configuration_adv.h
+++ b/Marlin/example_configurations/Roxys_printers/original_release_files/Configuration_adv.h
--- a/Marlin/example_configurations/SCARA/Configuration.h
+++ b/Marlin/example_configurations/SCARA/Configuration.h
@ -263,6 +263,7 @@
 *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
 *    66 : 4.7M High Temperature thermistor from Dyze Design
 *    70 : the 100K thermistor found in the bq Hephestos 2
 *    75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor
 *
 *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
 *                              (but gives greater accuracy and more stable PID)
@ -618,8 +619,7 @@
 //
 // To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN.
 //
-// For a servo-based Z probe, you must set up servo support below, including
+// For a servo-based Z probe, just set Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES above.
 // NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES.
 //
 // - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin.
 // - Use 5V for powered (usu. inductive) sensors.
@ -756,35 +756,9 @@
  #define FILAMENT_RUNOUT_SCRIPT "M600"
 #endif
 //===========================================================================
 //============================ Mesh Bed Leveling ============================
 //===========================================================================
 //#define MESH_BED_LEVELING    // Enable mesh bed leveling.
 #if ENABLED(MESH_BED_LEVELING)
  #define MESH_INSET 10        // Mesh inset margin on print area
  #define MESH_NUM_X_POINTS 3  // Don't use more than 7 points per axis, implementation limited.
  #define MESH_NUM_Y_POINTS 3
  #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS
  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
  #if ENABLED(MANUAL_BED_LEVELING)
    #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
  #endif  // MANUAL_BED_LEVELING
  // Gradually reduce leveling correction until a set height is reached,
  // at which point movement will be level to the machine's XY plane.
  // The height can be set with M420 Z<height>
  #define ENABLE_LEVELING_FADE_HEIGHT
 #endif  // MESH_BED_LEVELING
 //===========================================================================
-//============================ Auto Bed Leveling ============================
+//=============================== Bed Leveling ==============================
 //===========================================================================
 // @section bedlevel
@ -808,10 +782,22 @@
 *   Probe several points in a grid.
 *   You specify the rectangle and the density of sample points.
 *   The result is a mesh, best for large or uneven beds.
 *
 * - UBL Unified Bed Leveling
 *   A comprehensive bed leveling system that combines features and benefits from previous
 *   bed leveling system.  The UBL Bed Leveling System also includes an integrated and easy to use
 *   Mesh Generation, Mesh Validation and Mesh Editing system.
 *     - Currently, the UBL Bed Leveling System is only checked out for Cartesian Printers.  But with
 *       that said, it was primarily designed to handle poor quality Delta Printers.  If you feel
 *       adventurous and have a Delta, please post an issue if something doesn't work correctly.
 *       Initially, you will need to reduce your declared bed size so you have a rectangular area to
 *       test on.
 */
 //#define AUTO_BED_LEVELING_3POINT
 //#define AUTO_BED_LEVELING_LINEAR
 //#define AUTO_BED_LEVELING_BILINEAR
 //#define MESH_BED_LEVELING
 //#define AUTO_BED_LEVELING_UBL
 /**
 * Enable detailed logging of G28, G29, M48, etc.
@ -820,6 +806,13 @@
 */
 //#define DEBUG_LEVELING_FEATURE
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
  // Gradually reduce leveling correction until a set height is reached,
  // at which point movement will be level to the machine's XY plane.
  // The height can be set with M420 Z<height>
  #define ENABLE_LEVELING_FADE_HEIGHT
 #endif
 #if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
  // Set the number of grid points per dimension.
@ -840,11 +833,6 @@
  #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
    // Gradually reduce leveling correction until a set height is reached,
    // at which point movement will be level to the machine's XY plane.
    // The height can be set with M420 Z<height>
    #define ENABLE_LEVELING_FADE_HEIGHT
    //
    // Experimental Subdivision of the grid by Catmull-Rom method.
    // Synthesizes intermediate points to produce a more detailed mesh.
@ -868,7 +856,42 @@
  #define ABL_PROBE_PT_3_X 170
  #define ABL_PROBE_PT_3_Y 20
-#endif
+#elif ENABLED(MESH_BED_LEVELING)
 //===========================================================================
 //=================================== Mesh ==================================
 //===========================================================================
  #define MANUAL_PROBE_Z_RANGE 4 // Z after Home, bed somewhere below but above 0.0.
  #define MESH_INSET 10          // Mesh inset margin on print area
  #define MESH_NUM_X_POINTS 3    // Don't use more than 7 points per axis, implementation limited.
  #define MESH_NUM_Y_POINTS 3
  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest at origin [0,0,0]
  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
  #if ENABLED(MANUAL_BED_LEVELING)
    #define MBL_Z_STEP 0.025     // Step size while manually probing Z axis.
  #endif  // MANUAL_BED_LEVELING
 #elif ENABLED(AUTO_BED_LEVELING_UBL)
 //===========================================================================
 //========================= Unified Bed Leveling ============================
 //===========================================================================
  #define UBL_MESH_INSET 1          // Mesh inset margin on print area
  #define UBL_MESH_NUM_X_POINTS 10  // Don't use more than 15 points per axis, implementation limited.
  #define UBL_MESH_NUM_Y_POINTS 10
  #define UBL_PROBE_PT_1_X 39       // These set the probe locations for when UBL does a 3-Point leveling
  #define UBL_PROBE_PT_1_Y 180      // of the mesh.
  #define UBL_PROBE_PT_2_X 39
  #define UBL_PROBE_PT_2_Y 20
  #define UBL_PROBE_PT_3_X 180
  #define UBL_PROBE_PT_3_Y 20
 #endif  // BED_LEVELING
 /**
 * Commands to execute at the end of G29 probing.
--- a/Marlin/example_configurations/TAZ4/Configuration.h
+++ b/Marlin/example_configurations/TAZ4/Configuration.h
@ -231,6 +231,7 @@
 *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
 *    66 : 4.7M High Temperature thermistor from Dyze Design
 *    70 : the 100K thermistor found in the bq Hephestos 2
 *    75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor
 *
 *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
 *                              (but gives greater accuracy and more stable PID)
@ -624,8 +625,7 @@
 //
 // To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN.
 //
-// For a servo-based Z probe, you must set up servo support below, including
+// For a servo-based Z probe, just set Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES above.
 // NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES.
 //
 // - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin.
 // - Use 5V for powered (usu. inductive) sensors.
@ -762,35 +762,9 @@
  #define FILAMENT_RUNOUT_SCRIPT "M600"
 #endif
 //===========================================================================
 //============================ Mesh Bed Leveling ============================
 //===========================================================================
 //#define MESH_BED_LEVELING    // Enable mesh bed leveling.
 #if ENABLED(MESH_BED_LEVELING)
  #define MESH_INSET 10        // Mesh inset margin on print area
  #define MESH_NUM_X_POINTS 3  // Don't use more than 7 points per axis, implementation limited.
  #define MESH_NUM_Y_POINTS 3
  #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS
  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
  #if ENABLED(MANUAL_BED_LEVELING)
    #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
  #endif  // MANUAL_BED_LEVELING
  // Gradually reduce leveling correction until a set height is reached,
  // at which point movement will be level to the machine's XY plane.
  // The height can be set with M420 Z<height>
  #define ENABLE_LEVELING_FADE_HEIGHT
 #endif  // MESH_BED_LEVELING
 //===========================================================================
-//============================ Auto Bed Leveling ============================
+//=============================== Bed Leveling ==============================
 //===========================================================================
 // @section bedlevel
@ -814,10 +788,22 @@
 *   Probe several points in a grid.
 *   You specify the rectangle and the density of sample points.
 *   The result is a mesh, best for large or uneven beds.
 *
 * - UBL Unified Bed Leveling
 *   A comprehensive bed leveling system that combines features and benefits from previous
 *   bed leveling system.  The UBL Bed Leveling System also includes an integrated and easy to use
 *   Mesh Generation, Mesh Validation and Mesh Editing system.
 *     - Currently, the UBL Bed Leveling System is only checked out for Cartesian Printers.  But with
 *       that said, it was primarily designed to handle poor quality Delta Printers.  If you feel
 *       adventurous and have a Delta, please post an issue if something doesn't work correctly.
 *       Initially, you will need to reduce your declared bed size so you have a rectangular area to
 *       test on.
 */
 //#define AUTO_BED_LEVELING_3POINT
 //#define AUTO_BED_LEVELING_LINEAR
 //#define AUTO_BED_LEVELING_BILINEAR
 //#define MESH_BED_LEVELING
 //#define AUTO_BED_LEVELING_UBL
 /**
 * Enable detailed logging of G28, G29, M48, etc.
@ -826,6 +812,13 @@
 */
 //#define DEBUG_LEVELING_FEATURE
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
  // Gradually reduce leveling correction until a set height is reached,
  // at which point movement will be level to the machine's XY plane.
  // The height can be set with M420 Z<height>
  #define ENABLE_LEVELING_FADE_HEIGHT
 #endif
 #if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
  // Set the number of grid points per dimension.
@ -846,11 +839,6 @@
  #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
    // Gradually reduce leveling correction until a set height is reached,
    // at which point movement will be level to the machine's XY plane.
    // The height can be set with M420 Z<height>
    #define ENABLE_LEVELING_FADE_HEIGHT
    //
    // Experimental Subdivision of the grid by Catmull-Rom method.
    // Synthesizes intermediate points to produce a more detailed mesh.
@ -874,7 +862,42 @@
  #define ABL_PROBE_PT_3_X 170
  #define ABL_PROBE_PT_3_Y 20
-#endif
+#elif ENABLED(MESH_BED_LEVELING)
 //===========================================================================
 //=================================== Mesh ==================================
 //===========================================================================
  #define MANUAL_PROBE_Z_RANGE 4 // Z after Home, bed somewhere below but above 0.0.
  #define MESH_INSET 10          // Mesh inset margin on print area
  #define MESH_NUM_X_POINTS 3    // Don't use more than 7 points per axis, implementation limited.
  #define MESH_NUM_Y_POINTS 3
  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest at origin [0,0,0]
  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
  #if ENABLED(MANUAL_BED_LEVELING)
    #define MBL_Z_STEP 0.025     // Step size while manually probing Z axis.
  #endif  // MANUAL_BED_LEVELING
 #elif ENABLED(AUTO_BED_LEVELING_UBL)
 //===========================================================================
 //========================= Unified Bed Leveling ============================
 //===========================================================================
  #define UBL_MESH_INSET 1          // Mesh inset margin on print area
  #define UBL_MESH_NUM_X_POINTS 10  // Don't use more than 15 points per axis, implementation limited.
  #define UBL_MESH_NUM_Y_POINTS 10
  #define UBL_PROBE_PT_1_X 39       // These set the probe locations for when UBL does a 3-Point leveling
  #define UBL_PROBE_PT_1_Y 180      // of the mesh.
  #define UBL_PROBE_PT_2_X 39
  #define UBL_PROBE_PT_2_Y 20
  #define UBL_PROBE_PT_3_X 180
  #define UBL_PROBE_PT_3_Y 20
 #endif  // BED_LEVELING
 /**
 * Commands to execute at the end of G29 probing.
--- a/Marlin/example_configurations/WITBOX/Configuration.h
+++ b/Marlin/example_configurations/WITBOX/Configuration.h
@ -234,6 +234,7 @@
 *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
 *    66 : 4.7M High Temperature thermistor from Dyze Design
 *    70 : the 100K thermistor found in the bq Hephestos 2
 *    75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor
 *
 *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
 *                              (but gives greater accuracy and more stable PID)
@ -595,8 +596,7 @@
 //
 // To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN.
 //
-// For a servo-based Z probe, you must set up servo support below, including
+// For a servo-based Z probe, just set Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES above.
 // NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES.
 //
 // - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin.
 // - Use 5V for powered (usu. inductive) sensors.
@ -733,35 +733,9 @@
  #define FILAMENT_RUNOUT_SCRIPT "M600"
 #endif
 //===========================================================================
 //============================ Mesh Bed Leveling ============================
 //===========================================================================
 //#define MESH_BED_LEVELING    // Enable mesh bed leveling.
 #if ENABLED(MESH_BED_LEVELING)
  #define MESH_INSET 10        // Mesh inset margin on print area
  #define MESH_NUM_X_POINTS 3  // Don't use more than 7 points per axis, implementation limited.
  #define MESH_NUM_Y_POINTS 3
  #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS
  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
  #if ENABLED(MANUAL_BED_LEVELING)
    #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
  #endif  // MANUAL_BED_LEVELING
  // Gradually reduce leveling correction until a set height is reached,
  // at which point movement will be level to the machine's XY plane.
  // The height can be set with M420 Z<height>
  #define ENABLE_LEVELING_FADE_HEIGHT
 #endif  // MESH_BED_LEVELING
 //===========================================================================
-//============================ Auto Bed Leveling ============================
+//=============================== Bed Leveling ==============================
 //===========================================================================
 // @section bedlevel
@ -785,10 +759,22 @@
 *   Probe several points in a grid.
 *   You specify the rectangle and the density of sample points.
 *   The result is a mesh, best for large or uneven beds.
 *
 * - UBL Unified Bed Leveling
 *   A comprehensive bed leveling system that combines features and benefits from previous
 *   bed leveling system.  The UBL Bed Leveling System also includes an integrated and easy to use
 *   Mesh Generation, Mesh Validation and Mesh Editing system.
 *     - Currently, the UBL Bed Leveling System is only checked out for Cartesian Printers.  But with
 *       that said, it was primarily designed to handle poor quality Delta Printers.  If you feel
 *       adventurous and have a Delta, please post an issue if something doesn't work correctly.
 *       Initially, you will need to reduce your declared bed size so you have a rectangular area to
 *       test on.
 */
 //#define AUTO_BED_LEVELING_3POINT
 //#define AUTO_BED_LEVELING_LINEAR
 //#define AUTO_BED_LEVELING_BILINEAR
 //#define MESH_BED_LEVELING
 //#define AUTO_BED_LEVELING_UBL
 /**
 * Enable detailed logging of G28, G29, M48, etc.
@ -797,6 +783,13 @@
 */
 //#define DEBUG_LEVELING_FEATURE
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
  // Gradually reduce leveling correction until a set height is reached,
  // at which point movement will be level to the machine's XY plane.
  // The height can be set with M420 Z<height>
  #define ENABLE_LEVELING_FADE_HEIGHT
 #endif
 #if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
  // Set the number of grid points per dimension.
@ -817,11 +810,6 @@
  #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
    // Gradually reduce leveling correction until a set height is reached,
    // at which point movement will be level to the machine's XY plane.
    // The height can be set with M420 Z<height>
    #define ENABLE_LEVELING_FADE_HEIGHT
    //
    // Experimental Subdivision of the grid by Catmull-Rom method.
    // Synthesizes intermediate points to produce a more detailed mesh.
@ -845,7 +833,42 @@
  #define ABL_PROBE_PT_3_X 170
  #define ABL_PROBE_PT_3_Y 20
-#endif
+#elif ENABLED(MESH_BED_LEVELING)
 //===========================================================================
 //=================================== Mesh ==================================
 //===========================================================================
  #define MANUAL_PROBE_Z_RANGE 4 // Z after Home, bed somewhere below but above 0.0.
  #define MESH_INSET 10          // Mesh inset margin on print area
  #define MESH_NUM_X_POINTS 3    // Don't use more than 7 points per axis, implementation limited.
  #define MESH_NUM_Y_POINTS 3
  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest at origin [0,0,0]
  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
  #if ENABLED(MANUAL_BED_LEVELING)
    #define MBL_Z_STEP 0.025     // Step size while manually probing Z axis.
  #endif  // MANUAL_BED_LEVELING
 #elif ENABLED(AUTO_BED_LEVELING_UBL)
 //===========================================================================
 //========================= Unified Bed Leveling ============================
 //===========================================================================
  #define UBL_MESH_INSET 1          // Mesh inset margin on print area
  #define UBL_MESH_NUM_X_POINTS 10  // Don't use more than 15 points per axis, implementation limited.
  #define UBL_MESH_NUM_Y_POINTS 10
  #define UBL_PROBE_PT_1_X 39       // These set the probe locations for when UBL does a 3-Point leveling
  #define UBL_PROBE_PT_1_Y 180      // of the mesh.
  #define UBL_PROBE_PT_2_X 39
  #define UBL_PROBE_PT_2_Y 20
  #define UBL_PROBE_PT_3_X 180
  #define UBL_PROBE_PT_3_Y 20
 #endif  // BED_LEVELING
 /**
 * Commands to execute at the end of G29 probing.
--- a/Marlin/example_configurations/adafruit/ST7565/Configuration.h
+++ b/Marlin/example_configurations/adafruit/ST7565/Configuration.h
@ -231,6 +231,7 @@
 *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
 *    66 : 4.7M High Temperature thermistor from Dyze Design
 *    70 : the 100K thermistor found in the bq Hephestos 2
 *    75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor
 *
 *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
 *                              (but gives greater accuracy and more stable PID)
@ -603,8 +604,7 @@
 //
 // To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN.
 //
-// For a servo-based Z probe, you must set up servo support below, including
+// For a servo-based Z probe, just set Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES above.
 // NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES.
 //
 // - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin.
 // - Use 5V for powered (usu. inductive) sensors.
@ -741,35 +741,9 @@
  #define FILAMENT_RUNOUT_SCRIPT "M600"
 #endif
 //===========================================================================
 //============================ Mesh Bed Leveling ============================
 //===========================================================================
 //#define MESH_BED_LEVELING    // Enable mesh bed leveling.
 #if ENABLED(MESH_BED_LEVELING)
  #define MESH_INSET 10        // Mesh inset margin on print area
  #define MESH_NUM_X_POINTS 3  // Don't use more than 7 points per axis, implementation limited.
  #define MESH_NUM_Y_POINTS 3
  #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS
  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
  #if ENABLED(MANUAL_BED_LEVELING)
    #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
  #endif  // MANUAL_BED_LEVELING
  // Gradually reduce leveling correction until a set height is reached,
  // at which point movement will be level to the machine's XY plane.
  // The height can be set with M420 Z<height>
  #define ENABLE_LEVELING_FADE_HEIGHT
 #endif  // MESH_BED_LEVELING
 //===========================================================================
-//============================ Auto Bed Leveling ============================
+//=============================== Bed Leveling ==============================
 //===========================================================================
 // @section bedlevel
@ -793,10 +767,22 @@
 *   Probe several points in a grid.
 *   You specify the rectangle and the density of sample points.
 *   The result is a mesh, best for large or uneven beds.
 *
 * - UBL Unified Bed Leveling
 *   A comprehensive bed leveling system that combines features and benefits from previous
 *   bed leveling system.  The UBL Bed Leveling System also includes an integrated and easy to use
 *   Mesh Generation, Mesh Validation and Mesh Editing system.
 *     - Currently, the UBL Bed Leveling System is only checked out for Cartesian Printers.  But with
 *       that said, it was primarily designed to handle poor quality Delta Printers.  If you feel
 *       adventurous and have a Delta, please post an issue if something doesn't work correctly.
 *       Initially, you will need to reduce your declared bed size so you have a rectangular area to
 *       test on.
 */
 //#define AUTO_BED_LEVELING_3POINT
 //#define AUTO_BED_LEVELING_LINEAR
 //#define AUTO_BED_LEVELING_BILINEAR
 //#define MESH_BED_LEVELING
 //#define AUTO_BED_LEVELING_UBL
 /**
 * Enable detailed logging of G28, G29, M48, etc.
@ -805,6 +791,13 @@
 */
 //#define DEBUG_LEVELING_FEATURE
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
  // Gradually reduce leveling correction until a set height is reached,
  // at which point movement will be level to the machine's XY plane.
  // The height can be set with M420 Z<height>
  #define ENABLE_LEVELING_FADE_HEIGHT
 #endif
 #if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
  // Set the number of grid points per dimension.
@ -825,11 +818,6 @@
  #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
    // Gradually reduce leveling correction until a set height is reached,
    // at which point movement will be level to the machine's XY plane.
    // The height can be set with M420 Z<height>
    #define ENABLE_LEVELING_FADE_HEIGHT
    //
    // Experimental Subdivision of the grid by Catmull-Rom method.
    // Synthesizes intermediate points to produce a more detailed mesh.
@ -853,7 +841,42 @@
  #define ABL_PROBE_PT_3_X 170
  #define ABL_PROBE_PT_3_Y 20
-#endif
+#elif ENABLED(MESH_BED_LEVELING)
 //===========================================================================
 //=================================== Mesh ==================================
 //===========================================================================
  #define MANUAL_PROBE_Z_RANGE 4 // Z after Home, bed somewhere below but above 0.0.
  #define MESH_INSET 10          // Mesh inset margin on print area
  #define MESH_NUM_X_POINTS 3    // Don't use more than 7 points per axis, implementation limited.
  #define MESH_NUM_Y_POINTS 3
  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest at origin [0,0,0]
  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
  #if ENABLED(MANUAL_BED_LEVELING)
    #define MBL_Z_STEP 0.025     // Step size while manually probing Z axis.
  #endif  // MANUAL_BED_LEVELING
 #elif ENABLED(AUTO_BED_LEVELING_UBL)
 //===========================================================================
 //========================= Unified Bed Leveling ============================
 //===========================================================================
  #define UBL_MESH_INSET 1          // Mesh inset margin on print area
  #define UBL_MESH_NUM_X_POINTS 10  // Don't use more than 15 points per axis, implementation limited.
  #define UBL_MESH_NUM_Y_POINTS 10
  #define UBL_PROBE_PT_1_X 39       // These set the probe locations for when UBL does a 3-Point leveling
  #define UBL_PROBE_PT_1_Y 180      // of the mesh.
  #define UBL_PROBE_PT_2_X 39
  #define UBL_PROBE_PT_2_Y 20
  #define UBL_PROBE_PT_3_X 180
  #define UBL_PROBE_PT_3_Y 20
 #endif  // BED_LEVELING
 /**
 * Commands to execute at the end of G29 probing.
--- a/Marlin/example_configurations/delta/flsun_kossel_mini/Configuration.h
+++ b/Marlin/example_configurations/delta/flsun_kossel_mini/Configuration.h
@ -231,6 +231,7 @@
 *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
 *    66 : 4.7M High Temperature thermistor from Dyze Design
 *    70 : the 100K thermistor found in the bq Hephestos 2
 *    75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor
 *
 *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
 *                              (but gives greater accuracy and more stable PID)
@ -705,8 +706,7 @@
 //
 // To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN.
 //
-// For a servo-based Z probe, you must set up servo support below, including
+// For a servo-based Z probe, just set Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES above.
 // NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES.
 //
 // - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin.
 // - Use 5V for powered (usu. inductive) sensors.
@ -844,35 +844,7 @@
 #endif
 //===========================================================================
-//============================ Mesh Bed Leveling ============================
+//=============================== Bed Leveling ==============================
 //===========================================================================
 //
 // MESH_BED_LEVELING does not yet support DELTA printers.
 //#define MESH_BED_LEVELING    // Enable mesh bed leveling.
 #if ENABLED(MESH_BED_LEVELING)
  #define MESH_INSET 10        // Mesh inset margin on print area
  #define MESH_NUM_X_POINTS 3  // Don't use more than 7 points per axis, implementation limited.
  #define MESH_NUM_Y_POINTS 3
  #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS
  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
  #if ENABLED(MANUAL_BED_LEVELING)
    #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
  #endif  // MANUAL_BED_LEVELING
  // Gradually reduce leveling correction until a set height is reached,
  // at which point movement will be level to the machine's XY plane.
  // The height can be set with M420 Z<height>
  #define ENABLE_LEVELING_FADE_HEIGHT
 #endif  // MESH_BED_LEVELING
 //===========================================================================
 //============================ Auto Bed Leveling ============================
 //===========================================================================
 // @section bedlevel
@ -896,10 +868,22 @@
 *   Probe several points in a grid.
 *   You specify the rectangle and the density of sample points.
 *   The result is a mesh, best for large or uneven beds.
 *
 * - UBL Unified Bed Leveling
 *   A comprehensive bed leveling system that combines features and benefits from previous
 *   bed leveling system.  The UBL Bed Leveling System also includes an integrated and easy to use
 *   Mesh Generation, Mesh Validation and Mesh Editing system.
 *     - Currently, the UBL Bed Leveling System is only checked out for Cartesian Printers.  But with
 *       that said, it was primarily designed to handle poor quality Delta Printers.  If you feel
 *       adventurous and have a Delta, please post an issue if something doesn't work correctly.
 *       Initially, you will need to reduce your declared bed size so you have a rectangular area to
 *       test on.
 */
 //#define AUTO_BED_LEVELING_3POINT // Only AUTO_BED_LEVELING_BILINEAR is supported for DELTA bed leveling.
 //#define AUTO_BED_LEVELING_LINEAR // Only AUTO_BED_LEVELING_BILINEAR is supported for DELTA bed leveling.
 #define AUTO_BED_LEVELING_BILINEAR // Only AUTO_BED_LEVELING_BILINEAR is supported for DELTA bed leveling.
 //#define MESH_BED_LEVELING
 //#define AUTO_BED_LEVELING_UBL
 /**
 * Enable detailed logging of G28, G29, M48, etc.
@ -908,6 +892,13 @@
 */
 //#define DEBUG_LEVELING_FEATURE
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
  // Gradually reduce leveling correction until a set height is reached,
  // at which point movement will be level to the machine's XY plane.
  // The height can be set with M420 Z<height>
  //#define ENABLE_LEVELING_FADE_HEIGHT
 #endif
 #if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
  // Set the number of grid points per dimension.
@ -928,12 +919,6 @@
  //#define PROBE_Y_FIRST
  #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
    // Gradually reduce leveling correction until a set height is reached,
    // at which point movement will be level to the machine's XY plane.
    // The height can be set with M420 Z<height>
    //#define ENABLE_LEVELING_FADE_HEIGHT
    //
    // Experimental Subdivision of the grid by Catmull-Rom method.
    // Synthesizes intermediate points to produce a more detailed mesh.
@ -957,7 +942,42 @@
  #define ABL_PROBE_PT_3_X 170
  #define ABL_PROBE_PT_3_Y 20
-#endif
+#elif ENABLED(MESH_BED_LEVELING)
 //===========================================================================
 //=================================== Mesh ==================================
 //===========================================================================
  #define MANUAL_PROBE_Z_RANGE 4 // Z after Home, bed somewhere below but above 0.0.
  #define MESH_INSET 10          // Mesh inset margin on print area
  #define MESH_NUM_X_POINTS 3    // Don't use more than 7 points per axis, implementation limited.
  #define MESH_NUM_Y_POINTS 3
  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest at origin [0,0,0]
  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
  #if ENABLED(MANUAL_BED_LEVELING)
    #define MBL_Z_STEP 0.025     // Step size while manually probing Z axis.
  #endif  // MANUAL_BED_LEVELING
 #elif ENABLED(AUTO_BED_LEVELING_UBL)
 //===========================================================================
 //========================= Unified Bed Leveling ============================
 //===========================================================================
  #define UBL_MESH_INSET 1          // Mesh inset margin on print area
  #define UBL_MESH_NUM_X_POINTS 10  // Don't use more than 15 points per axis, implementation limited.
  #define UBL_MESH_NUM_Y_POINTS 10
  #define UBL_PROBE_PT_1_X 39       // These set the probe locations for when UBL does a 3-Point leveling
  #define UBL_PROBE_PT_1_Y 180      // of the mesh.
  #define UBL_PROBE_PT_2_X 39
  #define UBL_PROBE_PT_2_Y 20
  #define UBL_PROBE_PT_3_X 180
  #define UBL_PROBE_PT_3_Y 20
 #endif  // BED_LEVELING
 /**
 * Commands to execute at the end of G29 probing.
--- a/Marlin/example_configurations/delta/generic/Configuration.h
+++ b/Marlin/example_configurations/delta/generic/Configuration.h
@ -231,6 +231,7 @@
 *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
 *    66 : 4.7M High Temperature thermistor from Dyze Design
 *    70 : the 100K thermistor found in the bq Hephestos 2
 *    75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor
 *
 *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
 *                              (but gives greater accuracy and more stable PID)
@ -689,8 +690,7 @@
 //
 // To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN.
 //
-// For a servo-based Z probe, you must set up servo support below, including
+// For a servo-based Z probe, just set Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES above.
 // NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES.
 //
 // - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin.
 // - Use 5V for powered (usu. inductive) sensors.
@ -827,35 +827,9 @@
  #define FILAMENT_RUNOUT_SCRIPT "M600"
 #endif
 //===========================================================================
 //============================ Mesh Bed Leveling ============================
 //===========================================================================
 //#define MESH_BED_LEVELING    // Enable mesh bed leveling.
 #if ENABLED(MESH_BED_LEVELING)
  #define MESH_INSET 10        // Mesh inset margin on print area
  #define MESH_NUM_X_POINTS 3  // Don't use more than 7 points per axis, implementation limited.
  #define MESH_NUM_Y_POINTS 3
  #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS
  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
  #if ENABLED(MANUAL_BED_LEVELING)
    #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
  #endif  // MANUAL_BED_LEVELING
  // Gradually reduce leveling correction until a set height is reached,
  // at which point movement will be level to the machine's XY plane.
  // The height can be set with M420 Z<height>
  #define ENABLE_LEVELING_FADE_HEIGHT
 #endif  // MESH_BED_LEVELING
 //===========================================================================
-//============================ Auto Bed Leveling ============================
+//=============================== Bed Leveling ==============================
 //===========================================================================
 // @section bedlevel
@ -879,10 +853,22 @@
 *   Probe several points in a grid.
 *   You specify the rectangle and the density of sample points.
 *   The result is a mesh, best for large or uneven beds.
 *
 * - UBL Unified Bed Leveling
 *   A comprehensive bed leveling system that combines features and benefits from previous
 *   bed leveling system.  The UBL Bed Leveling System also includes an integrated and easy to use
 *   Mesh Generation, Mesh Validation and Mesh Editing system.
 *     - Currently, the UBL Bed Leveling System is only checked out for Cartesian Printers.  But with
 *       that said, it was primarily designed to handle poor quality Delta Printers.  If you feel
 *       adventurous and have a Delta, please post an issue if something doesn't work correctly.
 *       Initially, you will need to reduce your declared bed size so you have a rectangular area to
 *       test on.
 */
 //#define AUTO_BED_LEVELING_3POINT
 //#define AUTO_BED_LEVELING_LINEAR
 //#define AUTO_BED_LEVELING_BILINEAR
 //#define MESH_BED_LEVELING
 //#define AUTO_BED_LEVELING_UBL
 /**
 * Enable detailed logging of G28, G29, M48, etc.
@ -891,6 +877,13 @@
 */
 //#define DEBUG_LEVELING_FEATURE
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
  // Gradually reduce leveling correction until a set height is reached,
  // at which point movement will be level to the machine's XY plane.
  // The height can be set with M420 Z<height>
  //#define ENABLE_LEVELING_FADE_HEIGHT
 #endif
 #if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
  // Set the number of grid points per dimension.
@ -912,12 +905,6 @@
  //#define PROBE_Y_FIRST
  #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
    // Gradually reduce leveling correction until a set height is reached,
    // at which point movement will be level to the machine's XY plane.
    // The height can be set with M420 Z<height>
    //#define ENABLE_LEVELING_FADE_HEIGHT
    //
    // Experimental Subdivision of the grid by Catmull-Rom method.
    // Synthesizes intermediate points to produce a more detailed mesh.
@ -941,7 +928,42 @@
  #define ABL_PROBE_PT_3_X 170
  #define ABL_PROBE_PT_3_Y 20
-#endif
+#elif ENABLED(MESH_BED_LEVELING)
 //===========================================================================
 //=================================== Mesh ==================================
 //===========================================================================
  #define MANUAL_PROBE_Z_RANGE 4 // Z after Home, bed somewhere below but above 0.0.
  #define MESH_INSET 10          // Mesh inset margin on print area
  #define MESH_NUM_X_POINTS 3    // Don't use more than 7 points per axis, implementation limited.
  #define MESH_NUM_Y_POINTS 3
  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest at origin [0,0,0]
  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
  #if ENABLED(MANUAL_BED_LEVELING)
    #define MBL_Z_STEP 0.025     // Step size while manually probing Z axis.
  #endif  // MANUAL_BED_LEVELING
 #elif ENABLED(AUTO_BED_LEVELING_UBL)
 //===========================================================================
 //========================= Unified Bed Leveling ============================
 //===========================================================================
  #define UBL_MESH_INSET 1          // Mesh inset margin on print area
  #define UBL_MESH_NUM_X_POINTS 10  // Don't use more than 15 points per axis, implementation limited.
  #define UBL_MESH_NUM_Y_POINTS 10
  #define UBL_PROBE_PT_1_X 39       // These set the probe locations for when UBL does a 3-Point leveling
  #define UBL_PROBE_PT_1_Y 180      // of the mesh.
  #define UBL_PROBE_PT_2_X 39
  #define UBL_PROBE_PT_2_Y 20
  #define UBL_PROBE_PT_3_X 180
  #define UBL_PROBE_PT_3_Y 20
 #endif  // BED_LEVELING
 /**
 * Commands to execute at the end of G29 probing.
--- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h
+++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h
@ -231,6 +231,7 @@
 *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
 *    66 : 4.7M High Temperature thermistor from Dyze Design
 *    70 : the 100K thermistor found in the bq Hephestos 2
 *    75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor
 *
 *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
 *                              (but gives greater accuracy and more stable PID)
@ -692,8 +693,7 @@
 //
 // To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN.
 //
-// For a servo-based Z probe, you must set up servo support below, including
+// For a servo-based Z probe, just set Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES above.
 // NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES.
 //
 // - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin.
 // - Use 5V for powered (usu. inductive) sensors.
@ -830,35 +830,9 @@
  #define FILAMENT_RUNOUT_SCRIPT "M600"
 #endif
 //===========================================================================
 //============================ Mesh Bed Leveling ============================
 //===========================================================================
 //#define MESH_BED_LEVELING    // Enable mesh bed leveling.
 #if ENABLED(MESH_BED_LEVELING)
  #define MESH_INSET 10        // Mesh inset margin on print area
  #define MESH_NUM_X_POINTS 3  // Don't use more than 7 points per axis, implementation limited.
  #define MESH_NUM_Y_POINTS 3
  #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS
  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
  #if ENABLED(MANUAL_BED_LEVELING)
    #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
  #endif  // MANUAL_BED_LEVELING
  // Gradually reduce leveling correction until a set height is reached,
  // at which point movement will be level to the machine's XY plane.
  // The height can be set with M420 Z<height>
  #define ENABLE_LEVELING_FADE_HEIGHT
 #endif  // MESH_BED_LEVELING
 //===========================================================================
-//============================ Auto Bed Leveling ============================
+//=============================== Bed Leveling ==============================
 //===========================================================================
 // @section bedlevel
@ -882,10 +856,22 @@
 *   Probe several points in a grid.
 *   You specify the rectangle and the density of sample points.
 *   The result is a mesh, best for large or uneven beds.
 *
 * - UBL Unified Bed Leveling
 *   A comprehensive bed leveling system that combines features and benefits from previous
 *   bed leveling system.  The UBL Bed Leveling System also includes an integrated and easy to use
 *   Mesh Generation, Mesh Validation and Mesh Editing system.
 *     - Currently, the UBL Bed Leveling System is only checked out for Cartesian Printers.  But with
 *       that said, it was primarily designed to handle poor quality Delta Printers.  If you feel
 *       adventurous and have a Delta, please post an issue if something doesn't work correctly.
 *       Initially, you will need to reduce your declared bed size so you have a rectangular area to
 *       test on.
 */
 //#define AUTO_BED_LEVELING_3POINT
 //#define AUTO_BED_LEVELING_LINEAR
 //#define AUTO_BED_LEVELING_BILINEAR
 //#define MESH_BED_LEVELING
 //#define AUTO_BED_LEVELING_UBL
 /**
 * Enable detailed logging of G28, G29, M48, etc.
@ -894,6 +880,13 @@
 */
 //#define DEBUG_LEVELING_FEATURE
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
  // Gradually reduce leveling correction until a set height is reached,
  // at which point movement will be level to the machine's XY plane.
  // The height can be set with M420 Z<height>
  //#define ENABLE_LEVELING_FADE_HEIGHT
 #endif
 #if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
  // Set the number of grid points per dimension.
@ -916,11 +909,6 @@
  #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
    // Gradually reduce leveling correction until a set height is reached,
    // at which point movement will be level to the machine's XY plane.
    // The height can be set with M420 Z<height>
    #define ENABLE_LEVELING_FADE_HEIGHT
    //
    // Experimental Subdivision of the grid by Catmull-Rom method.
    // Synthesizes intermediate points to produce a more detailed mesh.
@ -944,7 +932,42 @@
  #define ABL_PROBE_PT_3_X 170
  #define ABL_PROBE_PT_3_Y 20
-#endif
+#elif ENABLED(MESH_BED_LEVELING)
 //===========================================================================
 //=================================== Mesh ==================================
 //===========================================================================
  #define MANUAL_PROBE_Z_RANGE 4 // Z after Home, bed somewhere below but above 0.0.
  #define MESH_INSET 10          // Mesh inset margin on print area
  #define MESH_NUM_X_POINTS 3    // Don't use more than 7 points per axis, implementation limited.
  #define MESH_NUM_Y_POINTS 3
  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest at origin [0,0,0]
  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
  #if ENABLED(MANUAL_BED_LEVELING)
    #define MBL_Z_STEP 0.025     // Step size while manually probing Z axis.
  #endif  // MANUAL_BED_LEVELING
 #elif ENABLED(AUTO_BED_LEVELING_UBL)
 //===========================================================================
 //========================= Unified Bed Leveling ============================
 //===========================================================================
  #define UBL_MESH_INSET 1          // Mesh inset margin on print area
  #define UBL_MESH_NUM_X_POINTS 10  // Don't use more than 15 points per axis, implementation limited.
  #define UBL_MESH_NUM_Y_POINTS 10
  #define UBL_PROBE_PT_1_X 39       // These set the probe locations for when UBL does a 3-Point leveling
  #define UBL_PROBE_PT_1_Y 180      // of the mesh.
  #define UBL_PROBE_PT_2_X 39
  #define UBL_PROBE_PT_2_Y 20
  #define UBL_PROBE_PT_3_X 180
  #define UBL_PROBE_PT_3_Y 20
 #endif  // BED_LEVELING
 /**
 * Commands to execute at the end of G29 probing.
--- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h
+++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h
@ -235,6 +235,7 @@
 *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
 *    66 : 4.7M High Temperature thermistor from Dyze Design
 *    70 : the 100K thermistor found in the bq Hephestos 2
 *    75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor
 *
 *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
 *                              (but gives greater accuracy and more stable PID)
@ -691,8 +692,7 @@
 //
 // To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN.
 //
-// For a servo-based Z probe, you must set up servo support below, including
+// For a servo-based Z probe, just set Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES above.
 // NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES.
 //
 // - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin.
 // - Use 5V for powered (usu. inductive) sensors.
@ -829,35 +829,9 @@
  #define FILAMENT_RUNOUT_SCRIPT "M600"
 #endif
 //===========================================================================
 //============================ Mesh Bed Leveling ============================
 //===========================================================================
 //#define MESH_BED_LEVELING    // Enable mesh bed leveling.
 #if ENABLED(MESH_BED_LEVELING)
  #define MESH_INSET 10        // Mesh inset margin on print area
  #define MESH_NUM_X_POINTS 3  // Don't use more than 7 points per axis, implementation limited.
  #define MESH_NUM_Y_POINTS 3
  #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS
  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
  #if ENABLED(MANUAL_BED_LEVELING)
    #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
  #endif  // MANUAL_BED_LEVELING
  // Gradually reduce leveling correction until a set height is reached,
  // at which point movement will be level to the machine's XY plane.
  // The height can be set with M420 Z<height>
  #define ENABLE_LEVELING_FADE_HEIGHT
 #endif  // MESH_BED_LEVELING
 //===========================================================================
-//============================ Auto Bed Leveling ============================
+//=============================== Bed Leveling ==============================
 //===========================================================================
 // @section bedlevel
@ -881,10 +855,22 @@
 *   Probe several points in a grid.
 *   You specify the rectangle and the density of sample points.
 *   The result is a mesh, best for large or uneven beds.
 *
 * - UBL Unified Bed Leveling
 *   A comprehensive bed leveling system that combines features and benefits from previous
 *   bed leveling system.  The UBL Bed Leveling System also includes an integrated and easy to use
 *   Mesh Generation, Mesh Validation and Mesh Editing system.
 *     - Currently, the UBL Bed Leveling System is only checked out for Cartesian Printers.  But with
 *       that said, it was primarily designed to handle poor quality Delta Printers.  If you feel
 *       adventurous and have a Delta, please post an issue if something doesn't work correctly.
 *       Initially, you will need to reduce your declared bed size so you have a rectangular area to
 *       test on.
 */
 //#define AUTO_BED_LEVELING_3POINT
 //#define AUTO_BED_LEVELING_LINEAR
-#define AUTO_BED_LEVELING_BILINEAR
+//#define AUTO_BED_LEVELING_BILINEAR
 //#define MESH_BED_LEVELING
 //#define AUTO_BED_LEVELING_UBL
 /**
 * Enable detailed logging of G28, G29, M48, etc.
@ -893,6 +879,13 @@
 */
 //#define DEBUG_LEVELING_FEATURE
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
  // Gradually reduce leveling correction until a set height is reached,
  // at which point movement will be level to the machine's XY plane.
  // The height can be set with M420 Z<height>
  //#define ENABLE_LEVELING_FADE_HEIGHT
 #endif
 #if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
  // Set the number of grid points per dimension.
@ -915,11 +908,6 @@
  #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
    // Gradually reduce leveling correction until a set height is reached,
    // at which point movement will be level to the machine's XY plane.
    // The height can be set with M420 Z<height>
    //#define ENABLE_LEVELING_FADE_HEIGHT
    //
    // Experimental Subdivision of the grid by Catmull-Rom method.
    // Synthesizes intermediate points to produce a more detailed mesh.
@ -943,7 +931,42 @@
  #define ABL_PROBE_PT_3_X 170
  #define ABL_PROBE_PT_3_Y 20
-#endif
+#elif ENABLED(MESH_BED_LEVELING)
 //===========================================================================
 //=================================== Mesh ==================================
 //===========================================================================
  #define MANUAL_PROBE_Z_RANGE 4 // Z after Home, bed somewhere below but above 0.0.
  #define MESH_INSET 10          // Mesh inset margin on print area
  #define MESH_NUM_X_POINTS 3    // Don't use more than 7 points per axis, implementation limited.
  #define MESH_NUM_Y_POINTS 3
  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest at origin [0,0,0]
  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
  #if ENABLED(MANUAL_BED_LEVELING)
    #define MBL_Z_STEP 0.025     // Step size while manually probing Z axis.
  #endif  // MANUAL_BED_LEVELING
 #elif ENABLED(AUTO_BED_LEVELING_UBL)
 //===========================================================================
 //========================= Unified Bed Leveling ============================
 //===========================================================================
  #define UBL_MESH_INSET 1          // Mesh inset margin on print area
  #define UBL_MESH_NUM_X_POINTS 10  // Don't use more than 15 points per axis, implementation limited.
  #define UBL_MESH_NUM_Y_POINTS 10
  #define UBL_PROBE_PT_1_X 39       // These set the probe locations for when UBL does a 3-Point leveling
  #define UBL_PROBE_PT_1_Y 180      // of the mesh.
  #define UBL_PROBE_PT_2_X 39
  #define UBL_PROBE_PT_2_Y 20
  #define UBL_PROBE_PT_3_X 180
  #define UBL_PROBE_PT_3_Y 20
 #endif  // BED_LEVELING
 /**
 * Commands to execute at the end of G29 probing.
--- a/Marlin/example_configurations/delta/kossel_xl/Configuration.h
+++ b/Marlin/example_configurations/delta/kossel_xl/Configuration.h
@ -74,6 +74,13 @@
 // example_configurations/delta directory.
 //
 //===========================================================================
 //============================= SCARA Printer ===============================
 //===========================================================================
 // For a Scara printer replace the configuration files with the files in the
 // example_configurations/SCARA directory.
 //
 // @section info
 // User-specified version info of this build to display in [Pronterface, etc] terminal window during
@ -224,6 +231,7 @@
 *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
 *    66 : 4.7M High Temperature thermistor from Dyze Design
 *    70 : the 100K thermistor found in the bq Hephestos 2
 *    75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor
 *
 *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
 *                              (but gives greater accuracy and more stable PID)
@ -695,8 +703,7 @@
 //
 // To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN.
 //
-// For a servo-based Z probe, you must set up servo support below, including
+// For a servo-based Z probe, just set Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES above.
 // NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES.
 //
 // - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin.
 // - Use 5V for powered (usu. inductive) sensors.
@ -833,35 +840,9 @@
  #define FILAMENT_RUNOUT_SCRIPT "M600"
 #endif
 //===========================================================================
 //============================ Mesh Bed Leveling ============================
 //===========================================================================
 //#define MESH_BED_LEVELING    // Enable mesh bed leveling.
 #if ENABLED(MESH_BED_LEVELING)
  #define MESH_INSET 10        // Mesh inset margin on print area
  #define MESH_NUM_X_POINTS 3  // Don't use more than 7 points per axis, implementation limited.
  #define MESH_NUM_Y_POINTS 3
  #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS
  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
  #if ENABLED(MANUAL_BED_LEVELING)
    #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
  #endif  // MANUAL_BED_LEVELING
  // Gradually reduce leveling correction until a set height is reached,
  // at which point movement will be level to the machine's XY plane.
  // The height can be set with M420 Z<height>
  #define ENABLE_LEVELING_FADE_HEIGHT
 #endif  // MESH_BED_LEVELING
 //===========================================================================
-//============================ Auto Bed Leveling ============================
+//=============================== Bed Leveling ==============================
 //===========================================================================
 // @section bedlevel
@ -885,10 +866,22 @@
 *   Probe several points in a grid.
 *   You specify the rectangle and the density of sample points.
 *   The result is a mesh, best for large or uneven beds.
 *
 * - UBL Unified Bed Leveling
 *   A comprehensive bed leveling system that combines features and benefits from previous
 *   bed leveling system.  The UBL Bed Leveling System also includes an integrated and easy to use
 *   Mesh Generation, Mesh Validation and Mesh Editing system.
 *     - Currently, the UBL Bed Leveling System is only checked out for Cartesian Printers.  But with
 *       that said, it was primarily designed to handle poor quality Delta Printers.  If you feel
 *       adventurous and have a Delta, please post an issue if something doesn't work correctly.
 *       Initially, you will need to reduce your declared bed size so you have a rectangular area to
 *       test on.
 */
 //#define AUTO_BED_LEVELING_3POINT
 //#define AUTO_BED_LEVELING_LINEAR
-#define AUTO_BED_LEVELING_BILINEAR
+//#define AUTO_BED_LEVELING_BILINEAR
 //#define MESH_BED_LEVELING
 //#define AUTO_BED_LEVELING_UBL
 /**
 * Enable detailed logging of G28, G29, M48, etc.
@ -897,6 +890,13 @@
 */
 //#define DEBUG_LEVELING_FEATURE
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
  // Gradually reduce leveling correction until a set height is reached,
  // at which point movement will be level to the machine's XY plane.
  // The height can be set with M420 Z<height>
  //#define ENABLE_LEVELING_FADE_HEIGHT
 #endif
 #if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
  // Set the number of grid points per dimension.
@ -918,12 +918,6 @@
  //#define PROBE_Y_FIRST
  #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
    // Gradually reduce leveling correction until a set height is reached,
    // at which point movement will be level to the machine's XY plane.
    // The height can be set with M420 Z<height>
    //#define ENABLE_LEVELING_FADE_HEIGHT
    //
    // Experimental Subdivision of the grid by Catmull-Rom method.
    // Synthesizes intermediate points to produce a more detailed mesh.
@ -947,7 +941,42 @@
  #define ABL_PROBE_PT_3_X 170
  #define ABL_PROBE_PT_3_Y 20
-#endif
+#elif ENABLED(MESH_BED_LEVELING)
 //===========================================================================
 //=================================== Mesh ==================================
 //===========================================================================
  #define MANUAL_PROBE_Z_RANGE 4 // Z after Home, bed somewhere below but above 0.0.
  #define MESH_INSET 10          // Mesh inset margin on print area
  #define MESH_NUM_X_POINTS 3    // Don't use more than 7 points per axis, implementation limited.
  #define MESH_NUM_Y_POINTS 3
  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest at origin [0,0,0]
  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
  #if ENABLED(MANUAL_BED_LEVELING)
    #define MBL_Z_STEP 0.025     // Step size while manually probing Z axis.
  #endif  // MANUAL_BED_LEVELING
 #elif ENABLED(AUTO_BED_LEVELING_UBL)
 //===========================================================================
 //========================= Unified Bed Leveling ============================
 //===========================================================================
  #define UBL_MESH_INSET 1          // Mesh inset margin on print area
  #define UBL_MESH_NUM_X_POINTS 10  // Don't use more than 15 points per axis, implementation limited.
  #define UBL_MESH_NUM_Y_POINTS 10
  #define UBL_PROBE_PT_1_X 39       // These set the probe locations for when UBL does a 3-Point leveling
  #define UBL_PROBE_PT_1_Y 180      // of the mesh.
  #define UBL_PROBE_PT_2_X 39
  #define UBL_PROBE_PT_2_Y 20
  #define UBL_PROBE_PT_3_X 180
  #define UBL_PROBE_PT_3_Y 20
 #endif  // BED_LEVELING
 /**
 * Commands to execute at the end of G29 probing.
--- a/Marlin/example_configurations/makibox/Configuration.h
+++ b/Marlin/example_configurations/makibox/Configuration.h
@ -231,6 +231,7 @@
 *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
 *    66 : 4.7M High Temperature thermistor from Dyze Design
 *    70 : the 100K thermistor found in the bq Hephestos 2
 *    75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor
 *
 *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
 *                              (but gives greater accuracy and more stable PID)
@ -606,8 +607,7 @@
 //
 // To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN.
 //
-// For a servo-based Z probe, you must set up servo support below, including
+// For a servo-based Z probe, just set Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES above.
 // NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES.
 //
 // - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin.
 // - Use 5V for powered (usu. inductive) sensors.
@ -744,35 +744,9 @@
  #define FILAMENT_RUNOUT_SCRIPT "M600"
 #endif
 //===========================================================================
 //============================ Mesh Bed Leveling ============================
 //===========================================================================
 //#define MESH_BED_LEVELING    // Enable mesh bed leveling.
 #if ENABLED(MESH_BED_LEVELING)
  #define MESH_INSET 10        // Mesh inset margin on print area
  #define MESH_NUM_X_POINTS 3  // Don't use more than 7 points per axis, implementation limited.
  #define MESH_NUM_Y_POINTS 3
  #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS
  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
  #if ENABLED(MANUAL_BED_LEVELING)
    #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
  #endif  // MANUAL_BED_LEVELING
  // Gradually reduce leveling correction until a set height is reached,
  // at which point movement will be level to the machine's XY plane.
  // The height can be set with M420 Z<height>
  #define ENABLE_LEVELING_FADE_HEIGHT
 #endif  // MESH_BED_LEVELING
 //===========================================================================
-//============================ Auto Bed Leveling ============================
+//=============================== Bed Leveling ==============================
 //===========================================================================
 // @section bedlevel
@ -796,10 +770,22 @@
 *   Probe several points in a grid.
 *   You specify the rectangle and the density of sample points.
 *   The result is a mesh, best for large or uneven beds.
 *
 * - UBL Unified Bed Leveling
 *   A comprehensive bed leveling system that combines features and benefits from previous
 *   bed leveling system.  The UBL Bed Leveling System also includes an integrated and easy to use
 *   Mesh Generation, Mesh Validation and Mesh Editing system.
 *     - Currently, the UBL Bed Leveling System is only checked out for Cartesian Printers.  But with
 *       that said, it was primarily designed to handle poor quality Delta Printers.  If you feel
 *       adventurous and have a Delta, please post an issue if something doesn't work correctly.
 *       Initially, you will need to reduce your declared bed size so you have a rectangular area to
 *       test on.
 */
 //#define AUTO_BED_LEVELING_3POINT
 //#define AUTO_BED_LEVELING_LINEAR
 //#define AUTO_BED_LEVELING_BILINEAR
 //#define MESH_BED_LEVELING
 //#define AUTO_BED_LEVELING_UBL
 /**
 * Enable detailed logging of G28, G29, M48, etc.
@ -808,6 +794,13 @@
 */
 //#define DEBUG_LEVELING_FEATURE
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
  // Gradually reduce leveling correction until a set height is reached,
  // at which point movement will be level to the machine's XY plane.
  // The height can be set with M420 Z<height>
  #define ENABLE_LEVELING_FADE_HEIGHT
 #endif
 #if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
  // Set the number of grid points per dimension.
@ -828,11 +821,6 @@
  #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
    // Gradually reduce leveling correction until a set height is reached,
    // at which point movement will be level to the machine's XY plane.
    // The height can be set with M420 Z<height>
    #define ENABLE_LEVELING_FADE_HEIGHT
    //
    // Experimental Subdivision of the grid by Catmull-Rom method.
    // Synthesizes intermediate points to produce a more detailed mesh.
@ -856,7 +844,42 @@
  #define ABL_PROBE_PT_3_X 170
  #define ABL_PROBE_PT_3_Y 20
-#endif
+#elif ENABLED(MESH_BED_LEVELING)
 //===========================================================================
 //=================================== Mesh ==================================
 //===========================================================================
  #define MANUAL_PROBE_Z_RANGE 4 // Z after Home, bed somewhere below but above 0.0.
  #define MESH_INSET 10          // Mesh inset margin on print area
  #define MESH_NUM_X_POINTS 3    // Don't use more than 7 points per axis, implementation limited.
  #define MESH_NUM_Y_POINTS 3
  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest at origin [0,0,0]
  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
  #if ENABLED(MANUAL_BED_LEVELING)
    #define MBL_Z_STEP 0.025     // Step size while manually probing Z axis.
  #endif  // MANUAL_BED_LEVELING
 #elif ENABLED(AUTO_BED_LEVELING_UBL)
 //===========================================================================
 //========================= Unified Bed Leveling ============================
 //===========================================================================
  #define UBL_MESH_INSET 1          // Mesh inset margin on print area
  #define UBL_MESH_NUM_X_POINTS 10  // Don't use more than 15 points per axis, implementation limited.
  #define UBL_MESH_NUM_Y_POINTS 10
  #define UBL_PROBE_PT_1_X 39       // These set the probe locations for when UBL does a 3-Point leveling
  #define UBL_PROBE_PT_1_Y 180      // of the mesh.
  #define UBL_PROBE_PT_2_X 39
  #define UBL_PROBE_PT_2_Y 20
  #define UBL_PROBE_PT_3_X 180
  #define UBL_PROBE_PT_3_Y 20
 #endif  // BED_LEVELING
 /**
 * Commands to execute at the end of G29 probing.
--- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h
+++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h
@ -231,6 +231,7 @@
 *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
 *    66 : 4.7M High Temperature thermistor from Dyze Design
 *    70 : the 100K thermistor found in the bq Hephestos 2
 *    75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor
 *
 *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
 *                              (but gives greater accuracy and more stable PID)
@ -599,8 +600,7 @@
 //
 // To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN.
 //
-// For a servo-based Z probe, you must set up servo support below, including
+// For a servo-based Z probe, just set Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES above.
 // NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES.
 //
 // - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin.
 // - Use 5V for powered (usu. inductive) sensors.
@ -737,35 +737,9 @@
  #define FILAMENT_RUNOUT_SCRIPT "M600"
 #endif
 //===========================================================================
 //============================ Mesh Bed Leveling ============================
 //===========================================================================
 //#define MESH_BED_LEVELING    // Enable mesh bed leveling.
 #if ENABLED(MESH_BED_LEVELING)
  #define MESH_INSET 10        // Mesh inset margin on print area
  #define MESH_NUM_X_POINTS 3  // Don't use more than 7 points per axis, implementation limited.
  #define MESH_NUM_Y_POINTS 3
  #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS
  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
  #if ENABLED(MANUAL_BED_LEVELING)
    #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
  #endif  // MANUAL_BED_LEVELING
  // Gradually reduce leveling correction until a set height is reached,
  // at which point movement will be level to the machine's XY plane.
  // The height can be set with M420 Z<height>
  #define ENABLE_LEVELING_FADE_HEIGHT
 #endif  // MESH_BED_LEVELING
 //===========================================================================
-//============================ Auto Bed Leveling ============================
+//=============================== Bed Leveling ==============================
 //===========================================================================
 // @section bedlevel
@ -789,10 +763,22 @@
 *   Probe several points in a grid.
 *   You specify the rectangle and the density of sample points.
 *   The result is a mesh, best for large or uneven beds.
 *
 * - UBL Unified Bed Leveling
 *   A comprehensive bed leveling system that combines features and benefits from previous
 *   bed leveling system.  The UBL Bed Leveling System also includes an integrated and easy to use
 *   Mesh Generation, Mesh Validation and Mesh Editing system.
 *     - Currently, the UBL Bed Leveling System is only checked out for Cartesian Printers.  But with
 *       that said, it was primarily designed to handle poor quality Delta Printers.  If you feel
 *       adventurous and have a Delta, please post an issue if something doesn't work correctly.
 *       Initially, you will need to reduce your declared bed size so you have a rectangular area to
 *       test on.
 */
 //#define AUTO_BED_LEVELING_3POINT
 //#define AUTO_BED_LEVELING_LINEAR
 //#define AUTO_BED_LEVELING_BILINEAR
 //#define MESH_BED_LEVELING
 //#define AUTO_BED_LEVELING_UBL
 /**
 * Enable detailed logging of G28, G29, M48, etc.
@ -801,6 +787,13 @@
 */
 //#define DEBUG_LEVELING_FEATURE
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
  // Gradually reduce leveling correction until a set height is reached,
  // at which point movement will be level to the machine's XY plane.
  // The height can be set with M420 Z<height>
  #define ENABLE_LEVELING_FADE_HEIGHT
 #endif
 #if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
  // Set the number of grid points per dimension.
@ -821,11 +814,6 @@
  #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
    // Gradually reduce leveling correction until a set height is reached,
    // at which point movement will be level to the machine's XY plane.
    // The height can be set with M420 Z<height>
    #define ENABLE_LEVELING_FADE_HEIGHT
    //
    // Experimental Subdivision of the grid by Catmull-Rom method.
    // Synthesizes intermediate points to produce a more detailed mesh.
@ -849,7 +837,42 @@
  #define ABL_PROBE_PT_3_X 170
  #define ABL_PROBE_PT_3_Y 20
-#endif
+#elif ENABLED(MESH_BED_LEVELING)
 //===========================================================================
 //=================================== Mesh ==================================
 //===========================================================================
  #define MANUAL_PROBE_Z_RANGE 4 // Z after Home, bed somewhere below but above 0.0.
  #define MESH_INSET 10          // Mesh inset margin on print area
  #define MESH_NUM_X_POINTS 3    // Don't use more than 7 points per axis, implementation limited.
  #define MESH_NUM_Y_POINTS 3
  //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest at origin [0,0,0]
  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
  #if ENABLED(MANUAL_BED_LEVELING)
    #define MBL_Z_STEP 0.025     // Step size while manually probing Z axis.
  #endif  // MANUAL_BED_LEVELING
 #elif ENABLED(AUTO_BED_LEVELING_UBL)
 //===========================================================================
 //========================= Unified Bed Leveling ============================
 //===========================================================================
  #define UBL_MESH_INSET 1          // Mesh inset margin on print area
  #define UBL_MESH_NUM_X_POINTS 10  // Don't use more than 15 points per axis, implementation limited.
  #define UBL_MESH_NUM_Y_POINTS 10
  #define UBL_PROBE_PT_1_X 39       // These set the probe locations for when UBL does a 3-Point leveling
  #define UBL_PROBE_PT_1_Y 180      // of the mesh.
  #define UBL_PROBE_PT_2_X 39
  #define UBL_PROBE_PT_2_Y 20
  #define UBL_PROBE_PT_3_X 180
  #define UBL_PROBE_PT_3_Y 20
 #endif  // BED_LEVELING
 /**
 * Commands to execute at the end of G29 probing.