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

Merge branch 'master' of https://github.com/Ultimaker/PluggableCura

Browse source 
Conflicts:
	plugins/USBPrinting/USBPrinterManager.py
This commit is contained in:
Jaime van Kessel 2015-04-10 11:26:35 +02:00
commit 4dc6f87a36
2 changed files with 21 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

10
PrinterConnection.py
View file

@ -95,7 +95,7 @@ class PrinterConnection(SignalEmitter):
return
self._gcode = gcode_list
#Reset line number. If this is not done, first line is sometimes ignored
self._gcode.insert(0,"M110 N0")
self._gcode.insert(0, "M110")
self._gcode_position = 0
self._print_start_time_100 = None
self._is_printing = True
@ -152,8 +152,7 @@ class PrinterConnection(SignalEmitter):
self.setIsConnected(True)
return
self.setIsConnected(False)
## Set the baud rate of the serial. This can cause exceptions, but we simply want to ignore those.
def setBaudRate(self, baud_rate):
try:
@ -161,9 +160,7 @@ class PrinterConnection(SignalEmitter):
return True
except Exception as e:
return False
def setIsConnected(self, state):
self._is_connecting = False
if self._is_connected != state:
@ -377,4 +374,3 @@ class PrinterConnection(SignalEmitter):
#ret.remove(prev)
#ret.insert(0, prev)
return ret