Revision number is no longer taken into account

CURA-2475
This commit is contained in:
Jaime van Kessel 2016-10-06 11:30:56 +02:00
parent f71b23c72a
commit 2688928467
2 changed files with 3 additions and 3 deletions

View file

@ -79,7 +79,7 @@ class DiscoverUM3Action(MachineAction):
global_printer_type = Application.getInstance().getGlobalContainerStack().getBottom().getId() global_printer_type = Application.getInstance().getGlobalContainerStack().getBottom().getId()
else: else:
global_printer_type = "unknown" global_printer_type = "unknown"
printers = list(self._network_plugin.getPrinters().values()) printers = list(self._network_plugin.getPrinters().values())
# TODO; There are still some testing printers that don't have a correct printer type, so don't filter out unkown ones just yet. # TODO; There are still some testing printers that don't have a correct printer type, so don't filter out unkown ones just yet.
printers = [printer for printer in printers if printer.printerType == global_printer_type or printer.printerType == "unknown"] printers = [printer for printer in printers if printer.printerType == global_printer_type or printer.printerType == "unknown"]

View file

@ -167,9 +167,9 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
self._compressing_print = False self._compressing_print = False
printer_type = self._properties.get(b"machine", b"").decode("utf-8") printer_type = self._properties.get(b"machine", b"").decode("utf-8")
if printer_type == "9511.0": if printer_type.startswith("9511"):
self._updatePrinterType("ultimaker3_extended") self._updatePrinterType("ultimaker3_extended")
elif printer_type == "9066.0": elif printer_type.startswith("9066"):
self._updatePrinterType("ultimaker3") self._updatePrinterType("ultimaker3")
else: else:
self._updatePrinterType("unknown") self._updatePrinterType("unknown")