Pārlūkot izejas kodu

Try on "CLEARANCE" for size

Scott Lahteine 8 gadus atpakaļ
vecāks
revīzija
01f1028510
25 mainītis faili ar 117 papildinājumiem un 117 dzēšanām
  1. 8
    8
      Marlin/Conditionals_post.h
  2. 4
    4
      Marlin/Configuration.h
  3. 10
    10
      Marlin/Marlin_main.cpp
  4. 11
    11
      Marlin/SanityCheck.h
  5. 4
    4
      Marlin/example_configurations/Cartesio/Configuration.h
  6. 4
    4
      Marlin/example_configurations/Felix/Configuration.h
  7. 4
    4
      Marlin/example_configurations/Felix/DUAL/Configuration.h
  8. 4
    4
      Marlin/example_configurations/Hephestos/Configuration.h
  9. 4
    4
      Marlin/example_configurations/Hephestos_2/Configuration.h
  10. 4
    4
      Marlin/example_configurations/K8200/Configuration.h
  11. 4
    4
      Marlin/example_configurations/K8400/Configuration.h
  12. 4
    4
      Marlin/example_configurations/K8400/Dual-head/Configuration.h
  13. 4
    4
      Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
  14. 4
    4
      Marlin/example_configurations/RigidBot/Configuration.h
  15. 4
    4
      Marlin/example_configurations/SCARA/Configuration.h
  16. 4
    4
      Marlin/example_configurations/TAZ4/Configuration.h
  17. 4
    4
      Marlin/example_configurations/WITBOX/Configuration.h
  18. 4
    4
      Marlin/example_configurations/adafruit/ST7565/Configuration.h
  19. 4
    4
      Marlin/example_configurations/delta/biv2.5/Configuration.h
  20. 4
    4
      Marlin/example_configurations/delta/generic/Configuration.h
  21. 4
    4
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  22. 4
    4
      Marlin/example_configurations/delta/kossel_pro/Configuration.h
  23. 4
    4
      Marlin/example_configurations/delta/kossel_xl/Configuration.h
  24. 4
    4
      Marlin/example_configurations/makibox/Configuration.h
  25. 4
    4
      Marlin/example_configurations/tvrrug/Round2/Configuration.h

+ 8
- 8
Marlin/Conditionals_post.h Parādīt failu

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

+ 4
- 4
Marlin/Configuration.h Parādīt failu

630
  * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
630
  * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
631
  * Only integer values >= 1 are valid here.
631
  * Only integer values >= 1 are valid here.
632
  *
632
  *
633
- * Example: `M851 Z-5` with a RAISE of 4  =>  9mm from bed to nozzle.
634
- *     But: `M851 Z+1` with a RAISE of 2  =>  2mm from bed to nozzle.
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
  */
635
  */
636
-#define Z_RAISE_DEPLOY_PROBE   10 // Z Raise for Deploy/Stow
637
-#define Z_RAISE_BETWEEN_PROBES  5 // Z Raise between probe points
636
+#define Z_CLEARANCE_DEPLOY_PROBE   10 // Z Clearance for Deploy/Stow
637
+#define Z_CLEARANCE_BETWEEN_PROBES  5 // Z Clearance between probe points
638
 
638
 
639
 //
639
 //
640
 // For M851 give a range for adjusting the Z probe offset
640
 // For M851 give a range for adjusting the Z probe offset

+ 10
- 10
Marlin/Marlin_main.cpp Parādīt failu

1882
     if (endstops.z_probe_enabled == deploy) return false;
1882
     if (endstops.z_probe_enabled == deploy) return false;
1883
 
1883
 
1884
     // Make room for probe
1884
     // Make room for probe
1885
-    do_probe_raise(_Z_RAISE_DEPLOY_PROBE);
1885
+    do_probe_raise(_Z_CLEARANCE_DEPLOY_PROBE);
1886
 
1886
 
1887
     // Check BLTOUCH probe status for an error
1887
     // Check BLTOUCH probe status for an error
1888
     #if ENABLED(BLTOUCH)
1888
     #if ENABLED(BLTOUCH)
1991
 
