Skip to content

P
Printrun
Commit 05003322 authored by Steven Devijver's avatar Steven Devijver
Browse files
Options

Also take forward movement after retraction into account

parent 0bff3c93
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
pronsole.py
View file @ 05003322
...@@ -114,7 +114,7 @@ def estimate_duration(g): ...@@ -114,7 +114,7 @@ def estimate_duration(g):
feedrate = F / 60 feedrate = F / 60
distance = 0 distance = 0
if (X is None and Y is None and E is not None and E < 0.0): if (X is None and Y is None and E is not None):
distance = abs(E) distance = abs(E)
elif (X is not None and Y is None): elif (X is not None and Y is None):
distance = X - X_last_position distance = X - X_last_position
...@@ -128,9 +128,8 @@ def estimate_duration(g): ...@@ -128,9 +128,8 @@ def estimate_duration(g):
distance = sqrt(X_distance * X_distance + Y_distance * Y_distance) distance = sqrt(X_distance * X_distance + Y_distance * Y_distance)
X_last_position = X X_last_position = X
Y_last_position = Y Y_last_position = Y
else:
continue
if (feedrate == 0 or distance == 0): continue
time_for_move = distance / feedrate time_for_move = distance / feedrate
acceleration = (feedrate - initial_feedrate) / time_for_move acceleration = (feedrate - initial_feedrate) / time_for_move
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment