probe: Move multi-sampling capability from ProbePointsHelper to Probe

This changes the config file so that the configuration of
multi-samples is now done in the [probe] (and [bltouch]) section
instead of the various delta, bed_mesh, z_tilt, etc. config sections.

With this change, PROBE and PROBE_CALIBRATE commands now also utilize
multi-sampling.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>

5 files changed, 20 insertions, 60 deletions

diff --git a/config/example-delta.cfg b/config/example-delta.cfg
index 71ad750a..b6a25fdb 100644
--- a/config/example-delta.cfg
+++ b/config/example-delta.cfg
@@ -123,12 +123,3 @@ radius: 50
 #horizontal_move_z: 5
 #   The height (in mm) that the head should be commanded to move to
 #   just prior to starting a probe operation. The default is 5.
-#samples: 1
-#   The number of times to probe each point.  The probed z-values will
-#   be averaged. The default is to probe 1 time.
-#samples_result: average
-#   One can choose median or average between probes samples
-#   The default is average.
-#sample_retract_dist: 2.0
-#   The distance (in mm) to retract between each sample if sampling
-#   more than once. The default is 2mm.
diff --git a/config/example-extras.cfg b/config/example-extras.cfg
index b0f8cdf3..2b0bdb1c 100644
--- a/config/example-extras.cfg
+++ b/config/example-extras.cfg
@@ -30,6 +30,15 @@
 #   triggers. This parameter must be provided.
 #speed: 5.0
 #   Speed (in mm/s) of the Z axis when probing. The default is 5mm/s.
+#samples: 1
+#   The number of times to probe each point. The probed z-values will
+#   be averaged. The default is to probe 1 time.
+#sample_retract_dist: 2.0
+#   The distance (in mm) to lift the toolhead between each sample (if
+#   sampling more than once). The default is 2mm.
+#samples_result: average
+#   The calculation method when sampling more than once - either
+#   "median" or "average". The default is average.
 #activate_gcode:
 #   A list of G-Code commands (one per line; subsequent lines
 #   indented) to execute prior to each probe attempt. This may be
@@ -72,6 +81,9 @@
 #y_offset:
 #z_offset:
 #speed:
+#samples:
+#sample_retract_dist:
+#samples_result:
 #   See the "probe" section for information on these parameters.
 
 
@@ -102,15 +114,6 @@
 #horizontal_move_z: 5
 #   The height (in mm) that the head should be commanded to move to
 #   just prior to starting a probe operation. The default is 5.
-#samples: 1
-#   The number of times to probe each point.  The probed z-values
-#   will be averaged.  The default is to probe 1 time.
-#samples_result: average
-#   One can choose median or average between probes samples
-#   The default is average.
-#sample_retract_dist: 2.0
-#   The distance (in mm) to retract between each sample if
-#   sampling more than once.  Default is 2mm.
 
 
 # Mesh Bed Leveling. One may define a [bed_mesh] config section
@@ -147,15 +150,6 @@
 #horizontal_move_z: 5
 #   The height (in mm) that the head should be commanded to move to
 #   just prior to starting a probe operation. The default is 5.
-#samples: 1
-#   The number of times to probe each point.  The probed z-values
-#   will be averaged.  The default is to probe 1 time.
-#samples_result: average
-#   One can choose median or average between probes samples
-#   The default is average.
-#sample_retract_dist: 2.0
-#   The distance (in mm) to retract between each sample if
-#   sampling more than once.  Default is 2mm.
 #bed_radius:
 #   Defines the radius to probe for round beds.  Note that the radius
 #   is relative to the nozzle's origin, if using a probe be sure to
@@ -283,15 +277,6 @@
 #horizontal_move_z: 5
 #   The height (in mm) that the head should be commanded to move to
 #   just prior to starting a probe operation. The default is 5.