1991
 
1992
       // If the nozzle is above the travel height then
1992
       // If the nozzle is above the travel height then
1993
       // move down quickly before doing the slow probe
1993
       // move down quickly before doing the slow probe
1994
-      float z = LOGICAL_Z_POSITION(Z_RAISE_BETWEEN_PROBES);
1994
+      float z = LOGICAL_Z_POSITION(Z_CLEARANCE_BETWEEN_PROBES);
1995
       if (z < current_position[Z_AXIS])
1995
       if (z < current_position[Z_AXIS])
1996
         do_blocking_move_to_z(z, MMM_TO_MMS(Z_PROBE_SPEED_FAST));
1996
         do_blocking_move_to_z(z, MMM_TO_MMS(Z_PROBE_SPEED_FAST));
1997
 
1997
 
2030
     float old_feedrate_mm_s = feedrate_mm_s;
2030
     float old_feedrate_mm_s = feedrate_mm_s;
2031
 
2031
 
2032
     // Ensure a minimum height before moving the probe
2032
     // Ensure a minimum height before moving the probe
2033
-    do_probe_raise(Z_RAISE_BETWEEN_PROBES);
2033
+    do_probe_raise(Z_CLEARANCE_BETWEEN_PROBES);
2034
 
2034
 
2035
     // Move to the XY where we shall probe
2035
     // Move to the XY where we shall probe
2036
     #if ENABLED(DEBUG_LEVELING_FEATURE)
2036
     #if ENABLED(DEBUG_LEVELING_FEATURE)
2051
     float measured_z = run_z_probe();
2051
     float measured_z = run_z_probe();
2052
 
2052
 
2053
     if (!stow)
2053
     if (!stow)
2054
-      do_probe_raise(Z_RAISE_BETWEEN_PROBES);
2054
+      do_probe_raise(Z_CLEARANCE_BETWEEN_PROBES);
2055
     else
2055
     else
2056
       if (STOW_PROBE()) return NAN;
2056
       if (STOW_PROBE()) return NAN;
2057
 
2057
 
3097
     feedrate_mm_s = homing_feedrate_mm_s[X_AXIS];
3097
     feedrate_mm_s = homing_feedrate_mm_s[X_AXIS];
3098
 
3098
 
3099
     current_position[Z_AXIS] = MESH_HOME_SEARCH_Z
3099
     current_position[Z_AXIS] = MESH_HOME_SEARCH_Z
3100
-      #if Z_RAISE_BETWEEN_PROBES > Z_HOMING_HEIGHT
3101
-        + Z_RAISE_BETWEEN_PROBES
3100
+      #if Z_CLEARANCE_BETWEEN_PROBES > Z_HOMING_HEIGHT
3101
+        + Z_CLEARANCE_BETWEEN_PROBES
3102
       #elif Z_HOMING_HEIGHT > 0
3102
       #elif Z_HOMING_HEIGHT > 0
3103
         + Z_HOMING_HEIGHT
3103
         + Z_HOMING_HEIGHT
3104
       #endif
3104
       #endif
3109
     current_position[Y_AXIS] = LOGICAL_Y_POSITION(y);
3109
     current_position[Y_AXIS] = LOGICAL_Y_POSITION(y);
3110
     line_to_current_position();
3110
     line_to_current_position();
3111
 
3111
 
3112
-    #if Z_RAISE_BETWEEN_PROBES > 0 || Z_HOMING_HEIGHT > 0
3112
+    #if Z_CLEARANCE_BETWEEN_PROBES > 0 || Z_HOMING_HEIGHT > 0
3113
       current_position[Z_AXIS] = LOGICAL_Z_POSITION(MESH_HOME_SEARCH_Z);
3113
       current_position[Z_AXIS] = LOGICAL_Z_POSITION(MESH_HOME_SEARCH_Z);
3114
       line_to_current_position();
3114
       line_to_current_position();
3115
     #endif
3115
     #endif
