From 946bf033066e561827da4d00afbc3b680cd7e552 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 13 Aug 2024 15:56:01 +0200 Subject: [PATCH 01/24] Revert "Merge branch 'main' into 5.8" This reverts commit fec7637615fd05fb052848bb1cd569840d650ebd, reversing changes made to 081b9b543b564ac6c2a840916162a06b289c5d94. --- .github/ISSUE_TEMPLATE/SlicingCrash.yaml | 6 +- conandata.yml | 14 +-- cura/API/Interface/Settings.py | 62 +--------- cura/PrinterOutput/FormatMaps.py | 106 ------------------ .../Models/ExtruderConfigurationModel.py | 15 ++- .../Models/MaterialOutputModel.py | 30 ++++- .../NetworkedPrinterOutputDevice.py | 13 ++- plugins/3MFWriter/ThreeMFWriter.py | 16 ++- plugins/CuraEngineBackend/StartSliceJob.py | 7 +- plugins/MakerbotWriter/MakerbotWriter.py | 27 +---- plugins/UFPWriter/UFPWriter.py | 58 +++++++++- .../XmlMaterialProfile/XmlMaterialProfile.py | 30 ++++- .../XmlMaterialProfile}/product_to_id.json | 0 .../definitions/Mark2_for_Ultimaker2.def.json | 1 + resources/definitions/atom3.def.json | 1 + resources/definitions/creality_crm4.def.json | 18 --- resources/definitions/diy220.def.json | 1 + resources/definitions/dxu.def.json | 1 + resources/definitions/erzay3d.def.json | 1 + resources/definitions/fdmextruder.def.json | 11 -- resources/definitions/fdmprinter.def.json | 54 ++------- resources/definitions/maker_starter.def.json | 1 + resources/definitions/mendel90.def.json | 1 + ...tur3d_discov3ry1_complete_um2plus.def.json | 1 + resources/definitions/tam.def.json | 1 + resources/definitions/ultimaker2.def.json | 1 + .../definitions/ultimaker2_plus.def.json | 1 + .../ultimaker2_plus_connect.def.json | 1 + resources/extruders/Mark2_extruder1.def.json | 1 - resources/extruders/Mark2_extruder2.def.json | 1 - resources/extruders/atom3_extruder_0.def.json | 1 - .../extruders/diy220_extruder_0.def.json | 1 - resources/extruders/dxu_extruder1.def.json | 1 - resources/extruders/dxu_extruder2.def.json | 1 - .../extruders/erzay3d_extruder_0.def.json | 1 - .../maker_starter_extruder_0.def.json | 1 - .../extruders/mendel90_extruder_0.def.json | 1 - ...v3ry1_complete_um2plus_extruder_0.def.json | 1 - resources/extruders/tam_extruder_0.def.json | 1 - .../extruders/ultimaker2_extruder_0.def.json | 1 - ...ltimaker2_plus_connect_extruder_0.def.json | 1 - .../ultimaker2_plus_extruder_0.def.json | 1 - resources/i18n/cura.pot | 4 +- 43 files changed, 171 insertions(+), 326 deletions(-) delete mode 100644 cura/PrinterOutput/FormatMaps.py rename {resources/texts => plugins/XmlMaterialProfile}/product_to_id.json (100%) delete mode 100644 resources/definitions/creality_crm4.def.json diff --git a/.github/ISSUE_TEMPLATE/SlicingCrash.yaml b/.github/ISSUE_TEMPLATE/SlicingCrash.yaml index 06025886a27..0d939776272 100644 --- a/.github/ISSUE_TEMPLATE/SlicingCrash.yaml +++ b/.github/ISSUE_TEMPLATE/SlicingCrash.yaml @@ -6,9 +6,9 @@ body: attributes: value: | ### ✨Try our improved Cura 5.7✨ - Before filling out the report below, we want you to try the latest Cura 5.7. + Before filling out the report below, we want you to try the latest Cura 5.7 Beta. This version of Cura has become significantly more reliable and has an updated slicing engine that will automatically send a report to the Cura Team for analysis. - #### [You can find the downloads here](https://github.com/Ultimaker/Cura/releases/latest) #### + #### [You can find the downloads here](https://github.com/Ultimaker/Cura/releases/tag/5.7.0-beta.1) #### If you still encounter a crash you are still welcome to report the issue so we can use your model as a test case, you can find instructions on how to do that below. ### Project File @@ -35,7 +35,7 @@ body: - type: markdown attributes: value: | - We work hard on improving our slicing crashes. Our most recent release is 5.7.1. + We work hard on improving our slicing crashes. Our most recent release is 5.6.0. If you are not on the latest version of Cura, [you can download it here](https://github.com/Ultimaker/Cura/releases/latest) - type: input attributes: diff --git a/conandata.yml b/conandata.yml index 06408131461..83bfd935a0c 100644 --- a/conandata.yml +++ b/conandata.yml @@ -1,17 +1,17 @@ -version: "5.9.0-alpha.0" +version: "5.8.0" requirements: - - "cura_resources/(latest)@ultimaker/testing" - - "uranium/(latest)@ultimaker/testing" - - "curaengine/(latest)@ultimaker/testing" - - "cura_binary_data/(latest)@ultimaker/testing" - - "fdm_materials/(latest)@ultimaker/testing" + - "cura_resources/5.8.0" + - "uranium/5.8.0" + - "curaengine/5.8.0" + - "cura_binary_data/5.8.0" + - "fdm_materials/5.8.0" - "curaengine_plugin_gradual_flow/0.1.0-beta.4" - "dulcificum/0.2.1" - "pysavitar/5.3.0" - "pynest2d/5.3.0" - "native_cad_plugin/2.0.0" requirements_internal: - - "fdm_materials/(latest)@internal/testing" + - "fdm_materials/5.8.0" - "cura_private_data/(latest)@internal/testing" urls: default: diff --git a/cura/API/Interface/Settings.py b/cura/API/Interface/Settings.py index 084023b9bd9..706a6d8c74a 100644 --- a/cura/API/Interface/Settings.py +++ b/cura/API/Interface/Settings.py @@ -1,13 +1,7 @@ # Copyright (c) 2018 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from dataclasses import asdict - -from typing import cast, Dict, TYPE_CHECKING - -from UM.Settings.InstanceContainer import InstanceContainer -from UM.Settings.SettingFunction import SettingFunction -from cura.Settings.GlobalStack import GlobalStack +from typing import TYPE_CHECKING if TYPE_CHECKING: from cura.CuraApplication import CuraApplication @@ -53,57 +47,3 @@ def getContextMenuItems(self) -> list: """ return self.application.getSidebarCustomMenuItems() - - def getSliceMetadata(self) -> Dict[str, Dict[str, Dict[str, str]]]: - """Get all changed settings and all settings. For each extruder and the global stack""" - print_information = self.application.getPrintInformation() - machine_manager = self.application.getMachineManager() - settings = { - "material": { - "length": print_information.materialLengths, - "weight": print_information.materialWeights, - "cost": print_information.materialCosts, - }, - "global": { - "changes": {}, - "all_settings": {}, - }, - "quality": asdict(machine_manager.activeQualityDisplayNameMap()), - } - - def _retrieveValue(container: InstanceContainer, setting_: str): - value_ = container.getProperty(setting_, "value") - for _ in range(0, 1024): # Prevent possibly endless loop by not using a limit. - if not isinstance(value_, SettingFunction): - return value_ # Success! - value_ = value_(container) - return 0 # Fallback value after breaking possibly endless loop. - - global_stack = cast(GlobalStack, self.application.getGlobalContainerStack()) - - # Add global user or quality changes - global_flattened_changes = InstanceContainer.createMergedInstanceContainer(global_stack.userChanges, global_stack.qualityChanges) - for setting in global_flattened_changes.getAllKeys(): - settings["global"]["changes"][setting] = _retrieveValue(global_flattened_changes, setting) - - # Get global all settings values without user or quality changes - for setting in global_stack.getAllKeys(): - settings["global"]["all_settings"][setting] = _retrieveValue(global_stack, setting) - - for i, extruder in enumerate(global_stack.extruderList): - # Add extruder fields to settings dictionary - settings[f"extruder_{i}"] = { - "changes": {}, - "all_settings": {}, - } - - # Add extruder user or quality changes - extruder_flattened_changes = InstanceContainer.createMergedInstanceContainer(extruder.userChanges, extruder.qualityChanges) - for setting in extruder_flattened_changes.getAllKeys(): - settings[f"extruder_{i}"]["changes"][setting] = _retrieveValue(extruder_flattened_changes, setting) - - # Get extruder all settings values without user or quality changes - for setting in extruder.getAllKeys(): - settings[f"extruder_{i}"]["all_settings"][setting] = _retrieveValue(extruder, setting) - - return settings diff --git a/cura/PrinterOutput/FormatMaps.py b/cura/PrinterOutput/FormatMaps.py deleted file mode 100644 index b8ad4df2a20..00000000000 --- a/cura/PrinterOutput/FormatMaps.py +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright (c) 2024 UltiMaker -# Cura is released under the terms of the LGPLv3 or higher. - -from UM.Resources import Resources - -import json -from typing import Dict, List, Optional - -class FormatMaps: - - # A map from the printer-type in their native file-formats to the internal name we use. - PRINTER_TYPE_NAME = { - "fire_e": "ultimaker_method", - "lava_f": "ultimaker_methodx", - "magma_10": "ultimaker_methodxl", - "sketch": "ultimaker_sketch" - } - - # A map from the extruder-name in their native file-formats to the internal name we use. - EXTRUDER_NAME_MAP = { - "mk14_hot": "1XA", - "mk14_hot_s": "2XA", - "mk14_c": "1C", - "mk14": "1A", - "mk14_s": "2A", - "mk14_e": "LABS" - } - - # A map from the material-name in their native file-formats to some info, including the internal name we use. - MATERIAL_MAP = { - "abs": {"name": "ABS", "guid": "2780b345-577b-4a24-a2c5-12e6aad3e690"}, - "abs-cf10": {"name": "ABS-CF", "guid": "495a0ce5-9daf-4a16-b7b2-06856d82394d"}, - "abs-wss1": {"name": "ABS-R", "guid": "88c8919c-6a09-471a-b7b6-e801263d862d"}, - "asa": {"name": "ASA", "guid": "f79bc612-21eb-482e-ad6c-87d75bdde066"}, - "nylon12-cf": {"name": "Nylon 12 CF", "guid": "3c6f2877-71cc-4760-84e6-4b89ab243e3b"}, - "nylon": {"name": "Nylon", "guid": "283d439a-3490-4481-920c-c51d8cdecf9c"}, - "pc": {"name": "PC", "guid": "62414577-94d1-490d-b1e4-7ef3ec40db02"}, - "petg": {"name": "PETG", "guid": "69386c85-5b6c-421a-bec5-aeb1fb33f060"}, - "pla": {"name": "PLA", "guid": "abb9c58e-1f56-48d1-bd8f-055fde3a5b56"}, - "pva": {"name": "PVA", "guid": "add51ef2-86eb-4c39-afd5-5586564f0715"}, - "wss1": {"name": "RapidRinse", "guid": "a140ef8f-4f26-4e73-abe0-cfc29d6d1024"}, - "sr30": {"name": "SR-30", "guid": "77873465-83a9-4283-bc44-4e542b8eb3eb"}, - "bvoh": {"name": "BVOH", "guid": "923e604c-8432-4b09-96aa-9bbbd42207f4"}, - "cpe": {"name": "CPE", "guid": "da1872c1-b991-4795-80ad-bdac0f131726"}, - "hips": {"name": "HIPS", "guid": "a468d86a-220c-47eb-99a5-bbb47e514eb0"}, - "tpu": {"name": "TPU 95A", "guid": "19baa6a9-94ff-478b-b4a1-8157b74358d2"}, - "im-pla": {"name": "Tough", "guid": "de031137-a8ca-4a72-bd1b-17bb964033ad"} - } - - __inverse_printer_name: Optional[Dict[str, str]] = None - __inverse_extruder_type: Optional[Dict[str, str]] = None - __inverse_material_map: Optional[Dict[str, str]] = None - __product_to_id_map: Optional[Dict[str, List[str]]] = None - - @classmethod - def getInversePrinterNameMap(cls) -> Dict[str, str]: - """Returns the inverse of the printer name map, that is, from the internal name to the name used in output.""" - if cls.__inverse_printer_name is not None: - return cls.__inverse_printer_name - cls.__inverse_printer_name = {} - for key, value in cls.PRINTER_TYPE_NAME.items(): - cls.__inverse_printer_name[value] = key - return cls.__inverse_printer_name - - @classmethod - def getInverseExtruderTypeMap(cls) -> Dict[str, str]: - """Returns the inverse of the extruder type map, that is, from the internal name to the name used in output.""" - if cls.__inverse_extruder_type is not None: - return cls.__inverse_extruder_type - cls.__inverse_extruder_type = {} - for key, value in cls.EXTRUDER_NAME_MAP.items(): - cls.__inverse_extruder_type[value] = key - return cls.__inverse_extruder_type - - @classmethod - def getInverseMaterialMap(cls) -> Dict[str, str]: - """Returns the inverse of the material map, that is, from the internal name to the name used in output. - - Note that this drops the extra info saved in the non-inverse material map, use that if you need it. - """ - if cls.__inverse_material_map is not None: - return cls.__inverse_material_map - cls.__inverse_material_map = {} - for key, value in cls.MATERIAL_MAP.items(): - cls.__inverse_material_map[value["name"]] = key - return cls.__inverse_material_map - - @classmethod - def getProductIdMap(cls) -> Dict[str, List[str]]: - """Gets a mapping from product names (for example, in the XML files) to their definition IDs. - - This loads the mapping from a file. - """ - if cls.__product_to_id_map is not None: - return cls.__product_to_id_map - - product_to_id_file = Resources.getPath(Resources.Texts, "product_to_id.json") - with open(product_to_id_file, encoding = "utf-8") as f: - contents = "" - for line in f: - contents += line if "#" not in line else "".join([line.replace("#", str(n)) for n in range(1, 12)]) - cls.__product_to_id_map = json.loads(contents) - cls.__product_to_id_map = {key: [value] for key, value in cls.__product_to_id_map.items()} - #This also loads "Ultimaker S5" -> "ultimaker_s5" even though that is not strictly necessary with the default to change spaces into underscores. - #However it is not always loaded with that default; this mapping is also used in serialize() without that default. - return cls.__product_to_id_map diff --git a/cura/PrinterOutput/Models/ExtruderConfigurationModel.py b/cura/PrinterOutput/Models/ExtruderConfigurationModel.py index c5c480e2248..ac924c684e5 100644 --- a/cura/PrinterOutput/Models/ExtruderConfigurationModel.py +++ b/cura/PrinterOutput/Models/ExtruderConfigurationModel.py @@ -1,10 +1,9 @@ -# Copyright (c) 2024 UltiMaker +# Copyright (c) 2018 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from typing import Optional from PyQt6.QtCore import pyqtProperty, QObject, pyqtSignal -from cura.PrinterOutput.FormatMaps import FormatMaps from .MaterialOutputModel import MaterialOutputModel @@ -46,8 +45,16 @@ def setHotendID(self, hotend_id: Optional[str]) -> None: @staticmethod def applyNameMappingHotend(hotendId) -> str: - if hotendId in FormatMaps.EXTRUDER_NAME_MAP: - return FormatMaps.EXTRUDER_NAME_MAP[hotendId] + _EXTRUDER_NAME_MAP = { + "mk14_hot":"1XA", + "mk14_hot_s":"2XA", + "mk14_c":"1C", + "mk14":"1A", + "mk14_s":"2A", + "mk14_e": "LABS" + } + if hotendId in _EXTRUDER_NAME_MAP: + return _EXTRUDER_NAME_MAP[hotendId] return hotendId @pyqtProperty(str, fset = setHotendID, notify = extruderConfigurationChanged) diff --git a/cura/PrinterOutput/Models/MaterialOutputModel.py b/cura/PrinterOutput/Models/MaterialOutputModel.py index 8790d1626ee..854226c6d40 100644 --- a/cura/PrinterOutput/Models/MaterialOutputModel.py +++ b/cura/PrinterOutput/Models/MaterialOutputModel.py @@ -1,10 +1,9 @@ -# Copyright (c) 2024 UltiMaker +# Copyright (c) 2017 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from typing import Optional from PyQt6.QtCore import pyqtProperty, QObject -from cura.PrinterOutput.FormatMaps import FormatMaps class MaterialOutputModel(QObject): @@ -24,9 +23,30 @@ def guid(self) -> str: @staticmethod def getMaterialFromDefinition(guid, type, brand, name): - if guid is None and brand != "empty" and type in FormatMaps.MATERIAL_MAP: - name = FormatMaps.MATERIAL_MAP[type]["name"] - guid = FormatMaps.MATERIAL_MAP[type]["guid"] + + _MATERIAL_MAP = { "abs" :{"name" :"ABS" ,"guid": "2780b345-577b-4a24-a2c5-12e6aad3e690"}, + "abs-cf10" :{"name": "ABS-CF" ,"guid": "495a0ce5-9daf-4a16-b7b2-06856d82394d"}, + "abs-wss1" :{"name" :"ABS-R" ,"guid": "88c8919c-6a09-471a-b7b6-e801263d862d"}, + "asa" :{"name" :"ASA" ,"guid": "f79bc612-21eb-482e-ad6c-87d75bdde066"}, + "nylon12-cf":{"name": "Nylon 12 CF" ,"guid": "3c6f2877-71cc-4760-84e6-4b89ab243e3b"}, + "nylon" :{"name" :"Nylon" ,"guid": "283d439a-3490-4481-920c-c51d8cdecf9c"}, + "pc" :{"name" :"PC" ,"guid": "62414577-94d1-490d-b1e4-7ef3ec40db02"}, + "petg" :{"name" :"PETG" ,"guid": "69386c85-5b6c-421a-bec5-aeb1fb33f060"}, + "pla" :{"name" :"PLA" ,"guid": "abb9c58e-1f56-48d1-bd8f-055fde3a5b56"}, + "pva" :{"name" :"PVA" ,"guid": "add51ef2-86eb-4c39-afd5-5586564f0715"}, + "wss1" :{"name" :"RapidRinse" ,"guid": "a140ef8f-4f26-4e73-abe0-cfc29d6d1024"}, + "sr30" :{"name" :"SR-30" ,"guid": "77873465-83a9-4283-bc44-4e542b8eb3eb"}, + "bvoh" :{"name" :"BVOH" ,"guid": "923e604c-8432-4b09-96aa-9bbbd42207f4"}, + "cpe" :{"name" :"CPE" ,"guid": "da1872c1-b991-4795-80ad-bdac0f131726"}, + "hips" :{"name" :"HIPS" ,"guid": "a468d86a-220c-47eb-99a5-bbb47e514eb0"}, + "tpu" :{"name" :"TPU 95A" ,"guid": "19baa6a9-94ff-478b-b4a1-8157b74358d2"}, + "im-pla" :{"name": "Tough" ,"guid": "de031137-a8ca-4a72-bd1b-17bb964033ad"} + } + + + if guid is None and brand != "empty" and type in _MATERIAL_MAP: + name = _MATERIAL_MAP[type]["name"] + guid = _MATERIAL_MAP[type]["guid"] return name, guid diff --git a/cura/PrinterOutput/NetworkedPrinterOutputDevice.py b/cura/PrinterOutput/NetworkedPrinterOutputDevice.py index 3dc245d4688..2a683966db6 100644 --- a/cura/PrinterOutput/NetworkedPrinterOutputDevice.py +++ b/cura/PrinterOutput/NetworkedPrinterOutputDevice.py @@ -1,4 +1,4 @@ -# Copyright (c) 2024 UltiMaker +# Copyright (c) 2021 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from UM.FileHandler.FileHandler import FileHandler #For typing. @@ -6,7 +6,6 @@ from UM.Scene.SceneNode import SceneNode #For typing. from cura.API import Account from cura.CuraApplication import CuraApplication -from cura.PrinterOutput.FormatMaps import FormatMaps from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice, ConnectionState, ConnectionType @@ -420,8 +419,14 @@ def printerType(self) -> str: @staticmethod def applyPrinterTypeMapping(printer_type): - if printer_type in FormatMaps.PRINTER_TYPE_NAME: - return FormatMaps.PRINTER_TYPE_NAME[printer_type] + _PRINTER_TYPE_NAME = { + "fire_e": "ultimaker_method", + "lava_f": "ultimaker_methodx", + "magma_10": "ultimaker_methodxl", + "sketch": "ultimaker_sketch" + } + if printer_type in _PRINTER_TYPE_NAME: + return _PRINTER_TYPE_NAME[printer_type] return printer_type @pyqtProperty(str, constant = True) diff --git a/plugins/3MFWriter/ThreeMFWriter.py b/plugins/3MFWriter/ThreeMFWriter.py index a3eb43ca32d..5a9fa487fc9 100644 --- a/plugins/3MFWriter/ThreeMFWriter.py +++ b/plugins/3MFWriter/ThreeMFWriter.py @@ -114,24 +114,22 @@ def _convertUMNodeToSavitarNode(um_node, mesh_data = um_node.getMeshData() - node_matrix = um_node.getLocalTransformation() - node_matrix.preMultiply(transformation) - if center_mesh: - center_matrix = Matrix() + node_matrix = Matrix() # compensate for original center position, if object(s) is/are not around its zero position if mesh_data is not None: extents = mesh_data.getExtents() if extents is not None: # We use a different coordinate space while writing, so flip Z and Y - center_vector = Vector(-extents.center.x, -extents.center.y, -extents.center.z) - center_matrix.setByTranslation(center_vector) - node_matrix.preMultiply(center_matrix) + center_vector = Vector(extents.center.x, extents.center.y, extents.center.z) + node_matrix.setByTranslation(center_vector) + node_matrix.multiply(um_node.getLocalTransformation()) + else: + node_matrix = um_node.getLocalTransformation() - matrix_string = ThreeMFWriter._convertMatrixToString(node_matrix) + matrix_string = ThreeMFWriter._convertMatrixToString(node_matrix.preMultiply(transformation)) savitar_node.setTransformation(matrix_string) - if mesh_data is not None: savitar_node.getMeshData().setVerticesFromBytes(mesh_data.getVerticesAsByteArray()) indices_array = mesh_data.getIndicesAsByteArray() diff --git a/plugins/CuraEngineBackend/StartSliceJob.py b/plugins/CuraEngineBackend/StartSliceJob.py index 6da0edb2a71..3da0a68c951 100644 --- a/plugins/CuraEngineBackend/StartSliceJob.py +++ b/plugins/CuraEngineBackend/StartSliceJob.py @@ -366,12 +366,7 @@ def run(self) -> None: for extruder_stack in global_stack.extruderList: self._buildExtruderMessage(extruder_stack) - backend_plugins = CuraApplication.getInstance().getBackendPlugins() - - # Sort backend plugins by name. Not a very good strategy, but at least it is repeatable. This will be improved later. - backend_plugins = sorted(backend_plugins, key=lambda backend_plugin: backend_plugin.getId()) - - for plugin in backend_plugins: + for plugin in CuraApplication.getInstance().getBackendPlugins(): if not plugin.usePlugin(): continue for slot in plugin.getSupportedSlots(): diff --git a/plugins/MakerbotWriter/MakerbotWriter.py b/plugins/MakerbotWriter/MakerbotWriter.py index 34ef562fd32..43595bbf247 100644 --- a/plugins/MakerbotWriter/MakerbotWriter.py +++ b/plugins/MakerbotWriter/MakerbotWriter.py @@ -1,4 +1,4 @@ -# Copyright (c) 2024 UltiMaker +# Copyright (c) 2023 UltiMaker # Cura is released under the terms of the LGPLv3 or higher. from io import StringIO, BufferedIOBase import json @@ -18,7 +18,6 @@ from UM.i18n import i18nCatalog from cura.CuraApplication import CuraApplication -from cura.PrinterOutput.FormatMaps import FormatMaps from cura.Snapshot import Snapshot from cura.Utils.Threading import call_on_qt_thread from cura.CuraVersion import ConanInstalls @@ -138,30 +137,6 @@ def write(self, stream: BufferedIOBase, nodes: List[SceneNode], mode=MeshWriter. for png_file in png_files: file, data = png_file["file"], png_file["data"] zip_stream.writestr(file, data) - api = CuraApplication.getInstance().getCuraAPI() - metadata_json = api.interface.settings.getSliceMetadata() - - # All the mapping stuff we have to do: - product_to_id_map = FormatMaps.getProductIdMap() - printer_name_map = FormatMaps.getInversePrinterNameMap() - extruder_type_map = FormatMaps.getInverseExtruderTypeMap() - material_map = FormatMaps.getInverseMaterialMap() - for key, value in metadata_json.items(): - if "all_settings" in value: - if "machine_name" in value["all_settings"]: - machine_name = value["all_settings"]["machine_name"] - if machine_name in product_to_id_map: - machine_name = product_to_id_map[machine_name][0] - value["all_settings"]["machine_name"] = printer_name_map.get(machine_name, machine_name) - if "machine_nozzle_id" in value["all_settings"]: - extruder_type = value["all_settings"]["machine_nozzle_id"] - value["all_settings"]["machine_nozzle_id"] = extruder_type_map.get(extruder_type, extruder_type) - if "material_type" in value["all_settings"]: - material_type = value["all_settings"]["material_type"] - value["all_settings"]["material_type"] = material_map.get(material_type, material_type) - - slice_metadata = json.dumps(metadata_json, separators=(", ", ": "), indent=4) - zip_stream.writestr("slicemetadata.json", slice_metadata) except (IOError, OSError, BadZipFile) as ex: Logger.log("e", f"Could not write to (.makerbot) file because: '{ex}'.") self.setInformation(catalog.i18nc("@error", "MakerbotWriter could not save to the designated path.")) diff --git a/plugins/UFPWriter/UFPWriter.py b/plugins/UFPWriter/UFPWriter.py index 0cf756b6a44..475e5fc01ac 100644 --- a/plugins/UFPWriter/UFPWriter.py +++ b/plugins/UFPWriter/UFPWriter.py @@ -24,7 +24,6 @@ from cura.CuraApplication import CuraApplication from cura.Settings.GlobalStack import GlobalStack from cura.Utils.Threading import call_on_qt_thread -from cura.API import CuraAPI from UM.i18n import i18nCatalog @@ -86,8 +85,7 @@ def write(self, stream, nodes, mode = MeshWriter.OutputMode.BinaryMode): try: archive.addContentType(extension="json", mime_type="application/json") setting_textio = StringIO() - api = CuraApplication.getInstance().getCuraAPI() - json.dump(api.interface.settings.getSliceMetadata(), setting_textio, separators=(", ", ": "), indent=4) + json.dump(self._getSliceMetadata(), setting_textio, separators=(", ", ": "), indent=4) steam = archive.getStream(SLICE_METADATA_PATH) steam.write(setting_textio.getvalue().encode("UTF-8")) except EnvironmentError as e: @@ -212,3 +210,57 @@ def _getObjectMetadata(node: SceneNode) -> List[Dict[str, str]]: return [{"name": item.getName()} for item in DepthFirstIterator(node) if item.getMeshData() is not None and not item.callDecoration("isNonPrintingMesh")] + + def _getSliceMetadata(self) -> Dict[str, Dict[str, Dict[str, str]]]: + """Get all changed settings and all settings. For each extruder and the global stack""" + print_information = CuraApplication.getInstance().getPrintInformation() + machine_manager = CuraApplication.getInstance().getMachineManager() + settings = { + "material": { + "length": print_information.materialLengths, + "weight": print_information.materialWeights, + "cost": print_information.materialCosts, + }, + "global": { + "changes": {}, + "all_settings": {}, + }, + "quality": asdict(machine_manager.activeQualityDisplayNameMap()), + } + + def _retrieveValue(container: InstanceContainer, setting_: str): + value_ = container.getProperty(setting_, "value") + for _ in range(0, 1024): # Prevent possibly endless loop by not using a limit. + if not isinstance(value_, SettingFunction): + return value_ # Success! + value_ = value_(container) + return 0 # Fallback value after breaking possibly endless loop. + + global_stack = cast(GlobalStack, Application.getInstance().getGlobalContainerStack()) + + # Add global user or quality changes + global_flattened_changes = InstanceContainer.createMergedInstanceContainer(global_stack.userChanges, global_stack.qualityChanges) + for setting in global_flattened_changes.getAllKeys(): + settings["global"]["changes"][setting] = _retrieveValue(global_flattened_changes, setting) + + # Get global all settings values without user or quality changes + for setting in global_stack.getAllKeys(): + settings["global"]["all_settings"][setting] = _retrieveValue(global_stack, setting) + + for i, extruder in enumerate(global_stack.extruderList): + # Add extruder fields to settings dictionary + settings[f"extruder_{i}"] = { + "changes": {}, + "all_settings": {}, + } + + # Add extruder user or quality changes + extruder_flattened_changes = InstanceContainer.createMergedInstanceContainer(extruder.userChanges, extruder.qualityChanges) + for setting in extruder_flattened_changes.getAllKeys(): + settings[f"extruder_{i}"]["changes"][setting] = _retrieveValue(extruder_flattened_changes, setting) + + # Get extruder all settings values without user or quality changes + for setting in extruder.getAllKeys(): + settings[f"extruder_{i}"]["all_settings"][setting] = _retrieveValue(extruder, setting) + + return settings diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index 49b5e7661dc..980288e3c98 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -17,7 +17,6 @@ from UM.ConfigurationErrorMessage import ConfigurationErrorMessage from cura.CuraApplication import CuraApplication -from cura.PrinterOutput.FormatMaps import FormatMaps from cura.Machines.VariantType import VariantType try: @@ -250,7 +249,7 @@ def serialize(self, ignored_metadata_keys: Optional[Set[str]] = None): machine_variant_map[definition_id][variant_name] = variant_dict # Map machine human-readable names to IDs - product_id_map = FormatMaps.getProductIdMap() + product_id_map = self.getProductIdMap() for definition_id, container in machine_container_map.items(): definition_id = container.getMetaDataEntry("definition") @@ -648,7 +647,7 @@ def deserialize(self, serialized, file_name = None): self._dirty = False # Map machine human-readable names to IDs - product_id_map = FormatMaps.getProductIdMap() + product_id_map = self.getProductIdMap() machines = data.iterfind("./um:settings/um:machine", self.__namespaces) for machine in machines: @@ -924,7 +923,7 @@ def deserializeMetadata(cls, serialized: str, container_id: str) -> List[Dict[st result_metadata.append(base_metadata) # Map machine human-readable names to IDs - product_id_map = FormatMaps.getProductIdMap() + product_id_map = cls.getProductIdMap() for machine in data.iterfind("./um:settings/um:machine", cls.__namespaces): machine_compatibility = common_compatibility @@ -1129,6 +1128,29 @@ def getPossibleDefinitionIDsFromName(name): id_list = list(id_list) return id_list + __product_to_id_map: Optional[Dict[str, List[str]]] = None + + @classmethod + def getProductIdMap(cls) -> Dict[str, List[str]]: + """Gets a mapping from product names in the XML files to their definition IDs. + + This loads the mapping from a file. + """ + if cls.__product_to_id_map is not None: + return cls.__product_to_id_map + + plugin_path = cast(str, PluginRegistry.getInstance().getPluginPath("XmlMaterialProfile")) + product_to_id_file = os.path.join(plugin_path, "product_to_id.json") + with open(product_to_id_file, encoding = "utf-8") as f: + contents = "" + for line in f: + contents += line if "#" not in line else "".join([line.replace("#", str(n)) for n in range(1, 12)]) + cls.__product_to_id_map = json.loads(contents) + cls.__product_to_id_map = {key: [value] for key, value in cls.__product_to_id_map.items()} + #This also loads "Ultimaker S5" -> "ultimaker_s5" even though that is not strictly necessary with the default to change spaces into underscores. + #However it is not always loaded with that default; this mapping is also used in serialize() without that default. + return cls.__product_to_id_map + @staticmethod def _parseCompatibleValue(value: str): """Parse the value of the "material compatible" property.""" diff --git a/resources/texts/product_to_id.json b/plugins/XmlMaterialProfile/product_to_id.json similarity index 100% rename from resources/texts/product_to_id.json rename to plugins/XmlMaterialProfile/product_to_id.json diff --git a/resources/definitions/Mark2_for_Ultimaker2.def.json b/resources/definitions/Mark2_for_Ultimaker2.def.json index dab45dd80c6..789d5d42eca 100644 --- a/resources/definitions/Mark2_for_Ultimaker2.def.json +++ b/resources/definitions/Mark2_for_Ultimaker2.def.json @@ -130,6 +130,7 @@ "machine_min_cool_heat_time_window": { "default_value": 15.0 }, "machine_name": { "default_value": "Mark2_for_Ultimaker2" }, "machine_nozzle_cool_down_speed": { "default_value": 1.5 }, + "machine_nozzle_head_distance": { "default_value": 5 }, "machine_nozzle_heat_up_speed": { "default_value": 3.5 }, "machine_nozzle_size": { "default_value": 0.4 }, "machine_show_variants": { "default_value": true }, diff --git a/resources/definitions/atom3.def.json b/resources/definitions/atom3.def.json index 6fab25a96d6..c9b54d2f89a 100644 --- a/resources/definitions/atom3.def.json +++ b/resources/definitions/atom3.def.json @@ -65,6 +65,7 @@ "machine_heated_bed": { "default_value": true }, "machine_height": { "default_value": 340 }, "machine_name": { "default_value": "Atom 3" }, + "machine_nozzle_head_distance": { "default_value": 6 }, "machine_shape": { "default_value": "elliptic" }, "machine_show_variants": { "default_value": true }, "machine_start_gcode": { "default_value": ";MACHINE START CODE\nG21 ;metric values\nG90 ;absolute positioning\nG28 ;home\nG1 Z5 F9000\n;MACHINE START CODE" }, diff --git a/resources/definitions/creality_crm4.def.json b/resources/definitions/creality_crm4.def.json deleted file mode 100644 index 89ab3ed04c2..00000000000 --- a/resources/definitions/creality_crm4.def.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "version": 2, - "name": "Creality CR-M4", - "inherits": "creality_base", - "metadata": - { - "visible": true, - "quality_definition": "creality_base" - }, - "overrides": - { - "gantry_height": { "value": 35 }, - "machine_depth": { "default_value": 450 }, - "machine_height": { "default_value": 470 }, - "machine_name": { "default_value": "Creality CR-M4" }, - "machine_width": { "default_value": 450 } - } -} \ No newline at end of file diff --git a/resources/definitions/diy220.def.json b/resources/definitions/diy220.def.json index ea3e89ab04c..f4c2e41364e 100644 --- a/resources/definitions/diy220.def.json +++ b/resources/definitions/diy220.def.json @@ -35,6 +35,7 @@ "machine_max_feedrate_y": { "default_value": 300 }, "machine_max_feedrate_z": { "default_value": 40 }, "machine_name": { "default_value": "Diytech 220" }, + "machine_nozzle_head_distance": { "default_value": 3 }, "machine_nozzle_tip_outer_diameter": { "default_value": 1 }, "machine_start_gcode": { "default_value": "G21\nG90\nM82\nM107\nG28\nG1 Z15 F200\nT0\nG92 E0\nG1 E16 F250\nG92 E0\n" }, "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, diff --git a/resources/definitions/dxu.def.json b/resources/definitions/dxu.def.json index 117edf43db7..c5eb9720f3b 100644 --- a/resources/definitions/dxu.def.json +++ b/resources/definitions/dxu.def.json @@ -122,6 +122,7 @@ "machine_name": { "default_value": "dxu" }, "machine_nozzle_cool_down_speed": { "default_value": 1.5 }, "machine_nozzle_expansion_angle": { "default_value": 45 }, + "machine_nozzle_head_distance": { "default_value": 5 }, "machine_nozzle_heat_up_speed": { "default_value": 3.5 }, "machine_nozzle_size": { "default_value": 0.4 }, "machine_show_variants": { "default_value": true }, diff --git a/resources/definitions/erzay3d.def.json b/resources/definitions/erzay3d.def.json index af5784e4e67..5baadf32e46 100644 --- a/resources/definitions/erzay3d.def.json +++ b/resources/definitions/erzay3d.def.json @@ -44,6 +44,7 @@ "machine_max_jerk_xy": { "default_value": 10 }, "machine_max_jerk_z": { "default_value": 10 }, "machine_name": { "default_value": "Erzay3D" }, + "machine_nozzle_head_distance": { "default_value": 2.5 }, "machine_nozzle_size": { "default_value": 0.4 }, "machine_shape": { "default_value": "elliptic" }, "machine_start_gcode": { "default_value": "G28\nG1 Z15.0 F6000\nG92 E0" }, diff --git a/resources/definitions/fdmextruder.def.json b/resources/definitions/fdmextruder.def.json index 101efee3b10..f60cf63360f 100644 --- a/resources/definitions/fdmextruder.def.json +++ b/resources/definitions/fdmextruder.def.json @@ -167,17 +167,6 @@ "type": "float", "unit": "mm" }, - "machine_nozzle_head_distance": - { - "default_value": 3, - "description": "The height difference between the tip of the nozzle and the lowest part of the print head.", - "label": "Nozzle Length", - "settable_per_extruder": true, - "settable_per_mesh": false, - "settable_per_meshgroup": false, - "type": "float", - "unit": "mm" - }, "machine_nozzle_id": { "default_value": "unknown", diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index c0c90dc6d73..045bec05a40 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -28,18 +28,6 @@ "icon": "Printer", "children": { - "build_volume_fan_nr": - { - "label": "Build volume fan number", - "description": "The number of the fan that cools the build volume. If this is set to 0, it's means that there is no build volume fan", - "default_value": 0, - "minimum_value": "0", - "maximum_value": "999999", - "type": "int", - "settable_per_mesh": false, - "settable_per_extruder": false, - "settable_per_meshgroup": false - }, "machine_name": { "label": "Machine Type", @@ -301,6 +289,17 @@ "settable_per_meshgroup": false, "settable_globally": false }, + "machine_nozzle_head_distance": + { + "label": "Nozzle Length", + "description": "The height difference between the tip of the nozzle and the lowest part of the print head.", + "unit": "mm", + "default_value": 3, + "type": "float", + "settable_per_mesh": false, + "settable_per_extruder": true, + "settable_per_meshgroup": false + }, "machine_nozzle_expansion_angle": { "label": "Nozzle Angle", @@ -4468,37 +4467,6 @@ "settable_per_mesh": false, "settable_per_extruder": true }, - "build_fan_full_at_height": - { - "label": "Build Fan Speed at Height", - "description": "The height at which the fans spin on regular fan speed. At the layers below the fan speed gradually increases from Initial Fan Speed to Regular Fan Speed.", - "unit": "mm", - "type": "float", - "default_value": 0, - "minimum_value": "0", - "enabled": "build_volume_fan_nr != 0", - "maximum_value_warning": "10.0", - "settable_per_mesh": false, - "settable_per_extruder": false, - "settable_per_meshgroup": false, - "children": - { - "build_fan_full_layer": - { - "label": "Build Fan Speed at Layer", - "description": "The layer at which the build fans spin on full fan speed. This value is calculated and rounded to a whole number.", - "type": "int", - "default_value": 0, - "minimum_value": "0", - "enabled": "build_volume_fan_nr != 0", - "maximum_value_warning": "10 / resolveOrValue('layer_height')", - "value": "max(1, int(math.floor((build_fan_full_at_height - resolveOrValue('layer_height_0')) / resolveOrValue('layer_height')) + 2))", - "settable_per_mesh": false, - "settable_per_extruder": false, - "settable_per_meshgroup": false - } - } - }, "cool_fan_speed": { "label": "Fan Speed", diff --git a/resources/definitions/maker_starter.def.json b/resources/definitions/maker_starter.def.json index 5e5f9dcb5bb..e654ee09159 100644 --- a/resources/definitions/maker_starter.def.json +++ b/resources/definitions/maker_starter.def.json @@ -27,6 +27,7 @@ "machine_heated_bed": { "default_value": false }, "machine_height": { "default_value": 200 }, "machine_name": { "default_value": "3DMaker Starter" }, + "machine_nozzle_head_distance": { "default_value": 3 }, "machine_nozzle_tip_outer_diameter": { "default_value": 1 }, "machine_width": { "default_value": 210 }, "raft_airgap": { "default_value": 0.2 }, diff --git a/resources/definitions/mendel90.def.json b/resources/definitions/mendel90.def.json index d8619fe276a..57e1276e6ac 100644 --- a/resources/definitions/mendel90.def.json +++ b/resources/definitions/mendel90.def.json @@ -37,6 +37,7 @@ "machine_heated_bed": { "default_value": true }, "machine_height": { "default_value": 200 }, "machine_name": { "default_value": "Mendel90" }, + "machine_nozzle_head_distance": { "default_value": 5 }, "machine_nozzle_tip_outer_diameter": { "default_value": 1 }, "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;absolute extrusion\nM107 ;start with the fan off\nG28 ;home\nG92 E0 ;zero the extruded length\nM140 S{material_bed_temperature_layer_0} ; set the bed temperature and continue on\nG1 X-50 Y98 F9000 ;go to the left of the top\nG1 Z0.05 ; close to the bed\nM104 S{material_print_temperature_layer_0}; pre-heat the extruder continue on\nM190 S{material_bed_temperature_layer_0} ;set the bed temp & wait\nM109 S{material_print_temperature_layer_0};set the extruder temp for layer 0 & wait\nG92 E0 ;zero the extruded length\nG1 X50 E10 F300 ; make a thick line to prime extruder\nG92 E0 ; reset extruder\nG1 E-4 F1800\nG1 Z0.3 ;lift Z\n" }, "machine_width": { "default_value": 200 }, diff --git a/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json b/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json index 722f4dade54..c013c49e05b 100644 --- a/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json +++ b/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json @@ -78,6 +78,7 @@ "machine_heat_zone_length": { "default_value": 20 }, "machine_height": { "default_value": 205 }, "machine_name": { "default_value": "Discov3ry Complete (Ultimaker 2+)" }, + "machine_nozzle_head_distance": { "default_value": 5 }, "machine_show_variants": { "default_value": true }, "machine_start_gcode": { "default_value": "\n;Updated Firmware (.hex and Marlin .ino) for \n;Ultimaker 2+ with Discov3ry Extruder available at: \n;https://github.com/Structur3d/UM2.1Discov3ry-Firmware-beta \n;**Learn more at https://www.structur3d.io** \n \nM104 S{material_print_temperature} ;Start heating extruder \nM140 S{material_bed_temperature} ;Start heating bed \nG21 ;metric values \nG90 ;absolute positioning \nM82 ;set extruder to absolute mode \nM107 ;start with the fan off \nM302 ;allow cold extrusion \nM92 E2589 ;set extruder EEPROM steps/mm for paste \nG28 Z0 ;move Z to bottom endstops \nG28 X0 Y0 ;move X/Y to endstops \nG1 X15 Y0 F4000 ;move X/Y to front of printer \nG1 Z15.0 F9000 ;move the platform to 15mm \nG92 E0 ;zero the extruded length \nG1 F200 E10 ;extrude 10 mm of feed stock \nG92 E0 ;zero the extruded length again \nG1 F9000 \n;Put printing message on LCD screen \nM117 Printing..." }, "machine_width": { "default_value": 205 }, diff --git a/resources/definitions/tam.def.json b/resources/definitions/tam.def.json index 01437cebe70..84bbc9c8fb3 100644 --- a/resources/definitions/tam.def.json +++ b/resources/definitions/tam.def.json @@ -44,6 +44,7 @@ "machine_max_acceleration_y": { "default_value": 6000 }, "machine_max_acceleration_z": { "default_value": 12000 }, "machine_name": { "default_value": "TypeAMachines" }, + "machine_nozzle_head_distance": { "default_value": 3 }, "machine_nozzle_tip_outer_diameter": { "default_value": 1 }, "machine_start_gcode": { "default_value": ";-- START GCODE --\n;Sliced for Type A Machines Series 1\n;Sliced at: {day} {date} {time}\n;Basic settings:\n;Layer height: {layer_height}\n;Walls: {wall_thickness}\n;Fill: {fill_distance}\n;Print Speed: {print_speed}\n;Support: {support}\n;Retraction Speed: {retraction_speed}\n;Retraction Distance: {retraction_amount}\n;Print time: {print_time}\n;Filament used: {filament_amount}m {filament_weight}g\n;Settings based on: {material_profile}\nG21 ;metric values\nG90 ;absolute positioning\nG28 ;move to endstops\nG29 ;allows for auto-levelling\nG1 Z15.0 F12000 ;move the platform down 15mm\nG1 X150 Y5 F9000 ;center\nM140 S{material_bed_temperature} ;Prep Heat Bed\nM109 S{default_material_print_temperature} ;Heat To temp\nM190 S{material_bed_temperature} ;Heat Bed to temp\nG1 X150 Y5 Z0.3 ;move the platform to purge extrusion\nG92 E0 ;zero the extruded length\nG1 F200 X250 E30 ;extrude 30mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 X150 Y150 Z25 F12000 ;recenter and begin\nG1 F9000" }, "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, diff --git a/resources/definitions/ultimaker2.def.json b/resources/definitions/ultimaker2.def.json index d749c96a001..8c0e066cd18 100644 --- a/resources/definitions/ultimaker2.def.json +++ b/resources/definitions/ultimaker2.def.json @@ -95,6 +95,7 @@ "machine_max_feedrate_y": { "default_value": 300 }, "machine_max_feedrate_z": { "default_value": 40 }, "machine_name": { "default_value": "Ultimaker 2" }, + "machine_nozzle_head_distance": { "default_value": 3 }, "machine_nozzle_tip_outer_diameter": { "default_value": 1 }, "machine_start_gcode": { "value": "\"G0 F3000 Y50 ;avoid prime blob\" if machine_gcode_flavor == \"UltiGCode\" else \"G21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\nG28 Z0 ;move Z to bottom endstops\\nG28 X0 Y0 ;move X/Y to endstops\\nG1 X15 Y0 F4000 ;move X/Y to front of printer\\nG1 Z15.0 F9000 ;move the platform to 15mm\\nG92 E0 ;zero the extruded length\\nG1 F200 E10 ;extrude 10 mm of feed stock\\nG92 E0 ;zero the extruded length again\\nG1 Y50 F9000\\n;Put printing message on LCD screen\\nM117 Printing...\"" }, "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, diff --git a/resources/definitions/ultimaker2_plus.def.json b/resources/definitions/ultimaker2_plus.def.json index c06d8b1e68c..b5ad30bb8d6 100644 --- a/resources/definitions/ultimaker2_plus.def.json +++ b/resources/definitions/ultimaker2_plus.def.json @@ -83,6 +83,7 @@ "machine_heat_zone_length": { "default_value": 20 }, "machine_height": { "default_value": 205 }, "machine_name": { "default_value": "Ultimaker 2+" }, + "machine_nozzle_head_distance": { "default_value": 5 }, "machine_show_variants": { "default_value": true }, "speed_infill": { "value": "speed_print" }, "speed_support": { "value": "speed_wall_0" }, diff --git a/resources/definitions/ultimaker2_plus_connect.def.json b/resources/definitions/ultimaker2_plus_connect.def.json index 6cdd3e97058..8aae2d4c195 100644 --- a/resources/definitions/ultimaker2_plus_connect.def.json +++ b/resources/definitions/ultimaker2_plus_connect.def.json @@ -92,6 +92,7 @@ "machine_heat_zone_length": { "default_value": 20 }, "machine_height": { "default_value": 205 }, "machine_name": { "default_value": "Ultimaker 2+ Connect" }, + "machine_nozzle_head_distance": { "default_value": 5 }, "machine_show_variants": { "default_value": true }, "machine_start_gcode": { "value": "''" }, "machine_width": { "default_value": 223 }, diff --git a/resources/extruders/Mark2_extruder1.def.json b/resources/extruders/Mark2_extruder1.def.json index 9617678f7ec..89992ad450e 100644 --- a/resources/extruders/Mark2_extruder1.def.json +++ b/resources/extruders/Mark2_extruder1.def.json @@ -14,7 +14,6 @@ "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_head_distance": { "default_value": 5 }, "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 } } diff --git a/resources/extruders/Mark2_extruder2.def.json b/resources/extruders/Mark2_extruder2.def.json index b0ea604fbb4..967e32d8b89 100644 --- a/resources/extruders/Mark2_extruder2.def.json +++ b/resources/extruders/Mark2_extruder2.def.json @@ -14,7 +14,6 @@ "default_value": 1, "maximum_value": "1" }, - "machine_nozzle_head_distance": { "default_value": 5 }, "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 } } diff --git a/resources/extruders/atom3_extruder_0.def.json b/resources/extruders/atom3_extruder_0.def.json index fc51a8cf038..ccc7a0bd6b0 100644 --- a/resources/extruders/atom3_extruder_0.def.json +++ b/resources/extruders/atom3_extruder_0.def.json @@ -10,7 +10,6 @@ "overrides": { "extruder_nr": { "default_value": 0 }, - "machine_nozzle_head_distance": { "default_value": 6 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } diff --git a/resources/extruders/diy220_extruder_0.def.json b/resources/extruders/diy220_extruder_0.def.json index ab271d10067..4d802b4a8d5 100644 --- a/resources/extruders/diy220_extruder_0.def.json +++ b/resources/extruders/diy220_extruder_0.def.json @@ -10,7 +10,6 @@ "overrides": { "extruder_nr": { "default_value": 0 }, - "machine_nozzle_head_distance": { "default_value": 3 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } diff --git a/resources/extruders/dxu_extruder1.def.json b/resources/extruders/dxu_extruder1.def.json index b44f79fdac2..de974b81748 100644 --- a/resources/extruders/dxu_extruder1.def.json +++ b/resources/extruders/dxu_extruder1.def.json @@ -14,7 +14,6 @@ "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_head_distance": { "default_value": 5 }, "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, "machine_nozzle_size": { "default_value": 0.4 }, diff --git a/resources/extruders/dxu_extruder2.def.json b/resources/extruders/dxu_extruder2.def.json index 358bc69dae4..b4de4712892 100644 --- a/resources/extruders/dxu_extruder2.def.json +++ b/resources/extruders/dxu_extruder2.def.json @@ -14,7 +14,6 @@ "default_value": 1, "maximum_value": "1" }, - "machine_nozzle_head_distance": { "default_value": 5 }, "machine_nozzle_offset_x": { "default_value": 19.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, "machine_nozzle_size": { "default_value": 0.4 }, diff --git a/resources/extruders/erzay3d_extruder_0.def.json b/resources/extruders/erzay3d_extruder_0.def.json index 8ba6c573f36..a4082a6224e 100644 --- a/resources/extruders/erzay3d_extruder_0.def.json +++ b/resources/extruders/erzay3d_extruder_0.def.json @@ -10,7 +10,6 @@ "overrides": { "extruder_nr": { "default_value": 0 }, - "machine_nozzle_head_distance": { "default_value": 2.5 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } diff --git a/resources/extruders/maker_starter_extruder_0.def.json b/resources/extruders/maker_starter_extruder_0.def.json index 4154b008623..1a8877f8ef6 100644 --- a/resources/extruders/maker_starter_extruder_0.def.json +++ b/resources/extruders/maker_starter_extruder_0.def.json @@ -10,7 +10,6 @@ "overrides": { "extruder_nr": { "default_value": 0 }, - "machine_nozzle_head_distance": { "default_value": 3 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } diff --git a/resources/extruders/mendel90_extruder_0.def.json b/resources/extruders/mendel90_extruder_0.def.json index b04e2d2fe99..0701164a65b 100644 --- a/resources/extruders/mendel90_extruder_0.def.json +++ b/resources/extruders/mendel90_extruder_0.def.json @@ -10,7 +10,6 @@ "overrides": { "extruder_nr": { "default_value": 0 }, - "machine_nozzle_head_distance": { "default_value": 5 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } diff --git a/resources/extruders/structur3d_discov3ry1_complete_um2plus_extruder_0.def.json b/resources/extruders/structur3d_discov3ry1_complete_um2plus_extruder_0.def.json index ec25298a5c7..0258f9da9c0 100644 --- a/resources/extruders/structur3d_discov3ry1_complete_um2plus_extruder_0.def.json +++ b/resources/extruders/structur3d_discov3ry1_complete_um2plus_extruder_0.def.json @@ -10,7 +10,6 @@ "overrides": { "extruder_nr": { "default_value": 0 }, - "machine_nozzle_head_distance": { "default_value": 5 }, "machine_nozzle_size": { "default_value": 0.84 }, "material_diameter": { "default_value": 3.175 } } diff --git a/resources/extruders/tam_extruder_0.def.json b/resources/extruders/tam_extruder_0.def.json index 4e5cbe42164..b606474ff01 100644 --- a/resources/extruders/tam_extruder_0.def.json +++ b/resources/extruders/tam_extruder_0.def.json @@ -10,7 +10,6 @@ "overrides": { "extruder_nr": { "default_value": 0 }, - "machine_nozzle_head_distance": { "default_value": 3 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } diff --git a/resources/extruders/ultimaker2_extruder_0.def.json b/resources/extruders/ultimaker2_extruder_0.def.json index 3432ace596d..17d0d425df6 100644 --- a/resources/extruders/ultimaker2_extruder_0.def.json +++ b/resources/extruders/ultimaker2_extruder_0.def.json @@ -10,7 +10,6 @@ "overrides": { "extruder_nr": { "default_value": 0 }, - "machine_nozzle_head_distance": { "default_value": 3 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 2.85 } } diff --git a/resources/extruders/ultimaker2_plus_connect_extruder_0.def.json b/resources/extruders/ultimaker2_plus_connect_extruder_0.def.json index 9ad61af3133..0b74aae0194 100644 --- a/resources/extruders/ultimaker2_plus_connect_extruder_0.def.json +++ b/resources/extruders/ultimaker2_plus_connect_extruder_0.def.json @@ -10,7 +10,6 @@ "overrides": { "extruder_nr": { "default_value": 0 }, - "machine_nozzle_head_distance": { "default_value": 5 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 2.85 } } diff --git a/resources/extruders/ultimaker2_plus_extruder_0.def.json b/resources/extruders/ultimaker2_plus_extruder_0.def.json index ace4b5b8131..3fec85805e8 100644 --- a/resources/extruders/ultimaker2_plus_extruder_0.def.json +++ b/resources/extruders/ultimaker2_plus_extruder_0.def.json @@ -10,7 +10,6 @@ "overrides": { "extruder_nr": { "default_value": 0 }, - "machine_nozzle_head_distance": { "default_value": 5 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 2.85 } } diff --git a/resources/i18n/cura.pot b/resources/i18n/cura.pot index 24a5221f4fc..8bf8688e0e9 100644 --- a/resources/i18n/cura.pot +++ b/resources/i18n/cura.pot @@ -215,14 +215,14 @@ msgstr "" msgctxt "@label crash message" msgid "" -"

