3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

quad_gantry_level: Support retries 

Support retrying QUAD_GANTRY_LEVEL a configurable number of times
to a configurable tolerance both in the config or as parameters.

- By default keeps original behavior of no retries.
- Adds parameters RETRIES and RETRY_TOLERANCE to QUAD_GANTRY_LEVEL gcode.
- adds config options retries and retry_tolerance to `[quad_gantry_level]`
- issues an error if we are getting worse intead of approaching tolerance
- issues an error if retries were requested but we did not reach the tolerance
in the specified number of retries

Signed-off-by: John "Fess" Fessenden <fess@fess.org>
This commit is contained in:
fess 2019-06-17 19:42:02 -07:00 committed by KevinOConnor
parent 4681775219
commit bd40690bd1
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/example-extras.cfg
View File

@ -350,6 +350,11 @@
#max_adjust: 4 #max_adjust: 4
# Saftey limit if an ajustment greater than this value is requested # Saftey limit if an ajustment greater than this value is requested
# quad_gantry_level will abort. # quad_gantry_level will abort.
#retries: 0
# number of times to retry if the probed points aren't within tolerance
#retry_tolerance: 0
# if retries are enabled then retry if largest and smallest probed points
# differ more than retry_tolerance
# In a multi-extruder printer add an additional extruder section for # In a multi-extruder printer add an additional extruder section for

4
klippy/extras/quad_gantry_level.py
View File

@ -9,6 +9,8 @@ import probe, z_tilt
class QuadGantryLevel: class QuadGantryLevel:
def __init__(self, config): def __init__(self, config):
self.printer = config.get_printer() self.printer = config.get_printer()
self.retry_helper = z_tilt.RetryHelper(config,
"Possibly Z motor numbering is wrong")
self.max_adjust = config.getfloat("max_adjust", 4, above=0) self.max_adjust = config.getfloat("max_adjust", 4, above=0)
self.horizontal_move_z = config.getfloat("horizontal_move_z", 5.0) self.horizontal_move_z = config.getfloat("horizontal_move_z", 5.0)
self.probe_helper = probe.ProbePointsHelper(config, self.probe_finalize) self.probe_helper = probe.ProbePointsHelper(config, self.probe_finalize)
@ -36,6 +38,7 @@ class QuadGantryLevel:
cmd_QUAD_GANTRY_LEVEL_help = ( cmd_QUAD_GANTRY_LEVEL_help = (
"Conform a moving, twistable gantry to the shape of a stationary bed") "Conform a moving, twistable gantry to the shape of a stationary bed")
def cmd_QUAD_GANTRY_LEVEL(self, params): def cmd_QUAD_GANTRY_LEVEL(self, params):
self.retry_helper.start(params)
self.probe_helper.start_probe(params) self.probe_helper.start_probe(params)
def probe_finalize(self, offsets, positions): def probe_finalize(self, offsets, positions):
# Mirror our perspective so the adjustments make sense # Mirror our perspective so the adjustments make sense
@ -89,6 +92,7 @@ class QuadGantryLevel:
speed = self.probe_helper.get_lift_speed() speed = self.probe_helper.get_lift_speed()
self.z_helper.adjust_steppers(z_adjust, speed) self.z_helper.adjust_steppers(z_adjust, speed)
return self.retry_helper.check_retry(z_positions)
def linefit(self,p1,p2): def linefit(self,p1,p2):
if p1[1] == p2[1]: if p1[1] == p2[1]:
# Straight line # Straight line