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

Fix position tracking of virtual printer

Browse source 
Wasn't taking relative moves into account for coordinate persistence.
This commit is contained in:
Gina Häußge 2016-11-11 11:52:33 +01:00
parent 5446dc645c
commit c8273785cd
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/octoprint/plugins/virtual_printer/virtual.py
View file

@ -705,7 +705,11 @@ class VirtualPrinter(object):
duration = max(duration, x * self._unitModifier / float(self.speeds["x"]) * 60.0)
else:
duration = max(duration, (x - self._lastX) * self._unitModifier / float(self.speeds["x"]) * 60.0)
self._lastX = x
if self._relative and self._lastX is not None:
self._lastX += x
else:
self._lastX = x
except:
pass
if matchY is not None:
@ -715,7 +719,11 @@ class VirtualPrinter(object):
duration = max(duration, y * self._unitModifier / float(self.speeds["y"]) * 60.0)
else:
duration = max(duration, (y - self._lastY) * self._unitModifier / float(self.speeds["y"]) * 60.0)
self._lastY = y
if self._relative and self._lastY is not None:
self._lastY += y
else:
self._lastY = y
except:
pass
if matchZ is not None:
@ -725,7 +733,11 @@ class VirtualPrinter(object):
duration = max(duration, z * self._unitModifier / float(self.speeds["z"]) * 60.0)
else:
duration = max(duration, (z - self._lastZ) * self._unitModifier / float(self.speeds["z"]) * 60.0)
self._lastZ = z
if self._relative and self._lastZ is not None:
self._lastZ += z
else:
self._lastZ = z
except:
pass
if matchE is not None:
@ -735,7 +747,11 @@ class VirtualPrinter(object):
duration = max(duration, e * self._unitModifier / float(self.speeds["e"]) * 60.0)
else:
duration = max(duration, (e - self._lastE) * self._unitModifier / float(self.speeds["e"]) * 60.0)
self._lastE = e
if self._relative and self._lastE is not None:
self._lastE += e
else:
self._lastE = e
except:
pass