-#samples: 1
-#   The number of times to probe each point.  The probed z-values
-#   will be averaged.  The default is to probe 1 time.
-#sample_retract_dist: 2.0
-#   The distance (in mm) to retract between each sample if
-#   sampling more than once.  Default is 2mm.
-#samples_result: median
-#   One can choose median or average between screw probes
-#   The default is average.
 #screw_thread: CW-M3
 #   The type of screw used for bed level, M3, M4 or M5 and the
 #   direction of the knob used to level the bed, clockwise decrease
@@ -325,15 +310,6 @@
 #horizontal_move_z: 5
 #   The height (in mm) that the head should be commanded to move to
 #   just prior to starting a probe operation. The default is 5.
-#samples: 1
-#   The number of times to probe each point.  The probed z-values
-#   will be averaged.  The default is to probe 1 time.
-#samples_result: average
-#   One can choose median or average between probes samples
-#   The default is average.
-#sample_retract_dist: 2.0
-#   The distance (in mm) to retract between each sample if
-#   sampling more than once.  Default is 2mm.
 
 
 # Moving gantry leveling using 4 independently controlled Z motors.
@@ -374,13 +350,6 @@
 #max_adjust: 4
 #   Saftey limit if an ajustment greater than this value is requested
 #   quad_gantry_level will abort.
-#samples: 1
-#   Number of probe samples per point. The defaut is 1
-#samples_result: average
-#   One can choose median or average between probes samples
-#   The default is average.
-#sample_retract_dist: 2.0
-#   Distance in mm to retract the probe between samples. Default is 2.
 
 
 # In a multi-extruder printer add an additional extruder section for
diff --git a/config/kit-voron2-250mm.cfg b/config/kit-voron2-250mm.cfg
index 73257af6..278d4299 100644
--- a/config/kit-voron2-250mm.cfg
+++ b/config/kit-voron2-250mm.cfg
@@ -158,6 +158,10 @@ x_offset: 0.0
 y_offset: 25.0
 z_offset: 0.00
 speed: 2.0
+samples: 4
+#   Number of times to probe a point
+sample_retract_dist: 6.0
+#   How far to retract (in mm) from the probe point for multi-probe samples
 
 [fan]
 # Print cooling fan
@@ -231,10 +235,6 @@ points:
 #   Probe points
 speed: 200
 horizontal_move_z: 6
-samples: 4
-#   Number of times to probe a point
-sample_retract_dist: 6.0
-#   How far to retract (in mm) from the probe point for multi-probe samples
 
 [display]
 # RepRapDiscount 128x64 Full Graphic Smart Controller
diff --git a/config/kit-zav3d-2019.cfg b/config/kit-zav3d-2019.cfg
index 502d0645..01beadcb 100644
--- a/config/kit-zav3d-2019.cfg
+++ b/config/kit-zav3d-2019.cfg
@@ -123,12 +123,12 @@ x_offset: 39
 y_offset: 11
 z_offset: 0.9
 pin_up_touch_mode_reports_triggered: false
+samples: 2
+sample_retract_dist: 3.0
 
 [bed_mesh]
 speed: 100
 horizontal_move_z: 5
-samples: 2
-sample_retract_dist: 3.0
 min_point: 30,30
 max_point: 150,150
 probe_count: 3,3
diff --git a/config/printer-tevo-flash-2018.cfg b/config/printer-tevo-flash-2018.cfg
index 169704bd..8c1adf8c 100644
--- a/config/printer-tevo-flash-2018.cfg
+++ b/config/printer-tevo-flash-2018.cfg
@@ -103,6 +103,8 @@ control_pin: ar11
 x_offset: 0
 y_offset: 18
 z_offset: 1.64
+samples: 3
+sample_retract_dist: 5
 
 # The homing_override section modifies the default G28 behavior
 [homing_override]
@@ -117,8 +119,6 @@ gcode:
 
 # Mesh Bed Leveling.
 [bed_mesh]
-samples: 3
-sample_retract_dist: 5
 min_point: 5,0
 max_point: 230,210
 probe_count: 9,9