3204
         else {
3204
         else {
3205
           // One last "return to the bed" (as originally coded) at completion
3205
           // One last "return to the bed" (as originally coded) at completion
3206
           current_position[Z_AXIS] = MESH_HOME_SEARCH_Z
3206
           current_position[Z_AXIS] = MESH_HOME_SEARCH_Z
3207
-            #if Z_RAISE_BETWEEN_PROBES > Z_HOMING_HEIGHT
3208
-              + Z_RAISE_BETWEEN_PROBES
3207
+            #if Z_CLEARANCE_BETWEEN_PROBES > Z_HOMING_HEIGHT
3208
+              + Z_CLEARANCE_BETWEEN_PROBES
3209
             #elif Z_HOMING_HEIGHT > 0
3209
             #elif Z_HOMING_HEIGHT > 0
3210
               + Z_HOMING_HEIGHT
3210
               + Z_HOMING_HEIGHT
3211
             #endif
3211
             #endif
3558
 
3558
 
3559
     #endif // AUTO_BED_LEVELING_3POINT
3559
     #endif // AUTO_BED_LEVELING_3POINT
3560
 
3560
 
3561
-    // Raise to _Z_RAISE_DEPLOY_PROBE. Stow the probe.
3561
+    // Raise to _Z_CLEARANCE_DEPLOY_PROBE. Stow the probe.
3562
     if (STOW_PROBE()) return;
3562
     if (STOW_PROBE()) return;
3563
 
3563
 
3564
     // Restore state after probing
3564
     // Restore state after probing

+ 11
- 11
Marlin/SanityCheck.h Parādīt failu

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

+ 4
- 4
Marlin/example_configurations/Cartesio/Configuration.h Parādīt failu

613
  * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
613
  * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
614
  * Only integer values >= 1 are valid here.
614
  * Only integer values >= 1 are valid here.
615
  *
615
  *
616
- * Example: `M851 Z-5` with a RAISE of 4  =>  9mm from bed to nozzle.
617
- *     But: `M851 Z+1` with a RAISE of 2  =>  2mm from bed to nozzle.
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
  */
618
  */
619
-#define Z_RAISE_DEPLOY_PROBE   15 // Z Raise for Deploy/Stow
620
-#define Z_RAISE_BETWEEN_PROBES  5 // Z Raise between probe points
619
+#define Z_CLEARANCE_DEPLOY_PROBE   15 // Z Clearance for Deploy/Stow
620
+#define Z_CLEARANCE_BETWEEN_PROBES  5 // Z Clearance between probe points
621
 
621
 
622
 //
622
 //
623
 // For M851 give a range for adjusting the Z probe offset
623
 // For M851 give a range for adjusting the Z probe offset

+ 4
- 4
Marlin/example_configurations/Felix/Configuration.h Parādīt failu

596
  * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
596
  * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
597
  * Only integer values >= 1 are valid here.
597
  * Only integer values >= 1 are valid here.
598
  *
598
  *
599
- * Example: `M851 Z-5` with a RAISE of 4  =>  9mm from bed to nozzle.
600
- *     But: `M851 Z+1` with a RAISE of 2  =>  2mm from bed to nozzle.
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
  */
601
  */
602
-#define Z_RAISE_DEPLOY_PROBE   15 // Z Raise for Deploy/Stow
603
-#define Z_RAISE_BETWEEN_PROBES  5 // Z Raise between probe points
602
+#define Z_CLEARANCE_DEPLOY_PROBE   15 // Z Clearance for Deploy/Stow
603
+#define Z_CLEARANCE_BETWEEN_PROBES  5 // Z Clearance between probe points
604
 
604
 
605
 //
605
 //
606
 // For M851 give a range for adjusting the Z probe offset
606
 // For M851 give a range for adjusting the Z probe offset

+ 4
- 4
Marlin/example_configurations/Felix/DUAL/Configuration.h Parādīt failu

594
  * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
594
  * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
595
  * Only integer values >= 1 are valid here.
595
  * Only integer values >= 1 are valid here.
596
  *
596
  *
597
- * Example: `M851 Z-5` with a RAISE of 4  =>  9mm from bed to nozzle.
598
- *     But: `M851 Z+1` with a RAISE of 2  =>  2mm from bed to nozzle.
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
  */
599
  */
600
-#define Z_RAISE_DEPLOY_PROBE   15 // Z Raise for Deploy/Stow
601
-#define Z_RAISE_BETWEEN_PROBES  5 // Z Raise between probe points
600
+#define Z_CLEARANCE_DEPLOY_PROBE   15 // Z Clearance for Deploy/Stow
601
+#define Z_CLEARANCE_BETWEEN_PROBES  5 // Z Clearance between probe points
602
 
602
 
603
 //
603
 //
604
 // For M851 give a range for adjusting the Z probe offset
604
 // For M851 give a range for adjusting the Z probe offset

+ 4
- 4
Marlin/example_configurations/Hephestos/Configuration.h Parādīt failu

605
  * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
605
  * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
606
  * Only integer values >= 1 are valid here.
606
  * Only integer values >= 1 are valid here.
607
  *
607
  *
608
- * Example: `M851 Z-5` with a RAISE of 4  =>  9mm from bed to nozzle.
609
- *     But: `M851 Z+1` with a RAISE of 2  =>  2mm from bed to nozzle.
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
  */
610
  */
611
-#define Z_RAISE_DEPLOY_PROBE   15 // Z Raise for Deploy/Stow
612
-#define Z_RAISE_BETWEEN_PROBES  5 // Z Raise between probe points
611
+#define Z_CLEARANCE_DEPLOY_PROBE   15 // Z Clearance for Deploy/Stow
612
+#define Z_CLEARANCE_BETWEEN_PROBES  5 // Z Clearance between probe points
613
 
613
 
614
 //
614
 //
615
 // For M851 give a range for adjusting the Z probe offset
615
 // For M851 give a range for adjusting the Z probe offset

+ 4
- 4
Marlin/example_configurations/Hephestos_2/Configuration.h Parādīt failu

607
  * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
607
  * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
608
  * Only integer values >= 1 are valid here.
608
  * Only integer values >= 1 are valid here.
609
  *
609
  *
610
- * Example: `M851 Z-5` with a RAISE of 4  =>  9mm from bed to nozzle.
611
- *     But: `M851 Z+1` with a RAISE of 2  =>  2mm from bed to nozzle.
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
  */
612
  */
613
-#define Z_RAISE_DEPLOY_PROBE   5 // Z Raise for Deploy/Stow
614
-#define Z_RAISE_BETWEEN_PROBES 2 // Z Raise between probe points
613
+#define Z_CLEARANCE_DEPLOY_PROBE   5 // Z Clearance for Deploy/Stow
614
+#define Z_CLEARANCE_BETWEEN_PROBES 2 // Z Clearance between probe points
615
 
615
 
616
 //
616
 //
617
 // For M851 give a range for adjusting the Z probe offset
617
 // For M851 give a range for adjusting the Z probe offset

+ 4
- 4
Marlin/example_configurations/K8200/Configuration.h Parādīt failu

630
  * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
630
  * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
631
  * Only integer values >= 1 are valid here.
631
  * Only integer values >= 1 are valid here.
632
  *
632
  *
633
- * Example: `M851 Z-5` with a RAISE of 4  =>  9mm from bed to nozzle.
634
- *     But: `M851 Z+1` with a RAISE of 2  =>  2mm from bed to nozzle.
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
  */
635
  */
636
-#define Z_RAISE_DEPLOY_PROBE   15 // Z Raise for Deploy/Stow
637
-#define Z_RAISE_BETWEEN_PROBES  5 // Z Raise between probe points
636
+#define Z_CLEARANCE_DEPLOY_PROBE   15 // Z Clearance for Deploy/Stow
637
+#define Z_CLEARANCE_BETWEEN_PROBES  5 // Z Clearance between probe points
638
 
638
 
639
 //
639
 //
640
 // For M851 give a range for adjusting the Z probe offset
640
 // For M851 give a range for adjusting the Z probe offset

+ 4
- 4
Marlin/example_configurations/K8400/Configuration.h Parādīt failu

613
  * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
613
  * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
614
  * Only integer values >= 1 are valid here.
614
  * Only integer values >= 1 are valid here.
615
  *
615
  *
616
- * Example: `M851 Z-5` with a RAISE of 4  =>  9mm from bed to nozzle.
617
- *     But: `M851 Z+1` with a RAISE of 2  =>  2mm from bed to nozzle.
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
  */
618
  */
619
-#define Z_RAISE_DEPLOY_PROBE   15 // Z Raise for Deploy/Stow
620
-#define Z_RAISE_BETWEEN_PROBES  5 // Z Raise between probe points
619
+#define Z_CLEARANCE_DEPLOY_PROBE   15 // Z Clearance for Deploy/Stow
620
+#define Z_CLEARANCE_BETWEEN_PROBES  5 // Z Clearance between probe points
621
 
621
 
622
 //
622
 //
623
 // For M851 give a range for adjusting the Z probe offset
623
 // For M851 give a range for adjusting the Z probe offset

+ 4
- 4
Marlin/example_configurations/K8400/Dual-head/Configuration.h Parādīt failu

613
  * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
613
  * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
614
  * Only integer values >= 1 are valid here.
614
  * Only integer values >= 1 are valid here.
615
  *
615
  *
616
- * Example: `M851 Z-5` with a RAISE of 4  =>  9mm from bed to nozzle.
617
- *     But: `M851 Z+1` with a RAISE of 2  =>  2mm from bed to nozzle.
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
  */
618
  */
619
-#define Z_RAISE_DEPLOY_PROBE   15 // Z Raise for Deploy/Stow
620
-#define Z_RAISE_BETWEEN_PROBES  5 // Z Raise between probe points
619
+#define Z_CLEARANCE_DEPLOY_PROBE   15 // Z Clearance for Deploy/Stow
620
+#define Z_CLEARANCE_BETWEEN_PROBES  5 // Z Clearance between probe points
621
 
621
 
622
 //
622
 //
623
 // For M851 give a range for adjusting the Z probe offset
623
 // For M851 give a range for adjusting the Z probe offset

+ 4
- 4
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h Parādīt failu

613
  * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
613
  * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
614
  * Only integer values >= 1 are valid here.
614
  * Only integer values >= 1 are valid here.
615
  *
615
  *
616
- * Example: `M851 Z-5` with a RAISE of 4  =>  9mm from bed to nozzle.
617
- *     But: `M851 Z+1` with a RAISE of 2  =>  2mm from bed to nozzle.
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
  */
618
  */
619
-#define Z_RAISE_DEPLOY_PROBE   15 // Z Raise for Deploy/Stow
620
-#define Z_RAISE_BETWEEN_PROBES  5 // Z Raise between probe points
619
+#define Z_CLEARANCE_DEPLOY_PROBE   15 // Z Clearance for Deploy/Stow
620
+#define Z_CLEARANCE_BETWEEN_PROBES  5 // Z Clearance between probe points
621
 
621
 
622
 //
622
 //
623
 // For M851 give a range for adjusting the Z probe offset
623
 // For M851 give a range for adjusting the Z probe offset

+ 4
- 4
Marlin/example_configurations/RigidBot/Configuration.h Parādīt failu

611
  * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
611
  * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
612
  * Only integer values >= 1 are valid here.
612
  * Only integer values >= 1 are valid here.
613
  *
613
  *
614
- * Example: `M851 Z-5` with a RAISE of 4  =>  9mm from bed to nozzle.
615
- *     But: `M851 Z+1` with a RAISE of 2  =>  2mm from bed to nozzle.
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
  */
616
  */
617
-#define Z_RAISE_DEPLOY_PROBE   15 // Z Raise for Deploy/Stow
618
-#define Z_RAISE_BETWEEN_PROBES  5 // Z Raise between probe points
617
+#define Z_CLEARANCE_DEPLOY_PROBE   15 // Z Clearance for Deploy/Stow
618
+#define Z_CLEARANCE_BETWEEN_PROBES  5 // Z Clearance between probe points
619
 
619
 
620
 //
620
 //
621
 // For M851 give a range for adjusting the Z probe offset
621
 // For M851 give a range for adjusting the Z probe offset

+ 4
- 4
Marlin/example_configurations/SCARA/Configuration.h Parādīt failu

623
  * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
623
  * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
624
  * Only integer values >= 1 are valid here.
624
  * Only integer values >= 1 are valid here.
625
  *
625
  *
626
- * Example: `M851 Z-5` with a RAISE of 4  =>  9mm from bed to nozzle.
627
- *     But: `M851 Z+1` with a RAISE of 2  =>  2mm from bed to nozzle.
626
+ * Example: `M851 Z-5` with a CLEARANCE of 4  =>  9mm from bed to nozzle.
627
+ *     But: `M851 Z+1` with a CLEARANCE of 2  =>  2mm from bed to nozzle.
628
  */
628
  */
629
-#define Z_RAISE_DEPLOY_PROBE   15 // Z Raise for Deploy/Stow
630
-#define Z_RAISE_BETWEEN_PROBES  5 // Z Raise between probe points
629
+#define Z_CLEARANCE_DEPLOY_PROBE   15 // Z Clearance for Deploy/Stow
630
+#define Z_CLEARANCE_BETWEEN_PROBES  5 // Z Clearance between probe points
631
 
631
 
632
 //
632
 //
633
 // For M851 give a range for adjusting the Z probe offset
633
 // For M851 give a range for adjusting the Z probe offset

+ 4
- 4
Marlin/example_configurations/TAZ4/Configuration.h Parādīt failu

634
  * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
634
  * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
635
  * Only integer values >= 1 are valid here.
635
  * Only integer values >= 1 are valid here.
636
  *
636
  *
637
- * Example: `M851 Z-5` with a RAISE of 4  =>  9mm from bed to nozzle.
638
- *     But: `M851 Z+1` with a RAISE of 2  =>  2mm from bed to nozzle.
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
  */
639
  */
640
-#define Z_RAISE_DEPLOY_PROBE   15 // Z Raise for Deploy/Stow
641
-#define Z_RAISE_BETWEEN_PROBES  5 // Z Raise between probe points
640
+#define Z_CLEARANCE_DEPLOY_PROBE   15 // Z Clearance for Deploy/Stow
641
+#define Z_CLEARANCE_BETWEEN_PROBES  5 // Z Clearance between probe points
642
 
642
 
643
 //
643
 //
644
 // For M851 give a range for adjusting the Z probe offset
644
 // For M851 give a range for adjusting the Z probe offset

+ 4
- 4
Marlin/example_configurations/WITBOX/Configuration.h Parādīt failu

605
  * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
605
  * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
606
  * Only integer values >= 1 are valid here.
606
  * Only integer values >= 1 are valid here.
607
  *
607
  *
608
- * Example: `M851 Z-5` with a RAISE of 4  =>  9mm from bed to nozzle.
609
- *     But: `M851 Z+1` with a RAISE of 2  =>  2mm from bed to nozzle.
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
  */
610
  */
611
-#define Z_RAISE_DEPLOY_PROBE   15 // Z Raise for Deploy/Stow
612
-#define Z_RAISE_BETWEEN_PROBES  5 // Z Raise between probe points
611
+#define Z_CLEARANCE_DEPLOY_PROBE   15 // Z Clearance for Deploy/Stow
612
+#define Z_CLEARANCE_BETWEEN_PROBES  5 // Z Clearance between probe points
613
 
613
 
614
 //
614
 //
615
 // For M851 give a range for adjusting the Z probe offset
615
 // For M851 give a range for adjusting the Z probe offset

+ 4
- 4
Marlin/example_configurations/adafruit/ST7565/Configuration.h Parādīt failu

613
  * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
613
  * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
614
  * Only integer values >= 1 are valid here.
614
  * Only integer values >= 1 are valid here.
615
  *
615
  *
616
- * Example: `M851 Z-5` with a RAISE of 4  =>  9mm from bed to nozzle.
617
- *     But: `M851 Z+1` with a RAISE of 2  =>  2mm from bed to nozzle.
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
  */
618
  */
619
-#define Z_RAISE_DEPLOY_PROBE   15 // Z Raise for Deploy/Stow
620
-#define Z_RAISE_BETWEEN_PROBES  5 // Z Raise between probe points
619
+#define Z_CLEARANCE_DEPLOY_PROBE   15 // Z Clearance for Deploy/Stow
620
+#define Z_CLEARANCE_BETWEEN_PROBES  5 // Z Clearance between probe points
621
 
621
 
622
 //
622
 //
623
 // For M851 give a range for adjusting the Z probe offset
623
 // For M851 give a range for adjusting the Z probe offset

+ 4
- 4
Marlin/example_configurations/delta/biv2.5/Configuration.h Parādīt failu

703
  * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
703
  * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
704
  * Only integer values >= 1 are valid here.
704
  * Only integer values >= 1 are valid here.
705
  *
705
  *
706
- * Example: `M851 Z-5` with a RAISE of 4  =>  9mm from bed to nozzle.
707
- *     But: `M851 Z+1` with a RAISE of 2  =>  2mm from bed to nozzle.
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
  */
708
  */
709
-#define Z_RAISE_DEPLOY_PROBE   50 // Z Raise for Deploy/Stow
710
-#define Z_RAISE_BETWEEN_PROBES  5 // Z Raise between probe points
709
+#define Z_CLEARANCE_DEPLOY_PROBE   50 // Z Clearance for Deploy/Stow
710
+#define Z_CLEARANCE_BETWEEN_PROBES  5 // Z Clearance between probe points
711
 
711
 
712
 //
712
 //
713
 // For M851 give a range for adjusting the Z probe offset
713
 // For M851 give a range for adjusting the Z probe offset

+ 4
- 4
Marlin/example_configurations/delta/generic/Configuration.h Parādīt failu

697
  * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
697
  * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
698
  * Only integer values >= 1 are valid here.
698
  * Only integer values >= 1 are valid here.
699
  *
699
  *
700
- * Example: `M851 Z-5` with a RAISE of 4  =>  9mm from bed to nozzle.
701
- *     But: `M851 Z+1` with a RAISE of 2  =>  2mm from bed to nozzle.
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
  */
702
  */
703
-#define Z_RAISE_DEPLOY_PROBE   15 // Z Raise for Deploy/Stow
704
-#define Z_RAISE_BETWEEN_PROBES  5 // Z Raise between probe points
703
+#define Z_CLEARANCE_DEPLOY_PROBE   15 // Z Clearance for Deploy/Stow
704
+#define Z_CLEARANCE_BETWEEN_PROBES  5 // Z Clearance between probe points
705
 
705
 
706
 //
706
 //
707
 // For M851 give a range for adjusting the Z probe offset
707
 // For M851 give a range for adjusting the Z probe offset

+ 4
- 4
Marlin/example_configurations/delta/kossel_mini/Configuration.h Parādīt failu

700
  * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
700
  * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
701
  * Only integer values >= 1 are valid here.
701
  * Only integer values >= 1 are valid here.
702
  *
702
  *
703
- * Example: `M851 Z-5` with a RAISE of 4  =>  9mm from bed to nozzle.
704
- *     But: `M851 Z+1` with a RAISE of 2  =>  2mm from bed to nozzle.
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
  */
705
  */
706
-#define Z_RAISE_DEPLOY_PROBE   50 // Z Raise for Deploy/Stow
707
-#define Z_RAISE_BETWEEN_PROBES  5 // Z Raise between probe points
706
+#define Z_CLEARANCE_DEPLOY_PROBE   50 // Z Clearance for Deploy/Stow
707
+#define Z_CLEARANCE_BETWEEN_PROBES  5 // Z Clearance between probe points
708
 
708
 
709
 //
709
 //
710
 // For M851 give a range for adjusting the Z probe offset
710
 // For M851 give a range for adjusting the Z probe offset

+ 4
- 4
Marlin/example_configurations/delta/kossel_pro/Configuration.h Parādīt failu

701
  * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
701
  * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
702
  * Only integer values >= 1 are valid here.
702
  * Only integer values >= 1 are valid here.
703
  *
703
  *
704
- * Example: `M851 Z-5` with a RAISE of 4  =>  9mm from bed to nozzle.
705
- *     But: `M851 Z+1` with a RAISE of 2  =>  2mm from bed to nozzle.
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
  */
706
  */
707
-#define Z_RAISE_DEPLOY_PROBE   100 // Z Raise for Deploy/Stow
708
-#define Z_RAISE_BETWEEN_PROBES   5 // Z Raise between probe points
707
+#define Z_CLEARANCE_DEPLOY_PROBE   100 // Z Clearance for Deploy/Stow
708
+#define Z_CLEARANCE_BETWEEN_PROBES   5 // Z Clearance between probe points
709
 
709
 
710
 //
710
 //
711
 // For M851 give a range for adjusting the Z probe offset
711
 // For M851 give a range for adjusting the Z probe offset

+ 4
- 4
Marlin/example_configurations/delta/kossel_xl/Configuration.h Parādīt failu

703
  * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
703
  * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
704
  * Only integer values >= 1 are valid here.
704
  * Only integer values >= 1 are valid here.
705
  *
705
  *
706
- * Example: `M851 Z-5` with a RAISE of 4  =>  9mm from bed to nozzle.
707
- *     But: `M851 Z+1` with a RAISE of 2  =>  2mm from bed to nozzle.
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
  */
708
  */
709
-#define Z_RAISE_DEPLOY_PROBE   20 // Z Raise for Deploy/Stow
710
-#define Z_RAISE_BETWEEN_PROBES 10 // Z Raise between probe points
709
+#define Z_CLEARANCE_DEPLOY_PROBE   20 // Z Clearance for Deploy/Stow
710
+#define Z_CLEARANCE_BETWEEN_PROBES 10 // Z Clearance between probe points
711
 
711
 
712
 //
712
 //
713
 // For M851 give a range for adjusting the Z probe offset
713
 // For M851 give a range for adjusting the Z probe offset

+ 4
- 4
Marlin/example_configurations/makibox/Configuration.h Parādīt failu

616
  * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
616
  * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
617
  * Only integer values >= 1 are valid here.
617
  * Only integer values >= 1 are valid here.
618
  *
618
  *
619
- * Example: `M851 Z-5` with a RAISE of 4  =>  9mm from bed to nozzle.
620
- *     But: `M851 Z+1` with a RAISE of 2  =>  2mm from bed to nozzle.
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
  */
621
  */
622
-#define Z_RAISE_DEPLOY_PROBE   15 // Z Raise for Deploy/Stow
623
-#define Z_RAISE_BETWEEN_PROBES  5 // Z Raise between probe points
622
+#define Z_CLEARANCE_DEPLOY_PROBE   15 // Z Clearance for Deploy/Stow
623
+#define Z_CLEARANCE_BETWEEN_PROBES  5 // Z Clearance between probe points
624
 
624
 
625
 //
625
 //
626
 // For M851 give a range for adjusting the Z probe offset
626
 // For M851 give a range for adjusting the Z probe offset

+ 4
- 4
Marlin/example_configurations/tvrrug/Round2/Configuration.h Parādīt failu

609
  * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
609
  * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
610
  * Only integer values >= 1 are valid here.
610
  * Only integer values >= 1 are valid here.
611
  *
611
  *
612
- * Example: `M851 Z-5` with a RAISE of 4  =>  9mm from bed to nozzle.
613
- *     But: `M851 Z+1` with a RAISE of 2  =>  2mm from bed to nozzle.
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
  */
614
  */
615
-#define Z_RAISE_DEPLOY_PROBE   15 // Z Raise for Deploy/Stow
616
-#define Z_RAISE_BETWEEN_PROBES  5 // Z Raise between probe points
615
+#define Z_CLEARANCE_DEPLOY_PROBE   15 // Z Clearance for Deploy/Stow
616
+#define Z_CLEARANCE_BETWEEN_PROBES  5 // Z Clearance between probe points
617
 
617
 
618
 //
618
 //
619
 // For M851 give a range for adjusting the Z probe offset
619
 // For M851 give a range for adjusting the Z probe offset

Notiek ielāde…
Atcelt
Saglabāt