Merge branch '4.7'

This commit is contained in:
Ghostkeeper 2020-08-20 16:34:58 +02:00
commit a757dc7fa0
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
12 changed files with 139 additions and 274 deletions

View file

@ -1101,7 +1101,7 @@ class ChangeAtZProcessor:
# if it's not a linear move, we don't care
if linear_command is None:
return line
return
# get our linear move parameters
feed_rate = linear_command.arguments["F"]
@ -1120,8 +1120,7 @@ class ChangeAtZProcessor:
new_line = self.processRetractFeedRate(extrude_length, feed_rate, new_line, x_coord, y_coord, z_coord)
# handle print speed adjustments
if extrude_length is not None: # Only for extrusion moves.
new_line = self.processPrintSpeed(feed_rate, new_line)
new_line = self.processPrintSpeed(feed_rate, new_line)
# set our current extrude position
self.lastE = extrude_length if extrude_length is not None else self.lastE