format, clean up

Author: thinkyhead

Marlin/Configuration.h

@@ -2107,32 +2107,35 @@
 //#define AUTO_BED_LEVELING_UBL
 //#define MESH_BED_LEVELING
 
-/* When a level probe is fitted but not used for homing, enabling USE_PROBE_FOR_MESH_REF will avoid a level mesh
- * being created with an unwanted offset between the fixed Z endstop/Homing Switch and probe trigger height. The 
+/**
+ * When a level probe is fitted but not used for homing, enabling USE_PROBE_FOR_MESH_REF will avoid a level mesh
+ * being created with an unwanted offset between the fixed Z endstop/Homing Switch and probe trigger height. The
  * probe Z offset menu option is removed from the level sub menu, as entering a Z offset there would shift the mesh
  * and the Homeing position giving confusing status values for Z. It is recomended not to enter a Z offset value in
  * the probe offset section of config.h for the same reason.
- * 
- * If no Z offsets are entered elsewhere the status screen will always show the actual Z possition. e.g when homing 
- * the Z status will show 0 at the Home position, unless the height of the fixed Z stop/Homeing switch above the bed 
- * has been set by the HOME_SWITCH_TO_BED_OFFSET_MENU option while creating a level mesh. In which case the Home 
- * position will show as that height. The printer will move down to the print height when printing starts and Z status 
+ *
+ * If no Z offsets are entered elsewhere the status screen will always show the actual Z possition. e.g when homing
+ * the Z status will show 0 at the Home position, unless the height of the fixed Z stop/Homeing switch above the bed
+ * has been set by the HOME_SWITCH_TO_BED_OFFSET_MENU option while creating a level mesh. In which case the Home
+ * position will show as that height. The printer will move down to the print height when printing starts and Z status
  * will show the first layer height. The Nozzle will follow the mesh and baby stepping can be used to temporarily lower
  * or raise the nozzle to adjust first layer squish.
- * 
+ *
  * If your Z stop/Homeing switch has a fine adjustment capability, the HOME_SWITCH_TO_BED_OFFSET_MENU menu option can be
  * left at zero or disabled. Using the paper pinch test and setting the Z stop/Homeing switch position works just as well.
  */
