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

Get firmware version through API...

Browse source 
...for parity between discovered printers and manual printers

CURA-2384
This commit is contained in:
fieldOfView 2016-09-29 09:41:21 +02:00
parent 578b4d3826
commit a2722c7571
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
NetworkPrinterOutputDevicePlugin.py
View file

@ -11,6 +11,7 @@ from PyQt5.QtNetwork import QNetworkRequest, QNetworkAccessManager, QNetworkRepl
from PyQt5.QtCore import QUrl from PyQt5.QtCore import QUrl
import time import time
import json
## This plugin handles the connection detection & creation of output device objects for the UM3 printer. ## This plugin handles the connection detection & creation of output device objects for the UM3 printer.
# Zero-Conf is used to detect printers, which are saved in a dict. # Zero-Conf is used to detect printers, which are saved in a dict.
@ -79,7 +80,7 @@ class NetworkPrinterOutputDevicePlugin(OutputDevicePlugin):
# Check if a printer exists at this address # Check if a printer exists at this address
# If a printer responds, it will replace the preliminary printer created above # If a printer responds, it will replace the preliminary printer created above
url = QUrl("http://" + address + self._api_prefix + "system/name") url = QUrl("http://" + address + self._api_prefix + "system")
name_request = QNetworkRequest(url) name_request = QNetworkRequest(url)
self._network_manager.get(name_request) self._network_manager.get(name_request)
@ -99,14 +100,14 @@ class NetworkPrinterOutputDevicePlugin(OutputDevicePlugin):
status_code = reply.attribute(QNetworkRequest.HttpStatusCodeAttribute) status_code = reply.attribute(QNetworkRequest.HttpStatusCodeAttribute)
if reply.operation() == QNetworkAccessManager.GetOperation: if reply.operation() == QNetworkAccessManager.GetOperation:
if "system/name" in reply_url: # Name returned from printer. if "system" in reply_url: # Name returned from printer.
if status_code == 200: if status_code == 200:
system_info = json.loads(bytes(reply.readAll()).decode("utf-8"))
address = reply.url().host() address = reply.url().host()
name = reply.readAll().data().decode() name = ("%s (%s)" % (system_info["name"], address))
name = ("%s (%s)" % (name, address))
instance_name = "manual:%s" % address instance_name = "manual:%s" % address
properties = { b"name": name.encode("UTF-8") } properties = { b"name": name.encode("UTF-8"), b"firmware_version": system_info["firmware"].encode("UTF-8") }
if instance_name in self._printers: if instance_name in self._printers:
# Only replace the printer if it is still in the list of (manual) printers # Only replace the printer if it is still in the list of (manual) printers
self.removePrinter(instance_name) self.removePrinter(instance_name)