q3k
/
OctoPrint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reset peakZ on new print

master
Gina Häußge 2013-06-30 00:03:34 +02:00
parent 81464d65b7
commit 83a864d3d8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
octoprint/printer.py
View File

@ -59,7 +59,7 @@ class Printer():
self._currentZ = None self._currentZ = None
self.peakZ = -1 self._peakZ = -1
self._progress = None self._progress = None
self._printTime = None self._printTime = None
self._printTimeLeft = None self._printTimeLeft = None
@ -184,6 +184,7 @@ class Printer():
return return
self._setCurrentZ(None) self._setCurrentZ(None)
self._peakZ = -1
self._comm.startPrint() self._comm.startPrint()
def togglePausePrint(self): def togglePausePrint(self):
@ -386,8 +387,8 @@ class Printer():
oldZ = self._currentZ oldZ = self._currentZ
# only do this if we hit a new Z peak level. Some slicers do a Z-lift when retracting / moving without printing # only do this if we hit a new Z peak level. Some slicers do a Z-lift when retracting / moving without printing
# and some do anti-backlash up-then-down movement when advancing layers # and some do anti-backlash up-then-down movement when advancing layers
if newZ > self.peakZ: if newZ > self._peakZ:
self.peakZ = newZ self._peakZ = newZ
eventManager().fire("ZChange", newZ) eventManager().fire("ZChange", newZ)
self._setCurrentZ(newZ) self._setCurrentZ(newZ)
@ -602,7 +603,6 @@ class StateMonitor(object):
self._gcodeData = None self._gcodeData = None
self._sdUploadData = None self._sdUploadData = None
self._currentZ = None self._currentZ = None
self._peakZ = -1
self._progress = None self._progress = None
self._changeEvent = threading.Event() self._changeEvent = threading.Event()