A fatal error has occurred in Cura. Please send us this Crash Report to fix the problem

\n" +"

A fatal error has occurred in Cura. Please send us this Crash Report to fix the problem

\n" "

Please use the \"Send report\" button to post a bug report automatically to our servers

\n" " " msgstr "" msgctxt "@label crash message" msgid "" -"

Oops, UltiMaker Cura has encountered something that doesn't seem right.

\n" +"

Oops, UltiMaker Cura has encountered something that doesn't seem right.

\n" "

We encountered an unrecoverable error during start up. It was possibly caused by some incorrect configuration files. We suggest to backup and reset your configuration.

\n" "

Backups can be found in the configuration folder.

\n" "

Please send us this Crash Report to fix the problem.

\n" From 1186303b154e7831b7ba02ae1f26478bcf20c203 Mon Sep 17 00:00:00 2001 From: THeijmans Date: Fri, 9 Aug 2024 09:43:52 +0200 Subject: [PATCH 02/24] PP-512 Fix bad print quality for TPU AA08 on Factor 4 --- .../um_f4_aa0.8_tpu_0.2mm.inst.cfg | 3 ++- .../um_f4_aa0.8_tpu_0.3mm.inst.cfg | 26 +++++++++++++++++++ .../um_f4_aa0.8_tpu_0.4mm.inst.cfg | 26 +++++++++++++++++++ 3 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.3mm.inst.cfg create mode 100644 resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.4mm.inst.cfg diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.2mm.inst.cfg index c3291f77a1d..78cbae1205e 100644 --- a/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.2mm.inst.cfg @@ -15,10 +15,11 @@ weight = -2 gradual_flow_discretisation_step_size = 0.1 gradual_flow_enabled = True infill_pattern = ='zigzag' if infill_sparse_density > 50 else 'cross_3d' -infill_sparse_density = 10 +infill_sparse_density = 20 inset_direction = outside_in max_flow_acceleration = 1 skin_material_flow = =material_flow * 0.9 skin_material_flow_layer_0 = 90 speed_layer_0 = 20 +speed_print = 35 diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.3mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.3mm.inst.cfg new file mode 100644 index 00000000000..cdce6ac6cda --- /dev/null +++ b/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.3mm.inst.cfg @@ -0,0 +1,26 @@ +[general] +definition = ultimaker_factor4 +name = Extra Fast +version = 4 + +[metadata] +setting_version = 23 +variant = AA 0.8 +material = generic_tpu +quality_type = verydraft +type = quality +weight = -3 + +[values] +_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1 +_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True +_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 +infill_pattern = ='zigzag' if infill_sparse_density > 50 else 'cross_3d' +infill_sparse_density = 20 +inset_direction = outside_in +material_print_temperature = =default_material_print_temperature + 5 +skin_material_flow = =material_flow * 0.9 +skin_material_flow_layer_0 = 90 +speed_layer_0 = 20 +speed_print = 35 + diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.4mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.4mm.inst.cfg new file mode 100644 index 00000000000..93e89652390 --- /dev/null +++ b/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.4mm.inst.cfg @@ -0,0 +1,26 @@ +[general] +definition = ultimaker_factor4 +name = Sprint +version = 4 + +[metadata] +setting_version = 23 +variant = AA 0.8 +material = generic_tpu +quality_type = superdraft +type = quality +weight = -4 + +[values] +_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1 +_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True +_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 +infill_pattern = ='zigzag' if infill_sparse_density > 50 else 'cross_3d' +infill_sparse_density = 20 +inset_direction = outside_in +material_print_temperature = =default_material_print_temperature + 8 +skin_material_flow = =material_flow * 0.9 +skin_material_flow_layer_0 = 90 +speed_layer_0 = 20 +speed_print = 35 + From e89e578ed9beee8a364ee9b9fa9aa884a653cfe5 Mon Sep 17 00:00:00 2001 From: THeijmans Date: Fri, 9 Aug 2024 07:45:20 +0000 Subject: [PATCH 03/24] Applied printer-linter format --- .../quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.3mm.inst.cfg | 4 ++-- .../quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.4mm.inst.cfg | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.3mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.3mm.inst.cfg index cdce6ac6cda..faca58aaa34 100644 --- a/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.3mm.inst.cfg @@ -4,11 +4,11 @@ name = Extra Fast version = 4 [metadata] -setting_version = 23 -variant = AA 0.8 material = generic_tpu quality_type = verydraft +setting_version = 23 type = quality +variant = AA 0.8 weight = -3 [values] diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.4mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.4mm.inst.cfg index 93e89652390..81dacccf6f7 100644 --- a/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.4mm.inst.cfg @@ -4,11 +4,11 @@ name = Sprint version = 4 [metadata] -setting_version = 23 -variant = AA 0.8 material = generic_tpu quality_type = superdraft +setting_version = 23 type = quality +variant = AA 0.8 weight = -4 [values] From b709f4d90f9be4e69d46de7be2a35252765386e2 Mon Sep 17 00:00:00 2001 From: THeijmans Date: Fri, 23 Aug 2024 09:38:18 +0200 Subject: [PATCH 04/24] Remove the bad print profile that started this whole ticket --- .../um_f4_aa0.8_tpu_0.2mm.inst.cfg | 25 ------------------- 1 file changed, 25 deletions(-) delete mode 100644 resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.2mm.inst.cfg diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.2mm.inst.cfg deleted file mode 100644 index 78cbae1205e..00000000000 --- a/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.2mm.inst.cfg +++ /dev/null @@ -1,25 +0,0 @@ -[general] -definition = ultimaker_factor4 -name = Fast -version = 4 - -[metadata] -material = generic_tpu -quality_type = draft -setting_version = 23 -type = quality -variant = AA 0.8 -weight = -2 - -[values] -gradual_flow_discretisation_step_size = 0.1 -gradual_flow_enabled = True -infill_pattern = ='zigzag' if infill_sparse_density > 50 else 'cross_3d' -infill_sparse_density = 20 -inset_direction = outside_in -max_flow_acceleration = 1 -skin_material_flow = =material_flow * 0.9 -skin_material_flow_layer_0 = 90 -speed_layer_0 = 20 -speed_print = 35 - From 07fc8b8c5b99c9249af3b1e774bc5d53da36fd06 Mon Sep 17 00:00:00 2001 From: Frederic Meeuwissen <13856291+Frederic98@users.noreply.github.com> Date: Fri, 23 Aug 2024 12:05:45 +0200 Subject: [PATCH 05/24] Change GradualFlow plugin setting names --- .../ultimaker_factor4/um_f4_aa0.8_tpu_0.3mm.inst.cfg | 6 +++--- .../ultimaker_factor4/um_f4_aa0.8_tpu_0.4mm.inst.cfg | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.3mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.3mm.inst.cfg index faca58aaa34..7949c64afc2 100644 --- a/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.3mm.inst.cfg @@ -12,13 +12,13 @@ variant = AA 0.8 weight = -3 [values] -_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1 -_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True -_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 +gradual_flow_discretisation_step_size = 0.1 +gradual_flow_enabled = True infill_pattern = ='zigzag' if infill_sparse_density > 50 else 'cross_3d' infill_sparse_density = 20 inset_direction = outside_in material_print_temperature = =default_material_print_temperature + 5 +max_flow_acceleration = 1 skin_material_flow = =material_flow * 0.9 skin_material_flow_layer_0 = 90 speed_layer_0 = 20 diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.4mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.4mm.inst.cfg index 81dacccf6f7..4b1d25bd18e 100644 --- a/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.4mm.inst.cfg @@ -12,13 +12,13 @@ variant = AA 0.8 weight = -4 [values] -_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1 -_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True -_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 +gradual_flow_discretisation_step_size = 0.1 +gradual_flow_enabled = True infill_pattern = ='zigzag' if infill_sparse_density > 50 else 'cross_3d' infill_sparse_density = 20 inset_direction = outside_in material_print_temperature = =default_material_print_temperature + 8 +max_flow_acceleration = 1 skin_material_flow = =material_flow * 0.9 skin_material_flow_layer_0 = 90 speed_layer_0 = 20 From c11c97dde041d257ef5c0cf1198091c068627a47 Mon Sep 17 00:00:00 2001 From: Frederic Meeuwissen <13856291+Frederic98@users.noreply.github.com> Date: Fri, 23 Aug 2024 13:03:49 +0200 Subject: [PATCH 06/24] Fix naming of the 0.3mm layer height profiles --- .../ultimaker_factor4/um_f4_global_Verydraft_Quality.inst.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/quality/ultimaker_factor4/um_f4_global_Verydraft_Quality.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_global_Verydraft_Quality.inst.cfg index 6aa1be79a39..48feef87236 100644 --- a/resources/quality/ultimaker_factor4/um_f4_global_Verydraft_Quality.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_global_Verydraft_Quality.inst.cfg @@ -1,6 +1,6 @@ [general] definition = ultimaker_factor4 -name = Sprint +name = Extra Fast version = 4 [metadata] From 0bf6bba43c4e120eb36353a2d7dc0bb4c057d0ad Mon Sep 17 00:00:00 2001 From: THeijmans Date: Wed, 21 Aug 2024 13:25:30 +0200 Subject: [PATCH 07/24] PP-514 Improve PVA printing quality and reliability on Factor 4 --- .../um_f4_bb0.4_pva_0.15mm.inst.cfg | 16 ++++++++++++++-- .../um_f4_bb0.4_pva_0.1mm.inst.cfg | 17 ++++++++++++++--- .../um_f4_bb0.4_pva_0.2mm.inst.cfg | 17 ++++++++++++++--- .../um_f4_bb0.4_pva_0.3mm.inst.cfg | 17 ++++++++++++++--- .../um_f4_bb0.8_pva_0.2mm.inst.cfg | 16 ++++++++++++++-- .../um_f4_bb0.8_pva_0.3mm.inst.cfg | 16 ++++++++++++++-- .../um_f4_bb0.8_pva_0.4mm.inst.cfg | 16 ++++++++++++++-- 7 files changed, 98 insertions(+), 17 deletions(-) diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.15mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.15mm.inst.cfg index 3294a3a1500..37e9bb8b737 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.15mm.inst.cfg @@ -12,20 +12,32 @@ variant = BB 0.4 weight = -1 [values] +acceleration_print = 1000.0 acceleration_support_bottom = 100 -acceleration_support_interface = 1500 +acceleration_support_interface = 1000 brim_replaces_support = False build_volume_temperature = =40 if extruders_enabled_count > 1 else 35 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 gradual_flow_discretisation_step_size = 0.1 gradual_flow_enabled = True -initial_layer_line_width_factor = 150 +gradual_support_infill_steps = 0 +initial_layer_line_width_factor = 125 +jerk_print = 10 +material_flow_layer_0 = 90 max_flow_acceleration = 1 minimum_support_area = 4 +prime_tower_flow = 90 prime_tower_min_volume = 15 +retraction_min_travel = 5.0 +retraction_prime_speed = 10.0 skin_material_flow = =material_flow * 0.93 +speed_print = 30 +support_angle = 45 +support_infill_rate = 20 support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height support_interface_offset = 1 support_offset = 3 +support_xy_distance = 2 support_z_distance = 0 +switch_extruder_prime_speed = 10.0 diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg index 0f10e4f507a..4c832766413 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg @@ -12,21 +12,32 @@ variant = BB 0.4 weight = 0 [values] +acceleration_print = 1000.0 acceleration_support_bottom = 100 -acceleration_support_interface = 1500 +acceleration_support_interface = 1000 brim_replaces_support = False build_volume_temperature = =40 if extruders_enabled_count > 1 else 35 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 gradual_flow_discretisation_step_size = 0.1 gradual_flow_enabled = True -initial_layer_line_width_factor = 150 +gradual_support_infill_steps = 0 +initial_layer_line_width_factor = 125 +jerk_print = 10 +material_flow_layer_0 = 90 max_flow_acceleration = 1 minimum_support_area = 4 +prime_tower_flow = 90 prime_tower_min_volume = 15 +retraction_min_travel = 5.0 +retraction_prime_speed = 10.0 skin_material_flow = =material_flow * 0.93 -speed_print = 50 +speed_print = 30 +support_angle = 45 +support_infill_rate = 20 support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height support_interface_offset = 1 support_offset = 3 +support_xy_distance = 2 support_z_distance = 0 +switch_extruder_prime_speed = 10.0 diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg index ef920e6fd75..93f62df9839 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg @@ -12,21 +12,32 @@ variant = BB 0.4 weight = -2 [values] +acceleration_print = 1000.0 acceleration_support_bottom = 100 -acceleration_support_interface = 1500 +acceleration_support_interface = 1000 brim_replaces_support = False build_volume_temperature = =40 if extruders_enabled_count > 1 else 35 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 gradual_flow_discretisation_step_size = 0.1 gradual_flow_enabled = True -initial_layer_line_width_factor = 150 +gradual_support_infill_steps = 0 +initial_layer_line_width_factor = 125 +jerk_print = 10 +material_flow_layer_0 = 90 max_flow_acceleration = 1 minimum_support_area = 4 +prime_tower_flow = 90 prime_tower_min_volume = 15 +retraction_min_travel = 5.0 +retraction_prime_speed = 10.0 skin_material_flow = =material_flow * 0.93 -speed_print = 50 +speed_print = 30 +support_angle = 45 +support_infill_rate = 20 support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height support_interface_offset = 1 support_offset = 3 +support_xy_distance = 2 support_z_distance = 0 +switch_extruder_prime_speed = 10.0 diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg index 4165a27a58e..0d946c00923 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg @@ -12,21 +12,32 @@ variant = BB 0.4 weight = -3 [values] +acceleration_print = 1000.0 acceleration_support_bottom = 100 -acceleration_support_interface = 1500 +acceleration_support_interface = 1000 brim_replaces_support = False build_volume_temperature = =40 if extruders_enabled_count > 1 else 35 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 gradual_flow_discretisation_step_size = 0.1 gradual_flow_enabled = True -initial_layer_line_width_factor = 150 +gradual_support_infill_steps = 0 +initial_layer_line_width_factor = 125 +jerk_print = 10 +material_flow_layer_0 = 90 max_flow_acceleration = 1 minimum_support_area = 4 +prime_tower_flow = 90 prime_tower_min_volume = 15 +retraction_min_travel = 5.0 +retraction_prime_speed = 10.0 skin_material_flow = =material_flow * 0.93 -speed_print = 40 +speed_print = 30 +support_angle = 45 +support_infill_rate = 20 support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height support_interface_offset = 1 support_offset = 3 +support_xy_distance = 2 support_z_distance = 0 +switch_extruder_prime_speed = 10.0 diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg index 2963265eece..148a82c9917 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg @@ -12,20 +12,32 @@ variant = BB 0.8 weight = -2 [values] +acceleration_print = 1000.0 acceleration_support_bottom = 100 -acceleration_support_interface = 1500 +acceleration_support_interface = 1000 brim_replaces_support = False build_volume_temperature = =40 if extruders_enabled_count > 1 else 35 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 gradual_flow_discretisation_step_size = 0.1 gradual_flow_enabled = True -initial_layer_line_width_factor = 150 +gradual_support_infill_steps = 0 +initial_layer_line_width_factor = 125 +jerk_print = 10 +material_flow_layer_0 = 90 max_flow_acceleration = 1 minimum_support_area = 4 +prime_tower_flow = 90 prime_tower_min_volume = 15 +retraction_min_travel = 5.0 +retraction_prime_speed = 10.0 skin_material_flow = =material_flow * 0.93 +speed_print = 30 +support_angle = 45 +support_infill_rate = 20 support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height support_interface_offset = 1 support_offset = 3 +support_xy_distance = 2 support_z_distance = 0 +switch_extruder_prime_speed = 10.0 diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg index 0a1437fd300..8ab21460461 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg @@ -12,20 +12,32 @@ variant = BB 0.8 weight = -3 [values] +acceleration_print = 1000.0 acceleration_support_bottom = 100 -acceleration_support_interface = 1500 +acceleration_support_interface = 1000 brim_replaces_support = False build_volume_temperature = =40 if extruders_enabled_count > 1 else 35 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 gradual_flow_discretisation_step_size = 0.1 gradual_flow_enabled = True -initial_layer_line_width_factor = 150 +gradual_support_infill_steps = 0 +initial_layer_line_width_factor = 125 +jerk_print = 10 +material_flow_layer_0 = 90 max_flow_acceleration = 1 minimum_support_area = 4 +prime_tower_flow = 90 prime_tower_min_volume = 15 +retraction_min_travel = 5.0 +retraction_prime_speed = 10.0 skin_material_flow = =material_flow * 0.93 +speed_print = 30 +support_angle = 45 +support_infill_rate = 20 support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height support_interface_offset = 1 support_offset = 3 +support_xy_distance = 2 support_z_distance = 0 +switch_extruder_prime_speed = 10.0 diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg index edd837f8fc2..52134575b0f 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg @@ -12,20 +12,32 @@ variant = BB 0.8 weight = -4 [values] +acceleration_print = 1000.0 acceleration_support_bottom = 100 -acceleration_support_interface = 1500 +acceleration_support_interface = 1000 brim_replaces_support = False build_volume_temperature = =40 if extruders_enabled_count > 1 else 35 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 gradual_flow_discretisation_step_size = 0.1 gradual_flow_enabled = True -initial_layer_line_width_factor = 150 +gradual_support_infill_steps = 0 +initial_layer_line_width_factor = 125 +jerk_print = 10 +material_flow_layer_0 = 90 max_flow_acceleration = 1 minimum_support_area = 4 +prime_tower_flow = 90 prime_tower_min_volume = 15 +retraction_min_travel = 5.0 +retraction_prime_speed = 10.0 skin_material_flow = =material_flow * 0.93 +speed_print = 30 +support_angle = 45 +support_infill_rate = 20 support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height support_interface_offset = 1 support_offset = 3 +support_xy_distance = 2 support_z_distance = 0 +switch_extruder_prime_speed = 10.0 From 4064dddacc2c48c8152c377c6a387dd67739e7c2 Mon Sep 17 00:00:00 2001 From: Frederic Meeuwissen <13856291+Frederic98@users.noreply.github.com> Date: Mon, 26 Aug 2024 13:12:03 +0200 Subject: [PATCH 08/24] Only convert to yes/no if value is a boolean --- plugins/XmlMaterialProfile/XmlMaterialProfile.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index 980288e3c98..d054f054854 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -1083,9 +1083,8 @@ def _addSettingElement(self, builder, instance): # Skip material properties (eg diameter) or metadata (eg GUID) return - truth_map = { True: "yes", False: "no" } - if tag_name != "cura:setting" and instance.value in truth_map: - data = truth_map[instance.value] + if tag_name != "cura:setting" and isinstance(instance.value, bool): + data = "yes" if instance.value else "no" else: data = str(instance.value) From 8e05bb49e183024cd08fe70d052b702d2f34f8c2 Mon Sep 17 00:00:00 2001 From: THeijmans Date: Wed, 21 Aug 2024 13:25:30 +0200 Subject: [PATCH 09/24] PP-514 Improve PVA printing quality and reliability on Factor 4 --- .../um_f4_bb0.4_pva_0.15mm.inst.cfg | 16 ++++++++++++++-- .../um_f4_bb0.4_pva_0.1mm.inst.cfg | 17 ++++++++++++++--- .../um_f4_bb0.4_pva_0.2mm.inst.cfg | 17 ++++++++++++++--- .../um_f4_bb0.4_pva_0.3mm.inst.cfg | 17 ++++++++++++++--- .../um_f4_bb0.8_pva_0.2mm.inst.cfg | 16 ++++++++++++++-- .../um_f4_bb0.8_pva_0.3mm.inst.cfg | 16 ++++++++++++++-- .../um_f4_bb0.8_pva_0.4mm.inst.cfg | 16 ++++++++++++++-- 7 files changed, 98 insertions(+), 17 deletions(-) diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.15mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.15mm.inst.cfg index bae4a519f31..380ea30c1e6 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.15mm.inst.cfg @@ -15,17 +15,29 @@ weight = -1 _plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1 _plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 +acceleration_print = 1000.0 acceleration_support_bottom = 100 -acceleration_support_interface = 1500 +acceleration_support_interface = 1000 brim_replaces_support = False build_volume_temperature = =40 if extruders_enabled_count > 1 else 35 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 -initial_layer_line_width_factor = 150 +gradual_support_infill_steps = 0 +initial_layer_line_width_factor = 125 +jerk_print = 10 +material_flow_layer_0 = 90 minimum_support_area = 4 +prime_tower_flow = 90 prime_tower_min_volume = 15 +retraction_min_travel = 5.0 +retraction_prime_speed = 10.0 skin_material_flow = =material_flow * 0.93 +speed_print = 30 +support_angle = 45 +support_infill_rate = 20 support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height support_interface_offset = 1 support_offset = 3 +support_xy_distance = 2 support_z_distance = 0 +switch_extruder_prime_speed = 10.0 diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg index 95b7c1856db..4123824c43a 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg @@ -15,18 +15,29 @@ weight = 0 _plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1 _plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 +acceleration_print = 1000.0 acceleration_support_bottom = 100 -acceleration_support_interface = 1500 +acceleration_support_interface = 1000 brim_replaces_support = False build_volume_temperature = =40 if extruders_enabled_count > 1 else 35 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 -initial_layer_line_width_factor = 150 +gradual_support_infill_steps = 0 +initial_layer_line_width_factor = 125 +jerk_print = 10 +material_flow_layer_0 = 90 minimum_support_area = 4 +prime_tower_flow = 90 prime_tower_min_volume = 15 +retraction_min_travel = 5.0 +retraction_prime_speed = 10.0 skin_material_flow = =material_flow * 0.93 -speed_print = 50 +speed_print = 30 +support_angle = 45 +support_infill_rate = 20 support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height support_interface_offset = 1 support_offset = 3 +support_xy_distance = 2 support_z_distance = 0 +switch_extruder_prime_speed = 10.0 diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg index 8de45aa01b5..f6cd7f65a72 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg @@ -15,18 +15,29 @@ weight = -2 _plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1 _plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 +acceleration_print = 1000.0 acceleration_support_bottom = 100 -acceleration_support_interface = 1500 +acceleration_support_interface = 1000 brim_replaces_support = False build_volume_temperature = =40 if extruders_enabled_count > 1 else 35 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 -initial_layer_line_width_factor = 150 +gradual_support_infill_steps = 0 +initial_layer_line_width_factor = 125 +jerk_print = 10 +material_flow_layer_0 = 90 minimum_support_area = 4 +prime_tower_flow = 90 prime_tower_min_volume = 15 +retraction_min_travel = 5.0 +retraction_prime_speed = 10.0 skin_material_flow = =material_flow * 0.93 -speed_print = 50 +speed_print = 30 +support_angle = 45 +support_infill_rate = 20 support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height support_interface_offset = 1 support_offset = 3 +support_xy_distance = 2 support_z_distance = 0 +switch_extruder_prime_speed = 10.0 diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg index be24017486a..69f33c5232b 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg @@ -15,18 +15,29 @@ weight = -3 _plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1 _plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 +acceleration_print = 1000.0 acceleration_support_bottom = 100 -acceleration_support_interface = 1500 +acceleration_support_interface = 1000 brim_replaces_support = False build_volume_temperature = =40 if extruders_enabled_count > 1 else 35 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 -initial_layer_line_width_factor = 150 +gradual_support_infill_steps = 0 +initial_layer_line_width_factor = 125 +jerk_print = 10 +material_flow_layer_0 = 90 minimum_support_area = 4 +prime_tower_flow = 90 prime_tower_min_volume = 15 +retraction_min_travel = 5.0 +retraction_prime_speed = 10.0 skin_material_flow = =material_flow * 0.93 -speed_print = 40 +speed_print = 30 +support_angle = 45 +support_infill_rate = 20 support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height support_interface_offset = 1 support_offset = 3 +support_xy_distance = 2 support_z_distance = 0 +switch_extruder_prime_speed = 10.0 diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg index 1e1ab101f45..f5241e08e72 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg @@ -15,17 +15,29 @@ weight = -2 _plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1 _plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 +acceleration_print = 1000.0 acceleration_support_bottom = 100 -acceleration_support_interface = 1500 +acceleration_support_interface = 1000 brim_replaces_support = False build_volume_temperature = =40 if extruders_enabled_count > 1 else 35 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 -initial_layer_line_width_factor = 150 +gradual_support_infill_steps = 0 +initial_layer_line_width_factor = 125 +jerk_print = 10 +material_flow_layer_0 = 90 minimum_support_area = 4 +prime_tower_flow = 90 prime_tower_min_volume = 15 +retraction_min_travel = 5.0 +retraction_prime_speed = 10.0 skin_material_flow = =material_flow * 0.93 +speed_print = 30 +support_angle = 45 +support_infill_rate = 20 support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height support_interface_offset = 1 support_offset = 3 +support_xy_distance = 2 support_z_distance = 0 +switch_extruder_prime_speed = 10.0 diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg index 2ae11eb4418..e226d1737f6 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg @@ -15,17 +15,29 @@ weight = -3 _plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1 _plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 +acceleration_print = 1000.0 acceleration_support_bottom = 100 -acceleration_support_interface = 1500 +acceleration_support_interface = 1000 brim_replaces_support = False build_volume_temperature = =40 if extruders_enabled_count > 1 else 35 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 -initial_layer_line_width_factor = 150 +gradual_support_infill_steps = 0 +initial_layer_line_width_factor = 125 +jerk_print = 10 +material_flow_layer_0 = 90 minimum_support_area = 4 +prime_tower_flow = 90 prime_tower_min_volume = 15 +retraction_min_travel = 5.0 +retraction_prime_speed = 10.0 skin_material_flow = =material_flow * 0.93 +speed_print = 30 +support_angle = 45 +support_infill_rate = 20 support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height support_interface_offset = 1 support_offset = 3 +support_xy_distance = 2 support_z_distance = 0 +switch_extruder_prime_speed = 10.0 diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg index 448152ca8ee..d6b9e95ace8 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg @@ -15,17 +15,29 @@ weight = -4 _plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1 _plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 +acceleration_print = 1000.0 acceleration_support_bottom = 100 -acceleration_support_interface = 1500 +acceleration_support_interface = 1000 brim_replaces_support = False build_volume_temperature = =40 if extruders_enabled_count > 1 else 35 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 -initial_layer_line_width_factor = 150 +gradual_support_infill_steps = 0 +initial_layer_line_width_factor = 125 +jerk_print = 10 +material_flow_layer_0 = 90 minimum_support_area = 4 +prime_tower_flow = 90 prime_tower_min_volume = 15 +retraction_min_travel = 5.0 +retraction_prime_speed = 10.0 skin_material_flow = =material_flow * 0.93 +speed_print = 30 +support_angle = 45 +support_infill_rate = 20 support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height support_interface_offset = 1 support_offset = 3 +support_xy_distance = 2 support_z_distance = 0 +switch_extruder_prime_speed = 10.0 From dc2a6cb8bf89e135039513514be59db27ef866cf Mon Sep 17 00:00:00 2001 From: HellAholic Date: Wed, 28 Aug 2024 14:58:08 +0200 Subject: [PATCH 10/24] TPU changes --- .../um_f4_aa0.8_tpu_0.3mm.inst.cfg | 26 +++++++++++++++++++ ...nst.cfg => um_f4_aa0.8_tpu_0.4mm.inst.cfg} | 10 ++++--- .../um_f4_global_Verydraft_Quality.inst.cfg | 2 +- 3 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.3mm.inst.cfg rename resources/quality/ultimaker_factor4/{um_f4_aa0.8_tpu_0.2mm.inst.cfg => um_f4_aa0.8_tpu_0.4mm.inst.cfg} (77%) diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.3mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.3mm.inst.cfg new file mode 100644 index 00000000000..faca58aaa34 --- /dev/null +++ b/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.3mm.inst.cfg @@ -0,0 +1,26 @@ +[general] +definition = ultimaker_factor4 +name = Extra Fast +version = 4 + +[metadata] +material = generic_tpu +quality_type = verydraft +setting_version = 23 +type = quality +variant = AA 0.8 +weight = -3 + +[values] +_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1 +_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True +_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 +infill_pattern = ='zigzag' if infill_sparse_density > 50 else 'cross_3d' +infill_sparse_density = 20 +inset_direction = outside_in +material_print_temperature = =default_material_print_temperature + 5 +skin_material_flow = =material_flow * 0.9 +skin_material_flow_layer_0 = 90 +speed_layer_0 = 20 +speed_print = 35 + diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.4mm.inst.cfg similarity index 77% rename from resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.2mm.inst.cfg rename to resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.4mm.inst.cfg index 7db0c220f4b..81dacccf6f7 100644 --- a/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.4mm.inst.cfg @@ -1,24 +1,26 @@ [general] definition = ultimaker_factor4 -name = Fast +name = Sprint version = 4 [metadata] material = generic_tpu -quality_type = draft +quality_type = superdraft setting_version = 23 type = quality variant = AA 0.8 -weight = -2 +weight = -4 [values] _plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1 _plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 infill_pattern = ='zigzag' if infill_sparse_density > 50 else 'cross_3d' -infill_sparse_density = 10 +infill_sparse_density = 20 inset_direction = outside_in +material_print_temperature = =default_material_print_temperature + 8 skin_material_flow = =material_flow * 0.9 skin_material_flow_layer_0 = 90 speed_layer_0 = 20 +speed_print = 35 diff --git a/resources/quality/ultimaker_factor4/um_f4_global_Verydraft_Quality.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_global_Verydraft_Quality.inst.cfg index 6aa1be79a39..48feef87236 100644 --- a/resources/quality/ultimaker_factor4/um_f4_global_Verydraft_Quality.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_global_Verydraft_Quality.inst.cfg @@ -1,6 +1,6 @@ [general] definition = ultimaker_factor4 -name = Sprint +name = Extra Fast version = 4 [metadata] From c7a286b33a1ca090fb2131399083a5449442b587 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Wed, 28 Aug 2024 13:16:33 +0000 Subject: [PATCH 11/24] Set conan package version 5.8.1 --- conandata.yml | 14 +++++++------- resources/conandata.yml | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/conandata.yml b/conandata.yml index 83bfd935a0c..5a99882ab1a 100644 --- a/conandata.yml +++ b/conandata.yml @@ -1,17 +1,17 @@ -version: "5.8.0" +version: "5.8.1" requirements: - - "cura_resources/5.8.0" - - "uranium/5.8.0" - - "curaengine/5.8.0" - - "cura_binary_data/5.8.0" - - "fdm_materials/5.8.0" + - "cura_resources/5.8.1" + - "uranium/5.8.1" + - "curaengine/5.8.1" + - "cura_binary_data/5.8.1" + - "fdm_materials/5.8.1" - "curaengine_plugin_gradual_flow/0.1.0-beta.4" - "dulcificum/0.2.1" - "pysavitar/5.3.0" - "pynest2d/5.3.0" - "native_cad_plugin/2.0.0" requirements_internal: - - "fdm_materials/5.8.0" + - "fdm_materials/5.8.1" - "cura_private_data/(latest)@internal/testing" urls: default: diff --git a/resources/conandata.yml b/resources/conandata.yml index d43b7d4dd2e..7d5a43c8917 100644 --- a/resources/conandata.yml +++ b/resources/conandata.yml @@ -1 +1 @@ -version: "5.8.0" +version: "5.8.1" From bcd74aac3a11dfde9ce073d4b0f7ed759bff1729 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Wed, 28 Aug 2024 17:08:57 +0200 Subject: [PATCH 12/24] Revert "TPU removal of 0.2mm" Requires upgrade script --- .../um_f4_aa0.8_tpu_0.2mm.inst.cfg | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.2mm.inst.cfg diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.2mm.inst.cfg new file mode 100644 index 00000000000..7db0c220f4b --- /dev/null +++ b/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.2mm.inst.cfg @@ -0,0 +1,24 @@ +[general] +definition = ultimaker_factor4 +name = Fast +version = 4 + +[metadata] +material = generic_tpu +quality_type = draft +setting_version = 23 +type = quality +variant = AA 0.8 +weight = -2 + +[values] +_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1 +_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True +_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 +infill_pattern = ='zigzag' if infill_sparse_density > 50 else 'cross_3d' +infill_sparse_density = 10 +inset_direction = outside_in +skin_material_flow = =material_flow * 0.9 +skin_material_flow_layer_0 = 90 +speed_layer_0 = 20 + From 63ff5517541d5d5973b433236508ebf70a85e3fd Mon Sep 17 00:00:00 2001 From: HellAholic Date: Wed, 28 Aug 2024 17:34:17 +0200 Subject: [PATCH 13/24] 5.8.1 changelog --- resources/texts/change_log.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/resources/texts/change_log.txt b/resources/texts/change_log.txt index cb5aa3d2a67..237caedea9a 100644 --- a/resources/texts/change_log.txt +++ b/resources/texts/change_log.txt @@ -1,3 +1,11 @@ +[5.8.1] + +* Bug fixes: +- Fixed an issue where materials could not be synced to UltiMaker Printers + +* Profile Improvements +- Significant improvements for PVA and TPU 95A profiles for UltiMaker Factor 4 + [5.8] * New Z Seam Settings: From d0252554c40c843da37506405e31d38b16103c20 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 3 Sep 2024 18:23:41 +0200 Subject: [PATCH 14/24] Make extra sure cache is emptied when objects get altered. See the (new) cachePerInstance decorator in UM/Decorators, and the accompanying CachedMemberFunction handler-class. part of CURA-11761 --- cura/Settings/CuraContainerStack.py | 3 ++- cura/Settings/ExtruderStack.py | 3 ++- plugins/XmlMaterialProfile/XmlMaterialProfile.py | 6 ++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/cura/Settings/CuraContainerStack.py b/cura/Settings/CuraContainerStack.py index b5b8a1b7213..ef1c9561afd 100755 --- a/cura/Settings/CuraContainerStack.py +++ b/cura/Settings/CuraContainerStack.py @@ -5,7 +5,7 @@ from PyQt6.QtCore import pyqtProperty, pyqtSignal, QObject from UM.Application import Application -from UM.Decorators import override +from UM.Decorators import CachedMemberFunctions, override from UM.FlameProfiler import pyqtSlot from UM.Logger import Logger from UM.Settings.ContainerStack import ContainerStack, InvalidContainerStackError @@ -237,6 +237,7 @@ def setProperty(self, key: str, property_name: str, property_value: Any, contain :param new_value: The new value to set the property to. """ + CachedMemberFunctions.clearInstanceCache(self) container_index = _ContainerIndexes.UserChanges self._containers[container_index].setProperty(key, property_name, property_value, container, set_from_cache) diff --git a/cura/Settings/ExtruderStack.py b/cura/Settings/ExtruderStack.py index eba41569b79..645abeb0f62 100644 --- a/cura/Settings/ExtruderStack.py +++ b/cura/Settings/ExtruderStack.py @@ -5,7 +5,7 @@ from PyQt6.QtCore import pyqtProperty, pyqtSignal -from UM.Decorators import override +from UM.Decorators import CachedMemberFunctions, override from UM.MimeTypeDatabase import MimeType, MimeTypeDatabase from UM.Settings.ContainerStack import ContainerStack from UM.Settings.ContainerRegistry import ContainerRegistry @@ -86,6 +86,7 @@ def getCompatibleMaterialDiameter(self) -> float: def setCompatibleMaterialDiameter(self, value: float) -> None: old_approximate_diameter = self.getApproximateMaterialDiameter() if self.getCompatibleMaterialDiameter() != value: + CachedMemberFunctions.clearInstanceCache(self) self.definitionChanges.setProperty("material_diameter", "value", value) self.compatibleMaterialDiameterChanged.emit() diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index 49b5e7661dc..c56c527f929 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -11,6 +11,7 @@ from UM.PluginRegistry import PluginRegistry from UM.Resources import Resources from UM.Logger import Logger +from UM.Decorators import CachedMemberFunctions import UM.Dictionary from UM.Settings.InstanceContainer import InstanceContainer from UM.Settings.ContainerRegistry import ContainerRegistry @@ -71,6 +72,8 @@ def setMetaDataEntry(self, key, value, apply_to_all = True): Logger.log("w", "Can't change metadata {key} of material {material_id} because it's read-only.".format(key = key, material_id = self.getId())) return + CachedMemberFunctions.clearInstanceCache(self) + # Some metadata such as diameter should also be instantiated to be a setting. Go though all values for the # "properties" field and apply the new values to SettingInstances as well. new_setting_values_dict = {} @@ -480,6 +483,7 @@ def _combineElement(first, second): first.append(element) def clearData(self): + CachedMemberFunctions.clearInstanceCache(self) self._metadata = { "id": self.getId(), "name": "" @@ -519,6 +523,8 @@ def getMetadataFromSerialized(cls, serialized: str, property_name: str) -> str: def deserialize(self, serialized, file_name = None): """Overridden from InstanceContainer""" + CachedMemberFunctions.clearInstanceCache(self) + containers_to_add = [] # update the serialized data first from UM.Settings.Interfaces import ContainerInterface From 41bbf5a951e476e1eca140ef5686776bae9caa43 Mon Sep 17 00:00:00 2001 From: THeijmans Date: Fri, 6 Sep 2024 10:41:19 +0200 Subject: [PATCH 15/24] PP-519 Update printhead size for Factor 4 --- resources/definitions/ultimaker_factor4.def.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/definitions/ultimaker_factor4.def.json b/resources/definitions/ultimaker_factor4.def.json index 573b26cf506..5945d3a2628 100644 --- a/resources/definitions/ultimaker_factor4.def.json +++ b/resources/definitions/ultimaker_factor4.def.json @@ -112,10 +112,10 @@ "machine_head_with_fans_polygon": { "default_value": [ - [-30, -80], - [-30, 20], - [50, 20], - [50, -80] + [-35, -80], + [-35, 30], + [55, 30], + [55, -80] ] }, "machine_heated_bed": { "default_value": true }, From 9b86f80a0e9122d98f975fa8fc38fe95f033ea8f Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 18 Sep 2024 15:38:55 +0200 Subject: [PATCH 16/24] Don't generate release description according to input --- .github/workflows/release-process_release-candidate.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index d14701d2780..961fe1ed49d 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -9,6 +9,11 @@ on: required: true type: string + publish_release_description: + description: 'Publish the description of the release based on the changelog' + required: true + type: bool + jobs: parse-version: name: Parse input version string @@ -153,6 +158,7 @@ jobs: ref: ${{ needs.parse-version.outputs.branch_name }} - name: Extract changelog + if: ${{ inputs.publish_release_description }} run: python ./scripts/extract_changelog.py --version ${{ needs.parse-version.outputs.version_major }}.${{ needs.parse-version.outputs.version_minor }}.${{ needs.parse-version.outputs.version_patch }} --changelog ./resources/texts/change_log.txt > formatted_changelog.txt - name: Create release From 5373d6fe5438a7afa420c5f0bd04611d408c67c9 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 18 Sep 2024 15:42:44 +0200 Subject: [PATCH 17/24] Set proper input type --- .github/workflows/release-process_release-candidate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 961fe1ed49d..978209d0d22 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -12,7 +12,7 @@ on: publish_release_description: description: 'Publish the description of the release based on the changelog' required: true - type: bool + type: boolean jobs: parse-version: From b334717a11c3319844583377a4be85775adf6a5a Mon Sep 17 00:00:00 2001 From: rburema Date: Wed, 18 Sep 2024 15:50:10 +0000 Subject: [PATCH 18/24] Applied printer-linter format --- .../ultimaker_factor4/um_f4_bb0.4_pva_0.15mm.inst.cfg | 5 +++-- .../quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg | 4 ++-- .../quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg | 4 ++-- .../quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg | 4 ++-- .../quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg | 4 ++-- .../quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg | 4 ++-- .../quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg | 4 ++-- 7 files changed, 15 insertions(+), 14 deletions(-) diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.15mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.15mm.inst.cfg index 61097b4bedb..37e9bb8b737 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.15mm.inst.cfg @@ -20,11 +20,11 @@ build_volume_temperature = =40 if extruders_enabled_count > 1 else 35 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 gradual_flow_discretisation_step_size = 0.1 gradual_flow_enabled = True -initial_layer_line_width_factor = 125 -max_flow_acceleration = 1 gradual_support_infill_steps = 0 +initial_layer_line_width_factor = 125 jerk_print = 10 material_flow_layer_0 = 90 +max_flow_acceleration = 1 minimum_support_area = 4 prime_tower_flow = 90 prime_tower_min_volume = 15 @@ -40,3 +40,4 @@ support_offset = 3 support_xy_distance = 2 support_z_distance = 0 switch_extruder_prime_speed = 10.0 + diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg index 3c6b85079bf..4c832766413 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg @@ -20,11 +20,11 @@ build_volume_temperature = =40 if extruders_enabled_count > 1 else 35 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 gradual_flow_discretisation_step_size = 0.1 gradual_flow_enabled = True -initial_layer_line_width_factor = 125 -max_flow_acceleration = 1 gradual_support_infill_steps = 0 +initial_layer_line_width_factor = 125 jerk_print = 10 material_flow_layer_0 = 90 +max_flow_acceleration = 1 minimum_support_area = 4 prime_tower_flow = 90 prime_tower_min_volume = 15 diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg index 6c6f1a7955f..93f62df9839 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg @@ -20,11 +20,11 @@ build_volume_temperature = =40 if extruders_enabled_count > 1 else 35 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 gradual_flow_discretisation_step_size = 0.1 gradual_flow_enabled = True -initial_layer_line_width_factor = 125 -max_flow_acceleration = 1 gradual_support_infill_steps = 0 +initial_layer_line_width_factor = 125 jerk_print = 10 material_flow_layer_0 = 90 +max_flow_acceleration = 1 minimum_support_area = 4 prime_tower_flow = 90 prime_tower_min_volume = 15 diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg index 1cca9ee3d8b..0d946c00923 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg @@ -20,11 +20,11 @@ build_volume_temperature = =40 if extruders_enabled_count > 1 else 35 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 gradual_flow_discretisation_step_size = 0.1 gradual_flow_enabled = True -initial_layer_line_width_factor = 125 -max_flow_acceleration = 1 gradual_support_infill_steps = 0 +initial_layer_line_width_factor = 125 jerk_print = 10 material_flow_layer_0 = 90 +max_flow_acceleration = 1 minimum_support_area = 4 prime_tower_flow = 90 prime_tower_min_volume = 15 diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg index 4a6144c06c5..148a82c9917 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg @@ -20,11 +20,11 @@ build_volume_temperature = =40 if extruders_enabled_count > 1 else 35 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 gradual_flow_discretisation_step_size = 0.1 gradual_flow_enabled = True -initial_layer_line_width_factor = 125 -max_flow_acceleration = 1 gradual_support_infill_steps = 0 +initial_layer_line_width_factor = 125 jerk_print = 10 material_flow_layer_0 = 90 +max_flow_acceleration = 1 minimum_support_area = 4 prime_tower_flow = 90 prime_tower_min_volume = 15 diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg index 402fe9642dc..8ab21460461 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg @@ -20,11 +20,11 @@ build_volume_temperature = =40 if extruders_enabled_count > 1 else 35 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 gradual_flow_discretisation_step_size = 0.1 gradual_flow_enabled = True -initial_layer_line_width_factor = 125 -max_flow_acceleration = 1 gradual_support_infill_steps = 0 +initial_layer_line_width_factor = 125 jerk_print = 10 material_flow_layer_0 = 90 +max_flow_acceleration = 1 minimum_support_area = 4 prime_tower_flow = 90 prime_tower_min_volume = 15 diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg index bad9ccb92c6..52134575b0f 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg @@ -20,11 +20,11 @@ build_volume_temperature = =40 if extruders_enabled_count > 1 else 35 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 gradual_flow_discretisation_step_size = 0.1 gradual_flow_enabled = True -initial_layer_line_width_factor = 125 -max_flow_acceleration = 1 gradual_support_infill_steps = 0 +initial_layer_line_width_factor = 125 jerk_print = 10 material_flow_layer_0 = 90 +max_flow_acceleration = 1 minimum_support_area = 4 prime_tower_flow = 90 prime_tower_min_volume = 15 From f0cbd8e8024c3e3716af156b42a00ee726622e93 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 19 Sep 2024 11:00:09 +0200 Subject: [PATCH 19/24] Restore lost change after an errored merge This reverts commit 946bf033066e561827da4d00afbc3b680cd7e552. --- .github/ISSUE_TEMPLATE/SlicingCrash.yaml | 6 +- conandata.yml | 2 +- cura/API/Interface/Settings.py | 62 +++++++++- cura/PrinterOutput/FormatMaps.py | 106 ++++++++++++++++++ .../Models/ExtruderConfigurationModel.py | 15 +-- .../Models/MaterialOutputModel.py | 30 +---- .../NetworkedPrinterOutputDevice.py | 13 +-- plugins/3MFWriter/ThreeMFWriter.py | 16 +-- plugins/CuraEngineBackend/StartSliceJob.py | 7 +- plugins/MakerbotWriter/MakerbotWriter.py | 27 ++++- plugins/UFPWriter/UFPWriter.py | 58 +--------- .../XmlMaterialProfile/XmlMaterialProfile.py | 30 +---- .../definitions/Mark2_for_Ultimaker2.def.json | 1 - resources/definitions/atom3.def.json | 1 - resources/definitions/creality_crm4.def.json | 18 +++ resources/definitions/diy220.def.json | 1 - resources/definitions/dxu.def.json | 1 - resources/definitions/erzay3d.def.json | 1 - resources/definitions/fdmextruder.def.json | 11 ++ resources/definitions/fdmprinter.def.json | 54 +++++++-- resources/definitions/maker_starter.def.json | 1 - resources/definitions/mendel90.def.json | 1 - ...tur3d_discov3ry1_complete_um2plus.def.json | 1 - resources/definitions/tam.def.json | 1 - resources/definitions/ultimaker2.def.json | 1 - .../definitions/ultimaker2_plus.def.json | 1 - .../ultimaker2_plus_connect.def.json | 1 - resources/extruders/Mark2_extruder1.def.json | 1 + resources/extruders/Mark2_extruder2.def.json | 1 + resources/extruders/atom3_extruder_0.def.json | 1 + .../extruders/diy220_extruder_0.def.json | 1 + resources/extruders/dxu_extruder1.def.json | 1 + resources/extruders/dxu_extruder2.def.json | 1 + .../extruders/erzay3d_extruder_0.def.json | 1 + .../maker_starter_extruder_0.def.json | 1 + .../extruders/mendel90_extruder_0.def.json | 1 + ...v3ry1_complete_um2plus_extruder_0.def.json | 1 + resources/extruders/tam_extruder_0.def.json | 1 + .../extruders/ultimaker2_extruder_0.def.json | 1 + ...ltimaker2_plus_connect_extruder_0.def.json | 1 + .../ultimaker2_plus_extruder_0.def.json | 1 + resources/i18n/cura.pot | 4 +- .../texts}/product_to_id.json | 0 43 files changed, 320 insertions(+), 165 deletions(-) create mode 100644 cura/PrinterOutput/FormatMaps.py create mode 100644 resources/definitions/creality_crm4.def.json rename {plugins/XmlMaterialProfile => resources/texts}/product_to_id.json (100%) diff --git a/.github/ISSUE_TEMPLATE/SlicingCrash.yaml b/.github/ISSUE_TEMPLATE/SlicingCrash.yaml index 0d939776272..06025886a27 100644 --- a/.github/ISSUE_TEMPLATE/SlicingCrash.yaml +++ b/.github/ISSUE_TEMPLATE/SlicingCrash.yaml @@ -6,9 +6,9 @@ body: attributes: value: | ### ✨Try our improved Cura 5.7✨ - Before filling out the report below, we want you to try the latest Cura 5.7 Beta. + Before filling out the report below, we want you to try the latest Cura 5.7. This version of Cura has become significantly more reliable and has an updated slicing engine that will automatically send a report to the Cura Team for analysis. - #### [You can find the downloads here](https://github.com/Ultimaker/Cura/releases/tag/5.7.0-beta.1) #### + #### [You can find the downloads here](https://github.com/Ultimaker/Cura/releases/latest) #### If you still encounter a crash you are still welcome to report the issue so we can use your model as a test case, you can find instructions on how to do that below. ### Project File @@ -35,7 +35,7 @@ body: - type: markdown attributes: value: | - We work hard on improving our slicing crashes. Our most recent release is 5.6.0. + We work hard on improving our slicing crashes. Our most recent release is 5.7.1. If you are not on the latest version of Cura, [you can download it here](https://github.com/Ultimaker/Cura/releases/latest) - type: input attributes: diff --git a/conandata.yml b/conandata.yml index 4faaed19c1c..eda0a7c1648 100644 --- a/conandata.yml +++ b/conandata.yml @@ -1,4 +1,4 @@ -version: "5.8.1" +version: "5.9.0-alpha.0" requirements: - "cura_resources/(latest)@ultimaker/testing" - "uranium/(latest)@ultimaker/testing" diff --git a/cura/API/Interface/Settings.py b/cura/API/Interface/Settings.py index 706a6d8c74a..084023b9bd9 100644 --- a/cura/API/Interface/Settings.py +++ b/cura/API/Interface/Settings.py @@ -1,7 +1,13 @@ # Copyright (c) 2018 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from typing import TYPE_CHECKING +from dataclasses import asdict + +from typing import cast, Dict, TYPE_CHECKING + +from UM.Settings.InstanceContainer import InstanceContainer +from UM.Settings.SettingFunction import SettingFunction +from cura.Settings.GlobalStack import GlobalStack if TYPE_CHECKING: from cura.CuraApplication import CuraApplication @@ -47,3 +53,57 @@ def getContextMenuItems(self) -> list: """ return self.application.getSidebarCustomMenuItems() + + def getSliceMetadata(self) -> Dict[str, Dict[str, Dict[str, str]]]: + """Get all changed settings and all settings. For each extruder and the global stack""" + print_information = self.application.getPrintInformation() + machine_manager = self.application.getMachineManager() + settings = { + "material": { + "length": print_information.materialLengths, + "weight": print_information.materialWeights, + "cost": print_information.materialCosts, + }, + "global": { + "changes": {}, + "all_settings": {}, + }, + "quality": asdict(machine_manager.activeQualityDisplayNameMap()), + } + + def _retrieveValue(container: InstanceContainer, setting_: str): + value_ = container.getProperty(setting_, "value") + for _ in range(0, 1024): # Prevent possibly endless loop by not using a limit. + if not isinstance(value_, SettingFunction): + return value_ # Success! + value_ = value_(container) + return 0 # Fallback value after breaking possibly endless loop. + + global_stack = cast(GlobalStack, self.application.getGlobalContainerStack()) + + # Add global user or quality changes + global_flattened_changes = InstanceContainer.createMergedInstanceContainer(global_stack.userChanges, global_stack.qualityChanges) + for setting in global_flattened_changes.getAllKeys(): + settings["global"]["changes"][setting] = _retrieveValue(global_flattened_changes, setting) + + # Get global all settings values without user or quality changes + for setting in global_stack.getAllKeys(): + settings["global"]["all_settings"][setting] = _retrieveValue(global_stack, setting) + + for i, extruder in enumerate(global_stack.extruderList): + # Add extruder fields to settings dictionary + settings[f"extruder_{i}"] = { + "changes": {}, + "all_settings": {}, + } + + # Add extruder user or quality changes + extruder_flattened_changes = InstanceContainer.createMergedInstanceContainer(extruder.userChanges, extruder.qualityChanges) + for setting in extruder_flattened_changes.getAllKeys(): + settings[f"extruder_{i}"]["changes"][setting] = _retrieveValue(extruder_flattened_changes, setting) + + # Get extruder all settings values without user or quality changes + for setting in extruder.getAllKeys(): + settings[f"extruder_{i}"]["all_settings"][setting] = _retrieveValue(extruder, setting) + + return settings diff --git a/cura/PrinterOutput/FormatMaps.py b/cura/PrinterOutput/FormatMaps.py new file mode 100644 index 00000000000..b8ad4df2a20 --- /dev/null +++ b/cura/PrinterOutput/FormatMaps.py @@ -0,0 +1,106 @@ +# Copyright (c) 2024 UltiMaker +# Cura is released under the terms of the LGPLv3 or higher. + +from UM.Resources import Resources + +import json +from typing import Dict, List, Optional + +class FormatMaps: + + # A map from the printer-type in their native file-formats to the internal name we use. + PRINTER_TYPE_NAME = { + "fire_e": "ultimaker_method", + "lava_f": "ultimaker_methodx", + "magma_10": "ultimaker_methodxl", + "sketch": "ultimaker_sketch" + } + + # A map from the extruder-name in their native file-formats to the internal name we use. + EXTRUDER_NAME_MAP = { + "mk14_hot": "1XA", + "mk14_hot_s": "2XA", + "mk14_c": "1C", + "mk14": "1A", + "mk14_s": "2A", + "mk14_e": "LABS" + } + + # A map from the material-name in their native file-formats to some info, including the internal name we use. + MATERIAL_MAP = { + "abs": {"name": "ABS", "guid": "2780b345-577b-4a24-a2c5-12e6aad3e690"}, + "abs-cf10": {"name": "ABS-CF", "guid": "495a0ce5-9daf-4a16-b7b2-06856d82394d"}, + "abs-wss1": {"name": "ABS-R", "guid": "88c8919c-6a09-471a-b7b6-e801263d862d"}, + "asa": {"name": "ASA", "guid": "f79bc612-21eb-482e-ad6c-87d75bdde066"}, + "nylon12-cf": {"name": "Nylon 12 CF", "guid": "3c6f2877-71cc-4760-84e6-4b89ab243e3b"}, + "nylon": {"name": "Nylon", "guid": "283d439a-3490-4481-920c-c51d8cdecf9c"}, + "pc": {"name": "PC", "guid": "62414577-94d1-490d-b1e4-7ef3ec40db02"}, + "petg": {"name": "PETG", "guid": "69386c85-5b6c-421a-bec5-aeb1fb33f060"}, + "pla": {"name": "PLA", "guid": "abb9c58e-1f56-48d1-bd8f-055fde3a5b56"}, + "pva": {"name": "PVA", "guid": "add51ef2-86eb-4c39-afd5-5586564f0715"}, + "wss1": {"name": "RapidRinse", "guid": "a140ef8f-4f26-4e73-abe0-cfc29d6d1024"}, + "sr30": {"name": "SR-30", "guid": "77873465-83a9-4283-bc44-4e542b8eb3eb"}, + "bvoh": {"name": "BVOH", "guid": "923e604c-8432-4b09-96aa-9bbbd42207f4"}, + "cpe": {"name": "CPE", "guid": "da1872c1-b991-4795-80ad-bdac0f131726"}, + "hips": {"name": "HIPS", "guid": "a468d86a-220c-47eb-99a5-bbb47e514eb0"}, + "tpu": {"name": "TPU 95A", "guid": "19baa6a9-94ff-478b-b4a1-8157b74358d2"}, + "im-pla": {"name": "Tough", "guid": "de031137-a8ca-4a72-bd1b-17bb964033ad"} + } + + __inverse_printer_name: Optional[Dict[str, str]] = None + __inverse_extruder_type: Optional[Dict[str, str]] = None + __inverse_material_map: Optional[Dict[str, str]] = None + __product_to_id_map: Optional[Dict[str, List[str]]] = None + + @classmethod + def getInversePrinterNameMap(cls) -> Dict[str, str]: + """Returns the inverse of the printer name map, that is, from the internal name to the name used in output.""" + if cls.__inverse_printer_name is not None: + return cls.__inverse_printer_name + cls.__inverse_printer_name = {} + for key, value in cls.PRINTER_TYPE_NAME.items(): + cls.__inverse_printer_name[value] = key + return cls.__inverse_printer_name + + @classmethod + def getInverseExtruderTypeMap(cls) -> Dict[str, str]: + """Returns the inverse of the extruder type map, that is, from the internal name to the name used in output.""" + if cls.__inverse_extruder_type is not None: + return cls.__inverse_extruder_type + cls.__inverse_extruder_type = {} + for key, value in cls.EXTRUDER_NAME_MAP.items(): + cls.__inverse_extruder_type[value] = key + return cls.__inverse_extruder_type + + @classmethod + def getInverseMaterialMap(cls) -> Dict[str, str]: + """Returns the inverse of the material map, that is, from the internal name to the name used in output. + + Note that this drops the extra info saved in the non-inverse material map, use that if you need it. + """ + if cls.__inverse_material_map is not None: + return cls.__inverse_material_map + cls.__inverse_material_map = {} + for key, value in cls.MATERIAL_MAP.items(): + cls.__inverse_material_map[value["name"]] = key + return cls.__inverse_material_map + + @classmethod + def getProductIdMap(cls) -> Dict[str, List[str]]: + """Gets a mapping from product names (for example, in the XML files) to their definition IDs. + + This loads the mapping from a file. + """ + if cls.__product_to_id_map is not None: + return cls.__product_to_id_map + + product_to_id_file = Resources.getPath(Resources.Texts, "product_to_id.json") + with open(product_to_id_file, encoding = "utf-8") as f: + contents = "" + for line in f: + contents += line if "#" not in line else "".join([line.replace("#", str(n)) for n in range(1, 12)]) + cls.__product_to_id_map = json.loads(contents) + cls.__product_to_id_map = {key: [value] for key, value in cls.__product_to_id_map.items()} + #This also loads "Ultimaker S5" -> "ultimaker_s5" even though that is not strictly necessary with the default to change spaces into underscores. + #However it is not always loaded with that default; this mapping is also used in serialize() without that default. + return cls.__product_to_id_map diff --git a/cura/PrinterOutput/Models/ExtruderConfigurationModel.py b/cura/PrinterOutput/Models/ExtruderConfigurationModel.py index ac924c684e5..c5c480e2248 100644 --- a/cura/PrinterOutput/Models/ExtruderConfigurationModel.py +++ b/cura/PrinterOutput/Models/ExtruderConfigurationModel.py @@ -1,9 +1,10 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2024 UltiMaker # Cura is released under the terms of the LGPLv3 or higher. from typing import Optional from PyQt6.QtCore import pyqtProperty, QObject, pyqtSignal +from cura.PrinterOutput.FormatMaps import FormatMaps from .MaterialOutputModel import MaterialOutputModel @@ -45,16 +46,8 @@ def setHotendID(self, hotend_id: Optional[str]) -> None: @staticmethod def applyNameMappingHotend(hotendId) -> str: - _EXTRUDER_NAME_MAP = { - "mk14_hot":"1XA", - "mk14_hot_s":"2XA", - "mk14_c":"1C", - "mk14":"1A", - "mk14_s":"2A", - "mk14_e": "LABS" - } - if hotendId in _EXTRUDER_NAME_MAP: - return _EXTRUDER_NAME_MAP[hotendId] + if hotendId in FormatMaps.EXTRUDER_NAME_MAP: + return FormatMaps.EXTRUDER_NAME_MAP[hotendId] return hotendId @pyqtProperty(str, fset = setHotendID, notify = extruderConfigurationChanged) diff --git a/cura/PrinterOutput/Models/MaterialOutputModel.py b/cura/PrinterOutput/Models/MaterialOutputModel.py index 854226c6d40..8790d1626ee 100644 --- a/cura/PrinterOutput/Models/MaterialOutputModel.py +++ b/cura/PrinterOutput/Models/MaterialOutputModel.py @@ -1,9 +1,10 @@ -# Copyright (c) 2017 Ultimaker B.V. +# Copyright (c) 2024 UltiMaker # Cura is released under the terms of the LGPLv3 or higher. from typing import Optional from PyQt6.QtCore import pyqtProperty, QObject +from cura.PrinterOutput.FormatMaps import FormatMaps class MaterialOutputModel(QObject): @@ -23,30 +24,9 @@ def guid(self) -> str: @staticmethod def getMaterialFromDefinition(guid, type, brand, name): - - _MATERIAL_MAP = { "abs" :{"name" :"ABS" ,"guid": "2780b345-577b-4a24-a2c5-12e6aad3e690"}, - "abs-cf10" :{"name": "ABS-CF" ,"guid": "495a0ce5-9daf-4a16-b7b2-06856d82394d"}, - "abs-wss1" :{"name" :"ABS-R" ,"guid": "88c8919c-6a09-471a-b7b6-e801263d862d"}, - "asa" :{"name" :"ASA" ,"guid": "f79bc612-21eb-482e-ad6c-87d75bdde066"}, - "nylon12-cf":{"name": "Nylon 12 CF" ,"guid": "3c6f2877-71cc-4760-84e6-4b89ab243e3b"}, - "nylon" :{"name" :"Nylon" ,"guid": "283d439a-3490-4481-920c-c51d8cdecf9c"}, - "pc" :{"name" :"PC" ,"guid": "62414577-94d1-490d-b1e4-7ef3ec40db02"}, - "petg" :{"name" :"PETG" ,"guid": "69386c85-5b6c-421a-bec5-aeb1fb33f060"}, - "pla" :{"name" :"PLA" ,"guid": "abb9c58e-1f56-48d1-bd8f-055fde3a5b56"}, - "pva" :{"name" :"PVA" ,"guid": "add51ef2-86eb-4c39-afd5-5586564f0715"}, - "wss1" :{"name" :"RapidRinse" ,"guid": "a140ef8f-4f26-4e73-abe0-cfc29d6d1024"}, - "sr30" :{"name" :"SR-30" ,"guid": "77873465-83a9-4283-bc44-4e542b8eb3eb"}, - "bvoh" :{"name" :"BVOH" ,"guid": "923e604c-8432-4b09-96aa-9bbbd42207f4"}, - "cpe" :{"name" :"CPE" ,"guid": "da1872c1-b991-4795-80ad-bdac0f131726"}, - "hips" :{"name" :"HIPS" ,"guid": "a468d86a-220c-47eb-99a5-bbb47e514eb0"}, - "tpu" :{"name" :"TPU 95A" ,"guid": "19baa6a9-94ff-478b-b4a1-8157b74358d2"}, - "im-pla" :{"name": "Tough" ,"guid": "de031137-a8ca-4a72-bd1b-17bb964033ad"} - } - - - if guid is None and brand != "empty" and type in _MATERIAL_MAP: - name = _MATERIAL_MAP[type]["name"] - guid = _MATERIAL_MAP[type]["guid"] + if guid is None and brand != "empty" and type in FormatMaps.MATERIAL_MAP: + name = FormatMaps.MATERIAL_MAP[type]["name"] + guid = FormatMaps.MATERIAL_MAP[type]["guid"] return name, guid diff --git a/cura/PrinterOutput/NetworkedPrinterOutputDevice.py b/cura/PrinterOutput/NetworkedPrinterOutputDevice.py index 2a683966db6..3dc245d4688 100644 --- a/cura/PrinterOutput/NetworkedPrinterOutputDevice.py +++ b/cura/PrinterOutput/NetworkedPrinterOutputDevice.py @@ -1,4 +1,4 @@ -# Copyright (c) 2021 Ultimaker B.V. +# Copyright (c) 2024 UltiMaker # Cura is released under the terms of the LGPLv3 or higher. from UM.FileHandler.FileHandler import FileHandler #For typing. @@ -6,6 +6,7 @@ from UM.Scene.SceneNode import SceneNode #For typing. from cura.API import Account from cura.CuraApplication import CuraApplication +from cura.PrinterOutput.FormatMaps import FormatMaps from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice, ConnectionState, ConnectionType @@ -419,14 +420,8 @@ def printerType(self) -> str: @staticmethod def applyPrinterTypeMapping(printer_type): - _PRINTER_TYPE_NAME = { - "fire_e": "ultimaker_method", - "lava_f": "ultimaker_methodx", - "magma_10": "ultimaker_methodxl", - "sketch": "ultimaker_sketch" - } - if printer_type in _PRINTER_TYPE_NAME: - return _PRINTER_TYPE_NAME[printer_type] + if printer_type in FormatMaps.PRINTER_TYPE_NAME: + return FormatMaps.PRINTER_TYPE_NAME[printer_type] return printer_type @pyqtProperty(str, constant = True) diff --git a/plugins/3MFWriter/ThreeMFWriter.py b/plugins/3MFWriter/ThreeMFWriter.py index 5a9fa487fc9..a3eb43ca32d 100644 --- a/plugins/3MFWriter/ThreeMFWriter.py +++ b/plugins/3MFWriter/ThreeMFWriter.py @@ -114,22 +114,24 @@ def _convertUMNodeToSavitarNode(um_node, mesh_data = um_node.getMeshData() + node_matrix = um_node.getLocalTransformation() + node_matrix.preMultiply(transformation) + if center_mesh: - node_matrix = Matrix() + center_matrix = Matrix() # compensate for original center position, if object(s) is/are not around its zero position if mesh_data is not None: extents = mesh_data.getExtents() if extents is not None: # We use a different coordinate space while writing, so flip Z and Y - center_vector = Vector(extents.center.x, extents.center.y, extents.center.z) - node_matrix.setByTranslation(center_vector) - node_matrix.multiply(um_node.getLocalTransformation()) - else: - node_matrix = um_node.getLocalTransformation() + center_vector = Vector(-extents.center.x, -extents.center.y, -extents.center.z) + center_matrix.setByTranslation(center_vector) + node_matrix.preMultiply(center_matrix) - matrix_string = ThreeMFWriter._convertMatrixToString(node_matrix.preMultiply(transformation)) + matrix_string = ThreeMFWriter._convertMatrixToString(node_matrix) savitar_node.setTransformation(matrix_string) + if mesh_data is not None: savitar_node.getMeshData().setVerticesFromBytes(mesh_data.getVerticesAsByteArray()) indices_array = mesh_data.getIndicesAsByteArray() diff --git a/plugins/CuraEngineBackend/StartSliceJob.py b/plugins/CuraEngineBackend/StartSliceJob.py index 7ece7b30a11..0789e8a6845 100644 --- a/plugins/CuraEngineBackend/StartSliceJob.py +++ b/plugins/CuraEngineBackend/StartSliceJob.py @@ -454,7 +454,12 @@ def run(self) -> None: for extruder_stack in global_stack.extruderList: self._buildExtruderMessage(extruder_stack) - for plugin in CuraApplication.getInstance().getBackendPlugins(): + backend_plugins = CuraApplication.getInstance().getBackendPlugins() + + # Sort backend plugins by name. Not a very good strategy, but at least it is repeatable. This will be improved later. + backend_plugins = sorted(backend_plugins, key=lambda backend_plugin: backend_plugin.getId()) + + for plugin in backend_plugins: if not plugin.usePlugin(): continue for slot in plugin.getSupportedSlots(): diff --git a/plugins/MakerbotWriter/MakerbotWriter.py b/plugins/MakerbotWriter/MakerbotWriter.py index 43595bbf247..34ef562fd32 100644 --- a/plugins/MakerbotWriter/MakerbotWriter.py +++ b/plugins/MakerbotWriter/MakerbotWriter.py @@ -1,4 +1,4 @@ -# Copyright (c) 2023 UltiMaker +# Copyright (c) 2024 UltiMaker # Cura is released under the terms of the LGPLv3 or higher. from io import StringIO, BufferedIOBase import json @@ -18,6 +18,7 @@ from UM.i18n import i18nCatalog from cura.CuraApplication import CuraApplication +from cura.PrinterOutput.FormatMaps import FormatMaps from cura.Snapshot import Snapshot from cura.Utils.Threading import call_on_qt_thread from cura.CuraVersion import ConanInstalls @@ -137,6 +138,30 @@ def write(self, stream: BufferedIOBase, nodes: List[SceneNode], mode=MeshWriter. for png_file in png_files: file, data = png_file["file"], png_file["data"] zip_stream.writestr(file, data) + api = CuraApplication.getInstance().getCuraAPI() + metadata_json = api.interface.settings.getSliceMetadata() + + # All the mapping stuff we have to do: + product_to_id_map = FormatMaps.getProductIdMap() + printer_name_map = FormatMaps.getInversePrinterNameMap() + extruder_type_map = FormatMaps.getInverseExtruderTypeMap() + material_map = FormatMaps.getInverseMaterialMap() + for key, value in metadata_json.items(): + if "all_settings" in value: + if "machine_name" in value["all_settings"]: + machine_name = value["all_settings"]["machine_name"] + if machine_name in product_to_id_map: + machine_name = product_to_id_map[machine_name][0] + value["all_settings"]["machine_name"] = printer_name_map.get(machine_name, machine_name) + if "machine_nozzle_id" in value["all_settings"]: + extruder_type = value["all_settings"]["machine_nozzle_id"] + value["all_settings"]["machine_nozzle_id"] = extruder_type_map.get(extruder_type, extruder_type) + if "material_type" in value["all_settings"]: + material_type = value["all_settings"]["material_type"] + value["all_settings"]["material_type"] = material_map.get(material_type, material_type) + + slice_metadata = json.dumps(metadata_json, separators=(", ", ": "), indent=4) + zip_stream.writestr("slicemetadata.json", slice_metadata) except (IOError, OSError, BadZipFile) as ex: Logger.log("e", f"Could not write to (.makerbot) file because: '{ex}'.") self.setInformation(catalog.i18nc("@error", "MakerbotWriter could not save to the designated path.")) diff --git a/plugins/UFPWriter/UFPWriter.py b/plugins/UFPWriter/UFPWriter.py index 475e5fc01ac..0cf756b6a44 100644 --- a/plugins/UFPWriter/UFPWriter.py +++ b/plugins/UFPWriter/UFPWriter.py @@ -24,6 +24,7 @@ from cura.CuraApplication import CuraApplication from cura.Settings.GlobalStack import GlobalStack from cura.Utils.Threading import call_on_qt_thread +from cura.API import CuraAPI from UM.i18n import i18nCatalog @@ -85,7 +86,8 @@ def write(self, stream, nodes, mode = MeshWriter.OutputMode.BinaryMode): try: archive.addContentType(extension="json", mime_type="application/json") setting_textio = StringIO() - json.dump(self._getSliceMetadata(), setting_textio, separators=(", ", ": "), indent=4) + api = CuraApplication.getInstance().getCuraAPI() + json.dump(api.interface.settings.getSliceMetadata(), setting_textio, separators=(", ", ": "), indent=4) steam = archive.getStream(SLICE_METADATA_PATH) steam.write(setting_textio.getvalue().encode("UTF-8")) except EnvironmentError as e: @@ -210,57 +212,3 @@ def _getObjectMetadata(node: SceneNode) -> List[Dict[str, str]]: return [{"name": item.getName()} for item in DepthFirstIterator(node) if item.getMeshData() is not None and not item.callDecoration("isNonPrintingMesh")] - - def _getSliceMetadata(self) -> Dict[str, Dict[str, Dict[str, str]]]: - """Get all changed settings and all settings. For each extruder and the global stack""" - print_information = CuraApplication.getInstance().getPrintInformation() - machine_manager = CuraApplication.getInstance().getMachineManager() - settings = { - "material": { - "length": print_information.materialLengths, - "weight": print_information.materialWeights, - "cost": print_information.materialCosts, - }, - "global": { - "changes": {}, - "all_settings": {}, - }, - "quality": asdict(machine_manager.activeQualityDisplayNameMap()), - } - - def _retrieveValue(container: InstanceContainer, setting_: str): - value_ = container.getProperty(setting_, "value") - for _ in range(0, 1024): # Prevent possibly endless loop by not using a limit. - if not isinstance(value_, SettingFunction): - return value_ # Success! - value_ = value_(container) - return 0 # Fallback value after breaking possibly endless loop. - - global_stack = cast(GlobalStack, Application.getInstance().getGlobalContainerStack()) - - # Add global user or quality changes - global_flattened_changes = InstanceContainer.createMergedInstanceContainer(global_stack.userChanges, global_stack.qualityChanges) - for setting in global_flattened_changes.getAllKeys(): - settings["global"]["changes"][setting] = _retrieveValue(global_flattened_changes, setting) - - # Get global all settings values without user or quality changes - for setting in global_stack.getAllKeys(): - settings["global"]["all_settings"][setting] = _retrieveValue(global_stack, setting) - - for i, extruder in enumerate(global_stack.extruderList): - # Add extruder fields to settings dictionary - settings[f"extruder_{i}"] = { - "changes": {}, - "all_settings": {}, - } - - # Add extruder user or quality changes - extruder_flattened_changes = InstanceContainer.createMergedInstanceContainer(extruder.userChanges, extruder.qualityChanges) - for setting in extruder_flattened_changes.getAllKeys(): - settings[f"extruder_{i}"]["changes"][setting] = _retrieveValue(extruder_flattened_changes, setting) - - # Get extruder all settings values without user or quality changes - for setting in extruder.getAllKeys(): - settings[f"extruder_{i}"]["all_settings"][setting] = _retrieveValue(extruder, setting) - - return settings diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index d054f054854..13111c1c7a2 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -17,6 +17,7 @@ from UM.ConfigurationErrorMessage import ConfigurationErrorMessage from cura.CuraApplication import CuraApplication +from cura.PrinterOutput.FormatMaps import FormatMaps from cura.Machines.VariantType import VariantType try: @@ -249,7 +250,7 @@ def serialize(self, ignored_metadata_keys: Optional[Set[str]] = None): machine_variant_map[definition_id][variant_name] = variant_dict # Map machine human-readable names to IDs - product_id_map = self.getProductIdMap() + product_id_map = FormatMaps.getProductIdMap() for definition_id, container in machine_container_map.items(): definition_id = container.getMetaDataEntry("definition") @@ -647,7 +648,7 @@ def deserialize(self, serialized, file_name = None): self._dirty = False # Map machine human-readable names to IDs - product_id_map = self.getProductIdMap() + product_id_map = FormatMaps.getProductIdMap() machines = data.iterfind("./um:settings/um:machine", self.__namespaces) for machine in machines: @@ -923,7 +924,7 @@ def deserializeMetadata(cls, serialized: str, container_id: str) -> List[Dict[st result_metadata.append(base_metadata) # Map machine human-readable names to IDs - product_id_map = cls.getProductIdMap() + product_id_map = FormatMaps.getProductIdMap() for machine in data.iterfind("./um:settings/um:machine", cls.__namespaces): machine_compatibility = common_compatibility @@ -1127,29 +1128,6 @@ def getPossibleDefinitionIDsFromName(name): id_list = list(id_list) return id_list - __product_to_id_map: Optional[Dict[str, List[str]]] = None - - @classmethod - def getProductIdMap(cls) -> Dict[str, List[str]]: - """Gets a mapping from product names in the XML files to their definition IDs. - - This loads the mapping from a file. - """ - if cls.__product_to_id_map is not None: - return cls.__product_to_id_map - - plugin_path = cast(str, PluginRegistry.getInstance().getPluginPath("XmlMaterialProfile")) - product_to_id_file = os.path.join(plugin_path, "product_to_id.json") - with open(product_to_id_file, encoding = "utf-8") as f: - contents = "" - for line in f: - contents += line if "#" not in line else "".join([line.replace("#", str(n)) for n in range(1, 12)]) - cls.__product_to_id_map = json.loads(contents) - cls.__product_to_id_map = {key: [value] for key, value in cls.__product_to_id_map.items()} - #This also loads "Ultimaker S5" -> "ultimaker_s5" even though that is not strictly necessary with the default to change spaces into underscores. - #However it is not always loaded with that default; this mapping is also used in serialize() without that default. - return cls.__product_to_id_map - @staticmethod def _parseCompatibleValue(value: str): """Parse the value of the "material compatible" property.""" diff --git a/resources/definitions/Mark2_for_Ultimaker2.def.json b/resources/definitions/Mark2_for_Ultimaker2.def.json index 789d5d42eca..dab45dd80c6 100644 --- a/resources/definitions/Mark2_for_Ultimaker2.def.json +++ b/resources/definitions/Mark2_for_Ultimaker2.def.json @@ -130,7 +130,6 @@ "machine_min_cool_heat_time_window": { "default_value": 15.0 }, "machine_name": { "default_value": "Mark2_for_Ultimaker2" }, "machine_nozzle_cool_down_speed": { "default_value": 1.5 }, - "machine_nozzle_head_distance": { "default_value": 5 }, "machine_nozzle_heat_up_speed": { "default_value": 3.5 }, "machine_nozzle_size": { "default_value": 0.4 }, "machine_show_variants": { "default_value": true }, diff --git a/resources/definitions/atom3.def.json b/resources/definitions/atom3.def.json index c9b54d2f89a..6fab25a96d6 100644 --- a/resources/definitions/atom3.def.json +++ b/resources/definitions/atom3.def.json @@ -65,7 +65,6 @@ "machine_heated_bed": { "default_value": true }, "machine_height": { "default_value": 340 }, "machine_name": { "default_value": "Atom 3" }, - "machine_nozzle_head_distance": { "default_value": 6 }, "machine_shape": { "default_value": "elliptic" }, "machine_show_variants": { "default_value": true }, "machine_start_gcode": { "default_value": ";MACHINE START CODE\nG21 ;metric values\nG90 ;absolute positioning\nG28 ;home\nG1 Z5 F9000\n;MACHINE START CODE" }, diff --git a/resources/definitions/creality_crm4.def.json b/resources/definitions/creality_crm4.def.json new file mode 100644 index 00000000000..89ab3ed04c2 --- /dev/null +++ b/resources/definitions/creality_crm4.def.json @@ -0,0 +1,18 @@ +{ + "version": 2, + "name": "Creality CR-M4", + "inherits": "creality_base", + "metadata": + { + "visible": true, + "quality_definition": "creality_base" + }, + "overrides": + { + "gantry_height": { "value": 35 }, + "machine_depth": { "default_value": 450 }, + "machine_height": { "default_value": 470 }, + "machine_name": { "default_value": "Creality CR-M4" }, + "machine_width": { "default_value": 450 } + } +} \ No newline at end of file diff --git a/resources/definitions/diy220.def.json b/resources/definitions/diy220.def.json index f4c2e41364e..ea3e89ab04c 100644 --- a/resources/definitions/diy220.def.json +++ b/resources/definitions/diy220.def.json @@ -35,7 +35,6 @@ "machine_max_feedrate_y": { "default_value": 300 }, "machine_max_feedrate_z": { "default_value": 40 }, "machine_name": { "default_value": "Diytech 220" }, - "machine_nozzle_head_distance": { "default_value": 3 }, "machine_nozzle_tip_outer_diameter": { "default_value": 1 }, "machine_start_gcode": { "default_value": "G21\nG90\nM82\nM107\nG28\nG1 Z15 F200\nT0\nG92 E0\nG1 E16 F250\nG92 E0\n" }, "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, diff --git a/resources/definitions/dxu.def.json b/resources/definitions/dxu.def.json index c5eb9720f3b..117edf43db7 100644 --- a/resources/definitions/dxu.def.json +++ b/resources/definitions/dxu.def.json @@ -122,7 +122,6 @@ "machine_name": { "default_value": "dxu" }, "machine_nozzle_cool_down_speed": { "default_value": 1.5 }, "machine_nozzle_expansion_angle": { "default_value": 45 }, - "machine_nozzle_head_distance": { "default_value": 5 }, "machine_nozzle_heat_up_speed": { "default_value": 3.5 }, "machine_nozzle_size": { "default_value": 0.4 }, "machine_show_variants": { "default_value": true }, diff --git a/resources/definitions/erzay3d.def.json b/resources/definitions/erzay3d.def.json index 5baadf32e46..af5784e4e67 100644 --- a/resources/definitions/erzay3d.def.json +++ b/resources/definitions/erzay3d.def.json @@ -44,7 +44,6 @@ "machine_max_jerk_xy": { "default_value": 10 }, "machine_max_jerk_z": { "default_value": 10 }, "machine_name": { "default_value": "Erzay3D" }, - "machine_nozzle_head_distance": { "default_value": 2.5 }, "machine_nozzle_size": { "default_value": 0.4 }, "machine_shape": { "default_value": "elliptic" }, "machine_start_gcode": { "default_value": "G28\nG1 Z15.0 F6000\nG92 E0" }, diff --git a/resources/definitions/fdmextruder.def.json b/resources/definitions/fdmextruder.def.json index f60cf63360f..101efee3b10 100644 --- a/resources/definitions/fdmextruder.def.json +++ b/resources/definitions/fdmextruder.def.json @@ -167,6 +167,17 @@ "type": "float", "unit": "mm" }, + "machine_nozzle_head_distance": + { + "default_value": 3, + "description": "The height difference between the tip of the nozzle and the lowest part of the print head.", + "label": "Nozzle Length", + "settable_per_extruder": true, + "settable_per_mesh": false, + "settable_per_meshgroup": false, + "type": "float", + "unit": "mm" + }, "machine_nozzle_id": { "default_value": "unknown", diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 48e013aa169..571d5012126 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -28,6 +28,18 @@ "icon": "Printer", "children": { + "build_volume_fan_nr": + { + "label": "Build volume fan number", + "description": "The number of the fan that cools the build volume. If this is set to 0, it's means that there is no build volume fan", + "default_value": 0, + "minimum_value": "0", + "maximum_value": "999999", + "type": "int", + "settable_per_mesh": false, + "settable_per_extruder": false, + "settable_per_meshgroup": false + }, "machine_name": { "label": "Machine Type", @@ -289,17 +301,6 @@ "settable_per_meshgroup": false, "settable_globally": false }, - "machine_nozzle_head_distance": - { - "label": "Nozzle Length", - "description": "The height difference between the tip of the nozzle and the lowest part of the print head.", - "unit": "mm", - "default_value": 3, - "type": "float", - "settable_per_mesh": false, - "settable_per_extruder": true, - "settable_per_meshgroup": false - }, "machine_nozzle_expansion_angle": { "label": "Nozzle Angle", @@ -4545,6 +4546,37 @@ "settable_per_mesh": false, "settable_per_extruder": true }, + "build_fan_full_at_height": + { + "label": "Build Fan Speed at Height", + "description": "The height at which the fans spin on regular fan speed. At the layers below the fan speed gradually increases from Initial Fan Speed to Regular Fan Speed.", + "unit": "mm", + "type": "float", + "default_value": 0, + "minimum_value": "0", + "enabled": "build_volume_fan_nr != 0", + "maximum_value_warning": "10.0", + "settable_per_mesh": false, + "settable_per_extruder": false, + "settable_per_meshgroup": false, + "children": + { + "build_fan_full_layer": + { + "label": "Build Fan Speed at Layer", + "description": "The layer at which the build fans spin on full fan speed. This value is calculated and rounded to a whole number.", + "type": "int", + "default_value": 0, + "minimum_value": "0", + "enabled": "build_volume_fan_nr != 0", + "maximum_value_warning": "10 / resolveOrValue('layer_height')", + "value": "max(1, int(math.floor((build_fan_full_at_height - resolveOrValue('layer_height_0')) / resolveOrValue('layer_height')) + 2))", + "settable_per_mesh": false, + "settable_per_extruder": false, + "settable_per_meshgroup": false + } + } + }, "cool_fan_speed": { "label": "Fan Speed", diff --git a/resources/definitions/maker_starter.def.json b/resources/definitions/maker_starter.def.json index e654ee09159..5e5f9dcb5bb 100644 --- a/resources/definitions/maker_starter.def.json +++ b/resources/definitions/maker_starter.def.json @@ -27,7 +27,6 @@ "machine_heated_bed": { "default_value": false }, "machine_height": { "default_value": 200 }, "machine_name": { "default_value": "3DMaker Starter" }, - "machine_nozzle_head_distance": { "default_value": 3 }, "machine_nozzle_tip_outer_diameter": { "default_value": 1 }, "machine_width": { "default_value": 210 }, "raft_airgap": { "default_value": 0.2 }, diff --git a/resources/definitions/mendel90.def.json b/resources/definitions/mendel90.def.json index 57e1276e6ac..d8619fe276a 100644 --- a/resources/definitions/mendel90.def.json +++ b/resources/definitions/mendel90.def.json @@ -37,7 +37,6 @@ "machine_heated_bed": { "default_value": true }, "machine_height": { "default_value": 200 }, "machine_name": { "default_value": "Mendel90" }, - "machine_nozzle_head_distance": { "default_value": 5 }, "machine_nozzle_tip_outer_diameter": { "default_value": 1 }, "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;absolute extrusion\nM107 ;start with the fan off\nG28 ;home\nG92 E0 ;zero the extruded length\nM140 S{material_bed_temperature_layer_0} ; set the bed temperature and continue on\nG1 X-50 Y98 F9000 ;go to the left of the top\nG1 Z0.05 ; close to the bed\nM104 S{material_print_temperature_layer_0}; pre-heat the extruder continue on\nM190 S{material_bed_temperature_layer_0} ;set the bed temp & wait\nM109 S{material_print_temperature_layer_0};set the extruder temp for layer 0 & wait\nG92 E0 ;zero the extruded length\nG1 X50 E10 F300 ; make a thick line to prime extruder\nG92 E0 ; reset extruder\nG1 E-4 F1800\nG1 Z0.3 ;lift Z\n" }, "machine_width": { "default_value": 200 }, diff --git a/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json b/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json index c013c49e05b..722f4dade54 100644 --- a/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json +++ b/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json @@ -78,7 +78,6 @@ "machine_heat_zone_length": { "default_value": 20 }, "machine_height": { "default_value": 205 }, "machine_name": { "default_value": "Discov3ry Complete (Ultimaker 2+)" }, - "machine_nozzle_head_distance": { "default_value": 5 }, "machine_show_variants": { "default_value": true }, "machine_start_gcode": { "default_value": "\n;Updated Firmware (.hex and Marlin .ino) for \n;Ultimaker 2+ with Discov3ry Extruder available at: \n;https://github.com/Structur3d/UM2.1Discov3ry-Firmware-beta \n;**Learn more at https://www.structur3d.io** \n \nM104 S{material_print_temperature} ;Start heating extruder \nM140 S{material_bed_temperature} ;Start heating bed \nG21 ;metric values \nG90 ;absolute positioning \nM82 ;set extruder to absolute mode \nM107 ;start with the fan off \nM302 ;allow cold extrusion \nM92 E2589 ;set extruder EEPROM steps/mm for paste \nG28 Z0 ;move Z to bottom endstops \nG28 X0 Y0 ;move X/Y to endstops \nG1 X15 Y0 F4000 ;move X/Y to front of printer \nG1 Z15.0 F9000 ;move the platform to 15mm \nG92 E0 ;zero the extruded length \nG1 F200 E10 ;extrude 10 mm of feed stock \nG92 E0 ;zero the extruded length again \nG1 F9000 \n;Put printing message on LCD screen \nM117 Printing..." }, "machine_width": { "default_value": 205 }, diff --git a/resources/definitions/tam.def.json b/resources/definitions/tam.def.json index 84bbc9c8fb3..01437cebe70 100644 --- a/resources/definitions/tam.def.json +++ b/resources/definitions/tam.def.json @@ -44,7 +44,6 @@ "machine_max_acceleration_y": { "default_value": 6000 }, "machine_max_acceleration_z": { "default_value": 12000 }, "machine_name": { "default_value": "TypeAMachines" }, - "machine_nozzle_head_distance": { "default_value": 3 }, "machine_nozzle_tip_outer_diameter": { "default_value": 1 }, "machine_start_gcode": { "default_value": ";-- START GCODE --\n;Sliced for Type A Machines Series 1\n;Sliced at: {day} {date} {time}\n;Basic settings:\n;Layer height: {layer_height}\n;Walls: {wall_thickness}\n;Fill: {fill_distance}\n;Print Speed: {print_speed}\n;Support: {support}\n;Retraction Speed: {retraction_speed}\n;Retraction Distance: {retraction_amount}\n;Print time: {print_time}\n;Filament used: {filament_amount}m {filament_weight}g\n;Settings based on: {material_profile}\nG21 ;metric values\nG90 ;absolute positioning\nG28 ;move to endstops\nG29 ;allows for auto-levelling\nG1 Z15.0 F12000 ;move the platform down 15mm\nG1 X150 Y5 F9000 ;center\nM140 S{material_bed_temperature} ;Prep Heat Bed\nM109 S{default_material_print_temperature} ;Heat To temp\nM190 S{material_bed_temperature} ;Heat Bed to temp\nG1 X150 Y5 Z0.3 ;move the platform to purge extrusion\nG92 E0 ;zero the extruded length\nG1 F200 X250 E30 ;extrude 30mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 X150 Y150 Z25 F12000 ;recenter and begin\nG1 F9000" }, "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, diff --git a/resources/definitions/ultimaker2.def.json b/resources/definitions/ultimaker2.def.json index 8c0e066cd18..d749c96a001 100644 --- a/resources/definitions/ultimaker2.def.json +++ b/resources/definitions/ultimaker2.def.json @@ -95,7 +95,6 @@ "machine_max_feedrate_y": { "default_value": 300 }, "machine_max_feedrate_z": { "default_value": 40 }, "machine_name": { "default_value": "Ultimaker 2" }, - "machine_nozzle_head_distance": { "default_value": 3 }, "machine_nozzle_tip_outer_diameter": { "default_value": 1 }, "machine_start_gcode": { "value": "\"G0 F3000 Y50 ;avoid prime blob\" if machine_gcode_flavor == \"UltiGCode\" else \"G21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\nG28 Z0 ;move Z to bottom endstops\\nG28 X0 Y0 ;move X/Y to endstops\\nG1 X15 Y0 F4000 ;move X/Y to front of printer\\nG1 Z15.0 F9000 ;move the platform to 15mm\\nG92 E0 ;zero the extruded length\\nG1 F200 E10 ;extrude 10 mm of feed stock\\nG92 E0 ;zero the extruded length again\\nG1 Y50 F9000\\n;Put printing message on LCD screen\\nM117 Printing...\"" }, "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, diff --git a/resources/definitions/ultimaker2_plus.def.json b/resources/definitions/ultimaker2_plus.def.json index b5ad30bb8d6..c06d8b1e68c 100644 --- a/resources/definitions/ultimaker2_plus.def.json +++ b/resources/definitions/ultimaker2_plus.def.json @@ -83,7 +83,6 @@ "machine_heat_zone_length": { "default_value": 20 }, "machine_height": { "default_value": 205 }, "machine_name": { "default_value": "Ultimaker 2+" }, - "machine_nozzle_head_distance": { "default_value": 5 }, "machine_show_variants": { "default_value": true }, "speed_infill": { "value": "speed_print" }, "speed_support": { "value": "speed_wall_0" }, diff --git a/resources/definitions/ultimaker2_plus_connect.def.json b/resources/definitions/ultimaker2_plus_connect.def.json index 8aae2d4c195..6cdd3e97058 100644 --- a/resources/definitions/ultimaker2_plus_connect.def.json +++ b/resources/definitions/ultimaker2_plus_connect.def.json @@ -92,7 +92,6 @@ "machine_heat_zone_length": { "default_value": 20 }, "machine_height": { "default_value": 205 }, "machine_name": { "default_value": "Ultimaker 2+ Connect" }, - "machine_nozzle_head_distance": { "default_value": 5 }, "machine_show_variants": { "default_value": true }, "machine_start_gcode": { "value": "''" }, "machine_width": { "default_value": 223 }, diff --git a/resources/extruders/Mark2_extruder1.def.json b/resources/extruders/Mark2_extruder1.def.json index 89992ad450e..9617678f7ec 100644 --- a/resources/extruders/Mark2_extruder1.def.json +++ b/resources/extruders/Mark2_extruder1.def.json @@ -14,6 +14,7 @@ "default_value": 0, "maximum_value": "1" }, + "machine_nozzle_head_distance": { "default_value": 5 }, "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 } } diff --git a/resources/extruders/Mark2_extruder2.def.json b/resources/extruders/Mark2_extruder2.def.json index 967e32d8b89..b0ea604fbb4 100644 --- a/resources/extruders/Mark2_extruder2.def.json +++ b/resources/extruders/Mark2_extruder2.def.json @@ -14,6 +14,7 @@ "default_value": 1, "maximum_value": "1" }, + "machine_nozzle_head_distance": { "default_value": 5 }, "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 } } diff --git a/resources/extruders/atom3_extruder_0.def.json b/resources/extruders/atom3_extruder_0.def.json index ccc7a0bd6b0..fc51a8cf038 100644 --- a/resources/extruders/atom3_extruder_0.def.json +++ b/resources/extruders/atom3_extruder_0.def.json @@ -10,6 +10,7 @@ "overrides": { "extruder_nr": { "default_value": 0 }, + "machine_nozzle_head_distance": { "default_value": 6 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } diff --git a/resources/extruders/diy220_extruder_0.def.json b/resources/extruders/diy220_extruder_0.def.json index 4d802b4a8d5..ab271d10067 100644 --- a/resources/extruders/diy220_extruder_0.def.json +++ b/resources/extruders/diy220_extruder_0.def.json @@ -10,6 +10,7 @@ "overrides": { "extruder_nr": { "default_value": 0 }, + "machine_nozzle_head_distance": { "default_value": 3 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } diff --git a/resources/extruders/dxu_extruder1.def.json b/resources/extruders/dxu_extruder1.def.json index de974b81748..b44f79fdac2 100644 --- a/resources/extruders/dxu_extruder1.def.json +++ b/resources/extruders/dxu_extruder1.def.json @@ -14,6 +14,7 @@ "default_value": 0, "maximum_value": "1" }, + "machine_nozzle_head_distance": { "default_value": 5 }, "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, "machine_nozzle_size": { "default_value": 0.4 }, diff --git a/resources/extruders/dxu_extruder2.def.json b/resources/extruders/dxu_extruder2.def.json index b4de4712892..358bc69dae4 100644 --- a/resources/extruders/dxu_extruder2.def.json +++ b/resources/extruders/dxu_extruder2.def.json @@ -14,6 +14,7 @@ "default_value": 1, "maximum_value": "1" }, + "machine_nozzle_head_distance": { "default_value": 5 }, "machine_nozzle_offset_x": { "default_value": 19.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, "machine_nozzle_size": { "default_value": 0.4 }, diff --git a/resources/extruders/erzay3d_extruder_0.def.json b/resources/extruders/erzay3d_extruder_0.def.json index a4082a6224e..8ba6c573f36 100644 --- a/resources/extruders/erzay3d_extruder_0.def.json +++ b/resources/extruders/erzay3d_extruder_0.def.json @@ -10,6 +10,7 @@ "overrides": { "extruder_nr": { "default_value": 0 }, + "machine_nozzle_head_distance": { "default_value": 2.5 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } diff --git a/resources/extruders/maker_starter_extruder_0.def.json b/resources/extruders/maker_starter_extruder_0.def.json index 1a8877f8ef6..4154b008623 100644 --- a/resources/extruders/maker_starter_extruder_0.def.json +++ b/resources/extruders/maker_starter_extruder_0.def.json @@ -10,6 +10,7 @@ "overrides": { "extruder_nr": { "default_value": 0 }, + "machine_nozzle_head_distance": { "default_value": 3 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } diff --git a/resources/extruders/mendel90_extruder_0.def.json b/resources/extruders/mendel90_extruder_0.def.json index 0701164a65b..b04e2d2fe99 100644 --- a/resources/extruders/mendel90_extruder_0.def.json +++ b/resources/extruders/mendel90_extruder_0.def.json @@ -10,6 +10,7 @@ "overrides": { "extruder_nr": { "default_value": 0 }, + "machine_nozzle_head_distance": { "default_value": 5 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } diff --git a/resources/extruders/structur3d_discov3ry1_complete_um2plus_extruder_0.def.json b/resources/extruders/structur3d_discov3ry1_complete_um2plus_extruder_0.def.json index 0258f9da9c0..ec25298a5c7 100644 --- a/resources/extruders/structur3d_discov3ry1_complete_um2plus_extruder_0.def.json +++ b/resources/extruders/structur3d_discov3ry1_complete_um2plus_extruder_0.def.json @@ -10,6 +10,7 @@ "overrides": { "extruder_nr": { "default_value": 0 }, + "machine_nozzle_head_distance": { "default_value": 5 }, "machine_nozzle_size": { "default_value": 0.84 }, "material_diameter": { "default_value": 3.175 } } diff --git a/resources/extruders/tam_extruder_0.def.json b/resources/extruders/tam_extruder_0.def.json index b606474ff01..4e5cbe42164 100644 --- a/resources/extruders/tam_extruder_0.def.json +++ b/resources/extruders/tam_extruder_0.def.json @@ -10,6 +10,7 @@ "overrides": { "extruder_nr": { "default_value": 0 }, + "machine_nozzle_head_distance": { "default_value": 3 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } diff --git a/resources/extruders/ultimaker2_extruder_0.def.json b/resources/extruders/ultimaker2_extruder_0.def.json index 17d0d425df6..3432ace596d 100644 --- a/resources/extruders/ultimaker2_extruder_0.def.json +++ b/resources/extruders/ultimaker2_extruder_0.def.json @@ -10,6 +10,7 @@ "overrides": { "extruder_nr": { "default_value": 0 }, + "machine_nozzle_head_distance": { "default_value": 3 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 2.85 } } diff --git a/resources/extruders/ultimaker2_plus_connect_extruder_0.def.json b/resources/extruders/ultimaker2_plus_connect_extruder_0.def.json index 0b74aae0194..9ad61af3133 100644 --- a/resources/extruders/ultimaker2_plus_connect_extruder_0.def.json +++ b/resources/extruders/ultimaker2_plus_connect_extruder_0.def.json @@ -10,6 +10,7 @@ "overrides": { "extruder_nr": { "default_value": 0 }, + "machine_nozzle_head_distance": { "default_value": 5 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 2.85 } } diff --git a/resources/extruders/ultimaker2_plus_extruder_0.def.json b/resources/extruders/ultimaker2_plus_extruder_0.def.json index 3fec85805e8..ace4b5b8131 100644 --- a/resources/extruders/ultimaker2_plus_extruder_0.def.json +++ b/resources/extruders/ultimaker2_plus_extruder_0.def.json @@ -10,6 +10,7 @@ "overrides": { "extruder_nr": { "default_value": 0 }, + "machine_nozzle_head_distance": { "default_value": 5 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 2.85 } } diff --git a/resources/i18n/cura.pot b/resources/i18n/cura.pot index 8bf8688e0e9..24a5221f4fc 100644 --- a/resources/i18n/cura.pot +++ b/resources/i18n/cura.pot @@ -215,14 +215,14 @@ msgstr "" msgctxt "@label crash message" msgid "" -"

