mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-07 06:57:28 -06:00
Merge branch 'master' into WIP_improve_initialization
This commit is contained in:
commit
8ad409ff55
74 changed files with 1810 additions and 778 deletions
|
@ -188,14 +188,10 @@ class UM3OutputDevicePlugin(OutputDevicePlugin):
|
|||
b"name": system_info["name"].encode("utf-8"),
|
||||
b"address": address.encode("utf-8"),
|
||||
b"firmware_version": system_info["firmware"].encode("utf-8"),
|
||||
b"manual": b"true"
|
||||
b"manual": b"true",
|
||||
b"machine": str(system_info['hardware']["typeid"]).encode("utf-8")
|
||||
}
|
||||
|
||||
if "hardware" in system_info and 'typeid' in system_info["hardware"]:
|
||||
properties[b"machine"] = str(system_info['hardware']["typeid"]).encode("utf-8")
|
||||
else:
|
||||
properties[b"machine"] = system_info["variant"].encode("utf-8")
|
||||
|
||||
if has_cluster_capable_firmware:
|
||||
# Cluster needs an additional request, before it's completed.
|
||||
properties[b"incomplete"] = b"true"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue