Browse Source

Move raise_z_after_probing into earlier block

Scott Lahteine 9 years ago
parent
commit
7f8a2025af
1 changed files with 8 additions and 12 deletions
  1. 8
    12
      Marlin/Marlin_main.cpp

+ 8
- 12
Marlin/Marlin_main.cpp View File

@@ -1685,6 +1685,14 @@ static void setup_for_endstop_move() {
1685 1685
     do_blocking_move_to(current_position[X_AXIS], current_position[Y_AXIS], z);
1686 1686
   }
1687 1687
 
1688
+  inline void raise_z_after_probing() {
1689
+    #if Z_RAISE_AFTER_PROBING > 0
1690
+      #if ENABLED(DEBUG_LEVELING_FEATURE)
1691
+        if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("raise_z_after_probing()");
1692
+      #endif
1693
+      do_blocking_move_to_z(current_position[Z_AXIS] + Z_RAISE_AFTER_PROBING);
1694
+    #endif
1695
+  }
1688 1696
 #endif //HAS_BED_PROBE
1689 1697
 
1690 1698
 #if HAS_Z_SERVO_ENDSTOP
@@ -1710,18 +1718,6 @@ static void setup_for_endstop_move() {
1710 1718
 
1711 1719
 #endif
1712 1720
 
1713
-#if HAS_BED_PROBE
1714
-
1715
-  inline void raise_z_after_probing() {
1716
-    #if Z_RAISE_AFTER_PROBING > 0
1717
-      #if ENABLED(DEBUG_LEVELING_FEATURE)
1718
-        if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("raise_z_after_probing()");
1719
-      #endif
1720
-      do_blocking_move_to_z(current_position[Z_AXIS] + Z_RAISE_AFTER_PROBING);
1721
-    #endif
1722
-  }
1723
-#endif
1724
-
1725 1721
 #if ENABLED(Z_PROBE_SLED)
1726 1722
 
1727 1723
   #ifndef SLED_DOCKING_OFFSET

Loading…
Cancel
Save