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

Revert "Added external system commands support for events" 

This reverts commit 3b66f63ff2.
master
Lars Norpchen 2013-05-09 14:22:40 -07:00
parent 3b66f63ff2
commit b609123d8a
3 changed files with 534 additions and 602 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
octoprint/printer.py
View File

@ -7,9 +7,6 @@ import datetime
import threading
import copy
import os
import subprocess
import re
import logging, logging.config
import octoprint.util.comm as comm
import octoprint.util as util
@ -56,7 +53,6 @@ class Printer():
self._currentZ = None
self.peakZ = -1
self._progress = None
self._printTime = None
self._printTimeLeft = None
@ -94,9 +90,6 @@ class Printer():
currentZ=None
)
self.sys_command= { "z_change": settings().get(["system_commands", "z_change"]), "cancelled" : settings().get(["system_commands", "cancelled"]), "print_done" :settings().get(["system_commands", "print_done"]), "print_started": settings().get(["system_commands", "print_started"])};
#~~ callback handling
def registerCallback(self, callback):
@ -197,9 +190,6 @@ class Printer():
return
self._setCurrentZ(-1)
self.executeSystemCommand(self.sys_command['print_started'])
self._comm.printGCode(self._gcodeList)
def togglePausePrint(self):
@ -226,7 +216,6 @@ class Printer():
# mark print as failure
self._gcodeManager.printFailed(self._filename)
self.executeSystemCommand(self.sys_command['cancelled'])
#~~ state monitoring
@ -374,13 +363,8 @@ class Printer():
if self._comm is not None and oldState == self._comm.STATE_PRINTING:
if state == self._comm.STATE_OPERATIONAL:
self._gcodeManager.printSucceeded(self._filename)
#hrm....we seem to hit this state and THEN the next failed state on a cancel request?
# oh well, add a check to see if we're really done before sending the success event external command
if self._printTimeLeft < 1:
self.executeSystemCommand(self.sys_command['print_done'])
elif state == self._comm.STATE_CLOSED or state == self._comm.STATE_ERROR or state == self._comm.STATE_CLOSED_WITH_ERROR:
self._gcodeManager.printFailed(self._filename)
self.executeSystemCommand(self.sys_command['cancelled'])
self._gcodeManager.resumeAnalysis() # do not analyse gcode while printing
elif self._comm is not None and state == self._comm.STATE_PRINTING:
self._gcodeManager.pauseAnalysis() # printing done, put those cpu cycles to good use
@ -413,13 +397,8 @@ class Printer():
Callback method for the comm object, called upon change of the z-layer.
"""
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
# and some do ananti-backlash up-then-down movement when advancing layers
if newZ > self.peakZ:
self.peakZ = newZ
if self._timelapse is not None:
self._timelapse.onZChange(oldZ, newZ)
self.executeSystemCommand(self.sys_command['z_change'])
self._setCurrentZ(newZ)
@ -490,32 +469,6 @@ class Printer():
def isLoading(self):
return self._gcodeLoader is not None
def executeSystemCommand(self,command_string):
if command_string is None:
return
logger = logging.getLogger(__name__)
try:
# handle a few regex substs for job data passed to external apps
cmd_string_with_params = command_string
cmd_string_with_params = re.sub("_ZHEIGHT_",str(self._currentZ), cmd_string_with_params)
cmd_string_with_params = re.sub("_FILE_",os.path.basename(self._filename), cmd_string_with_params)
# cut down to 2 decimal places, forcing through an int to avoid the 10.320000000001 floating point thing...
if self._gcodeList and self._progress:
prog = int(10000.0 * self._progress / len(self._gcodeList))/100.0
else:
prog = 0.0
cmd_string_with_params = re.sub("_PROGRESS_",str(prog), cmd_string_with_params)
cmd_string_with_params = re.sub("_LINE_",str(self._comm._gcodePos), cmd_string_with_params)
logger.info ("Executing system command: %s " % cmd_string_with_params)
#use Popen here since it won't wait for the shell to return...and we send some of these
# commands during a print job, we don't want to block!
subprocess.Popen(cmd_string_with_params,shell = True)
except subprocess.CalledProcessError, e:
logger.warn("Command failed with return code %i: %s" % (e.returncode, e.message))
except Exception, ex:
logger.exception("Command failed")
class GcodeLoader(threading.Thread):
"""
The GcodeLoader takes care of loading a gcode-File from disk and parsing it into a gcode object in a separate
@ -573,7 +526,6 @@ class StateMonitor(object):
self._jobData = None
self._gcodeData = None
self._currentZ = None
self._peakZ = -1
self._progress = None
self._changeEvent = threading.Event()

14
octoprint/server.py
View File

@ -375,15 +375,7 @@ def getSettings():
},
"system": {
"actions": s.get(["system", "actions"])
},
"system_commands": {
"print_done": s.get(["system_commands", "print_done"]),
"cancelled": s.get(["system_commands", "cancelled"]),
"print_started": s.get(["system_commands", "print_started"]),
"z_change": s.get(["system_commands", "z_change"])
}
})
@app.route(BASEURL + "settings", methods=["POST"])
@ -425,12 +417,6 @@ def setSettings():
if "system" in data.keys():
if "actions" in data["system"].keys(): s.set(["system", "actions"], data["system"]["actions"])
if "system_commands" in data.keys():
if "z_change" in data["system_commands"].keys(): s.set(["system_commands", "z_change"], data["system_commands"]["z_change"])
if "print_started" in data["system_commands"].keys(): s.set(["system_commands", "print_started"], data["system_commands"]["print_started"])
if "cancelled" in data["system_commands"].keys(): s.set(["system_commands", "cancelled"], data["system_commands"]["cancelled"])
if "print_done" in data["system_commands"].keys(): s.set(["system_commands", "print_done"], data["system_commands"]["print_done"])
s.save()
return getSettings()

6
octoprint/settings.py
View File

@ -69,12 +69,6 @@ default_settings = {
"controls": [],
"system": {
"actions": []
},
"system_commands": {
"z_change":None,
"print_started":None,
"cancelled":None,
"print_done":None
}
}