A fatal error has occurred in Cura. Please send us this Crash Report to fix the problem

\n" +"

A fatal error has occurred in Cura. Please send us this Crash Report to fix the problem

\n" "

Please use the \"Send report\" button to post a bug report automatically to our servers

\n" " " msgstr "" msgctxt "@label crash message" msgid "" -"

Oops, UltiMaker Cura has encountered something that doesn't seem right.

\n" +"

Oops, UltiMaker Cura has encountered something that doesn't seem right.

\n" "

We encountered an unrecoverable error during start up. It was possibly caused by some incorrect configuration files. We suggest to backup and reset your configuration.

\n" "

Backups can be found in the configuration folder.

\n" "

Please send us this Crash Report to fix the problem.

\n" diff --git a/plugins/XmlMaterialProfile/product_to_id.json b/resources/texts/product_to_id.json similarity index 100% rename from plugins/XmlMaterialProfile/product_to_id.json rename to resources/texts/product_to_id.json From 4419c6b2ccacf5aadf127a38de5d0422e8eaac71 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Thu, 19 Sep 2024 13:13:15 +0200 Subject: [PATCH 20/24] Re-introduce the 0.2mm to prevent break --- .../um_f4_aa0.8_tpu_0.2mm.inst.cfg | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.2mm.inst.cfg diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.2mm.inst.cfg new file mode 100644 index 00000000000..c3291f77a1d --- /dev/null +++ b/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.2mm.inst.cfg @@ -0,0 +1,24 @@ +[general] +definition = ultimaker_factor4 +name = Fast +version = 4 + +[metadata] +material = generic_tpu +quality_type = draft +setting_version = 23 +type = quality +variant = AA 0.8 +weight = -2 + +[values] +gradual_flow_discretisation_step_size = 0.1 +gradual_flow_enabled = True +infill_pattern = ='zigzag' if infill_sparse_density > 50 else 'cross_3d' +infill_sparse_density = 10 +inset_direction = outside_in +max_flow_acceleration = 1 +skin_material_flow = =material_flow * 0.9 +skin_material_flow_layer_0 = 90 +speed_layer_0 = 20 + From fa636c235bb6873841f8680380c919da6590c4ed Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 19 Sep 2024 13:36:24 +0200 Subject: [PATCH 21/24] Set explicit empty description when not published --- .github/workflows/release-process_release-candidate.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 978209d0d22..8851d1b9f6d 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -169,8 +169,8 @@ jobs: strategy: replace title: UltiMaker Cura ${{ inputs.cura_version }} draft: true - body-source: file - body: formatted_changelog.txt + body-source: ${{ inputs.publish_release_description && 'file' || 'literal' }} + body: ${{ inputs.publish_release_description && 'formatted_changelog.txt' || '' }} - name: Download artifacts uses: actions/download-artifact@v4.1.7 From 41c734498faaf7d52e5cac36cf5222e9bf47b52e Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 19 Sep 2024 15:53:06 +0200 Subject: [PATCH 22/24] Don't re-create the release if not necessary --- .github/workflows/release-process_release-candidate.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 8851d1b9f6d..62051a0809e 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -163,14 +163,15 @@ jobs: - name: Create release uses: notpeelz/action-gh-create-release@v5.0.1 + if: ${{ inputs.publish_release_description }} with: target: ${{ needs.create-tags.outputs.main_commit }} tag: ${{ inputs.cura_version }} strategy: replace title: UltiMaker Cura ${{ inputs.cura_version }} draft: true - body-source: ${{ inputs.publish_release_description && 'file' || 'literal' }} - body: ${{ inputs.publish_release_description && 'formatted_changelog.txt' || '' }} + body-source: file + body: formatted_changelog.txt - name: Download artifacts uses: actions/download-artifact@v4.1.7 From efa91dd094df5d096a298550e1de8a1168a399f1 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Fri, 20 Sep 2024 08:45:23 +0200 Subject: [PATCH 23/24] Update conandata.yml --- resources/conandata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/conandata.yml b/resources/conandata.yml index 7d5a43c8917..9e4e8b52711 100644 --- a/resources/conandata.yml +++ b/resources/conandata.yml @@ -1 +1 @@ -version: "5.8.1" +version: "5.9.0-alpha.0" From 5261936c4e37d296605dcdb510bf159a09c1c156 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 20 Sep 2024 10:11:27 +0200 Subject: [PATCH 24/24] Make description more explicit --- .github/workflows/release-process_release-candidate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 62051a0809e..1afb8aad048 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -10,7 +10,7 @@ on: type: string publish_release_description: - description: 'Publish the description of the release based on the changelog' + description: 'Create the GitHub release (if existing, the description will be overridden based on the changelog)' required: true type: boolean