diff options
Diffstat (limited to 'klippy/extras/firmware_retraction.py')
| -rw-r--r-- | klippy/extras/firmware_retraction.py | 79 |
1 files changed, 49 insertions, 30 deletions
diff --git a/klippy/extras/firmware_retraction.py b/klippy/extras/firmware_retraction.py index da0d67af..697d77e7 100644 --- a/klippy/extras/firmware_retraction.py +++ b/klippy/extras/firmware_retraction.py @@ -4,24 +4,27 @@ # # This file may be distributed under the terms of the GNU GPLv3 license. + class FirmwareRetraction: def __init__(self, config): self.printer = config.get_printer() - self.retract_length = config.getfloat('retract_length', 0., minval=0.) - self.retract_speed = config.getfloat('retract_speed', 20., minval=1) + self.retract_length = config.getfloat("retract_length", 0.0, minval=0.0) + self.retract_speed = config.getfloat("retract_speed", 20.0, minval=1) self.unretract_extra_length = config.getfloat( - 'unretract_extra_length', 0., minval=0.) - self.unretract_speed = config.getfloat('unretract_speed', 10., minval=1) - self.unretract_length = (self.retract_length - + self.unretract_extra_length) + "unretract_extra_length", 0.0, minval=0.0 + ) + self.unretract_speed = config.getfloat("unretract_speed", 10.0, minval=1) + self.unretract_length = self.retract_length + self.unretract_extra_length self.is_retracted = False - self.gcode = self.printer.lookup_object('gcode') - self.gcode.register_command('SET_RETRACTION', self.cmd_SET_RETRACTION, - desc=self.cmd_SET_RETRACTION_help) - self.gcode.register_command('GET_RETRACTION', self.cmd_GET_RETRACTION, - desc=self.cmd_GET_RETRACTION_help) - self.gcode.register_command('G10', self.cmd_G10) - self.gcode.register_command('G11', self.cmd_G11) + self.gcode = self.printer.lookup_object("gcode") + self.gcode.register_command( + "SET_RETRACTION", self.cmd_SET_RETRACTION, desc=self.cmd_SET_RETRACTION_help + ) + self.gcode.register_command( + "GET_RETRACTION", self.cmd_GET_RETRACTION, desc=self.cmd_GET_RETRACTION_help + ) + self.gcode.register_command("G10", self.cmd_G10) + self.gcode.register_command("G11", self.cmd_G11) def get_status(self, eventtime): return { @@ -30,25 +33,38 @@ class FirmwareRetraction: "unretract_extra_length": self.unretract_extra_length, "unretract_speed": self.unretract_speed, } - cmd_SET_RETRACTION_help = ("Set firmware retraction parameters") + + cmd_SET_RETRACTION_help = "Set firmware retraction parameters" + def cmd_SET_RETRACTION(self, gcmd): - self.retract_length = gcmd.get_float('RETRACT_LENGTH', - self.retract_length, minval=0.) - self.retract_speed = gcmd.get_float('RETRACT_SPEED', - self.retract_speed, minval=1) + self.retract_length = gcmd.get_float( + "RETRACT_LENGTH", self.retract_length, minval=0.0 + ) + self.retract_speed = gcmd.get_float( + "RETRACT_SPEED", self.retract_speed, minval=1 + ) self.unretract_extra_length = gcmd.get_float( - 'UNRETRACT_EXTRA_LENGTH', self.unretract_extra_length, minval=0.) - self.unretract_speed = gcmd.get_float('UNRETRACT_SPEED', - self.unretract_speed, minval=1) - self.unretract_length = (self.retract_length - + self.unretract_extra_length) + "UNRETRACT_EXTRA_LENGTH", self.unretract_extra_length, minval=0.0 + ) + self.unretract_speed = gcmd.get_float( + "UNRETRACT_SPEED", self.unretract_speed, minval=1 + ) + self.unretract_length = self.retract_length + self.unretract_extra_length self.is_retracted = False - cmd_GET_RETRACTION_help = ("Report firmware retraction parameters") + + cmd_GET_RETRACTION_help = "Report firmware retraction parameters" + def cmd_GET_RETRACTION(self, gcmd): - gcmd.respond_info("RETRACT_LENGTH=%.5f RETRACT_SPEED=%.5f" - " UNRETRACT_EXTRA_LENGTH=%.5f UNRETRACT_SPEED=%.5f" - % (self.retract_length, self.retract_speed, - self.unretract_extra_length, self.unretract_speed)) + gcmd.respond_info( + "RETRACT_LENGTH=%.5f RETRACT_SPEED=%.5f" + " UNRETRACT_EXTRA_LENGTH=%.5f UNRETRACT_SPEED=%.5f" + % ( + self.retract_length, + self.retract_speed, + self.unretract_extra_length, + self.unretract_speed, + ) + ) def cmd_G10(self, gcmd): if not self.is_retracted: @@ -57,7 +73,8 @@ class FirmwareRetraction: "G91\n" "G1 E-%.5f F%d\n" "RESTORE_GCODE_STATE NAME=_retract_state" - % (self.retract_length, self.retract_speed*60)) + % (self.retract_length, self.retract_speed * 60) + ) self.is_retracted = True def cmd_G11(self, gcmd): @@ -67,8 +84,10 @@ class FirmwareRetraction: "G91\n" "G1 E%.5f F%d\n" "RESTORE_GCODE_STATE NAME=_retract_state" - % (self.unretract_length, self.unretract_speed*60)) + % (self.unretract_length, self.unretract_speed * 60) + ) self.is_retracted = False + def load_config(config): return FirmwareRetraction(config) |