3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 22:47:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix merge conflicts with 4.0

Browse source
This commit is contained in:
ChrisTerBeke 2019-01-08 11:49:36 +01:00
commit a6114d39e4
78 changed files with 595 additions and 474 deletions
Download patch file Download diff file Expand all files Collapse all files

1
plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py
View file

@ -118,6 +118,7 @@ class UM3OutputDevicePlugin(OutputDevicePlugin):
if key == um_network_key:
if not self._discovered_devices[key].isConnected():
Logger.log("d", "Attempting to connect with [%s]" % key)
active_machine.setMetaDataEntry("connection_type", self._discovered_devices[key].getConnectionType().value)
self._discovered_devices[key].connect()
self._discovered_devices[key].connectionStateChanged.connect(self._onDeviceConnectionStateChanged)
else: