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

tuning_tower: Minor optimization 

Store a reference to the gcode class in self.code.  Obtain the
z_offset once and use for both the oldval and newval calculation.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2020-05-26 14:54:25 -04:00
parent 04532448bc
commit ceaf818a11
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
klippy/extras/tuning_tower.py
View File

@ -15,28 +15,27 @@ class TuningTower:
self.last_z = self.start = self.factor = self.band = 0. self.last_z = self.start = self.factor = self.band = 0.
self.command_fmt = "" self.command_fmt = ""
# Register command # Register command
gcode = self.printer.lookup_object("gcode") self.gcode = self.printer.lookup_object("gcode")
gcode.register_command("TUNING_TOWER", self.cmd_TUNING_TOWER, self.gcode.register_command("TUNING_TOWER", self.cmd_TUNING_TOWER,
desc=self.cmd_TUNING_TOWER_help) desc=self.cmd_TUNING_TOWER_help)
cmd_TUNING_TOWER_help = "Tool to adjust a parameter at each Z height" cmd_TUNING_TOWER_help = "Tool to adjust a parameter at each Z height"
def cmd_TUNING_TOWER(self, gcmd): def cmd_TUNING_TOWER(self, gcmd):
if self.normal_transform is not None: if self.normal_transform is not None:
self.end_test() self.end_test()
# Get parameters # Get parameters
gcode = self.printer.lookup_object("gcode")
command = gcmd.get('COMMAND') command = gcmd.get('COMMAND')
parameter = gcmd.get('PARAMETER') parameter = gcmd.get('PARAMETER')
self.start = gcmd.get_float('START', 0.) self.start = gcmd.get_float('START', 0.)
self.factor = gcmd.get_float('FACTOR') self.factor = gcmd.get_float('FACTOR')
self.band = gcmd.get_float('BAND', 0., minval=0.) self.band = gcmd.get_float('BAND', 0., minval=0.)
# Enable test mode # Enable test mode
if gcode.is_traditional_gcode(command): if self.gcode.is_traditional_gcode(command):
self.command_fmt = "%s %s%%.9f" % (command, parameter) self.command_fmt = "%s %s%%.9f" % (command, parameter)
else: else:
self.command_fmt = "%s %s=%%.9f" % (command, parameter) self.command_fmt = "%s %s=%%.9f" % (command, parameter)
self.normal_transform = gcode.set_move_transform(self, force=True) self.normal_transform = self.gcode.set_move_transform(self, force=True)
self.last_z = -99999999.9 self.last_z = -99999999.9
gcode.reset_last_position() self.gcode.reset_last_position()
self.get_position() self.get_position()
gcmd.respond_info("Starting tuning test (start=%.6f factor=%.6f)" gcmd.respond_info("Starting tuning test (start=%.6f factor=%.6f)"
% (self.start, self.factor)) % (self.start, self.factor))
@ -45,10 +44,6 @@ class TuningTower:
self.last_position = list(pos) self.last_position = list(pos)
return pos return pos
def calc_value(self, z): def calc_value(self, z):
# Compensate Z-Offset
gcode = self.printer.lookup_object("gcode")
z_offset = gcode.get_status(None)['base_zpos']
z = z - z_offset
if self.band: if self.band:
z = (math.floor(z / self.band) + .5) * self.band z = (math.floor(z / self.band) + .5) * self.band
return self.start + z * self.factor return self.start + z * self.factor
@ -63,19 +58,19 @@ class TuningTower:
self.end_test() self.end_test()
else: else:
# Process update # Process update
oldval = self.calc_value(self.last_z) z_offset = self.gcode.get_status(None)['base_zpos']
newval = self.calc_value(z) oldval = self.calc_value(self.last_z - z_offset)
newval = self.calc_value(z - z_offset)
self.last_z = z self.last_z = z
if newval != oldval: if newval != oldval:
gcode = self.printer.lookup_object("gcode") self.gcode.run_script_from_command(self.command_fmt
gcode.run_script_from_command(self.command_fmt % (newval,)) % (newval,))
# Forward move to actual handler # Forward move to actual handler
self.last_position[:] = newpos self.last_position[:] = newpos
normal_transform.move(newpos, speed) normal_transform.move(newpos, speed)
def end_test(self): def end_test(self):
gcode = self.printer.lookup_object("gcode") self.gcode.respond_info("Ending tuning test mode")
gcode.respond_info("Ending tuning test mode") self.gcode.set_move_transform(self.normal_transform, force=True)
gcode.set_move_transform(self.normal_transform, force=True)
self.normal_transform = None self.normal_transform = None
def load_config(config): def load_config(config):