Merge branch 'master' into feature_intent_container_tree

plugins/UM3NetworkPrinting/src/Network/ClusterApiClient.py

@@ -135,7 +135,7 @@ class ClusterApiClient:
                 result = model_class(**response)  # type: ClusterApiClientModel
                 on_finished_item = cast(Callable[[ClusterApiClientModel], Any], on_finished)
                 on_finished_item(result)
-        except JSONDecodeError:
+        except (JSONDecodeError, TypeError):
             Logger.log("e", "Could not parse response from network: %s", str(response))
 
     ## Creates a callback function so that it includes the parsing of the response into the correct model.

plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py

@@ -122,9 +122,6 @@ class LocalClusterOutputDevice(UltimakerNetworkedPrinterOutputDevice):
 
         self.writeStarted.emit(self)
 
-        # Make sure the printer is aware of all new materials as the new print job might contain one.
-        self.sendMaterialProfiles()
-
         # Export the scene to the correct file type.
         job = ExportFileJob(file_handler=file_handler, nodes=nodes, firmware_version=self.firmwareVersion)
         job.finished.connect(self._onPrintJobCreated)

plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py

@@ -135,10 +135,13 @@ class LocalClusterOutputDeviceManager:
         ultimaker_machines = container_registry.findContainersMetadata(type="machine", manufacturer="Ultimaker B.V.")
         found_machine_type_identifiers = {}  # type: Dict[str, str]
         for machine in ultimaker_machines:
-            machine_bom_number = machine.get("firmware_update_info", {}).get("id", None)
             machine_type = machine.get("id", None)
-            if machine_bom_number and machine_type:
-                found_machine_type_identifiers[str(machine_bom_number)] = machine_type
+            machine_bom_numbers = machine.get("bom_numbers", [])
+            if machine_type and machine_bom_numbers:
+                for bom_number in machine_bom_numbers:
+                    # This produces a n:1 mapping of bom numbers to machine types
+                    # allowing the S5R1 and S5R2 hardware to use a single S5 definition.
+                    found_machine_type_identifiers[str(bom_number)] = machine_type
         return found_machine_type_identifiers
 
     ## Add a new device.
@@ -236,7 +239,11 @@ class LocalClusterOutputDeviceManager:
         machine.setName(device.name)
         machine.setMetaDataEntry(self.META_NETWORK_KEY, device.key)
         machine.setMetaDataEntry("group_name", device.name)
-
-        device.connect()
         machine.addConfiguredConnectionType(device.connectionType.value)
-        CuraApplication.getInstance().getOutputDeviceManager().addOutputDevice(device)
+
+        if not device.isConnected():
+            device.connect()
+
+        output_device_manager = CuraApplication.getInstance().getOutputDeviceManager()
+        if device.key not in output_device_manager.getOutputDeviceIds():
+            output_device_manager.addOutputDevice(device)

plugins/UM3NetworkPrinting/src/Network/SendMaterialJob.py

@@ -105,7 +105,6 @@ class SendMaterialJob(Job):
                 parts.append(self.device.createFormPart("name=\"signature_file\"; filename=\"{file_name}\""
                                                         .format(file_name = signature_file_name), f.read()))
 
-        Logger.log("d", "Syncing material %s with cluster.", material_id)
         # FIXME: move form posting to API client
         self.device.postFormWithParts(target = "/cluster-api/v1/materials/", parts = parts,
                                       on_finished = self._sendingFinished)
@@ -118,7 +117,6 @@ class SendMaterialJob(Job):
         body = reply.readAll().data().decode('utf8')
         if "not added" in body:
             # For some reason the cluster returns a 200 sometimes even when syncing failed.
-            Logger.log("w", "Error while syncing material: %s", body)
             return
         # Inform the user that materials have been synced. This message only shows itself when not already visible.
         # Because of the guards above it is not shown when syncing failed (which is not always an actual problem).