Browse Source

Unconditional do_probe_raise() in probe_pt()

If Z_RAISE_BETWEEN_PROBINGS is null or undefined the probe is currently not raised by home_offset[Z_AXIS] and zprobe_zoffset.
But when different from 0 is.

If an undefined Z_RAISE_BETWEEN_PROBINGS expands to 0 (and it does) this is the solution.


A similar asymmetry exists with the newly introduced 'short-cut' in G28 - but its the rise before anything is probed - so should not make a difference.
AnHardt 8 years ago
parent
commit
cb1b31f69b
1 changed files with 6 additions and 8 deletions
  1. 6
    8
      Marlin/Marlin_main.cpp

+ 6
- 8
Marlin/Marlin_main.cpp View File

@@ -2118,14 +2118,12 @@ static void clean_up_after_endstop_or_probe_move() {
2118 2118
       #endif
2119 2119
       stow_z_probe();
2120 2120
     }
2121
-    #if Z_RAISE_BETWEEN_PROBINGS > 0
2122
-      else {
2123
-        #if ENABLED(DEBUG_LEVELING_FEATURE)
2124
-          if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("> do_probe_raise");
2125
-        #endif
2126
-        do_probe_raise(Z_RAISE_BETWEEN_PROBINGS);
2127
-      }
2128
-    #endif
2121
+    else {
2122
+      #if ENABLED(DEBUG_LEVELING_FEATURE)
2123
+        if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("> do_probe_raise");
2124
+      #endif
2125
+      do_probe_raise(Z_RAISE_BETWEEN_PROBINGS);
2126
+    }
2129 2127
 
2130 2128
     if (verbose_level > 2) {
2131 2129
       SERIAL_PROTOCOLPGM("Bed X: ");

Loading…
Cancel
Save