Browse Source

Merge pull request #4821 from thinkyhead/rc_revert_to_raises

Z Raise/Clearance rather than Height
Scott Lahteine 8 years ago
parent
commit
dbe41245f1
25 changed files with 387 additions and 167 deletions
  1. 8
    8
      Marlin/Conditionals_post.h
  2. 16
    6
      Marlin/Configuration.h
  3. 15
    17
      Marlin/Marlin_main.cpp
  4. 12
    10
      Marlin/SanityCheck.h
  5. 16
    6
      Marlin/example_configurations/Cartesio/Configuration.h
  6. 16
    6
      Marlin/example_configurations/Felix/Configuration.h
  7. 16
    6
      Marlin/example_configurations/Felix/DUAL/Configuration.h
  8. 16
    6
      Marlin/example_configurations/Hephestos/Configuration.h
  9. 16
    6
      Marlin/example_configurations/Hephestos_2/Configuration.h
  10. 16
    6
      Marlin/example_configurations/K8200/Configuration.h
  11. 16
    6
      Marlin/example_configurations/K8400/Configuration.h
  12. 16
    6
      Marlin/example_configurations/K8400/Dual-head/Configuration.h
  13. 16
    6
      Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
  14. 16
    6
      Marlin/example_configurations/RigidBot/Configuration.h
  15. 16
    6
      Marlin/example_configurations/SCARA/Configuration.h
  16. 16
    6
      Marlin/example_configurations/TAZ4/Configuration.h
  17. 16
    6
      Marlin/example_configurations/WITBOX/Configuration.h
  18. 16
    6
      Marlin/example_configurations/adafruit/ST7565/Configuration.h
  19. 16
    6
      Marlin/example_configurations/delta/biv2.5/Configuration.h
  20. 16
    6
      Marlin/example_configurations/delta/generic/Configuration.h
  21. 16
    6
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  22. 16
    6
      Marlin/example_configurations/delta/kossel_pro/Configuration.h
  23. 16
    6
      Marlin/example_configurations/delta/kossel_xl/Configuration.h
  24. 16
    6
      Marlin/example_configurations/makibox/Configuration.h
  25. 16
    6
      Marlin/example_configurations/tvrrug/Round2/Configuration.h

+ 8
- 8
Marlin/Conditionals_post.h View File

@@ -602,10 +602,10 @@
602 602
         #define XY_PROBE_SPEED 4000
603 603
       #endif
604 604
     #endif
605
-    #if Z_PROBE_TRAVEL_HEIGHT > Z_PROBE_DEPLOY_HEIGHT
606
-      #define _Z_PROBE_DEPLOY_HEIGHT Z_PROBE_TRAVEL_HEIGHT
605
+    #if Z_CLEARANCE_BETWEEN_PROBES > Z_CLEARANCE_DEPLOY_PROBE
606
+      #define _Z_CLEARANCE_DEPLOY_PROBE Z_CLEARANCE_BETWEEN_PROBES
607 607
     #else
608
-      #define _Z_PROBE_DEPLOY_HEIGHT Z_PROBE_DEPLOY_HEIGHT
608
+      #define _Z_CLEARANCE_DEPLOY_PROBE Z_CLEARANCE_DEPLOY_PROBE
609 609
     #endif
610 610
   #else
611 611
     #undef X_PROBE_OFFSET_FROM_EXTRUDER
@@ -681,17 +681,17 @@
681 681
   #endif
682 682
 
683 683
   /**
684
-   * Z_HOMING_HEIGHT / Z_PROBE_TRAVEL_HEIGHT
684
+   * Z_HOMING_HEIGHT / Z_CLEARANCE_BETWEEN_PROBES
685 685
    */
686 686
   #ifndef Z_HOMING_HEIGHT
687
-    #ifndef Z_PROBE_TRAVEL_HEIGHT
687
+    #ifndef Z_CLEARANCE_BETWEEN_PROBES
688 688
       #define Z_HOMING_HEIGHT 0
689 689
     #else
690
-      #define Z_HOMING_HEIGHT Z_PROBE_TRAVEL_HEIGHT
690
+      #define Z_HOMING_HEIGHT Z_CLEARANCE_BETWEEN_PROBES
691 691
     #endif
692 692
   #endif
693
-  #ifndef Z_PROBE_TRAVEL_HEIGHT
694
-    #define Z_PROBE_TRAVEL_HEIGHT Z_HOMING_HEIGHT
693
+  #ifndef Z_CLEARANCE_BETWEEN_PROBES
694
+    #define Z_CLEARANCE_BETWEEN_PROBES Z_HOMING_HEIGHT
695 695
   #endif
696 696
 
697 697
   #if IS_KINEMATIC

+ 16
- 6
Marlin/Configuration.h View File

@@ -619,12 +619,22 @@
619 619
 // Enable Z Probe Repeatability test to see how accurate your probe is
620 620
 //#define Z_MIN_PROBE_REPEATABILITY_TEST
621 621
 
622
-//
623
-// Minimum heights for the probe to deploy/stow and travel.
624
-// These values specify the distance from the NOZZLE to the BED.
625
-//
626
-#define Z_PROBE_DEPLOY_HEIGHT 15 // Z position for the probe to deploy/stow
627
-#define Z_PROBE_TRAVEL_HEIGHT  5 // Z position for travel between points
622
+/**
623
+ * Z probes require clearance when deploying, stowing, and moving between
624
+ * probe points to avoid hitting the bed and other hardware.
625
+ * Servo-mounted probes require extra space for the arm to rotate.
626
+ * Inductive probes need space to keep from triggering early.
627
+ *
628
+ * Use these settings to specify the distance (mm) to raise the probe (or
629
+ * lower the bed). The values set here apply over and above any (negative)
630
+ * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
631
+ * Only integer values >= 1 are valid here.
632
+ *
633
+ * Example: `M851 Z-5` with a CLEARANCE of 4  =>  9mm from bed to nozzle.
634
+ *     But: `M851 Z+1` with a CLEARANCE of 2  =>  2mm from bed to nozzle.
635
+ */
636
+#define Z_CLEARANCE_DEPLOY_PROBE   10 // Z Clearance for Deploy/Stow
637
+#define Z_CLEARANCE_BETWEEN_PROBES  5 // Z Clearance between probe points
628 638
 
629 639
 //
630 640
 // For M851 give a range for adjusting the Z probe offset

+ 15
- 17
Marlin/Marlin_main.cpp View File

@@ -1657,7 +1657,10 @@ static void clean_up_after_endstop_or_probe_move() {
1657 1657
         SERIAL_ECHOLNPGM(")");
1658 1658
       }
