chiark / gitweb /
Do not send the M0 or M1 to the machine, but send an M105 instead. We still need...
authorDaid <daid303@gmail.com>
Wed, 27 Jun 2012 18:24:51 +0000 (20:24 +0200)
committerDaid <daid303@gmail.com>
Wed, 27 Jun 2012 18:24:51 +0000 (20:24 +0200)
Cura/gui/printWindow.py

index e6f804cd7fb4af0d7e7603ec8e536c3d3b8f1787..d238e90eda7953e6c79864d7dccaa5727817dc3c 100644 (file)
@@ -363,6 +363,9 @@ class printWindow(wx.Frame):
                if lineNr >= len(self.gcodeList):\r
                        return False\r
                line = self.gcodeList[lineNr]\r
+               if line == 'M0' or line == 'M1':\r
+                       self.OnPause(None)\r
+                       line = 'M105'\r
                if self.typeList[lineNr] == 'WALL-OUTER':\r
                        line = re.sub('F([0-9]*)', lambda m: 'F' + str(int(int(m.group(1)) * self.feedrateRatioOuterWall)), line)\r
                if self.typeList[lineNr] == 'WALL-INNER':\r
@@ -373,8 +376,6 @@ class printWindow(wx.Frame):
                        line = re.sub('F([0-9]*)', lambda m: 'F' + str(int(int(m.group(1)) * self.feedrateRatioSupport)), line)\r
                checksum = reduce(lambda x,y:x^y, map(ord, "N%d%s" % (lineNr, line)))\r
                self.machineCom.sendCommand("N%d%s*%d" % (lineNr, line, checksum))\r
-               if line == 'M0' or line == 'M1':\r
-                       self.OnPause(None)\r
                return True\r
 \r
        def PrinterMonitor(self):\r