Browse Source

Apply MULTIPLE_PROBING to example configs

Scott Lahteine 6 years ago
parent
commit
6e85c060a9
68 changed files with 220 additions and 144 deletions
  1. 5
    3
      Marlin/example_configurations/AlephObjects/TAZ4/Configuration.h
  2. 1
    1
      Marlin/example_configurations/AlephObjects/TAZ4/Configuration_adv.h
  3. 5
    3
      Marlin/example_configurations/AliExpress/CL-260/Configuration.h
  4. 5
    3
      Marlin/example_configurations/Anet/A6/Configuration.h
  5. 1
    1
      Marlin/example_configurations/Anet/A6/Configuration_adv.h
  6. 5
    3
      Marlin/example_configurations/Anet/A8/Configuration.h
  7. 1
    1
      Marlin/example_configurations/Anet/A8/Configuration_adv.h
  8. 5
    3
      Marlin/example_configurations/BQ/Hephestos/Configuration.h
  9. 1
    1
      Marlin/example_configurations/BQ/Hephestos/Configuration_adv.h
  10. 5
    3
      Marlin/example_configurations/BQ/Hephestos_2/Configuration.h
  11. 1
    1
      Marlin/example_configurations/BQ/Hephestos_2/Configuration_adv.h
  12. 5
    3
      Marlin/example_configurations/BQ/WITBOX/Configuration.h
  13. 1
    1
      Marlin/example_configurations/BQ/WITBOX/Configuration_adv.h
  14. 5
    3
      Marlin/example_configurations/Cartesio/Configuration.h
  15. 1
    1
      Marlin/example_configurations/Cartesio/Configuration_adv.h
  16. 5
    3
      Marlin/example_configurations/Creality/CR-10/Configuration.h
  17. 1
    1
      Marlin/example_configurations/Creality/CR-10/Configuration_adv.h
  18. 5
    3
      Marlin/example_configurations/Felix/Configuration.h
  19. 1
    1
      Marlin/example_configurations/Felix/Configuration_adv.h
  20. 5
    3
      Marlin/example_configurations/Felix/DUAL/Configuration.h
  21. 5
    3
      Marlin/example_configurations/FolgerTech/i3-2020/Configuration.h
  22. 1
    1
      Marlin/example_configurations/FolgerTech/i3-2020/Configuration_adv.h
  23. 5
    3
      Marlin/example_configurations/Geeetech/GT2560/Configuration.h
  24. 5
    3
      Marlin/example_configurations/Geeetech/I3_Pro_X-GT2560/Configuration.h
  25. 5
    3
      Marlin/example_configurations/Infitary/i3-M508/Configuration.h
  26. 1
    1
      Marlin/example_configurations/Infitary/i3-M508/Configuration_adv.h
  27. 5
    3
      Marlin/example_configurations/Malyan/M150/Configuration.h
  28. 1
    1
      Marlin/example_configurations/Malyan/M150/Configuration_adv.h
  29. 5
    3
      Marlin/example_configurations/Micromake/C1/basic/Configuration.h
  30. 5
    3
      Marlin/example_configurations/Micromake/C1/enhanced/Configuration.h
  31. 1
    1
      Marlin/example_configurations/Micromake/C1/enhanced/Configuration_adv.h
  32. 5
    3
      Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
  33. 5
    3
      Marlin/example_configurations/RigidBot/Configuration.h
  34. 1
    1
      Marlin/example_configurations/RigidBot/Configuration_adv.h
  35. 5
    3
      Marlin/example_configurations/SCARA/Configuration.h
  36. 1
    1
      Marlin/example_configurations/SCARA/Configuration_adv.h
  37. 5
    3
      Marlin/example_configurations/Sanguinololu/Configuration.h
  38. 1
    1
      Marlin/example_configurations/Sanguinololu/Configuration_adv.h
  39. 5
    3
      Marlin/example_configurations/TinyBoy2/Configuration.h
  40. 1
    1
      Marlin/example_configurations/TinyBoy2/Configuration_adv.h
  41. 5
    3
      Marlin/example_configurations/Velleman/K8200/Configuration.h
  42. 1
    1
      Marlin/example_configurations/Velleman/K8200/Configuration_adv.h
  43. 5
    3
      Marlin/example_configurations/Velleman/K8400/Configuration.h
  44. 1
    1
      Marlin/example_configurations/Velleman/K8400/Configuration_adv.h
  45. 5
    3
      Marlin/example_configurations/Velleman/K8400/Dual-head/Configuration.h
  46. 5
    3
      Marlin/example_configurations/Wanhao/Duplicator 6/Configuration.h
  47. 1
    1
      Marlin/example_configurations/Wanhao/Duplicator 6/Configuration_adv.h
  48. 5
    3
      Marlin/example_configurations/adafruit/ST7565/Configuration.h
  49. 5
    3
      Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h
  50. 1
    1
      Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h
  51. 5
    3
      Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h
  52. 1
    1
      Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h
  53. 5
    3
      Marlin/example_configurations/delta/generic/Configuration.h
  54. 1
    1
      Marlin/example_configurations/delta/generic/Configuration_adv.h
  55. 5
    3
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  56. 1
    1
      Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
  57. 5
    3
      Marlin/example_configurations/delta/kossel_pro/Configuration.h
  58. 1
    1
      Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
  59. 5
    3
      Marlin/example_configurations/delta/kossel_xl/Configuration.h
  60. 1
    1
      Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h
  61. 5
    3
      Marlin/example_configurations/gCreate/gMax1.5+/Configuration.h
  62. 1
    1
      Marlin/example_configurations/gCreate/gMax1.5+/Configuration_adv.h
  63. 5
    3
      Marlin/example_configurations/makibox/Configuration.h
  64. 1
    1
      Marlin/example_configurations/makibox/Configuration_adv.h
  65. 5
    3
      Marlin/example_configurations/tvrrug/Round2/Configuration.h
  66. 1
    1
      Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
  67. 5
    3
      Marlin/example_configurations/wt150/Configuration.h
  68. 1
    1
      Marlin/example_configurations/wt150/Configuration_adv.h

+ 5
- 3
Marlin/example_configurations/AlephObjects/TAZ4/Configuration.h View File

@@ -710,14 +710,16 @@
710 710
 // X and Y axis travel speed (mm/m) between probes
711 711
 #define XY_PROBE_SPEED 8000
712 712
 
713
-// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
713
+// Speed for the first approach when double-probing (MULTIPLE_PROBING == 2)
714 714
 #define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
715 715
 
716 716
 // Speed for the "accurate" probe of each point
717 717
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
718 718
 
719
-// Use double touch for probing
720
-//#define PROBE_DOUBLE_TOUCH
719
+// The number of probes to perform at each point.
720
+//   Set to 2 for a fast/slow probe, using the second probe result.
721
+//   Set to 3 or more for slow probes, averaging the results.
722
+//#define MULTIPLE_PROBING 2
721 723
 
722 724
 /**
723 725
  * Z probes require clearance when deploying, stowing, and moving between

+ 1
- 1
Marlin/example_configurations/AlephObjects/TAZ4/Configuration_adv.h View File

@@ -742,7 +742,7 @@
742 742
 //#define BEZIER_CURVE_SUPPORT
743 743
 
744 744
 // G38.2 and G38.3 Probe Target
745
-// Enable PROBE_DOUBLE_TOUCH if you want G38 to double touch
745
+// Set MULTIPLE_PROBING if you want G38 to double touch
746 746
 //#define G38_PROBE_TARGET
747 747
 #if ENABLED(G38_PROBE_TARGET)
748 748
   #define G38_MINIMUM_MOVE 0.0275 // minimum distance in mm that will produce a move (determined using the print statement in check_move)

+ 5
- 3
Marlin/example_configurations/AliExpress/CL-260/Configuration.h View File

@@ -690,14 +690,16 @@
690 690
 // X and Y axis travel speed (mm/m) between probes
691 691
 #define XY_PROBE_SPEED 8000
692 692
 
693
-// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
693
+// Speed for the first approach when double-probing (MULTIPLE_PROBING == 2)
694 694
 #define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
695 695
 
696 696
 // Speed for the "accurate" probe of each point
697 697
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
698 698
 
699
-// Use double touch for probing
700
-//#define PROBE_DOUBLE_TOUCH
699
+// The number of probes to perform at each point.
700
+//   Set to 2 for a fast/slow probe, using the second probe result.
701
+//   Set to 3 or more for slow probes, averaging the results.
702
+//#define MULTIPLE_PROBING 2
701 703
 
702 704
 /**
703 705
  * Z probes require clearance when deploying, stowing, and moving between

+ 5
- 3
Marlin/example_configurations/Anet/A6/Configuration.h View File

@@ -769,14 +769,16 @@
769 769
 #define XY_PROBE_SPEED 8000
770 770
 //#define XY_PROBE_SPEED 6000
771 771
 
772
-// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
772
+// Speed for the first approach when double-probing (MULTIPLE_PROBING == 2)
773 773
 #define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
774 774
 
775 775
 // Speed for the "accurate" probe of each point
776 776
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 3)
777 777
 
778
-// Use double touch for probing
779
-#define PROBE_DOUBLE_TOUCH
778
+// The number of probes to perform at each point.
779
+//   Set to 2 for a fast/slow probe, using the second probe result.
780
+//   Set to 3 or more for slow probes, averaging the results.
781
+#define MULTIPLE_PROBING 2
780 782
 
781 783
 /**
782 784
  * Z probes require clearance when deploying, stowing, and moving between

+ 1
- 1
Marlin/example_configurations/Anet/A6/Configuration_adv.h View File

@@ -742,7 +742,7 @@
742 742
 //#define BEZIER_CURVE_SUPPORT
743 743
 
744 744
 // G38.2 and G38.3 Probe Target
745
-// Enable PROBE_DOUBLE_TOUCH if you want G38 to double touch
745
+// Set MULTIPLE_PROBING if you want G38 to double touch
746 746
 //#define G38_PROBE_TARGET
747 747
 #if ENABLED(G38_PROBE_TARGET)
748 748
   #define G38_MINIMUM_MOVE 0.0275 // minimum distance in mm that will produce a move (determined using the print statement in check_move)

+ 5
- 3
Marlin/example_configurations/Anet/A8/Configuration.h View File

@@ -697,14 +697,16 @@
697 697
 // X and Y axis travel speed (mm/m) between probes
698 698
 #define XY_PROBE_SPEED 6000
699 699
 
700
-// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
700
+// Speed for the first approach when double-probing (MULTIPLE_PROBING == 2)
701 701
 #define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
702 702
 
703 703
 // Speed for the "accurate" probe of each point
704 704
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
705 705
 
706
-// Use double touch for probing
707
-//#define PROBE_DOUBLE_TOUCH
706
+// The number of probes to perform at each point.
707
+//   Set to 2 for a fast/slow probe, using the second probe result.
708
+//   Set to 3 or more for slow probes, averaging the results.
709
+//#define MULTIPLE_PROBING 2
708 710
 
709 711
 /**
710 712
  * Z probes require clearance when deploying, stowing, and moving between

+ 1
- 1
Marlin/example_configurations/Anet/A8/Configuration_adv.h View File

@@ -742,7 +742,7 @@
742 742
 //#define BEZIER_CURVE_SUPPORT
743 743
 
744 744
 // G38.2 and G38.3 Probe Target
745
-// Enable PROBE_DOUBLE_TOUCH if you want G38 to double touch
745
+// Set MULTIPLE_PROBING if you want G38 to double touch
746 746
 //#define G38_PROBE_TARGET
747 747
 #if ENABLED(G38_PROBE_TARGET)
748 748
   #define G38_MINIMUM_MOVE 0.0275 // minimum distance in mm that will produce a move (determined using the print statement in check_move)

+ 5
- 3
Marlin/example_configurations/BQ/Hephestos/Configuration.h View File

@@ -681,14 +681,16 @@
681 681
 // X and Y axis travel speed (mm/m) between probes
682 682
 #define XY_PROBE_SPEED 8000
683 683
 
684
-// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
684
+// Speed for the first approach when double-probing (MULTIPLE_PROBING == 2)
685 685
 #define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
686 686
 
687 687
 // Speed for the "accurate" probe of each point
688 688
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
689 689
 
690
-// Use double touch for probing
691
-//#define PROBE_DOUBLE_TOUCH
690
+// The number of probes to perform at each point.
691
+//   Set to 2 for a fast/slow probe, using the second probe result.
692
+//   Set to 3 or more for slow probes, averaging the results.
693
+//#define MULTIPLE_PROBING 2
692 694
 
693 695
 /**
694 696
  * Z probes require clearance when deploying, stowing, and moving between

+ 1
- 1
Marlin/example_configurations/BQ/Hephestos/Configuration_adv.h View File

@@ -742,7 +742,7 @@
742 742
 //#define BEZIER_CURVE_SUPPORT
743 743
 
744 744
 // G38.2 and G38.3 Probe Target
745
-// Enable PROBE_DOUBLE_TOUCH if you want G38 to double touch
745
+// Set MULTIPLE_PROBING if you want G38 to double touch
746 746
 //#define G38_PROBE_TARGET
747 747
 #if ENABLED(G38_PROBE_TARGET)
748 748
   #define G38_MINIMUM_MOVE 0.0275 // minimum distance in mm that will produce a move (determined using the print statement in check_move)

+ 5
- 3
Marlin/example_configurations/BQ/Hephestos_2/Configuration.h View File

@@ -691,14 +691,16 @@
691 691
 // X and Y axis travel speed (mm/m) between probes
692 692
 #define XY_PROBE_SPEED 8000
693 693
 
694
-// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
694
+// Speed for the first approach when double-probing (MULTIPLE_PROBING == 2)
695 695
 #define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
696 696
 
697 697
 // Speed for the "accurate" probe of each point
698 698
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
699 699
 
700
-// Use double touch for probing
701
-//#define PROBE_DOUBLE_TOUCH
700
+// The number of probes to perform at each point.
701
+//   Set to 2 for a fast/slow probe, using the second probe result.
702
+//   Set to 3 or more for slow probes, averaging the results.
703
+//#define MULTIPLE_PROBING 2
702 704
 
703 705
 /**
704 706
  * Z probes require clearance when deploying, stowing, and moving between

+ 1
- 1
Marlin/example_configurations/BQ/Hephestos_2/Configuration_adv.h View File

@@ -742,7 +742,7 @@
742 742
 //#define BEZIER_CURVE_SUPPORT
743 743
 
744 744
 // G38.2 and G38.3 Probe Target
745
-// Enable PROBE_DOUBLE_TOUCH if you want G38 to double touch
745
+// Set MULTIPLE_PROBING if you want G38 to double touch
746 746
 //#define G38_PROBE_TARGET
747 747
 #if ENABLED(G38_PROBE_TARGET)
748 748
   #define G38_MINIMUM_MOVE 0.0275 // minimum distance in mm that will produce a move (determined using the print statement in check_move)

+ 5
- 3
Marlin/example_configurations/BQ/WITBOX/Configuration.h View File

@@ -681,14 +681,16 @@
681 681
 // X and Y axis travel speed (mm/m) between probes
682 682
 #define XY_PROBE_SPEED 8000
683 683
 
684
-// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
684
+// Speed for the first approach when double-probing (MULTIPLE_PROBING == 2)
685 685
 #define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
686 686
 
687 687
 // Speed for the "accurate" probe of each point
688 688
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
689 689
 
690
-// Use double touch for probing
691
-//#define PROBE_DOUBLE_TOUCH
690
+// The number of probes to perform at each point.
691
+//   Set to 2 for a fast/slow probe, using the second probe result.
692
+//   Set to 3 or more for slow probes, averaging the results.
693
+//#define MULTIPLE_PROBING 2
692 694
 
693 695
 /**
694 696
  * Z probes require clearance when deploying, stowing, and moving between

+ 1
- 1
Marlin/example_configurations/BQ/WITBOX/Configuration_adv.h View File

@@ -742,7 +742,7 @@
742 742
 //#define BEZIER_CURVE_SUPPORT
743 743
 
744 744
 // G38.2 and G38.3 Probe Target
745
-// Enable PROBE_DOUBLE_TOUCH if you want G38 to double touch
745
+// Set MULTIPLE_PROBING if you want G38 to double touch
746 746
 //#define G38_PROBE_TARGET
747 747
 #if ENABLED(G38_PROBE_TARGET)
748 748
   #define G38_MINIMUM_MOVE 0.0275 // minimum distance in mm that will produce a move (determined using the print statement in check_move)

+ 5
- 3
Marlin/example_configurations/Cartesio/Configuration.h View File

@@ -689,14 +689,16 @@
689 689
 // X and Y axis travel speed (mm/m) between probes
690 690
 #define XY_PROBE_SPEED 8000
691 691
 
692
-// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
692
+// Speed for the first approach when double-probing (MULTIPLE_PROBING == 2)
693 693
 #define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
694 694
 
695 695
 // Speed for the "accurate" probe of each point
696 696
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
697 697
 
698
-// Use double touch for probing
699
-//#define PROBE_DOUBLE_TOUCH
698
+// The number of probes to perform at each point.
699
+//   Set to 2 for a fast/slow probe, using the second probe result.
700
+//   Set to 3 or more for slow probes, averaging the results.
701
+//#define MULTIPLE_PROBING 2
700 702
 
701 703
 /**
702 704
  * Z probes require clearance when deploying, stowing, and moving between

+ 1
- 1
Marlin/example_configurations/Cartesio/Configuration_adv.h View File

@@ -742,7 +742,7 @@
742 742
 //#define BEZIER_CURVE_SUPPORT
743 743
 
744 744
 // G38.2 and G38.3 Probe Target
745
-// Enable PROBE_DOUBLE_TOUCH if you want G38 to double touch
745
+// Set MULTIPLE_PROBING if you want G38 to double touch
746 746
 //#define G38_PROBE_TARGET
747 747
 #if ENABLED(G38_PROBE_TARGET)
748 748
   #define G38_MINIMUM_MOVE 0.0275 // minimum distance in mm that will produce a move (determined using the print statement in check_move)

+ 5
- 3
Marlin/example_configurations/Creality/CR-10/Configuration.h View File

@@ -700,14 +700,16 @@
700 700
 // X and Y axis travel speed (mm/m) between probes
701 701
 #define XY_PROBE_SPEED 8000
702 702
 
703
-// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
703
+// Speed for the first approach when double-probing (MULTIPLE_PROBING == 2)
704 704
 #define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
705 705
 
706 706
 // Speed for the "accurate" probe of each point
707 707
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
708 708
 
709
-// Use double touch for probing
710
-//#define PROBE_DOUBLE_TOUCH
709
+// The number of probes to perform at each point.
710
+//   Set to 2 for a fast/slow probe, using the second probe result.
711
+//   Set to 3 or more for slow probes, averaging the results.
712
+//#define MULTIPLE_PROBING 2
711 713
 
712 714
 /**
713 715
  * Z probes require clearance when deploying, stowing, and moving between

+ 1
- 1
Marlin/example_configurations/Creality/CR-10/Configuration_adv.h View File

@@ -742,7 +742,7 @@
742 742
 //#define BEZIER_CURVE_SUPPORT
743 743
 
744 744
 // G38.2 and G38.3 Probe Target
745
-// Enable PROBE_DOUBLE_TOUCH if you want G38 to double touch
745
+// Set MULTIPLE_PROBING if you want G38 to double touch
746 746
 //#define G38_PROBE_TARGET
747 747
 #if ENABLED(G38_PROBE_TARGET)
748 748
   #define G38_MINIMUM_MOVE 0.0275 // minimum distance in mm that will produce a move (determined using the print statement in check_move)

+ 5
- 3
Marlin/example_configurations/Felix/Configuration.h View File

@@ -672,14 +672,16 @@
672 672
 // X and Y axis travel speed (mm/m) between probes
673 673
 #define XY_PROBE_SPEED 8000
674 674
 
675
-// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
675
+// Speed for the first approach when double-probing (MULTIPLE_PROBING == 2)
676 676
 #define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
677 677
 
678 678
 // Speed for the "accurate" probe of each point
679 679
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
680 680
 
681
-// Use double touch for probing
682
-//#define PROBE_DOUBLE_TOUCH
681
+// The number of probes to perform at each point.
682
+//   Set to 2 for a fast/slow probe, using the second probe result.
683
+//   Set to 3 or more for slow probes, averaging the results.
684
+//#define MULTIPLE_PROBING 2
683 685
 
684 686
 /**
685 687
  * Z probes require clearance when deploying, stowing, and moving between

+ 1
- 1
Marlin/example_configurations/Felix/Configuration_adv.h View File

@@ -742,7 +742,7 @@
742 742
 //#define BEZIER_CURVE_SUPPORT
743 743
 
744 744
 // G38.2 and G38.3 Probe Target
745
-// Enable PROBE_DOUBLE_TOUCH if you want G38 to double touch
745
+// Set MULTIPLE_PROBING if you want G38 to double touch
746 746
 //#define G38_PROBE_TARGET
747 747
 #if ENABLED(G38_PROBE_TARGET)
748 748
   #define G38_MINIMUM_MOVE 0.0275 // minimum distance in mm that will produce a move (determined using the print statement in check_move)

+ 5
- 3
Marlin/example_configurations/Felix/DUAL/Configuration.h View File

@@ -672,14 +672,16 @@
672 672
 // X and Y axis travel speed (mm/m) between probes
673 673
 #define XY_PROBE_SPEED 8000
674 674
 
675
-// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
675
+// Speed for the first approach when double-probing (MULTIPLE_PROBING == 2)
676 676
 #define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
677 677
 
678 678
 // Speed for the "accurate" probe of each point
679 679
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
680 680
 
681
-// Use double touch for probing
682
-//#define PROBE_DOUBLE_TOUCH
681
+// The number of probes to perform at each point.
682
+//   Set to 2 for a fast/slow probe, using the second probe result.
683
+//   Set to 3 or more for slow probes, averaging the results.
684
+//#define MULTIPLE_PROBING 2
683 685
 
684 686
 /**
685 687
  * Z probes require clearance when deploying, stowing, and moving between

+ 5
- 3
Marlin/example_configurations/FolgerTech/i3-2020/Configuration.h View File

@@ -694,14 +694,16 @@
694 694
 
695 695
 // X and Y axis travel speed (mm/m) between probes
696 696
 #define XY_PROBE_SPEED 7500
697
-// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
697
+// Speed for the first approach when double-probing (MULTIPLE_PROBING == 2)
698 698
 #define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
699 699
 
700 700
 // Speed for the "accurate" probe of each point
701 701
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
702 702
 
703
-// Use double touch for probing
704
-//#define PROBE_DOUBLE_TOUCH
703
+// The number of probes to perform at each point.
704
+//   Set to 2 for a fast/slow probe, using the second probe result.
705
+//   Set to 3 or more for slow probes, averaging the results.
706
+//#define MULTIPLE_PROBING 2
705 707
 
706 708
 /**
707 709
  * Z probes require clearance when deploying, stowing, and moving between

+ 1
- 1
Marlin/example_configurations/FolgerTech/i3-2020/Configuration_adv.h View File

@@ -742,7 +742,7 @@
742 742
 //#define BEZIER_CURVE_SUPPORT
743 743
 
744 744
 // G38.2 and G38.3 Probe Target
745
-// Enable PROBE_DOUBLE_TOUCH if you want G38 to double touch
745
+// Set MULTIPLE_PROBING if you want G38 to double touch
746 746
 //#define G38_PROBE_TARGET
747 747
 #if ENABLED(G38_PROBE_TARGET)
748 748
   #define G38_MINIMUM_MOVE 0.0275 // minimum distance in mm that will produce a move (determined using the print statement in check_move)

+ 5
- 3
Marlin/example_configurations/Geeetech/GT2560/Configuration.h View File

@@ -705,14 +705,16 @@
705 705
 // X and Y axis travel speed (mm/m) between probes
706 706
 #define XY_PROBE_SPEED 8000
707 707
 
708
-// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
708
+// Speed for the first approach when double-probing (MULTIPLE_PROBING == 2)
709 709
 #define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
710 710
 
711 711
 // Speed for the "accurate" probe of each point
712 712
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
713 713
 
714
-// Use double touch for probing
715
-//#define PROBE_DOUBLE_TOUCH
714
+// The number of probes to perform at each point.
715
+//   Set to 2 for a fast/slow probe, using the second probe result.
716
+//   Set to 3 or more for slow probes, averaging the results.
717
+//#define MULTIPLE_PROBING 2
716 718
 
717 719
 /**
718 720
  * Z probes require clearance when deploying, stowing, and moving between

+ 5
- 3
Marlin/example_configurations/Geeetech/I3_Pro_X-GT2560/Configuration.h View File

@@ -690,14 +690,16 @@
690 690
 // X and Y axis travel speed (mm/m) between probes
691 691
 #define XY_PROBE_SPEED 8000
692 692
 
693
-// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
693
+// Speed for the first approach when double-probing (MULTIPLE_PROBING == 2)
694 694
 #define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
695 695
 
696 696
 // Speed for the "accurate" probe of each point
697 697
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
698 698
 
699
-// Use double touch for probing
700
-//#define PROBE_DOUBLE_TOUCH
699
+// The number of probes to perform at each point.
700
+//   Set to 2 for a fast/slow probe, using the second probe result.
701
+//   Set to 3 or more for slow probes, averaging the results.
702
+//#define MULTIPLE_PROBING 2
701 703
 
702 704
 /**
703 705
  * Z probes require clearance when deploying, stowing, and moving between

+ 5
- 3
Marlin/example_configurations/Infitary/i3-M508/Configuration.h View File

@@ -694,14 +694,16 @@
694 694
 // X and Y axis travel speed (mm/m) between probes
695 695
 #define XY_PROBE_SPEED 8000
696 696
 
697
-// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
697
+// Speed for the first approach when double-probing (MULTIPLE_PROBING == 2)
698 698
 #define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
699 699
 
700 700
 // Speed for the "accurate" probe of each point
701 701
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
702 702
 
703
-// Use double touch for probing
704
-//#define PROBE_DOUBLE_TOUCH
703
+// The number of probes to perform at each point.
704
+//   Set to 2 for a fast/slow probe, using the second probe result.
705
+//   Set to 3 or more for slow probes, averaging the results.
706
+//#define MULTIPLE_PROBING 2
705 707
 
706 708
 /**
707 709
  * Z probes require clearance when deploying, stowing, and moving between

+ 1
- 1
Marlin/example_configurations/Infitary/i3-M508/Configuration_adv.h View File

@@ -742,7 +742,7 @@
742 742
 //#define BEZIER_CURVE_SUPPORT
743 743
 
744 744
 // G38.2 and G38.3 Probe Target
745
-// Enable PROBE_DOUBLE_TOUCH if you want G38 to double touch
745
+// Set MULTIPLE_PROBING if you want G38 to double touch
746 746
 //#define G38_PROBE_TARGET
747 747
 #if ENABLED(G38_PROBE_TARGET)
748 748
   #define G38_MINIMUM_MOVE 0.0275 // minimum distance in mm that will produce a move (determined using the print statement in check_move)

+ 5
- 3
Marlin/example_configurations/Malyan/M150/Configuration.h View File

@@ -714,14 +714,16 @@
714 714
 // X and Y axis travel speed (mm/m) between probes
715 715
 //#define XY_PROBE_SPEED 8000
716 716
 
717
-// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
717
+// Speed for the first approach when double-probing (MULTIPLE_PROBING == 2)
718 718
 //#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
719 719
 
720 720
 // Speed for the "accurate" probe of each point
721 721
 //#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
722 722
 
723
-// Use double touch for probing
724
-//#define PROBE_DOUBLE_TOUCH
723
+// The number of probes to perform at each point.
724
+//   Set to 2 for a fast/slow probe, using the second probe result.
725
+//   Set to 3 or more for slow probes, averaging the results.
726
+//#define MULTIPLE_PROBING 2
725 727
 
726 728
 /**
727 729
  * Z probes require clearance when deploying, stowing, and moving between

+ 1
- 1
Marlin/example_configurations/Malyan/M150/Configuration_adv.h View File

@@ -742,7 +742,7 @@
742 742
 //#define BEZIER_CURVE_SUPPORT
743 743
 
744 744
 // G38.2 and G38.3 Probe Target
745
-// Enable PROBE_DOUBLE_TOUCH if you want G38 to double touch
745
+// Set MULTIPLE_PROBING if you want G38 to double touch
746 746
 //#define G38_PROBE_TARGET
747 747
 #if ENABLED(G38_PROBE_TARGET)
748 748
   #define G38_MINIMUM_MOVE 0.0275 // minimum distance in mm that will produce a move (determined using the print statement in check_move)

+ 5
- 3
Marlin/example_configurations/Micromake/C1/basic/Configuration.h View File

@@ -694,14 +694,16 @@
694 694
 // X and Y axis travel speed (mm/m) between probes
695 695
 #define XY_PROBE_SPEED 8000
696 696
 
697
-// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
697
+// Speed for the first approach when double-probing (MULTIPLE_PROBING == 2)
698 698
 #define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
699 699
 
700 700
 // Speed for the "accurate" probe of each point
701 701
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
702 702
 
703
-// Use double touch for probing
704
-//#define PROBE_DOUBLE_TOUCH
703
+// The number of probes to perform at each point.
704
+//   Set to 2 for a fast/slow probe, using the second probe result.
705
+//   Set to 3 or more for slow probes, averaging the results.
706
+//#define MULTIPLE_PROBING 2
705 707
 
706 708
 /**
707 709
  * Z probes require clearance when deploying, stowing, and moving between

+ 5
- 3
Marlin/example_configurations/Micromake/C1/enhanced/Configuration.h View File

@@ -694,14 +694,16 @@
694 694
 // X and Y axis travel speed (mm/m) between probes
695 695
 #define XY_PROBE_SPEED 8000
696 696
 
697
-// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
697
+// Speed for the first approach when double-probing (MULTIPLE_PROBING == 2)
698 698
 #define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
699 699
 
700 700
 // Speed for the "accurate" probe of each point
701 701
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
702 702
 
703
-// Use double touch for probing
704
-#define PROBE_DOUBLE_TOUCH
703
+// The number of probes to perform at each point.
704
+//   Set to 2 for a fast/slow probe, using the second probe result.
705
+//   Set to 3 or more for slow probes, averaging the results.
706
+#define MULTIPLE_PROBING 2
705 707
 
706 708
 /**
707 709
  * Z probes require clearance when deploying, stowing, and moving between

+ 1
- 1
Marlin/example_configurations/Micromake/C1/enhanced/Configuration_adv.h View File

@@ -743,7 +743,7 @@
743 743
 //#define BEZIER_CURVE_SUPPORT
744 744
 
745 745
 // G38.2 and G38.3 Probe Target
746
-// Enable PROBE_DOUBLE_TOUCH if you want G38 to double touch
746
+// Set MULTIPLE_PROBING if you want G38 to double touch
747 747
 //#define G38_PROBE_TARGET
748 748
 #if ENABLED(G38_PROBE_TARGET)
749 749
   #define G38_MINIMUM_MOVE 0.0275 // minimum distance in mm that will produce a move (determined using the print statement in check_move)

+ 5
- 3
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h View File

@@ -690,14 +690,16 @@
690 690
 // X and Y axis travel speed (mm/m) between probes
691 691
 #define XY_PROBE_SPEED 8000
692 692
 
693
-// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
693
+// Speed for the first approach when double-probing (MULTIPLE_PROBING == 2)
694 694
 #define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
695 695
 
696 696
 // Speed for the "accurate" probe of each point
697 697
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
698 698
 
699
-// Use double touch for probing
700
-//#define PROBE_DOUBLE_TOUCH
699
+// The number of probes to perform at each point.
700
+//   Set to 2 for a fast/slow probe, using the second probe result.
701
+//   Set to 3 or more for slow probes, averaging the results.
702
+//#define MULTIPLE_PROBING 2
701 703
 
702 704
 /**
703 705
  * Z probes require clearance when deploying, stowing, and moving between

+ 5
- 3
Marlin/example_configurations/RigidBot/Configuration.h View File

@@ -688,14 +688,16 @@
688 688
 // X and Y axis travel speed (mm/m) between probes
689 689
 #define XY_PROBE_SPEED 8000
690 690
 
691
-// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
691
+// Speed for the first approach when double-probing (MULTIPLE_PROBING == 2)
692 692
 #define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
693 693
 
694 694
 // Speed for the "accurate" probe of each point
695 695
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
696 696
 
697
-// Use double touch for probing
698
-//#define PROBE_DOUBLE_TOUCH
697
+// The number of probes to perform at each point.
698
+//   Set to 2 for a fast/slow probe, using the second probe result.
699
+//   Set to 3 or more for slow probes, averaging the results.
700
+//#define MULTIPLE_PROBING 2
699 701
 
700 702
 /**
701 703
  * Z probes require clearance when deploying, stowing, and moving between

+ 1
- 1
Marlin/example_configurations/RigidBot/Configuration_adv.h View File

@@ -742,7 +742,7 @@
742 742
 //#define BEZIER_CURVE_SUPPORT
743 743
 
744 744
 // G38.2 and G38.3 Probe Target
745
-// Enable PROBE_DOUBLE_TOUCH if you want G38 to double touch
745
+// Set MULTIPLE_PROBING if you want G38 to double touch
746 746
 //#define G38_PROBE_TARGET
747 747
 #if ENABLED(G38_PROBE_TARGET)
748 748
   #define G38_MINIMUM_MOVE 0.0275 // minimum distance in mm that will produce a move (determined using the print statement in check_move)

+ 5
- 3
Marlin/example_configurations/SCARA/Configuration.h View File

@@ -702,14 +702,16 @@
702 702
 // X and Y axis travel speed (mm/m) between probes
703 703
 #define XY_PROBE_SPEED 8000
704 704
 
705
-// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
705
+// Speed for the first approach when double-probing (MULTIPLE_PROBING == 2)
706 706
 #define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
707 707
 
708 708
 // Speed for the "accurate" probe of each point
709 709
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
710 710
 
711
-// Use double touch for probing
712
-//#define PROBE_DOUBLE_TOUCH
711
+// The number of probes to perform at each point.
712
+//   Set to 2 for a fast/slow probe, using the second probe result.
713
+//   Set to 3 or more for slow probes, averaging the results.
714
+//#define MULTIPLE_PROBING 2
713 715
 
714 716
 /**
715 717
  * Z probes require clearance when deploying, stowing, and moving between

+ 1
- 1
Marlin/example_configurations/SCARA/Configuration_adv.h View File

@@ -742,7 +742,7 @@
742 742
 //#define BEZIER_CURVE_SUPPORT
743 743
 
744 744
 // G38.2 and G38.3 Probe Target
745
-// Enable PROBE_DOUBLE_TOUCH if you want G38 to double touch
745
+// Set MULTIPLE_PROBING if you want G38 to double touch
746 746
 //#define G38_PROBE_TARGET
747 747
 #if ENABLED(G38_PROBE_TARGET)
748 748
   #define G38_MINIMUM_MOVE 0.0275 // minimum distance in mm that will produce a move (determined using the print statement in check_move)

+ 5
- 3
Marlin/example_configurations/Sanguinololu/Configuration.h View File

@@ -721,14 +721,16 @@
721 721
 // X and Y axis travel speed (mm/m) between probes
722 722
 #define XY_PROBE_SPEED 8000
723 723
 
724
-// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
724
+// Speed for the first approach when double-probing (MULTIPLE_PROBING == 2)
725 725
 #define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
726 726
 
727 727
 // Speed for the "accurate" probe of each point
728 728
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
729 729
 
730
-// Use double touch for probing
731
-//#define PROBE_DOUBLE_TOUCH
730
+// The number of probes to perform at each point.
731
+//   Set to 2 for a fast/slow probe, using the second probe result.
732
+//   Set to 3 or more for slow probes, averaging the results.
733
+//#define MULTIPLE_PROBING 2
732 734
 
733 735
 /**
734 736
  * Z probes require clearance when deploying, stowing, and moving between

+ 1
- 1
Marlin/example_configurations/Sanguinololu/Configuration_adv.h View File

@@ -731,7 +731,7 @@
731 731
 //#define BEZIER_CURVE_SUPPORT
732 732
 
733 733
 // G38.2 and G38.3 Probe Target
734
-// Enable PROBE_DOUBLE_TOUCH if you want G38 to double touch
734
+// Set MULTIPLE_PROBING if you want G38 to double touch
735 735
 //#define G38_PROBE_TARGET
736 736
 #if ENABLED(G38_PROBE_TARGET)
737 737
   #define G38_MINIMUM_MOVE 0.0275 // minimum distance in mm that will produce a move (determined using the print statement in check_move)

+ 5
- 3
Marlin/example_configurations/TinyBoy2/Configuration.h View File

@@ -741,14 +741,16 @@
741 741
 // X and Y axis travel speed (mm/m) between probes
742 742
 #define XY_PROBE_SPEED 8000
743 743
 
744
-// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
744
+// Speed for the first approach when double-probing (MULTIPLE_PROBING == 2)
745 745
 #define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
746 746
 
747 747
 // Speed for the "accurate" probe of each point
748 748
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
749 749
 
750
-// Use double touch for probing
751
-//#define PROBE_DOUBLE_TOUCH
750
+// The number of probes to perform at each point.
751
+//   Set to 2 for a fast/slow probe, using the second probe result.
752
+//   Set to 3 or more for slow probes, averaging the results.
753
+//#define MULTIPLE_PROBING 2
752 754
 
753 755
 /**
754 756
  * Z probes require clearance when deploying, stowing, and moving between

+ 1
- 1
Marlin/example_configurations/TinyBoy2/Configuration_adv.h View File

@@ -742,7 +742,7 @@
742 742
 //#define BEZIER_CURVE_SUPPORT
743 743
 
744 744
 // G38.2 and G38.3 Probe Target
745
-// Enable PROBE_DOUBLE_TOUCH if you want G38 to double touch
745
+// Set MULTIPLE_PROBING if you want G38 to double touch
746 746
 //#define G38_PROBE_TARGET
747 747
 #if ENABLED(G38_PROBE_TARGET)
748 748
   #define G38_MINIMUM_MOVE 0.0275 // minimum distance in mm that will produce a move (determined using the print statement in check_move)

+ 5
- 3
Marlin/example_configurations/Velleman/K8200/Configuration.h View File

@@ -719,14 +719,16 @@
719 719
 // X and Y axis travel speed (mm/m) between probes
720 720
 #define XY_PROBE_SPEED 8000
721 721
 
722
-// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
722
+// Speed for the first approach when double-probing (MULTIPLE_PROBING == 2)
723 723
 #define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
724 724
 
725 725
 // Speed for the "accurate" probe of each point
726 726
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
727 727
 
728
-// Use double touch for probing
729
-//#define PROBE_DOUBLE_TOUCH
728
+// The number of probes to perform at each point.
729
+//   Set to 2 for a fast/slow probe, using the second probe result.
730
+//   Set to 3 or more for slow probes, averaging the results.
731
+//#define MULTIPLE_PROBING 2
730 732
 
731 733
 /**
732 734
  * Z probes require clearance when deploying, stowing, and moving between

+ 1
- 1
Marlin/example_configurations/Velleman/K8200/Configuration_adv.h View File

@@ -753,7 +753,7 @@
753 753
 //#define BEZIER_CURVE_SUPPORT
754 754
 
755 755
 // G38.2 and G38.3 Probe Target
756
-// Enable PROBE_DOUBLE_TOUCH if you want G38 to double touch
756
+// Set MULTIPLE_PROBING if you want G38 to double touch
757 757
 //#define G38_PROBE_TARGET
758 758
 #if ENABLED(G38_PROBE_TARGET)
759 759
   #define G38_MINIMUM_MOVE 0.0275 // minimum distance in mm that will produce a move (determined using the print statement in check_move)

+ 5
- 3
Marlin/example_configurations/Velleman/K8400/Configuration.h View File

@@ -690,14 +690,16 @@
690 690
 // X and Y axis travel speed (mm/m) between probes
691 691
 #define XY_PROBE_SPEED 8000
692 692
 
693
-// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
693
+// Speed for the first approach when double-probing (MULTIPLE_PROBING == 2)
694 694
 #define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
695 695
 
696 696
 // Speed for the "accurate" probe of each point
697 697
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
698 698
 
699
-// Use double touch for probing
700
-//#define PROBE_DOUBLE_TOUCH
699
+// The number of probes to perform at each point.
700
+//   Set to 2 for a fast/slow probe, using the second probe result.
701
+//   Set to 3 or more for slow probes, averaging the results.
702
+//#define MULTIPLE_PROBING 2
701 703
 
702 704
 /**
703 705
  * Z probes require clearance when deploying, stowing, and moving between

+ 1
- 1
Marlin/example_configurations/Velleman/K8400/Configuration_adv.h View File

@@ -742,7 +742,7 @@
742 742
 //#define BEZIER_CURVE_SUPPORT
743 743
 
744 744
 // G38.2 and G38.3 Probe Target
745
-// Enable PROBE_DOUBLE_TOUCH if you want G38 to double touch
745
+// Set MULTIPLE_PROBING if you want G38 to double touch
746 746
 //#define G38_PROBE_TARGET
747 747
 #if ENABLED(G38_PROBE_TARGET)
748 748
   #define G38_MINIMUM_MOVE 0.0275 // minimum distance in mm that will produce a move (determined using the print statement in check_move)

+ 5
- 3
Marlin/example_configurations/Velleman/K8400/Dual-head/Configuration.h View File

@@ -690,14 +690,16 @@
690 690
 // X and Y axis travel speed (mm/m) between probes
691 691
 #define XY_PROBE_SPEED 8000
692 692
 
693
-// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
693
+// Speed for the first approach when double-probing (MULTIPLE_PROBING == 2)
694 694
 #define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
695 695
 
696 696
 // Speed for the "accurate" probe of each point
697 697
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
698 698
 
699
-// Use double touch for probing
700
-//#define PROBE_DOUBLE_TOUCH
699
+// The number of probes to perform at each point.
700
+//   Set to 2 for a fast/slow probe, using the second probe result.
701
+//   Set to 3 or more for slow probes, averaging the results.
702
+//#define MULTIPLE_PROBING 2
701 703
 
702 704
 /**
703 705
  * Z probes require clearance when deploying, stowing, and moving between

+ 5
- 3
Marlin/example_configurations/Wanhao/Duplicator 6/Configuration.h View File

@@ -700,14 +700,16 @@
700 700
 // X and Y axis travel speed (mm/m) between probes
701 701
 #define XY_PROBE_SPEED 8000
702 702
 
703
-// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
703
+// Speed for the first approach when double-probing (MULTIPLE_PROBING == 2)
704 704
 #define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
705 705
 
706 706
 // Speed for the "accurate" probe of each point
707 707
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
708 708
 
709
-// Use double touch for probing
710
-//#define PROBE_DOUBLE_TOUCH
709
+// The number of probes to perform at each point.
710
+//   Set to 2 for a fast/slow probe, using the second probe result.
711
+//   Set to 3 or more for slow probes, averaging the results.
712
+//#define MULTIPLE_PROBING 2
711 713
 
712 714
 /**
713 715
  * Z probes require clearance when deploying, stowing, and moving between

+ 1
- 1
Marlin/example_configurations/Wanhao/Duplicator 6/Configuration_adv.h View File

@@ -744,7 +744,7 @@
744 744
 //#define BEZIER_CURVE_SUPPORT
745 745
 
746 746
 // G38.2 and G38.3 Probe Target
747
-// Enable PROBE_DOUBLE_TOUCH if you want G38 to double touch
747
+// Set MULTIPLE_PROBING if you want G38 to double touch
748 748
 //#define G38_PROBE_TARGET
749 749
 #if ENABLED(G38_PROBE_TARGET)
750 750
   #define G38_MINIMUM_MOVE 0.0275 // minimum distance in mm that will produce a move (determined using the print statement in check_move)

+ 5
- 3
Marlin/example_configurations/adafruit/ST7565/Configuration.h View File

@@ -690,14 +690,16 @@
690 690
 // X and Y axis travel speed (mm/m) between probes
691 691
 #define XY_PROBE_SPEED 8000
692 692
 
693
-// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
693
+// Speed for the first approach when double-probing (MULTIPLE_PROBING == 2)
694 694
 #define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
695 695
 
696 696
 // Speed for the "accurate" probe of each point
697 697
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
698 698
 
699
-// Use double touch for probing
700
-//#define PROBE_DOUBLE_TOUCH
699
+// The number of probes to perform at each point.
700
+//   Set to 2 for a fast/slow probe, using the second probe result.
701
+//   Set to 3 or more for slow probes, averaging the results.
702
+//#define MULTIPLE_PROBING 2
701 703
 
702 704
 /**
703 705
  * Z probes require clearance when deploying, stowing, and moving between

+ 5
- 3
Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h View File

@@ -770,14 +770,16 @@
770 770
 // X and Y axis travel speed (mm/m) between probes
771 771
 #define XY_PROBE_SPEED 5000
772 772
 
773
-// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
773
+// Speed for the first approach when double-probing (MULTIPLE_PROBING == 2)
774 774
 #define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
775 775
 
776 776
 // Speed for the "accurate" probe of each point
777 777
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST) / 6
778 778
 
779
-// Use double touch for probing
780
-//#define PROBE_DOUBLE_TOUCH
779
+// The number of probes to perform at each point.
780
+//   Set to 2 for a fast/slow probe, using the second probe result.
781
+//   Set to 3 or more for slow probes, averaging the results.
782
+//#define MULTIPLE_PROBING 2
781 783
 
782 784
 /**
783 785
  * Allen key retractable z-probe as seen on many Kossel delta printers - http://reprap.org/wiki/Kossel#Automatic_bed_leveling_probe

+ 1
- 1
Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h View File

@@ -744,7 +744,7 @@
744 744
 //#define BEZIER_CURVE_SUPPORT
745 745
 
746 746
 // G38.2 and G38.3 Probe Target
747
-// Enable PROBE_DOUBLE_TOUCH if you want G38 to double touch
747
+// Set MULTIPLE_PROBING if you want G38 to double touch
748 748
 //#define G38_PROBE_TARGET
749 749
 #if ENABLED(G38_PROBE_TARGET)
750 750
   #define G38_MINIMUM_MOVE 0.0275 // minimum distance in mm that will produce a move (determined using the print statement in check_move)

+ 5
- 3
Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h View File

@@ -770,14 +770,16 @@
770 770
 // X and Y axis travel speed (mm/m) between probes
771 771
 #define XY_PROBE_SPEED 2000
772 772
 
773
-// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
773
+// Speed for the first approach when double-probing (MULTIPLE_PROBING == 2)
774 774
 #define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
775 775
 
776 776
 // Speed for the "accurate" probe of each point
777 777
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
778 778
 
779
-// Use double touch for probing
780
-#define PROBE_DOUBLE_TOUCH
779
+// The number of probes to perform at each point.
780
+//   Set to 2 for a fast/slow probe, using the second probe result.
781
+//   Set to 3 or more for slow probes, averaging the results.
782
+#define MULTIPLE_PROBING 2
781 783
 
782 784
 /**
783 785
  * Allen key retractable z-probe as seen on many Kossel delta printers - http://reprap.org/wiki/Kossel#Automatic_bed_leveling_probe

+ 1
- 1
Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h View File

@@ -744,7 +744,7 @@
744 744
 //#define BEZIER_CURVE_SUPPORT
745 745
 
746 746
 // G38.2 and G38.3 Probe Target
747
-// Enable PROBE_DOUBLE_TOUCH if you want G38 to double touch
747
+// Set MULTIPLE_PROBING if you want G38 to double touch
748 748
 //#define G38_PROBE_TARGET
749 749
 #if ENABLED(G38_PROBE_TARGET)
750 750
   #define G38_MINIMUM_MOVE 0.0275 // minimum distance in mm that will produce a move (determined using the print statement in check_move)

+ 5
- 3
Marlin/example_configurations/delta/generic/Configuration.h View File

@@ -760,14 +760,16 @@
760 760
 // X and Y axis travel speed (mm/m) between probes
761 761
 #define XY_PROBE_SPEED 4000
762 762
 
763
-// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
763
+// Speed for the first approach when double-probing (MULTIPLE_PROBING == 2)
764 764
 #define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
765 765
 
766 766
 // Speed for the "accurate" probe of each point
767 767
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
768 768
 
769
-// Use double touch for probing
770
-//#define PROBE_DOUBLE_TOUCH
769
+// The number of probes to perform at each point.
770
+//   Set to 2 for a fast/slow probe, using the second probe result.
771
+//   Set to 3 or more for slow probes, averaging the results.
772
+//#define MULTIPLE_PROBING 2
771 773
 
772 774
 /**
773 775
  * Allen key retractable z-probe as seen on many Kossel delta printers - http://reprap.org/wiki/Kossel#Automatic_bed_leveling_probe

+ 1
- 1
Marlin/example_configurations/delta/generic/Configuration_adv.h View File

@@ -744,7 +744,7 @@
744 744
 //#define BEZIER_CURVE_SUPPORT
745 745
 
746 746
 // G38.2 and G38.3 Probe Target
747
-// Enable PROBE_DOUBLE_TOUCH if you want G38 to double touch
747
+// Set MULTIPLE_PROBING if you want G38 to double touch
748 748
 //#define G38_PROBE_TARGET
749 749
 #if ENABLED(G38_PROBE_TARGET)
750 750
   #define G38_MINIMUM_MOVE 0.0275 // minimum distance in mm that will produce a move (determined using the print statement in check_move)

+ 5
- 3
Marlin/example_configurations/delta/kossel_mini/Configuration.h View File

@@ -760,14 +760,16 @@
760 760
 // X and Y axis travel speed (mm/m) between probes
761 761
 #define XY_PROBE_SPEED 4000
762 762
 
763
-// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
763
+// Speed for the first approach when double-probing (MULTIPLE_PROBING == 2)
764 764
 #define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
765 765
 
766 766
 // Speed for the "accurate" probe of each point
767 767
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
768 768
 
769
-// Use double touch for probing
770
-//#define PROBE_DOUBLE_TOUCH
769
+// The number of probes to perform at each point.
770
+//   Set to 2 for a fast/slow probe, using the second probe result.
771
+//   Set to 3 or more for slow probes, averaging the results.
772
+//#define MULTIPLE_PROBING 2
771 773
 
772 774
 /**
773 775
  * Allen key retractable z-probe as seen on many Kossel delta printers - http://reprap.org/wiki/Kossel#Automatic_bed_leveling_probe

+ 1
- 1
Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h View File

@@ -744,7 +744,7 @@
744 744
 //#define BEZIER_CURVE_SUPPORT
745 745
 
746 746
 // G38.2 and G38.3 Probe Target
747
-// Enable PROBE_DOUBLE_TOUCH if you want G38 to double touch
747
+// Set MULTIPLE_PROBING if you want G38 to double touch
748 748
 //#define G38_PROBE_TARGET
749 749
 #if ENABLED(G38_PROBE_TARGET)
750 750
   #define G38_MINIMUM_MOVE 0.0275 // minimum distance in mm that will produce a move (determined using the print statement in check_move)

+ 5
- 3
Marlin/example_configurations/delta/kossel_pro/Configuration.h View File

@@ -756,14 +756,16 @@
756 756
 // X and Y axis travel speed (mm/m) between probes
757 757
 #define XY_PROBE_SPEED 8000
758 758
 
759
-// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
759
+// Speed for the first approach when double-probing (MULTIPLE_PROBING == 2)
760 760
 #define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
761 761
 
762 762
 // Speed for the "accurate" probe of each point
763 763
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
764 764
 
765
-// Use double touch for probing
766
-//#define PROBE_DOUBLE_TOUCH
765
+// The number of probes to perform at each point.
766
+//   Set to 2 for a fast/slow probe, using the second probe result.
767
+//   Set to 3 or more for slow probes, averaging the results.
768
+//#define MULTIPLE_PROBING 2
767 769
 
768 770
 /**
769 771
  * Allen key retractable z-probe as seen on many Kossel delta printers - http://reprap.org/wiki/Kossel#Automatic_bed_leveling_probe

+ 1
- 1
Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h View File

@@ -749,7 +749,7 @@
749 749
 //#define BEZIER_CURVE_SUPPORT
750 750
 
751 751
 // G38.2 and G38.3 Probe Target
752
-// Enable PROBE_DOUBLE_TOUCH if you want G38 to double touch
752
+// Set MULTIPLE_PROBING if you want G38 to double touch
753 753
 //#define G38_PROBE_TARGET
754 754
 #if ENABLED(G38_PROBE_TARGET)
755 755
   #define G38_MINIMUM_MOVE 0.0275 // minimum distance in mm that will produce a move (determined using the print statement in check_move)

+ 5
- 3
Marlin/example_configurations/delta/kossel_xl/Configuration.h View File

@@ -772,14 +772,16 @@
772 772
 // X and Y axis travel speed (mm/m) between probes
773 773
 #define XY_PROBE_SPEED 8000
774 774
 
775
-// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
775
+// Speed for the first approach when double-probing (MULTIPLE_PROBING == 2)
776 776
 #define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
777 777
 
778 778
 // Speed for the "accurate" probe of each point
779 779
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
780 780
 
781
-// Use double touch for probing
782
-//#define PROBE_DOUBLE_TOUCH
781
+// The number of probes to perform at each point.
782
+//   Set to 2 for a fast/slow probe, using the second probe result.
783
+//   Set to 3 or more for slow probes, averaging the results.
784
+//#define MULTIPLE_PROBING 2
783 785
 
784 786
 /**
785 787
  * Allen key retractable z-probe as seen on many Kossel delta printers - http://reprap.org/wiki/Kossel#Automatic_bed_leveling_probe

+ 1
- 1
Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h View File

@@ -744,7 +744,7 @@
744 744
 //#define BEZIER_CURVE_SUPPORT
745 745
 
746 746
 // G38.2 and G38.3 Probe Target
747
-// Enable PROBE_DOUBLE_TOUCH if you want G38 to double touch
747
+// Set MULTIPLE_PROBING if you want G38 to double touch
748 748
 //#define G38_PROBE_TARGET
749 749
 #if ENABLED(G38_PROBE_TARGET)
750 750
   #define G38_MINIMUM_MOVE 0.0275 // minimum distance in mm that will produce a move (determined using the print statement in check_move)

+ 5
- 3
Marlin/example_configurations/gCreate/gMax1.5+/Configuration.h View File

@@ -703,14 +703,16 @@
703 703
 // X and Y axis travel speed (mm/m) between probes
704 704
 #define XY_PROBE_SPEED 7500
705 705
 
706
-// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
706
+// Speed for the first approach when double-probing (MULTIPLE_PROBING == 2)
707 707
 #define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
708 708
 
709 709
 // Speed for the "accurate" probe of each point
710 710
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
711 711
 
712
-// Use double touch for probing
713
-//#define PROBE_DOUBLE_TOUCH
712
+// The number of probes to perform at each point.
713
+//   Set to 2 for a fast/slow probe, using the second probe result.
714
+//   Set to 3 or more for slow probes, averaging the results.
715
+//#define MULTIPLE_PROBING 2
714 716
 
715 717
 /**
716 718
  * Z probes require clearance when deploying, stowing, and moving between

+ 1
- 1
Marlin/example_configurations/gCreate/gMax1.5+/Configuration_adv.h View File

@@ -742,7 +742,7 @@
742 742
 //#define BEZIER_CURVE_SUPPORT
743 743
 
744 744
 // G38.2 and G38.3 Probe Target
745
-// Enable PROBE_DOUBLE_TOUCH if you want G38 to double touch
745
+// Set MULTIPLE_PROBING if you want G38 to double touch
746 746
 //#define G38_PROBE_TARGET
747 747
 #if ENABLED(G38_PROBE_TARGET)
748 748
   #define G38_MINIMUM_MOVE 0.0275 // minimum distance in mm that will produce a move (determined using the print statement in check_move)

+ 5
- 3
Marlin/example_configurations/makibox/Configuration.h View File

@@ -693,14 +693,16 @@
693 693
 // X and Y axis travel speed (mm/m) between probes
694 694
 #define XY_PROBE_SPEED 8000
695 695
 
696
-// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
696
+// Speed for the first approach when double-probing (MULTIPLE_PROBING == 2)
697 697
 #define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
698 698
 
699 699
 // Speed for the "accurate" probe of each point
700 700
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
701 701
 
702
-// Use double touch for probing
703
-//#define PROBE_DOUBLE_TOUCH
702
+// The number of probes to perform at each point.
703
+//   Set to 2 for a fast/slow probe, using the second probe result.
704
+//   Set to 3 or more for slow probes, averaging the results.
705
+//#define MULTIPLE_PROBING 2
704 706
 
705 707
 /**
706 708
  * Z probes require clearance when deploying, stowing, and moving between

+ 1
- 1
Marlin/example_configurations/makibox/Configuration_adv.h View File

@@ -742,7 +742,7 @@
742 742
 //#define BEZIER_CURVE_SUPPORT
743 743
 
744 744
 // G38.2 and G38.3 Probe Target
745
-// Enable PROBE_DOUBLE_TOUCH if you want G38 to double touch
745
+// Set MULTIPLE_PROBING if you want G38 to double touch
746 746
 //#define G38_PROBE_TARGET
747 747
 #if ENABLED(G38_PROBE_TARGET)
748 748
   #define G38_MINIMUM_MOVE 0.0275 // minimum distance in mm that will produce a move (determined using the print statement in check_move)

+ 5
- 3
Marlin/example_configurations/tvrrug/Round2/Configuration.h View File

@@ -685,14 +685,16 @@
685 685
 // X and Y axis travel speed (mm/m) between probes
686 686
 #define XY_PROBE_SPEED 8000
687 687
 
688
-// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
688
+// Speed for the first approach when double-probing (MULTIPLE_PROBING == 2)
689 689
 #define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
690 690
 
691 691
 // Speed for the "accurate" probe of each point
692 692
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
693 693
 
694
-// Use double touch for probing
695
-//#define PROBE_DOUBLE_TOUCH
694
+// The number of probes to perform at each point.
695
+//   Set to 2 for a fast/slow probe, using the second probe result.
696
+//   Set to 3 or more for slow probes, averaging the results.
697
+//#define MULTIPLE_PROBING 2
696 698
 
697 699
 /**
698 700
  * Z probes require clearance when deploying, stowing, and moving between

+ 1
- 1
Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h View File

@@ -742,7 +742,7 @@
742 742
 //#define BEZIER_CURVE_SUPPORT
743 743
 
744 744
 // G38.2 and G38.3 Probe Target
745
-// Enable PROBE_DOUBLE_TOUCH if you want G38 to double touch
745
+// Set MULTIPLE_PROBING if you want G38 to double touch
746 746
 //#define G38_PROBE_TARGET
747 747
 #if ENABLED(G38_PROBE_TARGET)
748 748
   #define G38_MINIMUM_MOVE 0.0275 // minimum distance in mm that will produce a move (determined using the print statement in check_move)

+ 5
- 3
Marlin/example_configurations/wt150/Configuration.h View File

@@ -695,14 +695,16 @@
695 695
 // X and Y axis travel speed (mm/m) between probes
696 696
 #define XY_PROBE_SPEED 8000
697 697
 
698
-// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
698
+// Speed for the first approach when double-probing (MULTIPLE_PROBING == 2)
699 699
 #define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
700 700
 
701 701
 // Speed for the "accurate" probe of each point
702 702
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
703 703
 
704
-// Use double touch for probing
705
-//#define PROBE_DOUBLE_TOUCH
704
+// The number of probes to perform at each point.
705
+//   Set to 2 for a fast/slow probe, using the second probe result.
706
+//   Set to 3 or more for slow probes, averaging the results.
707
+//#define MULTIPLE_PROBING 2
706 708
 
707 709
 /**
708 710
  * Z probes require clearance when deploying, stowing, and moving between

+ 1
- 1
Marlin/example_configurations/wt150/Configuration_adv.h View File

@@ -732,7 +732,7 @@
732 732
 //#define BEZIER_CURVE_SUPPORT
733 733
 
734 734
 // G38.2 and G38.3 Probe Target
735
-// Enable PROBE_DOUBLE_TOUCH if you want G38 to double touch
735
+// Set MULTIPLE_PROBING if you want G38 to double touch
736 736
 //#define G38_PROBE_TARGET
737 737
 #if ENABLED(G38_PROBE_TARGET)
738 738
   #define G38_MINIMUM_MOVE 0.0275 // minimum distance in mm that will produce a move (determined using the print statement in check_move)

Loading…
Cancel
Save