chiark / gitweb /
Revert "Disable pause feature"
authornickthetait <tait@alephobjects.com>
Mon, 12 Oct 2015 21:11:23 +0000 (15:11 -0600)
committerYouness Alaoui <kakaroto@kakaroto.homelinux.net>
Fri, 6 Nov 2015 16:38:32 +0000 (11:38 -0500)
This reverts commit 5544eba5ad653b11169cb60eefb64f590a884975.

Cura/util/machineCom.py
Cura/util/printerConnection/serialConnection.py

index ad84d24fdb154b1867084e14ad467e9c1c65e42e..e6764400b4a9e7412cbb04bd3cf91e3ed4790a04 100644 (file)
@@ -597,7 +597,7 @@ class MachineCom(object):
                        line = line[0]
                try:
                        if line == 'M0' or line == 'M1':
-                               #self.setPause(True)
+                               self.setPause(True)
                                line = 'M105'   #Don't send the M0 or M1 to the machine, as M0 and M1 are handled as an LCD menu pause.
                        if self._printSection in self._feedRateModifier:
                                line = re.sub('F([0-9]*)', lambda m: 'F' + str(int(int(m.group(1)) * self._feedRateModifier[self._printSection])), line)
index a2ecf76f38a5eb7f828908fce8019bbc4aef2a87..1fd0485d65278b45f4aa07f0c932dd969b91056f 100644 (file)
@@ -124,7 +124,7 @@ class serialConnection(printerConnectionBase.printerConnectionBase):
 
        #Returns true if we have the ability to pause the file printing.
        def hasPause(self):
-               return False
+               return True
 
        def isPaused(self):
                return self._commState == machineCom.MachineCom.STATE_PAUSED