From 1b8caa7a21ec0de6fd8f329796c37c2ae748758e Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 20 Nov 2017 13:23:09 +0100 Subject: [PATCH] NetworkedPrinterOutputDevice now requires address in constructor CL-541 --- cura/PrinterOutput/NetworkedPrinterOutputDevice.py | 4 ++-- plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py | 5 ++++- plugins/UM3NetworkPrinting/LegacyUM3OutputDevice.py | 7 +++++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/cura/PrinterOutput/NetworkedPrinterOutputDevice.py b/cura/PrinterOutput/NetworkedPrinterOutputDevice.py index dc02fa839d..416efe10a3 100644 --- a/cura/PrinterOutput/NetworkedPrinterOutputDevice.py +++ b/cura/PrinterOutput/NetworkedPrinterOutputDevice.py @@ -8,14 +8,14 @@ from time import time from typing import Callable class NetworkedPrinterOutputDevice(PrinterOutputDevice): - def __init__(self, device_id, parent = None): + def __init__(self, device_id, address: str, parent = None): super().__init__(device_id = device_id, parent = parent) self._manager = None self._createNetworkManager() self._last_response_time = time() self._last_request_time = None self._api_prefix = "" - self._address = "" + self._address = address self._user_agent = "%s/%s " % (Application.getInstance().getApplicationName(), Application.getInstance().getVersion()) diff --git a/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py b/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py index 4609e86f20..4a89e35275 100644 --- a/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py +++ b/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py @@ -2,4 +2,7 @@ from cura.PrinterOutput.NetworkedPrinterOutputDevice import NetworkedPrinterOutp class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice): def __init__(self, device_id, address, properties, parent = None): - super().__init__(device_id = device_id, parent = parent) \ No newline at end of file + super().__init__(device_id = device_id, address = address, parent = parent) + + def _update(self): + pass diff --git a/plugins/UM3NetworkPrinting/LegacyUM3OutputDevice.py b/plugins/UM3NetworkPrinting/LegacyUM3OutputDevice.py index 0e19df4c18..ee8501a070 100644 --- a/plugins/UM3NetworkPrinting/LegacyUM3OutputDevice.py +++ b/plugins/UM3NetworkPrinting/LegacyUM3OutputDevice.py @@ -1,5 +1,8 @@ from cura.PrinterOutput.NetworkedPrinterOutputDevice import NetworkedPrinterOutputDevice class LegacyUM3OutputDevice(NetworkedPrinterOutputDevice): - def __init__(self, device_id, address, properties, parent = None): - super().__init__(device_id = device_id, parent = parent) \ No newline at end of file + def __init__(self, device_id, address: str, properties, parent = None): + super().__init__(device_id = device_id, address = address, parent = parent) + + def _update(self): + pass