-#ifndef USE_PROBE_FOR_Z_HOMING
-  #if defined AUTO_BED_LEVELING_BILINEAR || defined AUTO_BED_LEVELING_UBL || defined AUTO_BED_LEVELING_LINEAR || defined AUTO_BED_LEVELING_3POINT
-  //#define USE_PROBE_FOR_MESH_REF
-      #ifdef USE_PROBE_FOR_MESH_REF
-      /*optional HOME_SWITCH_TO_BED_OFFSET_MENU enables a menu option called "Home Offset Z" to adjust the Z offset between
-      * the Fixed Z endstop/Homing switch and the bed. This offset is only used to adjust the level mesh down 
-      * to the Zero plane (Bed) as the mesh is created, so a new level mesh must be created when if it is changed to apply it.*/
-        #define HOME_SWITCH_TO_BED_OFFSET_MENU
-      #endif
-  #endif    
+#if DISABLED(USE_PROBE_FOR_Z_HOMING)
+  #if ANY(AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_UBL, AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_3POINT)
+    //#define USE_PROBE_FOR_MESH_REF
+    #if ENABLED(USE_PROBE_FOR_MESH_REF)
+      /**
+       * HOME_SWITCH_TO_BED_OFFSET_MENU enables a menu option called "Home Offset Z" to adjust the Z offset between
+       * the Fixed Z endstop/Homing switch and the bed. This offset is only used to adjust the level mesh down
+       * to the Zero plane (Bed) as the mesh is created, so a new level mesh must be created when if it is changed to apply it.
+       */
+      //#define HOME_SWITCH_TO_BED_OFFSET_MENU
+    #endif
+  #endif
 #endif
 
 /**

Marlin/src/feature/bedlevel/bedlevel.cpp

@@ -35,6 +35,10 @@
   bool g29_in_progress = false;
 #endif
 
+#if ENABLED(USE_PROBE_FOR_MESH_REF)
+  float mesh_zero_ref_offset = 0;  // declared in gcode.h as external so it can be set in menu_probe_level.cpp
+#endif
+
 #if ENABLED(LCD_BED_LEVELING)
   #include "../../lcd/marlinui.h"
 #endif

Marlin/src/feature/bedlevel/bedlevel.h

@@ -33,6 +33,10 @@
   constexpr bool g29_in_progress = false;
 #endif
 
+#if ENABLED(USE_PROBE_FOR_MESH_REF)
+  extern float mesh_zero_ref_offset;
+#endif
+
 bool leveling_is_valid();
 void set_bed_leveling_enabled(const bool enable=true);
 void reset_bed_level();

Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp

@@ -74,10 +74,6 @@
 #define SIZE_OF_LITTLE_RAISE 1
 #define BIG_RAISE_NOT_NEEDED 0
 
-#ifdef USE_PROBE_FOR_MESH_REF
-  float mesh_zero_ref_offset = 0;  // declared in gcode.h as external so it can be set in menu_probe_level.cpp
-#endif
-
 /**
  *   G29: Unified Bed Leveling by Roxy
  *
@@ -325,28 +321,26 @@ void unified_bed_leveling::G29() {
   if (may_move) {
     planner.synchronize();
 
-  #ifdef USE_PROBE_FOR_MESH_REF
-    // Send 'N' to force homing before G29 (internal only)
-    if (axes_should_home() || parser.seen_test('N')){
-      gcode.home_all_axes(); 
-    } 
-    else {
-      gcode.process_subcommands_now(F("G28L0 X Y"));  // Home X and Y only 
-    }
-    // Set the probe trigger height as Z home before leveling
-    probe.probe_at_point(current_position, PROBE_PT_NONE,0 ,false ,true, Z_PROBE_LOW_POINT, Z_TWEEN_SAFE_CLEARANCE, false);
-    set_axis_is_at_home(Z_AXIS);
-    sync_plan_position();
-  #else
-      #if ALL(DWIN_LCD_PROUI, ZHOME_BEFORE_LEVELING)
-        save_ubl_active_state_and_disable();
-        gcode.process_subcommands_now(F("G28Z"));
-        restore_ubl_active_state(false); // ...without telling ExtUI "done"
-      #else
-        // Send 'N' to force homing before G29 (internal only)
-        if (axes_should_home() || parser.seen_test('N')) gcode.home_all_axes();
-      #endif
-  #endif
+    #if ENABLED(USE_PROBE_FOR_MESH_REF)
+      // Send 'N' to force homing before G29 (internal only)
+      if (axes_should_home() || parser.seen_test('N')) {
+        gcode.home_all_axes();
+      }
+      else {
+        gcode.process_subcommands_now(F("G28L0 X Y"));  // Home X and Y only
+      }
+      // Set the probe trigger height as Z home before leveling
+      probe.probe_at_point(current_position, PROBE_PT_NONE,0 ,false ,true, Z_PROBE_LOW_POINT, Z_TWEEN_SAFE_CLEARANCE, false);
+      set_axis_is_at_home(Z_AXIS);
+      sync_plan_position();
+    #elif ALL(DWIN_LCD_PROUI, ZHOME_BEFORE_LEVELING)
+      save_ubl_active_state_and_disable();
+      gcode.process_subcommands_now(F("G28Z"));
+      restore_ubl_active_state(false); // ...without telling ExtUI "done"
+    #else
+      // Send 'N' to force homing before G29 (internal only)
+      if (axes_should_home() || parser.seen_test('N')) gcode.home_all_axes();
+    #endif
 
     probe.use_probing_tool();
 
@@ -827,11 +821,7 @@ void unified_bed_leveling::shift_mesh_height() {
 
       if (best.pos.x >= 0) {    // mesh point found and is reachable by probe
         TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(best.pos, ExtUI::G29_POINT_START));
-          #ifdef USE_PROBE_FOR_MESH_REF // adjust the mesh point value
-            const float measured_z = probe.probe_at_point(best.meshpos(), stow_probe ? PROBE_PT_STOW : PROBE_PT_RAISE, param.V_verbosity) - mesh_zero_ref_offset;
-          #else
-            const float measured_z = probe.probe_at_point(best.meshpos(), stow_probe ? PROBE_PT_STOW : PROBE_PT_RAISE, param.V_verbosity);
-          #endif
+        const float measured_z = DIFF_TERN(USE_PROBE_FOR_MESH_REF, probe.probe_at_point(best.meshpos(), stow_probe ? PROBE_PT_STOW : PROBE_PT_RAISE, param.V_verbosity), mesh_zero_ref_offset);
         z_values[best.pos.x][best.pos.y] = isnan(measured_z) ? HUGE_VALF : measured_z;  // Mark invalid point already probed with HUGE_VALF to omit it in the next loop
         #if ENABLED(EXTENSIBLE_UI)
           ExtUI::onMeshUpdate(best.pos, ExtUI::G29_POINT_FINISH);

Marlin/src/gcode/bedlevel/abl/G29.cpp

@@ -77,10 +77,6 @@
   #endif
 #endif
 
-#ifdef USE_PROBE_FOR_MESH_REF
-  float mesh_zero_ref_offset = 0;  // declared in gcode.h as external so it can be set in menu_probe_level.cpp
-#endif
-
 /**
  * @brief Do some things before returning from G29.
  * @param retry : true if the G29 can and should be retried. false if the failure is too serious.
@@ -141,7 +137,7 @@ class G29_State {
     #endif
 
     #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
-      float Z_offset;
+      float z_offset;
       bed_mesh_t z_values;
     #endif
 
@@ -267,13 +263,13 @@ G29_TYPE GcodeSuite::G29() {
     G29_RETURN(false, false);
   }
 
-  #ifdef USE_PROBE_FOR_MESH_REF
+  #if ENABLED(USE_PROBE_FOR_MESH_REF)
     // Send 'N' to force homing before G29 (internal only)
     if (parser.seen_test('N')){
-      process_subcommands_now(TERN(CAN_SET_LEVELING_AFTER_G28, F("G28L0"), FPSTR(G28_STR)));  
-    } 
+      process_subcommands_now(TERN(CAN_SET_LEVELING_AFTER_G28, F("G28L0"), FPSTR(G28_STR)));
+    }
     else {
-      process_subcommands_now(F("G28L0 X Y"));  // Home X and Y only 
+      process_subcommands_now(F("G28L0 X Y"));  // Home X and Y only
     }
     // Set the probe trigger height as Z home before leveling
     probe.probe_at_point(current_position, PROBE_PT_NONE,0 ,false ,true, Z_PROBE_LOW_POINT, Z_TWEEN_SAFE_CLEARANCE, false);
@@ -282,8 +278,8 @@ G29_TYPE GcodeSuite::G29() {
   #else
     // Send 'N' to force homing before G29 (internal only)
     if (parser.seen_test('N')){
-      process_subcommands_now(TERN(CAN_SET_LEVELING_AFTER_G28, F("G28L0"), FPSTR(G28_STR)));  
-    } 
+      process_subcommands_now(TERN(CAN_SET_LEVELING_AFTER_G28, F("G28L0"), FPSTR(G28_STR)));
+    }
   #endif
 
   // Don't allow auto-leveling without homing first
@@ -418,7 +414,7 @@ G29_TYPE GcodeSuite::G29() {
 
     #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
 
-      abl.Z_offset = parser.linearval('Z');
+      abl.z_offset = parser.linearval('Z');
 
     #endif
 
@@ -611,19 +607,11 @@ G29_TYPE GcodeSuite::G29() {
 
       #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
 
-        #ifdef USE_PROBE_FOR_MESH_REF
-          const float newz = abl.measured_z + mesh_zero_ref_offset;
-        #else
-          const float newz = abl.measured_z + abl.Z_offset;
-        #endif
+        const float newz = abl.measured_z + TERN(USE_PROBE_FOR_MESH_REF, mesh_zero_ref_offset, abl.z_offset);
         abl.z_values[abl.meshCount.x][abl.meshCount.y] = newz;
         TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(abl.meshCount, newz));
 
-        #ifdef USE_PROBE_FOR_MESH_REF
-          if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM_P(PSTR("Save X"), abl.meshCount.x, SP_Y_STR, abl.meshCount.y, SP_Z_STR, abl.measured_z + mesh_zero_ref_offset);
-        #else
-          if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM_P(PSTR("Save X"), abl.meshCount.x, SP_Y_STR, abl.meshCount.y, SP_Z_STR, abl.measured_z + abl.Z_offset);
-        #endif
+        if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM_P(PSTR("Save X"), abl.meshCount.x, SP_Y_STR, abl.meshCount.y, SP_Z_STR, newz);
 
       #endif
     }
@@ -825,11 +813,7 @@ G29_TYPE GcodeSuite::G29() {
 
           #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
 
-            #ifdef USE_PROBE_FOR_MESH_REF
-              const float z = abl.measured_z + mesh_zero_ref_offset; 
-            #else
-              const float z = abl.measured_z + abl.Z_offset; 
-            #endif
+            const float z = abl.measured_z + TERN(USE_PROBE_FOR_MESH_REF, mesh_zero_ref_offset, abl.z_offset);
 
             abl.z_values[abl.meshCount.x][abl.meshCount.y] = z;
             TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(abl.meshCount, z));

Marlin/src/gcode/gcode.h

@@ -375,10 +375,6 @@ typedef bits_t(NUM_REL_MODES) relative_t;
 
 extern const char G28_STR[];
 
-#ifdef USE_PROBE_FOR_MESH_REF
-  extern float mesh_zero_ref_offset;
-#endif
-
 class GcodeSuite {
 public:
 

Marlin/src/lcd/menu/menu_probe_level.cpp

@@ -26,7 +26,7 @@
 
 #include "../../inc/MarlinConfigPre.h"
 
-#ifdef USE_PROBE_FOR_MESH_REF
+#if ENABLED(USE_PROBE_FOR_MESH_REF)
   #include "../../gcode/gcode.h"
 #endif
 
@@ -347,24 +347,24 @@ void menu_probe_level() {
     //
     // Probe Z Offset - Babystep or Edit
     //
-    if (can_babystep_z) {
-      #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
-        SUBMENU(MSG_BABYSTEP_PROBE_Z, lcd_babystep_zoffset);
-      #endif
-    }
-    else {
-      #if HAS_BED_PROBE
-        #ifdef USE_PROBE_FOR_MESH_REF
-          #ifdef HOME_SWITCH_TO_BED_OFFSET_MENU
-            // Change the name of the menu option as the offsett relates to the fixed Z stop/Homing switch but
-            // reduce the range to -1/+1 and use the same offset variable so function stays the same
-            EDIT_ITEM_N(LCD_Z_OFFSET_TYPE, Z_AXIS, MSG_HOME_OFFSET_Z, &mesh_zero_ref_offset, -1, 0);
-          #endif
-        #else
+    #if HAS_BED_PROBE
+
+      if (can_babystep_z) {
+        #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
+          SUBMENU(MSG_BABYSTEP_PROBE_Z, lcd_babystep_zoffset);
+        #endif
+      }
+      else {
+        #if DISABLED(USE_PROBE_FOR_MESH_REF)
           EDIT_ITEM_N(LCD_Z_OFFSET_TYPE, Z_AXIS, MSG_ZPROBE_OFFSET_N, &probe.offset.z, PROBE_OFFSET_ZMIN, PROBE_OFFSET_ZMAX);
-        #endif         
-      #endif
-    }
+        #elif ENABLED(HOME_SWITCH_TO_BED_OFFSET_MENU)
+          // Change the name of the menu option as the offsett relates to the fixed Z stop/Homing switch but
+          // reduce the range to -1/+1 and use the same offset variable so function stays the same
+          EDIT_ITEM_N(LCD_Z_OFFSET_TYPE, Z_AXIS, MSG_HOME_OFFSET_Z, &mesh_zero_ref_offset, -1, 0);
+        #endif
+      }
+
+    #endif // HAS_BED_PROBE
 
     //
     // Probe Z Offset Wizard