Merge branch 'master' into feature_pause_at_height_optional_parking

# Conflicts:
#	plugins/PostProcessingPlugin/scripts/PauseAtHeight.py
This commit is contained in:
fieldOfView 2021-08-16 12:19:49 +02:00
commit e4a04c186f
3 changed files with 6 additions and 3 deletions

View file

@ -505,7 +505,7 @@ class PauseAtHeight(Script):
# Move the head back
if park_enabled:
if current_z < 15:
prepend_gcode += self.putValue(G = 1, Z = current_z + 1, F = 300) + "\n"
prepend_gcode += self.putValue(G = 1, Z = current_z, F = 300) + "\n"
prepend_gcode += self.putValue(G = 1, X = x, Y = y, F = 9000) + "\n"
prepend_gcode += self.putValue(G = 1, Z = current_z, F = 300) + " ; move back down to resume height\n"