1659 1659
     #endif
1660
+
1660 1661
     float z_dest = LOGICAL_Z_POSITION(z_raise);
1662
+    if (zprobe_zoffset < 0) z_dest -= zprobe_zoffset;
1663
+
1661 1664
     if (z_dest > current_position[Z_AXIS])
1662 1665
       do_blocking_move_to_z(z_dest);
1663 1666
   }
@@ -1911,7 +1914,7 @@ static void clean_up_after_endstop_or_probe_move() {
1911 1914
     if (endstops.z_probe_enabled == deploy) return false;
1912 1915
 
1913 1916
     // Make room for probe
1914
-    do_probe_raise(_Z_PROBE_DEPLOY_HEIGHT);
1917
+    do_probe_raise(_Z_CLEARANCE_DEPLOY_PROBE);
1915 1918
 
1916 1919
     // When deploying make sure BLTOUCH is not already triggered
1917 1920
     #if ENABLED(BLTOUCH)
@@ -2030,7 +2033,7 @@ static void clean_up_after_endstop_or_probe_move() {
2030 2033
 
2031 2034
       // If the nozzle is above the travel height then
2032 2035
       // move down quickly before doing the slow probe
2033
-      float z = LOGICAL_Z_POSITION(Z_PROBE_TRAVEL_HEIGHT);
2036
+      float z = LOGICAL_Z_POSITION(Z_CLEARANCE_BETWEEN_PROBES);
2034 2037
       if (z < current_position[Z_AXIS])
2035 2038
         do_blocking_move_to_z(z, MMM_TO_MMS(Z_PROBE_SPEED_FAST));
2036 2039
 
@@ -2069,7 +2072,7 @@ static void clean_up_after_endstop_or_probe_move() {
2069 2072
     float old_feedrate_mm_s = feedrate_mm_s;
2070 2073
 
2071 2074
     // Ensure a minimum height before moving the probe
2072
-    do_probe_raise(Z_PROBE_TRAVEL_HEIGHT);
2075
+    do_probe_raise(Z_CLEARANCE_BETWEEN_PROBES);
2073 2076
 
2074 2077
     // Move to the XY where we shall probe
2075 2078
     #if ENABLED(DEBUG_LEVELING_FEATURE)
@@ -2089,15 +2092,10 @@ static void clean_up_after_endstop_or_probe_move() {
2089 2092
 
2090 2093
     float measured_z = run_z_probe();
2091 2094
 
2092
-    if (stow) {
2095
+    if (!stow)
2096
+      do_probe_raise(Z_CLEARANCE_BETWEEN_PROBES);
2097
+    else
2093 2098
       if (STOW_PROBE()) return NAN;
2094
-    }
2095
-    else {
2096
-      #if ENABLED(DEBUG_LEVELING_FEATURE)
2097
-        if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("> do_probe_raise");
2098
-      #endif
2099
-      do_probe_raise(Z_PROBE_TRAVEL_HEIGHT);
2100
-    }
2101 2099
 
2102 2100
     if (verbose_level > 2) {
2103 2101
       SERIAL_PROTOCOLPGM("Bed X: ");
@@ -3194,8 +3192,8 @@ inline void gcode_G28() {
3194 3192
     feedrate_mm_s = homing_feedrate_mm_s[X_AXIS];
3195 3193
 
3196 3194
     current_position[Z_AXIS] = MESH_HOME_SEARCH_Z
3197
-      #if Z_PROBE_TRAVEL_HEIGHT > Z_HOMING_HEIGHT
3198
-        + Z_PROBE_TRAVEL_HEIGHT
3195
+      #if Z_CLEARANCE_BETWEEN_PROBES > Z_HOMING_HEIGHT
3196
+        + Z_CLEARANCE_BETWEEN_PROBES
3199 3197
       #elif Z_HOMING_HEIGHT > 0
3200 3198
         + Z_HOMING_HEIGHT
3201 3199
       #endif
@@ -3206,7 +3204,7 @@ inline void gcode_G28() {
3206 3204
     current_position[Y_AXIS] = LOGICAL_Y_POSITION(y);
3207 3205
     line_to_current_position();
3208 3206
 
3209
-    #if Z_PROBE_TRAVEL_HEIGHT > 0 || Z_HOMING_HEIGHT > 0
3207
+    #if Z_CLEARANCE_BETWEEN_PROBES > 0 || Z_HOMING_HEIGHT > 0
3210 3208
       current_position[Z_AXIS] = LOGICAL_Z_POSITION(MESH_HOME_SEARCH_Z);
3211 3209
       line_to_current_position();
3212 3210
     #endif
@@ -3301,8 +3299,8 @@ inline void gcode_G28() {
3301 3299
         else {
3302 3300
           // One last "return to the bed" (as originally coded) at completion
3303 3301
           current_position[Z_AXIS] = MESH_HOME_SEARCH_Z
3304
-            #if Z_PROBE_TRAVEL_HEIGHT > Z_HOMING_HEIGHT
3305
-              + Z_PROBE_TRAVEL_HEIGHT
3302
+            #if Z_CLEARANCE_BETWEEN_PROBES > Z_HOMING_HEIGHT
3303
+              + Z_CLEARANCE_BETWEEN_PROBES
3306 3304
             #elif Z_HOMING_HEIGHT > 0
3307 3305
               + Z_HOMING_HEIGHT
3308 3306
             #endif
@@ -3645,7 +3643,7 @@ inline void gcode_G28() {
3645 3643
 
3646 3644
     #endif // AUTO_BED_LEVELING_3POINT
3647 3645
 
3648
-    // Raise to _Z_PROBE_DEPLOY_HEIGHT. Stow the probe.
3646
+    // Raise to _Z_CLEARANCE_DEPLOY_PROBE. Stow the probe.
3649 3647
     if (STOW_PROBE()) return;
3650 3648
 
3651 3649
     // Restore state after probing

+ 12
- 10
Marlin/SanityCheck.h View File

@@ -130,9 +130,11 @@
130 130
 #elif defined(MIN_Z_HEIGHT_FOR_HOMING)
131 131
   #error "MIN_Z_HEIGHT_FOR_HOMING is now Z_HOMING_HEIGHT. Please update your configuration."
132 132
 #elif defined(Z_RAISE_BEFORE_PROBING) || defined(Z_RAISE_AFTER_PROBING)
133
-  #error "Z_RAISE_(BEFORE|AFTER)_PROBING are deprecated. Use Z_PROBE_DEPLOY_HEIGHT instead."
133
+  #error "Z_RAISE_(BEFORE|AFTER)_PROBING are deprecated. Use Z_CLEARANCE_DEPLOY_PROBE instead."
134 134
 #elif defined(Z_RAISE_PROBE_DEPLOY_STOW) || defined(Z_RAISE_BETWEEN_PROBINGS)
135
-  #error "Z_RAISE_PROBE_DEPLOY_STOW and Z_RAISE_BETWEEN_PROBINGS are now Z_PROBE_DEPLOY_HEIGHT and Z_PROBE_TRAVEL_HEIGHT Please update your configuration."
135
+  #error "Z_RAISE_PROBE_DEPLOY_STOW and Z_RAISE_BETWEEN_PROBINGS are now Z_CLEARANCE_DEPLOY_PROBE and Z_CLEARANCE_BETWEEN_PROBES. Please update your configuration."
136
+#elif defined(Z_PROBE_DEPLOY_HEIGHT) || defined(Z_PROBE_TRAVEL_HEIGHT)
137
+  #error "Z_PROBE_DEPLOY_HEIGHT and Z_PROBE_TRAVEL_HEIGHT are now Z_CLEARANCE_DEPLOY_PROBE and Z_CLEARANCE_BETWEEN_PROBES. Please update your configuration."
136 138
 #elif !defined(MIN_STEPS_PER_SEGMENT)
137 139
   #error Please replace "const int dropsegments" with "#define MIN_STEPS_PER_SEGMENT" (and increase by 1) in Configuration_adv.h.
138 140
 #elif defined(PREVENT_DANGEROUS_EXTRUDE)
@@ -425,14 +427,14 @@
425 427
   /**
426 428
    * Make sure Z raise values are set
427 429
    */
428
-  #if !defined(Z_PROBE_DEPLOY_HEIGHT)
429
-    #error "You must set Z_PROBE_DEPLOY_HEIGHT in your configuration."
430
-  #elif !defined(Z_PROBE_TRAVEL_HEIGHT)
431
-    #error "You must set Z_PROBE_TRAVEL_HEIGHT in your configuration."
432
-  #elif Z_PROBE_DEPLOY_HEIGHT < 0
433
-    #error "Probes need Z_PROBE_DEPLOY_HEIGHT >= 0."
434
-  #elif Z_PROBE_TRAVEL_HEIGHT < 0
435
-    #error "Probes need Z_PROBE_TRAVEL_HEIGHT >= 0."
430
+  #if !defined(Z_CLEARANCE_DEPLOY_PROBE)
431
+    #error "You must define Z_CLEARANCE_DEPLOY_PROBE in your configuration."
432
+  #elif !defined(Z_CLEARANCE_BETWEEN_PROBES)
433
+    #error "You must define Z_CLEARANCE_BETWEEN_PROBES in your configuration."
434
+  #elif Z_CLEARANCE_DEPLOY_PROBE < 0
435
+    #error "Probes need Z_CLEARANCE_DEPLOY_PROBE >= 0."
436
+  #elif Z_CLEARANCE_BETWEEN_PROBES < 0
437
+    #error "Probes need Z_CLEARANCE_BETWEEN_PROBES >= 0."
436 438
   #endif
437 439
 
438 440
 #else

+ 16
- 6
Marlin/example_configurations/Cartesio/Configuration.h View File

@@ -602,12 +602,22 @@
602 602
 // Enable Z Probe Repeatability test to see how accurate your probe is
603 603
 //#define Z_MIN_PROBE_REPEATABILITY_TEST
604 604
 
605
-//
606
-// Minimum heights for the probe to deploy/stow and travel.
607
-// These values specify the distance from the NOZZLE to the BED.
608
-//
609
-#define Z_PROBE_DEPLOY_HEIGHT 15 // Z position for the probe to deploy/stow
610
-#define Z_PROBE_TRAVEL_HEIGHT  5 // Z position for travel between points
605
+/**
606
+ * Z probes require clearance when deploying, stowing, and moving between
607
+ * probe points to avoid hitting the bed and other hardware.
608
+ * Servo-mounted probes require extra space for the arm to rotate.
609
+ * Inductive probes need space to keep from triggering early.
610
+ *
611
+ * Use these settings to specify the distance (mm) to raise the probe (or
612
+ * lower the bed). The values set here apply over and above any (negative)
613
+ * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
614
+ * Only integer values >= 1 are valid here.
615
+ *
616
+ * Example: `M851 Z-5` with a CLEARANCE of 4  =>  9mm from bed to nozzle.
617
+ *     But: `M851 Z+1` with a CLEARANCE of 2  =>  2mm from bed to nozzle.
618
+ */
619
+#define Z_CLEARANCE_DEPLOY_PROBE   15 // Z Clearance for Deploy/Stow
620
+#define Z_CLEARANCE_BETWEEN_PROBES  5 // Z Clearance between probe points
611 621
 
612 622
 //
613 623
 // For M851 give a range for adjusting the Z probe offset

+ 16
- 6
Marlin/example_configurations/Felix/Configuration.h View File

@@ -585,12 +585,22 @@
585 585
 // Enable Z Probe Repeatability test to see how accurate your probe is
586 586
 //#define Z_MIN_PROBE_REPEATABILITY_TEST
587 587
 
588
-//
589
-// Minimum heights for the probe to deploy/stow and travel.
590
-// These values specify the distance from the NOZZLE to the BED.
591
-//
592
-#define Z_PROBE_DEPLOY_HEIGHT 15 // Z position for the probe to deploy/stow
593
-#define Z_PROBE_TRAVEL_HEIGHT  5 // Z position for travel between points
588
+/**
589
+ * Z probes require clearance when deploying, stowing, and moving between
590
+ * probe points to avoid hitting the bed and other hardware.
591
+ * Servo-mounted probes require extra space for the arm to rotate.
592
+ * Inductive probes need space to keep from triggering early.
593
+ *
594
+ * Use these settings to specify the distance (mm) to raise the probe (or
595
+ * lower the bed). The values set here apply over and above any (negative)
596
+ * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
597
+ * Only integer values >= 1 are valid here.
598
+ *
599
+ * Example: `M851 Z-5` with a CLEARANCE of 4  =>  9mm from bed to nozzle.
600
+ *     But: `M851 Z+1` with a CLEARANCE of 2  =>  2mm from bed to nozzle.
601
+ */
602
+#define Z_CLEARANCE_DEPLOY_PROBE   15 // Z Clearance for Deploy/Stow
603
+#define Z_CLEARANCE_BETWEEN_PROBES  5 // Z Clearance between probe points
594 604
 
595 605
 //
596 606
 // For M851 give a range for adjusting the Z probe offset

+ 16
- 6
Marlin/example_configurations/Felix/DUAL/Configuration.h View File

@@ -583,12 +583,22 @@
583 583
 // Enable Z Probe Repeatability test to see how accurate your probe is
584 584
 //#define Z_MIN_PROBE_REPEATABILITY_TEST
585 585
 
586
-//
587
-// Minimum heights for the probe to deploy/stow and travel.
588
-// These values specify the distance from the NOZZLE to the BED.
589
-//
590
-#define Z_PROBE_DEPLOY_HEIGHT 15 // Z position for the probe to deploy/stow
591
-#define Z_PROBE_TRAVEL_HEIGHT  5 // Z position for travel between points
586
+/**
587
+ * Z probes require clearance when deploying, stowing, and moving between
588
+ * probe points to avoid hitting the bed and other hardware.
589
+ * Servo-mounted probes require extra space for the arm to rotate.
590
+ * Inductive probes need space to keep from triggering early.
591
+ *
592
+ * Use these settings to specify the distance (mm) to raise the probe (or
593
+ * lower the bed). The values set here apply over and above any (negative)
594
+ * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
595
+ * Only integer values >= 1 are valid here.
596
+ *
597
+ * Example: `M851 Z-5` with a CLEARANCE of 4  =>  9mm from bed to nozzle.
598
+ *     But: `M851 Z+1` with a CLEARANCE of 2  =>  2mm from bed to nozzle.
599
+ */
600
+#define Z_CLEARANCE_DEPLOY_PROBE   15 // Z Clearance for Deploy/Stow
601
+#define Z_CLEARANCE_BETWEEN_PROBES  5 // Z Clearance between probe points
592 602
 
593 603
 //
594 604
 // For M851 give a range for adjusting the Z probe offset

+ 16
- 6
Marlin/example_configurations/Hephestos/Configuration.h View File

@@ -594,12 +594,22 @@
594 594
 // Enable Z Probe Repeatability test to see how accurate your probe is
595 595
 //#define Z_MIN_PROBE_REPEATABILITY_TEST
596 596
 
597
-//
598
-// Minimum heights for the probe to deploy/stow and travel.
599
-// These values specify the distance from the NOZZLE to the BED.
600
-//
601
-#define Z_PROBE_DEPLOY_HEIGHT 15 // Z position for the probe to deploy/stow
602
-#define Z_PROBE_TRAVEL_HEIGHT  5 // Z position for travel between points
597
+/**
598
+ * Z probes require clearance when deploying, stowing, and moving between
599
+ * probe points to avoid hitting the bed and other hardware.
600
+ * Servo-mounted probes require extra space for the arm to rotate.
601
+ * Inductive probes need space to keep from triggering early.
602
+ *
603
+ * Use these settings to specify the distance (mm) to raise the probe (or
604
+ * lower the bed). The values set here apply over and above any (negative)
605
+ * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
606
+ * Only integer values >= 1 are valid here.
607
+ *
608
+ * Example: `M851 Z-5` with a CLEARANCE of 4  =>  9mm from bed to nozzle.
609
+ *     But: `M851 Z+1` with a CLEARANCE of 2  =>  2mm from bed to nozzle.
610
+ */
611
+#define Z_CLEARANCE_DEPLOY_PROBE   15 // Z Clearance for Deploy/Stow
612
+#define Z_CLEARANCE_BETWEEN_PROBES  5 // Z Clearance between probe points
603 613
 
604 614
 //
605 615
 // For M851 give a range for adjusting the Z probe offset

+ 16
- 6
Marlin/example_configurations/Hephestos_2/Configuration.h View File

@@ -596,12 +596,22 @@
596 596
 // Enable Z Probe Repeatability test to see how accurate your probe is
597 597
 //#define Z_MIN_PROBE_REPEATABILITY_TEST
598 598
 
599
-//
600
-// Minimum heights for the probe to deploy/stow and travel.
601
-// These values specify the distance from the NOZZLE to the BED.
602
-//
603
-#define Z_PROBE_DEPLOY_HEIGHT  5 // Z position for the probe to deploy/stow
604
-#define Z_PROBE_TRAVEL_HEIGHT  2 // Z position for travel between points
599
+/**
600
+ * Z probes require clearance when deploying, stowing, and moving between
601
+ * probe points to avoid hitting the bed and other hardware.
602
+ * Servo-mounted probes require extra space for the arm to rotate.
603
+ * Inductive probes need space to keep from triggering early.
604
+ *
605
+ * Use these settings to specify the distance (mm) to raise the probe (or
606
+ * lower the bed). The values set here apply over and above any (negative)
607
+ * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
608
+ * Only integer values >= 1 are valid here.
609
+ *
610
+ * Example: `M851 Z-5` with a CLEARANCE of 4  =>  9mm from bed to nozzle.
611
+ *     But: `M851 Z+1` with a CLEARANCE of 2  =>  2mm from bed to nozzle.
612
+ */
613
+#define Z_CLEARANCE_DEPLOY_PROBE   5 // Z Clearance for Deploy/Stow
614
+#define Z_CLEARANCE_BETWEEN_PROBES 2 // Z Clearance between probe points
605 615
 
606 616
 //
607 617
 // For M851 give a range for adjusting the Z probe offset

+ 16
- 6
Marlin/example_configurations/K8200/Configuration.h View File

@@ -619,12 +619,22 @@
619 619
 // Enable Z Probe Repeatability test to see how accurate your probe is
620 620
 //#define Z_MIN_PROBE_REPEATABILITY_TEST
621 621
 
622
-//
623
-// Minimum heights for the probe to deploy/stow and travel.
624
-// These values specify the distance from the NOZZLE to the BED.
625
-//
626
-#define Z_PROBE_DEPLOY_HEIGHT 15 // Z position for the probe to deploy/stow
627
-#define Z_PROBE_TRAVEL_HEIGHT  5 // Z position for travel between points
622
+/**
623
+ * Z probes require clearance when deploying, stowing, and moving between
624
+ * probe points to avoid hitting the bed and other hardware.
625
+ * Servo-mounted probes require extra space for the arm to rotate.
626
+ * Inductive probes need space to keep from triggering early.
627
+ *
628
+ * Use these settings to specify the distance (mm) to raise the probe (or
629
+ * lower the bed). The values set here apply over and above any (negative)
630
+ * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
631
+ * Only integer values >= 1 are valid here.
632
+ *
633
+ * Example: `M851 Z-5` with a CLEARANCE of 4  =>  9mm from bed to nozzle.
634
+ *     But: `M851 Z+1` with a CLEARANCE of 2  =>  2mm from bed to nozzle.
635
+ */
636
+#define Z_CLEARANCE_DEPLOY_PROBE   15 // Z Clearance for Deploy/Stow
637
+#define Z_CLEARANCE_BETWEEN_PROBES  5 // Z Clearance between probe points
628 638
 
629 639
 //
630 640
 // For M851 give a range for adjusting the Z probe offset

+ 16
- 6
Marlin/example_configurations/K8400/Configuration.h View File

@@ -602,12 +602,22 @@
602 602
 // Enable Z Probe Repeatability test to see how accurate your probe is
603 603
 //#define Z_MIN_PROBE_REPEATABILITY_TEST
604 604
 
605
-//
606
-// Minimum heights for the probe to deploy/stow and travel.
607
-// These values specify the distance from the NOZZLE to the BED.
608
-//
609
-#define Z_PROBE_DEPLOY_HEIGHT 15 // Z position for the probe to deploy/stow
610
-#define Z_PROBE_TRAVEL_HEIGHT  5 // Z position for travel between points
605
+/**
606
+ * Z probes require clearance when deploying, stowing, and moving between
607
+ * probe points to avoid hitting the bed and other hardware.
608
+ * Servo-mounted probes require extra space for the arm to rotate.
609
+ * Inductive probes need space to keep from triggering early.
610
+ *
611
+ * Use these settings to specify the distance (mm) to raise the probe (or
612
+ * lower the bed). The values set here apply over and above any (negative)
613
+ * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
614
+ * Only integer values >= 1 are valid here.
615
+ *
616
+ * Example: `M851 Z-5` with a CLEARANCE of 4  =>  9mm from bed to nozzle.
617
+ *     But: `M851 Z+1` with a CLEARANCE of 2  =>  2mm from bed to nozzle.
618
+ */
619
+#define Z_CLEARANCE_DEPLOY_PROBE   15 // Z Clearance for Deploy/Stow
620
+#define Z_CLEARANCE_BETWEEN_PROBES  5 // Z Clearance between probe points
611 621
 
612 622
 //
613 623
 // For M851 give a range for adjusting the Z probe offset

+ 16
- 6
Marlin/example_configurations/K8400/Dual-head/Configuration.h View File

@@ -602,12 +602,22 @@
602 602
 // Enable Z Probe Repeatability test to see how accurate your probe is
603 603
 //#define Z_MIN_PROBE_REPEATABILITY_TEST
604 604
 
605
-//
606
-// Minimum heights for the probe to deploy/stow and travel.
607
-// These values specify the distance from the NOZZLE to the BED.
608
-//
609
-#define Z_PROBE_DEPLOY_HEIGHT 15 // Z position for the probe to deploy/stow
610
-#define Z_PROBE_TRAVEL_HEIGHT  5 // Z position for travel between points
605
+/**
606
+ * Z probes require clearance when deploying, stowing, and moving between
607
+ * probe points to avoid hitting the bed and other hardware.
608
+ * Servo-mounted probes require extra space for the arm to rotate.
609
+ * Inductive probes need space to keep from triggering early.
610
+ *
611
+ * Use these settings to specify the distance (mm) to raise the probe (or
612
+ * lower the bed). The values set here apply over and above any (negative)
613
+ * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
614
+ * Only integer values >= 1 are valid here.
615
+ *
616
+ * Example: `M851 Z-5` with a CLEARANCE of 4  =>  9mm from bed to nozzle.
617
+ *     But: `M851 Z+1` with a CLEARANCE of 2  =>  2mm from bed to nozzle.
618
+ */
619
+#define Z_CLEARANCE_DEPLOY_PROBE   15 // Z Clearance for Deploy/Stow
620
+#define Z_CLEARANCE_BETWEEN_PROBES  5 // Z Clearance between probe points
611 621
 
612 622
 //
613 623
 // For M851 give a range for adjusting the Z probe offset

+ 16
- 6
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h View File

@@ -602,12 +602,22 @@
602 602
 // Enable Z Probe Repeatability test to see how accurate your probe is
603 603
 //#define Z_MIN_PROBE_REPEATABILITY_TEST
604 604
 
605
-//
606
-// Minimum heights for the probe to deploy/stow and travel.
607
-// These values specify the distance from the NOZZLE to the BED.
608
-//
609
-#define Z_PROBE_DEPLOY_HEIGHT 15 // Z position for the probe to deploy/stow
610
-#define Z_PROBE_TRAVEL_HEIGHT  5 // Z position for travel between points
605
+/**
606
+ * Z probes require clearance when deploying, stowing, and moving between
607
+ * probe points to avoid hitting the bed and other hardware.
608
+ * Servo-mounted probes require extra space for the arm to rotate.
609
+ * Inductive probes need space to keep from triggering early.
610
+ *
611
+ * Use these settings to specify the distance (mm) to raise the probe (or
612
+ * lower the bed). The values set here apply over and above any (negative)
613
+ * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
614
+ * Only integer values >= 1 are valid here.
615
+ *
616
+ * Example: `M851 Z-5` with a CLEARANCE of 4  =>  9mm from bed to nozzle.
617
+ *     But: `M851 Z+1` with a CLEARANCE of 2  =>  2mm from bed to nozzle.
618
+ */
619
+#define Z_CLEARANCE_DEPLOY_PROBE   15 // Z Clearance for Deploy/Stow
620
+#define Z_CLEARANCE_BETWEEN_PROBES  5 // Z Clearance between probe points
611 621
 
612 622
 //
613 623
 // For M851 give a range for adjusting the Z probe offset

+ 16
- 6
Marlin/example_configurations/RigidBot/Configuration.h View File

@@ -600,12 +600,22 @@
600 600
 // Enable Z Probe Repeatability test to see how accurate your probe is
601 601
 //#define Z_MIN_PROBE_REPEATABILITY_TEST
602 602
 
603
-//
604
-// Minimum heights for the probe to deploy/stow and travel.
605
-// These values specify the distance from the NOZZLE to the BED.
606
-//
607
-#define Z_PROBE_DEPLOY_HEIGHT 15 // Z position for the probe to deploy/stow
608
-#define Z_PROBE_TRAVEL_HEIGHT  5 // Z position for travel between points
603
+/**
604
+ * Z probes require clearance when deploying, stowing, and moving between
605
+ * probe points to avoid hitting the bed and other hardware.
606
+ * Servo-mounted probes require extra space for the arm to rotate.
607
+ * Inductive probes need space to keep from triggering early.
608
+ *
609
+ * Use these settings to specify the distance (mm) to raise the probe (or
610
+ * lower the bed). The values set here apply over and above any (negative)
611
+ * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
612
+ * Only integer values >= 1 are valid here.
613
+ *
614
+ * Example: `M851 Z-5` with a CLEARANCE of 4  =>  9mm from bed to nozzle.
615
+ *     But: `M851 Z+1` with a CLEARANCE of 2  =>  2mm from bed to nozzle.
616
+ */
617
+#define Z_CLEARANCE_DEPLOY_PROBE   15 // Z Clearance for Deploy/Stow
618
+#define Z_CLEARANCE_BETWEEN_PROBES  5 // Z Clearance between probe points
609 619
 
610 620
 //
611 621
 // For M851 give a range for adjusting the Z probe offset

+ 16
- 6
Marlin/example_configurations/SCARA/Configuration.h View File

@@ -617,12 +617,22 @@
617 617
 // Enable Z Probe Repeatability test to see how accurate your probe is
618 618
 //#define Z_MIN_PROBE_REPEATABILITY_TEST
619 619
 
620
-//
621
-// Minimum heights for the probe to deploy/stow and travel.
622
-// These values specify the distance from the NOZZLE to the BED.
623
-//
624
-#define Z_PROBE_DEPLOY_HEIGHT 15 // Z position for the probe to deploy/stow
625
-#define Z_PROBE_TRAVEL_HEIGHT  5 // Z position for travel between points
620
+/**
621
+ * Z probes require clearance when deploying, stowing, and moving between
622
+ * probe points to avoid hitting the bed and other hardware.
623
+ * Servo-mounted probes require extra space for the arm to rotate.
624
+ * Inductive probes need space to keep from triggering early.
625
+ *
626
+ * Use these settings to specify the distance (mm) to raise the probe (or
627
+ * lower the bed). The values set here apply over and above any (negative)
628
+ * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
629
+ * Only integer values >= 1 are valid here.
630
+ *
631
+ * Example: `M851 Z-5` with a CLEARANCE of 4  =>  9mm from bed to nozzle.
632
+ *     But: `M851 Z+1` with a CLEARANCE of 2  =>  2mm from bed to nozzle.
633
+ */
634
+#define Z_CLEARANCE_DEPLOY_PROBE   15 // Z Clearance for Deploy/Stow
635
+#define Z_CLEARANCE_BETWEEN_PROBES  5 // Z Clearance between probe points
626 636
 
627 637
 //
628 638
 // For M851 give a range for adjusting the Z probe offset

+ 16
- 6
Marlin/example_configurations/TAZ4/Configuration.h View File

@@ -623,12 +623,22 @@
623 623
 // Enable Z Probe Repeatability test to see how accurate your probe is
624 624
 //#define Z_MIN_PROBE_REPEATABILITY_TEST
625 625
 
626
-//
627
-// Minimum heights for the probe to deploy/stow and travel.
628
-// These values specify the distance from the NOZZLE to the BED.
629
-//
630
-#define Z_PROBE_DEPLOY_HEIGHT 15 // Z position for the probe to deploy/stow
631
-#define Z_PROBE_TRAVEL_HEIGHT  5 // Z position for travel between points
626
+/**
627
+ * Z probes require clearance when deploying, stowing, and moving between
628
+ * probe points to avoid hitting the bed and other hardware.
629
+ * Servo-mounted probes require extra space for the arm to rotate.
630
+ * Inductive probes need space to keep from triggering early.
631
+ *
632
+ * Use these settings to specify the distance (mm) to raise the probe (or
633
+ * lower the bed). The values set here apply over and above any (negative)
634
+ * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
635
+ * Only integer values >= 1 are valid here.
636
+ *
637
+ * Example: `M851 Z-5` with a CLEARANCE of 4  =>  9mm from bed to nozzle.
638
+ *     But: `M851 Z+1` with a CLEARANCE of 2  =>  2mm from bed to nozzle.
639
+ */
640
+#define Z_CLEARANCE_DEPLOY_PROBE   15 // Z Clearance for Deploy/Stow
641
+#define Z_CLEARANCE_BETWEEN_PROBES  5 // Z Clearance between probe points
632 642
 
633 643
 //
634 644
 // For M851 give a range for adjusting the Z probe offset

+ 16
- 6
Marlin/example_configurations/WITBOX/Configuration.h View File

@@ -594,12 +594,22 @@
594 594
 // Enable Z Probe Repeatability test to see how accurate your probe is
595 595
 //#define Z_MIN_PROBE_REPEATABILITY_TEST
596 596
 
597
-//
598
-// Minimum heights for the probe to deploy/stow and travel.
599
-// These values specify the distance from the NOZZLE to the BED.
600
-//
601
-#define Z_PROBE_DEPLOY_HEIGHT 15 // Z position for the probe to deploy/stow
602
-#define Z_PROBE_TRAVEL_HEIGHT  5 // Z position for travel between points
597
+/**
598
+ * Z probes require clearance when deploying, stowing, and moving between
599
+ * probe points to avoid hitting the bed and other hardware.
600
+ * Servo-mounted probes require extra space for the arm to rotate.
601
+ * Inductive probes need space to keep from triggering early.
602
+ *
603
+ * Use these settings to specify the distance (mm) to raise the probe (or
604
+ * lower the bed). The values set here apply over and above any (negative)
605
+ * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
606
+ * Only integer values >= 1 are valid here.
607
+ *
608
+ * Example: `M851 Z-5` with a CLEARANCE of 4  =>  9mm from bed to nozzle.
609
+ *     But: `M851 Z+1` with a CLEARANCE of 2  =>  2mm from bed to nozzle.
610
+ */
611
+#define Z_CLEARANCE_DEPLOY_PROBE   15 // Z Clearance for Deploy/Stow
612
+#define Z_CLEARANCE_BETWEEN_PROBES  5 // Z Clearance between probe points
603 613
 
604 614
 //
605 615
 // For M851 give a range for adjusting the Z probe offset

+ 16
- 6
Marlin/example_configurations/adafruit/ST7565/Configuration.h View File

@@ -602,12 +602,22 @@
602 602
 // Enable Z Probe Repeatability test to see how accurate your probe is
603 603
 //#define Z_MIN_PROBE_REPEATABILITY_TEST
604 604
 
605
-//
606
-// Minimum heights for the probe to deploy/stow and travel.
607
-// These values specify the distance from the NOZZLE to the BED.
608
-//
609
-#define Z_PROBE_DEPLOY_HEIGHT 15 // Z position for the probe to deploy/stow
610
-#define Z_PROBE_TRAVEL_HEIGHT  5 // Z position for travel between points
605
+/**
606
+ * Z probes require clearance when deploying, stowing, and moving between
607
+ * probe points to avoid hitting the bed and other hardware.
608
+ * Servo-mounted probes require extra space for the arm to rotate.
609
+ * Inductive probes need space to keep from triggering early.
610
+ *
611
+ * Use these settings to specify the distance (mm) to raise the probe (or
612
+ * lower the bed). The values set here apply over and above any (negative)
613
+ * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
614
+ * Only integer values >= 1 are valid here.
615
+ *
616
+ * Example: `M851 Z-5` with a CLEARANCE of 4  =>  9mm from bed to nozzle.
617
+ *     But: `M851 Z+1` with a CLEARANCE of 2  =>  2mm from bed to nozzle.
618
+ */
619
+#define Z_CLEARANCE_DEPLOY_PROBE   15 // Z Clearance for Deploy/Stow
620
+#define Z_CLEARANCE_BETWEEN_PROBES  5 // Z Clearance between probe points
611 621
 
612 622
 //
613 623
 // For M851 give a range for adjusting the Z probe offset

+ 16
- 6
Marlin/example_configurations/delta/biv2.5/Configuration.h View File

@@ -692,12 +692,22 @@
692 692
 // Enable Z Probe Repeatability test to see how accurate your probe is
693 693
 //#define Z_MIN_PROBE_REPEATABILITY_TEST
694 694
 
695
-//
696
-// Minimum heights for the probe to deploy/stow and travel.
697
-// These values specify the distance from the NOZZLE to the BED.
698
-//
699
-#define Z_PROBE_DEPLOY_HEIGHT 50 // Z position for the probe to deploy/stow
700
-#define Z_PROBE_TRAVEL_HEIGHT  5 // Z position for travel between points
695
+/**
696
+ * Z probes require clearance when deploying, stowing, and moving between
697
+ * probe points to avoid hitting the bed and other hardware.
698
+ * Servo-mounted probes require extra space for the arm to rotate.
699
+ * Inductive probes need space to keep from triggering early.
700
+ *
701
+ * Use these settings to specify the distance (mm) to raise the probe (or
702
+ * lower the bed). The values set here apply over and above any (negative)
703
+ * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
704
+ * Only integer values >= 1 are valid here.
705
+ *
706
+ * Example: `M851 Z-5` with a CLEARANCE of 4  =>  9mm from bed to nozzle.
707
+ *     But: `M851 Z+1` with a CLEARANCE of 2  =>  2mm from bed to nozzle.
708
+ */
709
+#define Z_CLEARANCE_DEPLOY_PROBE   50 // Z Clearance for Deploy/Stow
710
+#define Z_CLEARANCE_BETWEEN_PROBES  5 // Z Clearance between probe points
701 711
 
702 712
 //
703 713
 // For M851 give a range for adjusting the Z probe offset

+ 16
- 6
Marlin/example_configurations/delta/generic/Configuration.h View File

@@ -686,12 +686,22 @@
686 686
 // Enable Z Probe Repeatability test to see how accurate your probe is
687 687
 //#define Z_MIN_PROBE_REPEATABILITY_TEST
688 688
 
689
-//
690
-// Minimum heights for the probe to deploy/stow and travel.
691
-// These values specify the distance from the NOZZLE to the BED.
692
-//
693
-#define Z_PROBE_DEPLOY_HEIGHT 15 // Z position for the probe to deploy/stow
694
-#define Z_PROBE_TRAVEL_HEIGHT  5 // Z position for travel between points
689
+/**
690
+ * Z probes require clearance when deploying, stowing, and moving between
691
+ * probe points to avoid hitting the bed and other hardware.
692
+ * Servo-mounted probes require extra space for the arm to rotate.
693
+ * Inductive probes need space to keep from triggering early.
694
+ *
695
+ * Use these settings to specify the distance (mm) to raise the probe (or
696
+ * lower the bed). The values set here apply over and above any (negative)
697
+ * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
698
+ * Only integer values >= 1 are valid here.
699
+ *
700
+ * Example: `M851 Z-5` with a CLEARANCE of 4  =>  9mm from bed to nozzle.
701
+ *     But: `M851 Z+1` with a CLEARANCE of 2  =>  2mm from bed to nozzle.
702
+ */
703
+#define Z_CLEARANCE_DEPLOY_PROBE   15 // Z Clearance for Deploy/Stow
704
+#define Z_CLEARANCE_BETWEEN_PROBES  5 // Z Clearance between probe points
695 705
 
696 706
 //
697 707
 // For M851 give a range for adjusting the Z probe offset

+ 16
- 6
Marlin/example_configurations/delta/kossel_mini/Configuration.h View File

@@ -689,12 +689,22 @@
689 689
 // Enable Z Probe Repeatability test to see how accurate your probe is
690 690
 //#define Z_MIN_PROBE_REPEATABILITY_TEST
691 691
 
692
-//
693
-// Minimum heights for the probe to deploy/stow and travel.
694
-// These values specify the distance from the NOZZLE to the BED.
695
-//
696
-#define Z_PROBE_DEPLOY_HEIGHT 50 // Z position for the probe to deploy/stow
697
-#define Z_PROBE_TRAVEL_HEIGHT  5 // Z position for travel between points
692
+/**
693
+ * Z probes require clearance when deploying, stowing, and moving between
694
+ * probe points to avoid hitting the bed and other hardware.
695
+ * Servo-mounted probes require extra space for the arm to rotate.
696
+ * Inductive probes need space to keep from triggering early.
697
+ *
698
+ * Use these settings to specify the distance (mm) to raise the probe (or
699
+ * lower the bed). The values set here apply over and above any (negative)
700
+ * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
701
+ * Only integer values >= 1 are valid here.
702
+ *
703
+ * Example: `M851 Z-5` with a CLEARANCE of 4  =>  9mm from bed to nozzle.
704
+ *     But: `M851 Z+1` with a CLEARANCE of 2  =>  2mm from bed to nozzle.
705
+ */
706
+#define Z_CLEARANCE_DEPLOY_PROBE   50 // Z Clearance for Deploy/Stow
707
+#define Z_CLEARANCE_BETWEEN_PROBES  5 // Z Clearance between probe points
698 708
 
699 709
 //
700 710
 // For M851 give a range for adjusting the Z probe offset

+ 16
- 6
Marlin/example_configurations/delta/kossel_pro/Configuration.h View File

@@ -690,12 +690,22 @@
690 690
 // Enable Z Probe Repeatability test to see how accurate your probe is
691 691
 //#define Z_MIN_PROBE_REPEATABILITY_TEST
692 692
 
693
-//
694
-// Minimum heights for the probe to deploy/stow and travel.
695
-// These values specify the distance from the NOZZLE to the BED.
696
-//
697
-#define Z_PROBE_DEPLOY_HEIGHT 100 // Z position for the probe to deploy/stow
698
-#define Z_PROBE_TRAVEL_HEIGHT   5 // Z position for travel between points
693
+/**
694
+ * Z probes require clearance when deploying, stowing, and moving between
695
+ * probe points to avoid hitting the bed and other hardware.
696
+ * Servo-mounted probes require extra space for the arm to rotate.
697
+ * Inductive probes need space to keep from triggering early.
698
+ *
699
+ * Use these settings to specify the distance (mm) to raise the probe (or
700
+ * lower the bed). The values set here apply over and above any (negative)
701
+ * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
702
+ * Only integer values >= 1 are valid here.
703
+ *
704
+ * Example: `M851 Z-5` with a CLEARANCE of 4  =>  9mm from bed to nozzle.
705
+ *     But: `M851 Z+1` with a CLEARANCE of 2  =>  2mm from bed to nozzle.
706
+ */
707
+#define Z_CLEARANCE_DEPLOY_PROBE   100 // Z Clearance for Deploy/Stow
708
+#define Z_CLEARANCE_BETWEEN_PROBES   5 // Z Clearance between probe points
699 709
 
700 710
 //
701 711
 // For M851 give a range for adjusting the Z probe offset

+ 16
- 6
Marlin/example_configurations/delta/kossel_xl/Configuration.h View File

@@ -692,12 +692,22 @@
692 692
 // Enable Z Probe Repeatability test to see how accurate your probe is
693 693
 //#define Z_MIN_PROBE_REPEATABILITY_TEST
694 694
 
695
-//
696
-// Minimum heights for the probe to deploy/stow and travel.
697
-// These values specify the distance from the NOZZLE to the BED.
698
-//
699
-#define Z_PROBE_DEPLOY_HEIGHT 20 // Z position for the probe to deploy/stow
700
-#define Z_PROBE_TRAVEL_HEIGHT 10 // Z position for travel between points
695
+/**
696
+ * Z probes require clearance when deploying, stowing, and moving between
697
+ * probe points to avoid hitting the bed and other hardware.
698
+ * Servo-mounted probes require extra space for the arm to rotate.
699
+ * Inductive probes need space to keep from triggering early.
700
+ *
701
+ * Use these settings to specify the distance (mm) to raise the probe (or
702
+ * lower the bed). The values set here apply over and above any (negative)
703
+ * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
704
+ * Only integer values >= 1 are valid here.
705
+ *
706
+ * Example: `M851 Z-5` with a CLEARANCE of 4  =>  9mm from bed to nozzle.
707
+ *     But: `M851 Z+1` with a CLEARANCE of 2  =>  2mm from bed to nozzle.
708
+ */
709
+#define Z_CLEARANCE_DEPLOY_PROBE   20 // Z Clearance for Deploy/Stow
710
+#define Z_CLEARANCE_BETWEEN_PROBES 10 // Z Clearance between probe points
701 711
 
702 712
 //
703 713
 // For M851 give a range for adjusting the Z probe offset

+ 16
- 6
Marlin/example_configurations/makibox/Configuration.h View File

@@ -605,12 +605,22 @@
605 605
 // Enable Z Probe Repeatability test to see how accurate your probe is
606 606
 //#define Z_MIN_PROBE_REPEATABILITY_TEST
607 607
 
608
-//
609
-// Minimum heights for the probe to deploy/stow and travel.
610
-// These values specify the distance from the NOZZLE to the BED.
611
-//
612
-#define Z_PROBE_DEPLOY_HEIGHT 15 // Z position for the probe to deploy/stow
613
-#define Z_PROBE_TRAVEL_HEIGHT  5 // Z position for travel between points
608
+/**
609
+ * Z probes require clearance when deploying, stowing, and moving between
610
+ * probe points to avoid hitting the bed and other hardware.
611
+ * Servo-mounted probes require extra space for the arm to rotate.
612
+ * Inductive probes need space to keep from triggering early.
613
+ *
614
+ * Use these settings to specify the distance (mm) to raise the probe (or
615
+ * lower the bed). The values set here apply over and above any (negative)
616
+ * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
617
+ * Only integer values >= 1 are valid here.
618
+ *
619
+ * Example: `M851 Z-5` with a CLEARANCE of 4  =>  9mm from bed to nozzle.
620
+ *     But: `M851 Z+1` with a CLEARANCE of 2  =>  2mm from bed to nozzle.
621
+ */
622
+#define Z_CLEARANCE_DEPLOY_PROBE   15 // Z Clearance for Deploy/Stow
623
+#define Z_CLEARANCE_BETWEEN_PROBES  5 // Z Clearance between probe points
614 624
 
615 625
 //
616 626
 // For M851 give a range for adjusting the Z probe offset

+ 16
- 6
Marlin/example_configurations/tvrrug/Round2/Configuration.h View File

@@ -598,12 +598,22 @@
598 598
 // Enable Z Probe Repeatability test to see how accurate your probe is
599 599
 //#define Z_MIN_PROBE_REPEATABILITY_TEST
600 600
 
601
-//
602
-// Minimum heights for the probe to deploy/stow and travel.
603
-// These values specify the distance from the NOZZLE to the BED.
604
-//
605
-#define Z_PROBE_DEPLOY_HEIGHT 15 // Z position for the probe to deploy/stow
606
-#define Z_PROBE_TRAVEL_HEIGHT  5 // Z position for travel between points
601
+/**
602
+ * Z probes require clearance when deploying, stowing, and moving between
603
+ * probe points to avoid hitting the bed and other hardware.
604
+ * Servo-mounted probes require extra space for the arm to rotate.
605
+ * Inductive probes need space to keep from triggering early.
606
+ *
607
+ * Use these settings to specify the distance (mm) to raise the probe (or
608
+ * lower the bed). The values set here apply over and above any (negative)
609
+ * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
610
+ * Only integer values >= 1 are valid here.
611
+ *
612
+ * Example: `M851 Z-5` with a CLEARANCE of 4  =>  9mm from bed to nozzle.
613
+ *     But: `M851 Z+1` with a CLEARANCE of 2  =>  2mm from bed to nozzle.
614
+ */
615
+#define Z_CLEARANCE_DEPLOY_PROBE   15 // Z Clearance for Deploy/Stow
616
+#define Z_CLEARANCE_BETWEEN_PROBES  5 // Z Clearance between probe points
607 617
 
608 618
 //
609 619
 // For M851 give a range for adjusting the Z probe offset

Loading…
Cancel
Save