chiark / gitweb /
Minor fix for Doodle3D support.
authordaid <daid303@gmail.com>
Thu, 2 Jan 2014 12:28:23 +0000 (13:28 +0100)
committerdaid <daid303@gmail.com>
Thu, 2 Jan 2014 12:28:23 +0000 (13:28 +0100)
Cura/util/printerConnection/doodle3dConnect.py
Cura/util/printerConnection/printerConnectionManager.py

index bb03cd75e58b82815cba81adb2de184475e7d183..25b428513a8e580844638a6b693b066f37338167 100644 (file)
@@ -25,6 +25,9 @@ class doodle3dConnectionGroup(printerConnectionBase.printerConnectionGroup):
        def getAvailableConnections(self):
                return filter(lambda c: c.isAvailable(), self._connectionMap.values())
 
+       def remove(self, host):
+               del self._connectionMap[host]
+
        def getIconID(self):
                return 27
 
@@ -224,12 +227,13 @@ class doodle3dConnect(printerConnectionBase.printerConnectionBase):
                                # The Doodle3D box could also be offline, if we reach a high enough errorCount then assume the box is gone.
                                self._errorCount += 1
                                if self._errorCount > 10:
-                                       self._host = None
                                        if self._isAvailable:
                                                self._printing = False
                                                self._isAvailable = False
                                                self._doCallback()
                                        self._sleep(15)
+                                       self._group.remove(self._host)
+                                       return
                                else:
                                        self._sleep(3)
                                continue
index 674b86aec465ba5f12fa1c93c8dd2b8c41c721b0..62f77df6add6f3c0b192f4d8418689df8f49ba1a 100644 (file)
@@ -9,7 +9,7 @@ class PrinterConnectionManager(object):
                self._groupList = []
                if version.isDevVersion():
                        self._groupList.append(dummyConnection.dummyConnectionGroup())
-               #self._groupList.append(doodle3dConnect.doodle3dConnectionGroup())
+               self._groupList.append(doodle3dConnect.doodle3dConnectionGroup())
 
                #Sort the connections by highest priority first.
                self._groupList.sort(reverse=True)