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

Printers now automatically try to connect again

Browse source 
CL-541
This commit is contained in:
Jaime van Kessel 2017-11-21 14:47:55 +01:00
parent 3f1167a7d2
commit 9cfe9769d3
2 changed files with 5 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

1
cura/PrinterOutput/NetworkedPrinterOutputDevice.py
View file

@ -54,7 +54,6 @@ class NetworkedPrinterOutputDevice(PrinterOutputDevice):
def _createEmptyRequest(self, target): def _createEmptyRequest(self, target):
url = QUrl("http://" + self._address + self._api_prefix + target) url = QUrl("http://" + self._address + self._api_prefix + target)
print(url)
request = QNetworkRequest(url) request = QNetworkRequest(url)
request.setHeader(QNetworkRequest.ContentTypeHeader, "application/json") request.setHeader(QNetworkRequest.ContentTypeHeader, "application/json")
request.setHeader(QNetworkRequest.UserAgentHeader, self._user_agent) request.setHeader(QNetworkRequest.UserAgentHeader, self._user_agent)

23
plugins/UM3NetworkPrinting/UM3OutputDevicePlugin.py
View file

@ -32,6 +32,8 @@ class UM3OutputDevicePlugin(OutputDevicePlugin):
self.addDeviceSignal.connect(self._onAddDevice) self.addDeviceSignal.connect(self._onAddDevice)
self.removeDeviceSignal.connect(self._onRemoveDevice) self.removeDeviceSignal.connect(self._onRemoveDevice)
Application.getInstance().globalContainerStackChanged.connect(self.reCheckConnections)
self._discovered_devices = {} self._discovered_devices = {}
# The zero-conf service changed requests are handled in a separate thread, so we can re-schedule the requests # The zero-conf service changed requests are handled in a separate thread, so we can re-schedule the requests
@ -101,16 +103,8 @@ class UM3OutputDevicePlugin(OutputDevicePlugin):
device.connectionStateChanged.disconnect(self._onDeviceConnectionStateChanged) device.connectionStateChanged.disconnect(self._onDeviceConnectionStateChanged)
self.discoveredDevicesChanged.emit() self.discoveredDevicesChanged.emit()
'''printer = self._printers.pop(name, None)
if printer:
if printer.isConnected():
printer.disconnect()
printer.connectionStateChanged.disconnect(self._onPrinterConnectionStateChanged)
Logger.log("d", "removePrinter, disconnecting [%s]..." % name)
self.printerListChanged.emit()'''
def _onAddDevice(self, name, address, properties): def _onAddDevice(self, name, address, properties):
# Check what kind of device we need to add; Depending on the firmware we either add a "Connect"/"Cluster" # Check what kind of device we need to add; Depending on the firmware we either add a "Connect"/"Cluster"
# or "Legacy" UM3 device. # or "Legacy" UM3 device.
cluster_size = int(properties.get(b"cluster_size", -1)) cluster_size = int(properties.get(b"cluster_size", -1))
@ -122,17 +116,10 @@ class UM3OutputDevicePlugin(OutputDevicePlugin):
self._discovered_devices[device.getId()] = device self._discovered_devices[device.getId()] = device
self.discoveredDevicesChanged.emit() self.discoveredDevicesChanged.emit()
pass
'''
self._cluster_printers_seen[
printer.getKey()] = name # Cluster printers that may be temporary unreachable or is rebooted keep being stored here
global_container_stack = Application.getInstance().getGlobalContainerStack() global_container_stack = Application.getInstance().getGlobalContainerStack()
if global_container_stack and printer.getKey() == global_container_stack.getMetaDataEntry("um_network_key"): if global_container_stack and device.getId() == global_container_stack.getMetaDataEntry("um_network_key"):
if printer.getKey() not in self._old_printers: # Was the printer already connected, but a re-scan forced? device.connect()
Logger.log("d", "addPrinter, connecting [%s]..." % printer.getKey()) device.connectionStateChanged.connect(self._onDeviceConnectionStateChanged)
self._printers[printer.getKey()].connect()
printer.connectionStateChanged.connect(self._onPrinterConnectionStateChanged)
self.printerListChanged.emit()'''
## Appends a service changed request so later the handling thread will pick it up and processes it. ## Appends a service changed request so later the handling thread will pick it up and processes it.
def _appendServiceChangedRequest(self, zeroconf, service_type, name, state_change): def _appendServiceChangedRequest(self, zeroconf, service_type, name, state_change):