Some more cleanups
parent
0ed8f0f28d
commit
81464d65b7
|
@ -70,10 +70,6 @@ class Printer():
|
||||||
self._sdPrinting = False
|
self._sdPrinting = False
|
||||||
self._sdStreaming = False
|
self._sdStreaming = False
|
||||||
|
|
||||||
# TODO Still needed?
|
|
||||||
self._sdFile = None
|
|
||||||
self._sdStreamer = None
|
|
||||||
|
|
||||||
self._selectedFile = None
|
self._selectedFile = None
|
||||||
|
|
||||||
# comm
|
# comm
|
||||||
|
@ -437,7 +433,7 @@ class Printer():
|
||||||
def mcReceivedRegisteredMessage(self, command, output):
|
def mcReceivedRegisteredMessage(self, command, output):
|
||||||
self._sendFeedbackCommandOutput(command, output)
|
self._sendFeedbackCommandOutput(command, output)
|
||||||
|
|
||||||
#~~ sd file handling
|
#~~ sd file handling
|
||||||
|
|
||||||
def getSdFiles(self):
|
def getSdFiles(self):
|
||||||
if self._comm is None:
|
if self._comm is None:
|
||||||
|
@ -452,9 +448,6 @@ class Printer():
|
||||||
def deleteSdFile(self, filename):
|
def deleteSdFile(self, filename):
|
||||||
if not self._comm:
|
if not self._comm:
|
||||||
return
|
return
|
||||||
|
|
||||||
if self._sdFile == filename:
|
|
||||||
self._sdFile = None
|
|
||||||
self._comm.deleteSdFile(filename)
|
self._comm.deleteSdFile(filename)
|
||||||
|
|
||||||
def initSdCard(self):
|
def initSdCard(self):
|
||||||
|
@ -517,7 +510,7 @@ class Printer():
|
||||||
return self.isOperational() and not self._comm.isStreaming()
|
return self.isOperational() and not self._comm.isStreaming()
|
||||||
|
|
||||||
def isLoading(self):
|
def isLoading(self):
|
||||||
return self._gcodeLoader is not None or self._sdStreamer is not None
|
return self._gcodeLoader is not None
|
||||||
|
|
||||||
class GcodeLoader(threading.Thread):
|
class GcodeLoader(threading.Thread):
|
||||||
"""
|
"""
|
||||||
|
|
|
@ -404,7 +404,9 @@ class MachineCom(object):
|
||||||
self.refreshSdFiles()
|
self.refreshSdFiles()
|
||||||
|
|
||||||
def deleteSdFile(self, filename):
|
def deleteSdFile(self, filename):
|
||||||
if not self.isOperational() or (self.isBusy() and self._sdFile == filename.lower()):
|
if not self.isOperational() or (self.isBusy() and
|
||||||
|
isinstance(self._currentFile, PrintingSdFileInformation) and
|
||||||
|
self._currentFile.getFilename() == filename):
|
||||||
# do not delete a file from sd we are currently printing from
|
# do not delete a file from sd we are currently printing from
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue