Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection

This commit is contained in:
Marijn Deé 2018-12-04 13:06:33 +01:00
commit 99bdb9c93f
8 changed files with 69 additions and 68 deletions

View file

@ -131,6 +131,7 @@ class CloudOutputDeviceManager(NetworkClient):
device = CloudOutputDevice(cluster.cluster_id)
self._output_device_manager.addOutputDevice(device)
self._remote_clusters[cluster.cluster_id] = device
device.connect() # TODO: remove this
self._connectToActiveMachine()
## Remove a CloudOutputDevice