3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-17 11:47:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch 15.10 into master

Browse source 
Where automatic merging failed, the version of 15.10 was used.
This commit is contained in:
Ghostkeeper 2015-10-16 16:56:59 +02:00
commit da1d59ff98
19 changed files with 383 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

10
plugins/USBPrinting/PrinterConnection.py
View file

@ -45,7 +45,8 @@ class PrinterConnection(OutputDevice, QObject, SignalEmitter):
self._connect_thread.daemon = True
self._end_stop_thread = threading.Thread(target = self._pollEndStop)
self._end_stop_thread.daemon = True
self._end_stop_thread.deamon = True
self._poll_endstop = -1
# Printer is connected
self._is_connected = False
@ -237,8 +238,9 @@ class PrinterConnection(OutputDevice, QObject, SignalEmitter):
@pyqtSlot()
def startPollEndstop(self):
self._poll_endstop = True
self._end_stop_thread.start()
if self._poll_endstop == -1:
self._poll_endstop = True
self._end_stop_thread.start()
@pyqtSlot()
def stopPollEndstop(self):
@ -346,7 +348,7 @@ class PrinterConnection(OutputDevice, QObject, SignalEmitter):
self._serial = None
def isConnected(self):
return self._is_connected
return self._is_connected
@pyqtSlot(int)
def heatupNozzle(self, temperature):