pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do not repeatedly apply any set offsets in the gcode interpreter

Browse source 
They would accumulate and cause wrong calculations

Solves #1863
This commit is contained in:
Gina Häußge 2017-04-12 09:38:53 +02:00
parent b84432c8a5
commit fe585e7115
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/octoprint/util/gcodeInterpreter.py
View file

@ -316,11 +316,11 @@ class gcode(object):
oldPos = pos
# Use new coordinates if provided. If not provided, use prior coordinates in absolute
# Use new coordinates if provided. If not provided, use prior coordinates (minus offset) in absolute
# and 0.0 in relative mode.
newPos = Vector3D(x if x is not None else (pos.x if posAbs else 0.0),
y if y is not None else (pos.y if posAbs else 0.0),
z if z is not None else (pos.z if posAbs else 0.0))
newPos = Vector3D(x if x is not None else (pos.x - posOffset.x if posAbs else 0.0),
y if y is not None else (pos.y - posOffset.y if posAbs else 0.0),
z if z is not None else (pos.z - posOffset.z if posAbs else 0.0))
if posAbs:
# Absolute mode: scale coordinates and apply offsets