chiark / gitweb /
Fixed #729 - Use the name from the connect.doodle.com api if that one is available.
authordaid <daid303@gmail.com>
Mon, 17 Feb 2014 09:46:22 +0000 (10:46 +0100)
committerdaid <daid303@gmail.com>
Mon, 17 Feb 2014 09:46:22 +0000 (10:46 +0100)
Cura/util/printerConnection/doodle3dConnect.py

index ec2f5534404e3d908e4676413ff5a75b496fdfa3..f6e28ce8e656ff45dca67d9cd0a0a70cb2aad098 100644 (file)
@@ -60,7 +60,10 @@ class doodle3dConnectionGroup(printerConnectionBase.printerConnectionGroup):
                                if possiblePrinter['localip'] not in self._connectionMap:
                                        status = self._request('GET', '/d3dapi/config/?network.cl.wifiboxid=', host=possiblePrinter['localip'])
                                        if status and 'data' in status and 'network.cl.wifiboxid' in status['data']:
-                                               self._connectionMap[possiblePrinter['localip']] = doodle3dConnect(possiblePrinter['localip'], status['data']['network.cl.wifiboxid'], self)
+                                               name = status['data']['network.cl.wifiboxid']
+                                               if 'wifiboxid' in possiblePrinter:
+                                                       name = possiblePrinter['wifiboxid']
+                                               self._connectionMap[possiblePrinter['localip']] = doodle3dConnect(possiblePrinter['localip'], name, self)
 
                        # Delay a bit more after every request. This so we do not stress the connect.doodle3d.com api too much
                        if self._waitDelay < 10: