Try to remove timing issues when preparing next line to send
parent
245d9651b6
commit
da90b2d738
|
@ -205,6 +205,7 @@ class MachineCom(object):
|
||||||
self._resendDelta = None
|
self._resendDelta = None
|
||||||
self._lastLines = []
|
self._lastLines = []
|
||||||
|
|
||||||
|
self._sendNextLock = threading.Lock()
|
||||||
self._sendingLock = threading.Lock()
|
self._sendingLock = threading.Lock()
|
||||||
|
|
||||||
self.thread = threading.Thread(target=self._monitor)
|
self.thread = threading.Thread(target=self._monitor)
|
||||||
|
@ -644,6 +645,7 @@ class MachineCom(object):
|
||||||
self.close(True)
|
self.close(True)
|
||||||
|
|
||||||
def _sendNext(self):
|
def _sendNext(self):
|
||||||
|
with self._sendNextLock:
|
||||||
if self._gcodePos >= len(self._gcodeList):
|
if self._gcodePos >= len(self._gcodeList):
|
||||||
self._changeState(self.STATE_OPERATIONAL)
|
self._changeState(self.STATE_OPERATIONAL)
|
||||||
return
|
return
|
||||||
|
@ -686,7 +688,7 @@ class MachineCom(object):
|
||||||
self._printSection = 'CUSTOM'
|
self._printSection = 'CUSTOM'
|
||||||
self._changeState(self.STATE_PRINTING)
|
self._changeState(self.STATE_PRINTING)
|
||||||
self._printStartTime = time.time()
|
self._printStartTime = time.time()
|
||||||
for i in xrange(0, 6):
|
#for i in xrange(0, 6):
|
||||||
self._sendNext()
|
self._sendNext()
|
||||||
|
|
||||||
def cancelPrint(self):
|
def cancelPrint(self):
|
||||||
|
|
Loading…
Reference in New Issue