3D-printing/klipper
1
0
Fork 0
mirror of https://github.com/Klipper3d/klipper.git synced 2025-08-06 21:44:13 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

firmware_retract: Remove z_hop support

Browse source 
The current z_hop support did not work correctly with common slicers
that change Z height between retract and unretract, and it did not
work correctly with slicers that issue a retract at the end of a print
and then at the beginning of the next print.

The z_hop support is therefore being removed until these issues can be
fixed.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2019-07-10 19:25:56 -04:00
parent 364c22fe84
commit 0343d0c73a
4 changed files with 17 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

24
klippy/extras/firmware_retraction.py
View file

@ -12,9 +12,8 @@ class FirmwareRetraction:
self.unretract_extra_length = config.getfloat(
'unretract_extra_length', 0., minval=0.)
self.unretract_speed = config.getfloat('unretract_speed', 10., minval=1)
self.z_hop = config.getfloat('z_hop', 0., minval=0.)
self.unretract_length = (self.retract_length
+ self.unretract_extra_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)
@ -28,7 +27,6 @@ class FirmwareRetraction:
"retract_speed": self.retract_speed,
"unretract_extra_length": self.unretract_extra_length,
"unretract_speed": self.unretract_speed,
"z_hop": self.z_hop
}
def cmd_SET_RETRACTION(self, params):
@ -44,46 +42,36 @@ class FirmwareRetraction:
self.unretract_speed = self.gcode.get_float(
'UNRETRACT_SPEED',
params, self.unretract_speed, minval=1)
self.z_hop = self.gcode.get_float(
'Z_HOP',
params, self.z_hop, minval=0.)
self.unretract_length = (self.retract_length
+ self.unretract_extra_length)
+ self.unretract_extra_length)
self.is_retracted = False
def cmd_GET_RETRACTION(self, params):
msg = ("RETRACT_LENGTH=%.5f RETRACT_SPEED=%.5f "
"UNRETRACT_EXTRA_LENGTH=%.5f UNRETRACT_SPEED=%.5f "
"Z_HOP=%.5f"
"UNRETRACT_EXTRA_LENGTH=%.5f UNRETRACT_SPEED=%.5f"
% (self.retract_length, self.retract_speed,
self.unretract_extra_length, self.unretract_speed,
self.z_hop))
self.unretract_extra_length, self.unretract_speed))
self.gcode.respond_info(msg)
def cmd_G10(self, params):
if not self.is_retracted:
self.gcode.run_script_from_command(
"SAVE_GCODE_STATE NAME=_retract_state\n"
"G92 E0\n"
"G91\n"
"G1 E-%.5f F%d\n"
"G1 Z%.5f\n"
"RESTORE_GCODE_STATE NAME=_retract_state"
% (self.retract_length, self.retract_speed*60, self.z_hop))
% (self.retract_length, self.retract_speed*60))
self.is_retracted = True
def cmd_G11(self, params):
if self.is_retracted:
self.gcode.run_script_from_command(
"SAVE_GCODE_STATE NAME=_retract_state\n"
"G92 E0\n"
"G91\n"
"G1 E%.5f F%d\n"
"G1 Z-%.5f\n"
"RESTORE_GCODE_STATE NAME=_retract_state"
% (self.unretract_length, self.unretract_speed*60, self.z_hop))
% (self.unretract_length, self.unretract_speed*60))
self.is_retracted = False
def load_config(config):
return FirmwareRetraction(config)