chiark / gitweb /
Large update to the config wizard, new style machine check (unfinished)
[cura.git] / Cura / util / machineCom.py
index 521804e530b5d62834c2a3ed4c69049308cc2423..3e3b1f7e873fce1b1a948d61c5ba2ce41a5dc4a4 100644 (file)
@@ -101,7 +101,7 @@ class VirtualPrinter():
 
 class MachineComPrintCallback(object):
        def mcLog(self, message):
-               print(message)
+               pass
        
        def mcTempUpdate(self, temp, bedTemp):
                pass
@@ -212,15 +212,15 @@ class MachineCom(object):
        def isPrinting(self):
                return self._state == self.STATE_PRINTING
        
+       def isPaused(self):
+               return self._state == self.STATE_PAUSED
+
        def getPrintPos(self):
                return self._gcodePos
        
        def getPrintTime(self):
                return time.time() - self._printStartTime - self._heatupWaitTimeLost
        
-       def isPaused(self):
-               return self._state == self.STATE_PAUSED
-       
        def getTemp(self):
                return self._temp
        
@@ -306,7 +306,7 @@ class MachineCom(object):
                                        t = time.time()
                                        self._heatupWaitTimeLost = t - self._heatupWaitStartTime
                                        self._heatupWaitStartTime = t
-                       elif line.strip() != 'ok' and self.isOperational():
+                       elif line.strip() != '' and line.strip() != 'ok' and self.isOperational():
                                self._callback.mcMessage(line)
 
                        if self._state == self.STATE_DETECT_BAUDRATE: