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>
This commit is contained in:
Kevin O'Connor
2019-05-31 13:47:15 -04:00
committed by KevinOConnor
parent 5989f7a8a6
commit 2b8dca5dbf
7 changed files with 86 additions and 129 deletions

View File

@@ -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