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

z_tilt: Separate z adjustment code to new ZAdjustHelper class 

Introduce a new class to perform the low-level Z stepper adjustments.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2019-05-27 09:36:02 -04:00 committed by KevinOConnor
parent 1ee2835eed
commit 20851ab3e9
1 changed files with 63 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
klippy/extras/z_tilt.py
View File

@ -1,16 +1,69 @@
# Mechanical bed tilt calibration with multiple Z steppers
#
# Copyright (C) 2018 Kevin O'Connor <kevin@koconnor.net>
# Copyright (C) 2018-2019 Kevin O'Connor <kevin@koconnor.net>
#
# This file may be distributed under the terms of the GNU GPLv3 license.
import logging
import probe, mathutil
class ZAdjustHelper:
def __init__(self, config, z_count):
self.printer = config.get_printer()
self.name = config.get_name()
self.z_count = z_count
self.z_steppers = []
self.printer.register_event_handler("klippy:connect",
self.handle_connect)
def handle_connect(self):
kin = self.printer.lookup_object('toolhead').get_kinematics()
z_steppers = kin.get_steppers('Z')
if len(z_steppers) != self.z_count:
raise self.printer.config_error(
"%s z_positions needs exactly %d items" % (
self.name, len(z_steppers)))
if len(z_steppers) < 2:
raise config.error("%s requires multiple z steppers" % (self.name,))
self.z_steppers = z_steppers
def adjust_steppers(self, adjustments, speed):
toolhead = self.printer.lookup_object('toolhead')
gcode = self.printer.lookup_object('gcode')
curpos = toolhead.get_position()
# Report on movements
stepstrs = ["%s = %.6f" % (s.get_name(), a)
for s, a in zip(self.z_steppers, adjustments)]
msg = "Making the following Z adjustments:\n%s" % ("\n".join(stepstrs),)
gcode.respond_info(msg)
# Disable Z stepper movements
for s in self.z_steppers:
s.set_ignore_move(True)
# Move each z stepper (sorted from lowest to highest) until they match
positions = [(-a, s) for a, s in zip(adjustments, self.z_steppers)]
positions.sort()
first_stepper_offset, first_stepper = positions[0]
z_low = curpos[2] - first_stepper_offset
for i in range(len(positions)-1):
stepper_offset, stepper = positions[i]
next_stepper_offset, next_stepper = positions[i+1]
stepper.set_ignore_move(False)
curpos[2] = z_low + next_stepper_offset
try:
toolhead.move(curpos, speed)
toolhead.set_position(curpos)
except:
logging.exception("ZAdjustHelper adjust_steppers")
for s in self.z_steppers:
s.set_ignore_move(False)
raise
# Z should now be level - do final cleanup
last_stepper_offset, last_stepper = positions[-1]
last_stepper.set_ignore_move(False)
curpos[2] += first_stepper_offset
toolhead.set_position(curpos)
gcode.reset_last_position()
class ZTilt:
def __init__(self, config):
self.printer = config.get_printer()
self.printer.register_event_handler("klippy:connect",
self.handle_connect)
z_positions = config.get('z_positions').split('\n')
try:
z_positions = [line.split(',', 1)
@ -20,24 +73,13 @@ class ZTilt:
except:
raise config.error("Unable to parse z_positions in %s" % (
config.get_name()))
if len(z_positions) < 2:
raise config.error("z_tilt requires at least two z_positions")
self.probe_helper = probe.ProbePointsHelper(config, self.probe_finalize)
self.probe_helper.minimum_points(2)
self.z_steppers = []
self.z_helper = ZAdjustHelper(config, len(self.z_positions))
# Register Z_TILT_ADJUST command
self.gcode = self.printer.lookup_object('gcode')
self.gcode.register_command(
'Z_TILT_ADJUST', self.cmd_Z_TILT_ADJUST,
self.gcode.register_command('Z_TILT_ADJUST', self.cmd_Z_TILT_ADJUST,
desc=self.cmd_Z_TILT_ADJUST_help)
def handle_connect(self):
kin = self.printer.lookup_object('toolhead').get_kinematics()
z_steppers = kin.get_steppers('Z')
if len(z_steppers) != len(self.z_positions):
raise self.printer.config_error(
"z_tilt z_positions needs exactly %d items" % (
len(z_steppers),))
self.z_steppers = z_steppers
cmd_Z_TILT_ADJUST_help = "Adjust the Z tilt"
def cmd_Z_TILT_ADJUST(self, params):
self.probe_helper.start_probe(params)
@ -59,50 +101,15 @@ class ZTilt:
new_params = mathutil.coordinate_descent(
params.keys(), params, errorfunc)
# Apply results
speed = self.probe_helper.get_lift_speed()
logging.info("Calculated bed tilt parameters: %s", new_params)
x_adjust = new_params['x_adjust']
y_adjust = new_params['y_adjust']
z_adjust = (new_params['z_adjust'] - z_offset
- x_adjust * offsets[0] - y_adjust * offsets[1])
try:
self.adjust_steppers(x_adjust, y_adjust, z_adjust)
except:
logging.exception("z_tilt adjust_steppers")
for s in self.z_steppers:
s.set_ignore_move(False)
raise
def adjust_steppers(self, x_adjust, y_adjust, z_adjust):
toolhead = self.printer.lookup_object('toolhead')
curpos = toolhead.get_position()
speed = self.probe_helper.get_lift_speed()
# Find each stepper adjustment and disable all stepper movements
positions = []
for s, (x, y) in zip(self.z_steppers, self.z_positions):
s.set_ignore_move(True)
stepper_offset = -(x*x_adjust + y*y_adjust)
positions.append((stepper_offset, s))
# Report on movements
stepstrs = ["%s = %.6f" % (s.get_name(), so) for so, s in positions]
msg = "Making the following Z adjustments:\n%s\nz_adjust = %.6f" % (
"\n".join(stepstrs), z_adjust)
self.gcode.respond_info(msg)
# Move each z stepper (sorted from lowest to highest) until they match
positions.sort()
first_stepper_offset, first_stepper = positions[0]
z_low = curpos[2] - first_stepper_offset
for i in range(len(positions)-1):
stepper_offset, stepper = positions[i]
next_stepper_offset, next_stepper = positions[i+1]
stepper.set_ignore_move(False)
curpos[2] = z_low + next_stepper_offset
toolhead.move(curpos, speed)
toolhead.set_position(curpos)
# Z should now be level - do final cleanup
last_stepper_offset, last_stepper = positions[-1]
last_stepper.set_ignore_move(False)
curpos[2] -= z_adjust - first_stepper_offset
toolhead.set_position(curpos)
self.gcode.reset_last_position()
adjustments = [x*x_adjust + y*y_adjust + z_adjust
for x, y in self.z_positions]
self.z_helper.adjust_steppers(adjustments, speed)
def load_config(config):
return ZTilt(config)