Browse Source

⚡️ Add PROBE_PT_LAST_STOW

Scott Lahteine 4 years ago
parent
commit
eccd82b7c1

+ 1
- 1
Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp View File

1479
         SERIAL_ECHOLNPGM("Tilting mesh (3/3)");
1479
         SERIAL_ECHOLNPGM("Tilting mesh (3/3)");
1480
         TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " 3/3"), GET_TEXT(MSG_LCD_TILTING_MESH)));
1480
         TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " 3/3"), GET_TEXT(MSG_LCD_TILTING_MESH)));
1481
 
1481
 
1482
-        measured_z = probe.probe_at_point(points[2], PROBE_PT_STOW, param.V_verbosity);
1482
+        measured_z = probe.probe_at_point(points[2], PROBE_PT_LAST_STOW, param.V_verbosity);
1483
         #ifdef VALIDATE_MESH_TILT
1483
         #ifdef VALIDATE_MESH_TILT
1484
           z3 = measured_z;
1484
           z3 = measured_z;
1485
         #endif
1485
         #endif

+ 2
- 2
Marlin/src/module/probe.cpp View File

751
   if (DEBUGGING(LEVELING)) {
751
   if (DEBUGGING(LEVELING)) {
752
     DEBUG_ECHOLNPAIR(
752
     DEBUG_ECHOLNPAIR(
753
       "...(", LOGICAL_X_POSITION(rx), ", ", LOGICAL_Y_POSITION(ry),
753
       "...(", LOGICAL_X_POSITION(rx), ", ", LOGICAL_Y_POSITION(ry),
754
-      ", ", raise_after == PROBE_PT_RAISE ? "raise" : raise_after == PROBE_PT_STOW ? "stow" : "none",
754
+      ", ", raise_after == PROBE_PT_RAISE ? "raise" : raise_after == PROBE_PT_LAST_STOW ? "stow (last)" : raise_after == PROBE_PT_STOW ? "stow" : "none",
755
       ", ", verbose_level,
755
       ", ", verbose_level,
756
       ", ", probe_relative ? "probe" : "nozzle", "_relative)"
756
       ", ", probe_relative ? "probe" : "nozzle", "_relative)"
757
     );
757
     );
782
     const bool big_raise = raise_after == PROBE_PT_BIG_RAISE;
782
     const bool big_raise = raise_after == PROBE_PT_BIG_RAISE;
783
     if (big_raise || raise_after == PROBE_PT_RAISE)
783
     if (big_raise || raise_after == PROBE_PT_RAISE)
784
       do_blocking_move_to_z(current_position.z + (big_raise ? 25 : Z_CLEARANCE_BETWEEN_PROBES), z_probe_fast_mm_s);
784
       do_blocking_move_to_z(current_position.z + (big_raise ? 25 : Z_CLEARANCE_BETWEEN_PROBES), z_probe_fast_mm_s);
785
-    else if (raise_after == PROBE_PT_STOW)
785
+    else if (raise_after == PROBE_PT_STOW || raise_after == PROBE_PT_LAST_STOW)
786
       if (stow()) measured_z = NAN;   // Error on stow?
786
       if (stow()) measured_z = NAN;   // Error on stow?
787
 
787
 
788
     if (verbose_level > 2)
788
     if (verbose_level > 2)

+ 1
- 0
Marlin/src/module/probe.h View File

33
   enum ProbePtRaise : uint8_t {
33
   enum ProbePtRaise : uint8_t {
34
     PROBE_PT_NONE,      // No raise or stow after run_z_probe
34
     PROBE_PT_NONE,      // No raise or stow after run_z_probe
35
     PROBE_PT_STOW,      // Do a complete stow after run_z_probe
35
     PROBE_PT_STOW,      // Do a complete stow after run_z_probe
36
+    PROBE_PT_LAST_STOW, // Stow for sure, even in BLTouch HS mode
36
     PROBE_PT_RAISE,     // Raise to "between" clearance after run_z_probe
37
     PROBE_PT_RAISE,     // Raise to "between" clearance after run_z_probe
37
     PROBE_PT_BIG_RAISE  // Raise to big clearance after run_z_probe
38
     PROBE_PT_BIG_RAISE  // Raise to big clearance after run_z_probe
38
   };
39
   };

Loading…
Cancel
Save