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

More errors == more error events

master
Bryan Mayland 2013-06-20 17:41:10 +02:00 committed by Gina Häußge
parent 79f2cd0e31
commit a9ec4336de
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
octoprint/util/comm.py
View File

@ -623,7 +623,6 @@ class MachineCom(object):
elif not self.isError(): elif not self.isError():
self._errorValue = line[6:] self._errorValue = line[6:]
self._changeState(self.STATE_ERROR) self._changeState(self.STATE_ERROR)
eventManager().fire("Error", self.getErrorString()) eventManager().fire("Error", self.getErrorString())
##~~ SD file list ##~~ SD file list
@ -768,8 +767,8 @@ class MachineCom(object):
if self._sdAvailable: if self._sdAvailable:
self.refreshSdFiles() self.refreshSdFiles()
eventManager().fire("Connected", "%s at %s baud" % (self._port, self._baudrate)) eventManager().fire("Connected", "%s at %s baud" % (self._port, self._baudrate))
else: elif time.time() > timeout:
self._testingBaudrate = False self.close()
### Operational ### Operational
elif self._state == self.STATE_OPERATIONAL or self._state == self.STATE_PAUSED: elif self._state == self.STATE_OPERATIONAL or self._state == self.STATE_PAUSED:
@ -826,6 +825,7 @@ class MachineCom(object):
self._log(errorMsg) self._log(errorMsg)
self._errorValue = errorMsg self._errorValue = errorMsg
self._changeState(self.STATE_ERROR) self._changeState(self.STATE_ERROR)
eventManager().fire("Error", self.getErrorString())
self._log("Connection closed, closing down monitor") self._log("Connection closed, closing down monitor")
def _handleResendRequest(self, line): def _handleResendRequest(self, line):
@ -844,7 +844,7 @@ class MachineCom(object):
if self.isPrinting(): if self.isPrinting():
# abort the print, there's nothing we can do to rescue it now # abort the print, there's nothing we can do to rescue it now
self._changeState(self.STATE_ERROR) self._changeState(self.STATE_ERROR)
eventManager().fire("Error", self.getErrorString())
else: else:
# reset resend delta, we can't do anything about it # reset resend delta, we can't do anything about it
self._resendDelta = None self._resendDelta = None
@ -1067,8 +1067,9 @@ class MachineCom(object):
else: else:
self._sendNext() self._sendNext()
except: except:
self._changeState(self.STATE_ERROR)
self._errorValue = getExceptionString() self._errorValue = getExceptionString()
self._changeState(self.STATE_ERROR)
eventManager().fire("Error", self.getErrorString())
def startFileTransfer(self, filename, remoteFilename): def startFileTransfer(self, filename, remoteFilename):
if not self.isOperational() or self.isBusy(): if not self.isOperational() or self.isBusy():