From 6e42e3e0efbf027a7d04394fb5ce92d86ccee04b Mon Sep 17 00:00:00 2001 From: Salandora Date: Fri, 1 Jul 2016 18:26:43 +0200 Subject: [PATCH] Add calculation for moves in Z direction (cherry picked from commit b9cf42f) --- src/octoprint/util/gcodeInterpreter.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/octoprint/util/gcodeInterpreter.py b/src/octoprint/util/gcodeInterpreter.py index b3c98dbe..1a5178d2 100644 --- a/src/octoprint/util/gcodeInterpreter.py +++ b/src/octoprint/util/gcodeInterpreter.py @@ -154,11 +154,13 @@ class gcode(object): if moveType == "move": diffX = oldPos[0] - pos[0] diffY = oldPos[1] - pos[1] - totalMoveTimeMinute += math.sqrt(diffX * diffX + diffY * diffY) / feedRateXY + diffZ = oldPos[1] - pos[1] + totalMoveTimeMinute += math.sqrt(diffX * diffX + diffY * diffY + diffZ * diffZ) / feedRateXY elif moveType == "extrude": diffX = oldPos[0] - pos[0] diffY = oldPos[1] - pos[1] - time1 = math.sqrt(diffX * diffX + diffY * diffY) / feedRateXY + diffZ = oldPos[1] - pos[1] + time1 = math.sqrt(diffX * diffX + diffY * diffY + diffZ * diffZ) / feedRateXY time2 = abs(e / feedRateXY) totalMoveTimeMinute += max(time1, time2) elif moveType == "retract":