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

firmware_retraction: Use new GCodeCommand wrappers 

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2020-04-24 21:29:47 -04:00
parent 5fe5e21508
commit 1746148a45
1 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
klippy/extras/firmware_retraction.py
View File

@ -29,31 +29,26 @@ class FirmwareRetraction:
"unretract_speed": self.unretract_speed, "unretract_speed": self.unretract_speed,
} }
def cmd_SET_RETRACTION(self, params): def cmd_SET_RETRACTION(self, gcmd):
self.retract_length = self.gcode.get_float( self.retract_length = gcmd.get_float('RETRACT_LENGTH',
'RETRACT_LENGTH', self.retract_length, minval=0.)
params, self.retract_length, minval=0.) self.retract_speed = gcmd.get_float('RETRACT_SPEED',
self.retract_speed = self.gcode.get_float( self.retract_speed, minval=1)
'RETRACT_SPEED', self.unretract_extra_length = gcmd.get_float(
params, self.retract_speed, minval=1) 'UNRETRACT_EXTRA_LENGTH', self.unretract_extra_length, minval=0.)
self.unretract_extra_length = self.gcode.get_float( self.unretract_speed = gcmd.get_float('UNRETRACT_SPEED',
'UNRETRACT_EXTRA_LENGTH', self.unretract_speed, minval=1)
params, self.unretract_extra_length, minval=0.)
self.unretract_speed = self.gcode.get_float(
'UNRETRACT_SPEED',
params, self.unretract_speed, minval=1)
self.unretract_length = (self.retract_length self.unretract_length = (self.retract_length
+ self.unretract_extra_length) + self.unretract_extra_length)
self.is_retracted = False self.is_retracted = False
def cmd_GET_RETRACTION(self, params): def cmd_GET_RETRACTION(self, gcmd):
msg = ("RETRACT_LENGTH=%.5f RETRACT_SPEED=%.5f " gcmd.respond_info("RETRACT_LENGTH=%.5f RETRACT_SPEED=%.5f"
"UNRETRACT_EXTRA_LENGTH=%.5f UNRETRACT_SPEED=%.5f" " UNRETRACT_EXTRA_LENGTH=%.5f UNRETRACT_SPEED=%.5f"
% (self.retract_length, self.retract_speed, % (self.retract_length, self.retract_speed,
self.unretract_extra_length, self.unretract_speed)) self.unretract_extra_length, self.unretract_speed))
self.gcode.respond_info(msg)
def cmd_G10(self, params): def cmd_G10(self, gcmd):
if not self.is_retracted: if not self.is_retracted:
self.gcode.run_script_from_command( self.gcode.run_script_from_command(
"SAVE_GCODE_STATE NAME=_retract_state\n" "SAVE_GCODE_STATE NAME=_retract_state\n"
@ -63,7 +58,7 @@ class FirmwareRetraction:
% (self.retract_length, self.retract_speed*60)) % (self.retract_length, self.retract_speed*60))
self.is_retracted = True self.is_retracted = True
def cmd_G11(self, params): def cmd_G11(self, gcmd):
if self.is_retracted: if self.is_retracted:
self.gcode.run_script_from_command( self.gcode.run_script_from_command(
"SAVE_GCODE_STATE NAME=_retract_state\n" "SAVE_GCODE_STATE NAME=_retract_state\n"