From 34491402ded071dd51c0b69f0552b4ec61799006 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Sun, 28 Apr 2024 16:31:22 +0200 Subject: [PATCH 01/32] Update SlicingCrash.yaml --- .github/ISSUE_TEMPLATE/SlicingCrash.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/SlicingCrash.yaml b/.github/ISSUE_TEMPLATE/SlicingCrash.yaml index 0d93977627..06025886a2 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: From c5eeb012d2a68d63ef16843e7e50d7a6d309ce3b Mon Sep 17 00:00:00 2001 From: kixell Date: Tue, 4 Jun 2024 09:13:38 -0500 Subject: [PATCH 02/32] CR-M4 Added profile for Creality CR-M4 --- resources/definitions/creality_crm4.def.json | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 resources/definitions/creality_crm4.def.json diff --git a/resources/definitions/creality_crm4.def.json b/resources/definitions/creality_crm4.def.json new file mode 100644 index 0000000000..c3af9f8e07 --- /dev/null +++ b/resources/definitions/creality_crm4.def.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "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_width": { "default_value": 450 }, + "machine_height": { "default_value": 470 }, + "machine_name": { "default_value": "Creality CR-M4" } + } +} \ No newline at end of file From 57f004de0841d8b01b6d35cc2e35ad0cce2f422e Mon Sep 17 00:00:00 2001 From: kixell Date: Tue, 4 Jun 2024 09:14:47 -0500 Subject: [PATCH 03/32] Update creality_crm4.def.json --- resources/definitions/creality_crm4.def.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/definitions/creality_crm4.def.json b/resources/definitions/creality_crm4.def.json index c3af9f8e07..12396a99b3 100644 --- a/resources/definitions/creality_crm4.def.json +++ b/resources/definitions/creality_crm4.def.json @@ -11,8 +11,8 @@ { "gantry_height": { "value": 35 }, "machine_depth": { "default_value": 450 }, - "machine_width": { "default_value": 450 }, - "machine_height": { "default_value": 470 }, + "machine_width": { "default_value": 450 }, + "machine_height": { "default_value": 470 }, "machine_name": { "default_value": "Creality CR-M4" } } -} \ No newline at end of file +} From 7ba48bfa9783f9305023048ad8b156e921068236 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 10 Jul 2024 13:13:26 +0200 Subject: [PATCH 04/32] Add the slicemetadata.json file into the makerbot file archive CURA-12005 --- cura/API/Interface/Settings.py | 62 +++++++++++++++++++++++- plugins/MakerbotWriter/MakerbotWriter.py | 3 ++ plugins/UFPWriter/UFPWriter.py | 58 ++-------------------- 3 files changed, 67 insertions(+), 56 deletions(-) diff --git a/cura/API/Interface/Settings.py b/cura/API/Interface/Settings.py index 706a6d8c74..084023b9bd 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 @@ class Settings: """ 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/plugins/MakerbotWriter/MakerbotWriter.py b/plugins/MakerbotWriter/MakerbotWriter.py index 233575029c..a29d01873f 100644 --- a/plugins/MakerbotWriter/MakerbotWriter.py +++ b/plugins/MakerbotWriter/MakerbotWriter.py @@ -137,6 +137,9 @@ class MakerbotWriter(MeshWriter): for png_file in png_files: file, data = png_file["file"], png_file["data"] zip_stream.writestr(file, data) + api = CuraApplication.getInstance().getCuraAPI() + slice_metadata = json.dumps(api.interface.settings.getSliceMetadata(), 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 475e5fc01a..0cf756b6a4 100644 --- a/plugins/UFPWriter/UFPWriter.py +++ b/plugins/UFPWriter/UFPWriter.py @@ -24,6 +24,7 @@ from UM.Settings.InstanceContainer import InstanceContainer 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 @@ class UFPWriter(MeshWriter): 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 @@ class UFPWriter(MeshWriter): 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 From be4d4d404f67c202808b04880ae61dc6ba170d3d Mon Sep 17 00:00:00 2001 From: nilsiism <32297855+nilsiism@users.noreply.github.com> Date: Fri, 12 Jul 2024 13:47:21 +0200 Subject: [PATCH 05/32] Fix transformation The transformation from UM to savitar in the 3MFWriter does not invert the transformation in the 3MFReader. This usually doesn't cause any problems as the center mesh extension is zero and the resulting matrix the identity. However if the extent is not zero the final transformation is incorrect. --- plugins/3MFWriter/ThreeMFWriter.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/plugins/3MFWriter/ThreeMFWriter.py b/plugins/3MFWriter/ThreeMFWriter.py index 5a9fa487fc..a3eb43ca32 100644 --- a/plugins/3MFWriter/ThreeMFWriter.py +++ b/plugins/3MFWriter/ThreeMFWriter.py @@ -114,22 +114,24 @@ class ThreeMFWriter(MeshWriter): 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() From eff32ea8c2ba139789540259637f4630d8188336 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 15 Jul 2024 12:38:47 +0200 Subject: [PATCH 06/32] Order backend plugins by name The engine processes the plugins based on the order they were given in. By ordering them beforehand, we ensure that they will always be processed with the same logic. CURA-10914 --- plugins/CuraEngineBackend/StartSliceJob.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/plugins/CuraEngineBackend/StartSliceJob.py b/plugins/CuraEngineBackend/StartSliceJob.py index 9caadbdff6..7a294c89a8 100644 --- a/plugins/CuraEngineBackend/StartSliceJob.py +++ b/plugins/CuraEngineBackend/StartSliceJob.py @@ -366,7 +366,12 @@ class StartSliceJob(Job): 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(): From fbd50501c6ae284ba53a5b5d300c579245e09714 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Sat, 20 Jul 2024 14:14:34 +0200 Subject: [PATCH 07/32] Update cura.pot The bold tag should close before the paragraph tag. --- resources/i18n/cura.pot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/i18n/cura.pot b/resources/i18n/cura.pot index 4141ac0f71..c2d8ac781f 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 f81a3f0e11949387198a13adf4233f164dcf53a6 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Thu, 1 Aug 2024 13:59:49 +0200 Subject: [PATCH 08/32] Centralize all of these mappings. done as part of CURA-12005 --- cura/PrinterOutput/FormatMaps.py | 40 +++++++++++++++++++ .../Models/ExtruderConfigurationModel.py | 15 ++----- .../Models/MaterialOutputModel.py | 30 +++----------- .../NetworkedPrinterOutputDevice.py | 13 ++---- 4 files changed, 53 insertions(+), 45 deletions(-) create mode 100644 cura/PrinterOutput/FormatMaps.py diff --git a/cura/PrinterOutput/FormatMaps.py b/cura/PrinterOutput/FormatMaps.py new file mode 100644 index 0000000000..2aa9ccc86e --- /dev/null +++ b/cura/PrinterOutput/FormatMaps.py @@ -0,0 +1,40 @@ +# Copyright (c) 2024 UltiMaker +# Cura is released under the terms of the LGPLv3 or higher. + +class FormatMaps: + + PRINTER_TYPE_NAME = { + "fire_e": "ultimaker_method", + "lava_f": "ultimaker_methodx", + "magma_10": "ultimaker_methodxl", + "sketch": "ultimaker_sketch" + } + + EXTRUDER_NAME_MAP = { + "mk14_hot": "1XA", + "mk14_hot_s": "2XA", + "mk14_c": "1C", + "mk14": "1A", + "mk14_s": "2A", + "mk14_e": "LABS" + } + + 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"} + } diff --git a/cura/PrinterOutput/Models/ExtruderConfigurationModel.py b/cura/PrinterOutput/Models/ExtruderConfigurationModel.py index ac924c684e..c5c480e224 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 @@ class ExtruderConfigurationModel(QObject): @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 854226c6d4..8790d1626e 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 @@ class MaterialOutputModel(QObject): @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 2a683966db..3dc245d468 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.Logger import Logger 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 @@ class NetworkedPrinterOutputDevice(PrinterOutputDevice): @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) From ddf4f4c6fef74751d43db55cb8410583e5ee4c5e Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Thu, 1 Aug 2024 14:33:24 +0200 Subject: [PATCH 09/32] Also move printer name mapping to new FormatMaps utility. done as part of CURA-12005 --- cura/PrinterOutput/FormatMaps.py | 27 +++++++++++++++++ .../XmlMaterialProfile/XmlMaterialProfile.py | 30 +++---------------- .../texts}/product_to_id.json | 0 3 files changed, 31 insertions(+), 26 deletions(-) rename {plugins/XmlMaterialProfile => resources/texts}/product_to_id.json (100%) diff --git a/cura/PrinterOutput/FormatMaps.py b/cura/PrinterOutput/FormatMaps.py index 2aa9ccc86e..8c785eb2ff 100644 --- a/cura/PrinterOutput/FormatMaps.py +++ b/cura/PrinterOutput/FormatMaps.py @@ -1,6 +1,11 @@ # 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: PRINTER_TYPE_NAME = { @@ -38,3 +43,25 @@ class FormatMaps: "tpu": {"name": "TPU 95A", "guid": "19baa6a9-94ff-478b-b4a1-8157b74358d2"}, "im-pla": {"name": "Tough", "guid": "de031137-a8ca-4a72-bd1b-17bb964033ad"} } + + __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 + + 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/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index 980288e3c9..49b5e7661d 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -17,6 +17,7 @@ from UM.Settings.ContainerRegistry import ContainerRegistry 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 @@ class XmlMaterialProfile(InstanceContainer): 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 @@ class XmlMaterialProfile(InstanceContainer): 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 @@ class XmlMaterialProfile(InstanceContainer): 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 @@ -1128,29 +1129,6 @@ class XmlMaterialProfile(InstanceContainer): 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/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 832e59ec8ff8dfc106eb1b37691ae06f891cac53 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Thu, 1 Aug 2024 15:29:06 +0200 Subject: [PATCH 10/32] Add 'inverse' naming maps. done as part of CURA-12005 --- cura/PrinterOutput/FormatMaps.py | 41 +++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/cura/PrinterOutput/FormatMaps.py b/cura/PrinterOutput/FormatMaps.py index 8c785eb2ff..b8ad4df2a2 100644 --- a/cura/PrinterOutput/FormatMaps.py +++ b/cura/PrinterOutput/FormatMaps.py @@ -8,6 +8,7 @@ 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", @@ -15,6 +16,7 @@ class FormatMaps: "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", @@ -24,6 +26,7 @@ class FormatMaps: "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"}, @@ -44,11 +47,47 @@ class FormatMaps: "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 in the XML files to their definition IDs. + """Gets a mapping from product names (for example, in the XML files) to their definition IDs. This loads the mapping from a file. """ From 9c457b0d20f9023a8539a6235939ade1a642d40e Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Thu, 1 Aug 2024 15:31:04 +0200 Subject: [PATCH 11/32] Map internal name reps to .makerbot-file reps. Not only is this more congruent with the file-format as it exists, the Digital Library handles the metadata in this format, and can do little with it otherwise. last step needed for CURA-12005 --- plugins/MakerbotWriter/MakerbotWriter.py | 26 ++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/plugins/MakerbotWriter/MakerbotWriter.py b/plugins/MakerbotWriter/MakerbotWriter.py index 156a6371eb..34ef562fd3 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.Scene.Iterator.DepthFirstIterator import DepthFirstIterator 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,7 +139,28 @@ class MakerbotWriter(MeshWriter): file, data = png_file["file"], png_file["data"] zip_stream.writestr(file, data) api = CuraApplication.getInstance().getCuraAPI() - slice_metadata = json.dumps(api.interface.settings.getSliceMetadata(), separators=(", ", ": "), indent=4) + 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}'.") From ad0f6eb21dac16a2e446546238255a48874c57aa Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 5 Aug 2024 12:52:40 +0200 Subject: [PATCH 12/32] Add settings for aux fan control CURA-11849 --- resources/definitions/fdmprinter.def.json | 44 +++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 045bec05a4..1bc62a814c 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", @@ -4467,6 +4479,38 @@ "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", From c1a3b8f073e92c999cdff4d0d0d1c8c6c9b77b55 Mon Sep 17 00:00:00 2001 From: nallath Date: Mon, 5 Aug 2024 10:54:08 +0000 Subject: [PATCH 13/32] Applied printer-linter format --- resources/definitions/fdmprinter.def.json | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 1bc62a814c..3d23d1d040 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -4479,7 +4479,6 @@ "settable_per_mesh": false, "settable_per_extruder": true }, - "build_fan_full_at_height": { "label": "Build Fan Speed at Height", From f6f9e7a5b3222a16f2552ca6b40bf91ad5f74428 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 5 Aug 2024 13:56:18 +0200 Subject: [PATCH 14/32] Fix version number for CR-M4 --- resources/definitions/creality_crm4.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/creality_crm4.def.json b/resources/definitions/creality_crm4.def.json index 12396a99b3..2ea7579ad4 100644 --- a/resources/definitions/creality_crm4.def.json +++ b/resources/definitions/creality_crm4.def.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "name": "Creality CR-M4", "inherits": "creality_base", "metadata": From 2638f78dd28446a766b8962cb22f6e994a3a4313 Mon Sep 17 00:00:00 2001 From: nallath Date: Mon, 5 Aug 2024 11:57:30 +0000 Subject: [PATCH 15/32] Applied printer-linter format --- resources/definitions/creality_crm4.def.json | 36 ++++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/resources/definitions/creality_crm4.def.json b/resources/definitions/creality_crm4.def.json index 2ea7579ad4..89ab3ed04c 100644 --- a/resources/definitions/creality_crm4.def.json +++ b/resources/definitions/creality_crm4.def.json @@ -1,18 +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_width": { "default_value": 450 }, - "machine_height": { "default_value": 470 }, - "machine_name": { "default_value": "Creality CR-M4" } - } -} +{ + "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 From ded8ddde759fd23571405bfa5e8f644ae6e12e9d Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 5 Aug 2024 13:59:07 +0200 Subject: [PATCH 16/32] Move from fdmprinter to fdmextruder --- resources/definitions/fdmextruder.def.json | 11 +++++++++++ resources/definitions/fdmprinter.def.json | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/resources/definitions/fdmextruder.def.json b/resources/definitions/fdmextruder.def.json index f60cf63360..19a114d972 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": + { + "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_id": { "default_value": "unknown", diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 045bec05a4..8d088fccb1 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -289,17 +289,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", From c3a812bd3ca17776ca7c0b81120151e27a9aebb0 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 5 Aug 2024 13:59:20 +0200 Subject: [PATCH 17/32] atom3 move --- resources/definitions/atom3.def.json | 1 - resources/extruders/atom3_extruder_0.def.json | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/atom3.def.json b/resources/definitions/atom3.def.json index c9b54d2f89..6fab25a96d 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/extruders/atom3_extruder_0.def.json b/resources/extruders/atom3_extruder_0.def.json index ccc7a0bd6b..fc51a8cf03 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 } } From f79633ab703f60ca24c72da451e175002d31b3fb Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 5 Aug 2024 13:59:35 +0200 Subject: [PATCH 18/32] diy220 move --- resources/definitions/diy220.def.json | 1 - resources/extruders/diy220_extruder_0.def.json | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/diy220.def.json b/resources/definitions/diy220.def.json index f4c2e41364..ea3e89ab04 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/extruders/diy220_extruder_0.def.json b/resources/extruders/diy220_extruder_0.def.json index 4d802b4a8d..ab271d1006 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 } } From 8da6f7287237fb926ad8c08b1e0ad32ce9749df6 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 5 Aug 2024 13:59:51 +0200 Subject: [PATCH 19/32] dxu move --- resources/definitions/dxu.def.json | 1 - resources/extruders/dxu_extruder1.def.json | 1 + resources/extruders/dxu_extruder2.def.json | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/definitions/dxu.def.json b/resources/definitions/dxu.def.json index c5eb9720f3..117edf43db 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/extruders/dxu_extruder1.def.json b/resources/extruders/dxu_extruder1.def.json index de974b8174..b44f79fdac 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 b4de471289..358bc69dae 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 }, From 164224091c6a8b92a5f18cb4b073f3fb49844cd2 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 5 Aug 2024 14:00:03 +0200 Subject: [PATCH 20/32] erzay3d move --- resources/definitions/erzay3d.def.json | 1 - resources/extruders/erzay3d_extruder_0.def.json | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/erzay3d.def.json b/resources/definitions/erzay3d.def.json index 5baadf32e4..af5784e4e6 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/extruders/erzay3d_extruder_0.def.json b/resources/extruders/erzay3d_extruder_0.def.json index a4082a6224..8ba6c573f3 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 } } From 07aec02a440e12cfd1b9216c0817198a573dbed7 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 5 Aug 2024 14:00:20 +0200 Subject: [PATCH 21/32] maker_starter move --- resources/definitions/maker_starter.def.json | 1 - resources/extruders/maker_starter_extruder_0.def.json | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/maker_starter.def.json b/resources/definitions/maker_starter.def.json index e654ee0915..5e5f9dcb5b 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/extruders/maker_starter_extruder_0.def.json b/resources/extruders/maker_starter_extruder_0.def.json index 1a8877f8ef..4154b00862 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 } } From b8d5ad85e8a6fd3b17f82c284b3343f906ec91a8 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 5 Aug 2024 14:00:45 +0200 Subject: [PATCH 22/32] Mark2 for UM2 move --- resources/definitions/Mark2_for_Ultimaker2.def.json | 1 - resources/extruders/Mark2_extruder1.def.json | 1 + resources/extruders/Mark2_extruder2.def.json | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/definitions/Mark2_for_Ultimaker2.def.json b/resources/definitions/Mark2_for_Ultimaker2.def.json index 789d5d42ec..dab45dd80c 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/extruders/Mark2_extruder1.def.json b/resources/extruders/Mark2_extruder1.def.json index 89992ad450..9617678f7e 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 967e32d8b8..b0ea604fbb 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 } } From cfb46d3792ba49dd4edce29718b6afa2ee3948f1 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 5 Aug 2024 14:01:02 +0200 Subject: [PATCH 23/32] mendel90 move --- resources/definitions/mendel90.def.json | 1 - resources/extruders/mendel90_extruder_0.def.json | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/mendel90.def.json b/resources/definitions/mendel90.def.json index 57e1276e6a..d8619fe276 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/extruders/mendel90_extruder_0.def.json b/resources/extruders/mendel90_extruder_0.def.json index 0701164a65..b04e2d2fe9 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 } } From e2ea625a7b08320c7b4c487b6e09c582ec6e79a1 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 5 Aug 2024 14:01:25 +0200 Subject: [PATCH 24/32] structure3d_discov3ry move --- .../definitions/structur3d_discov3ry1_complete_um2plus.def.json | 1 - .../structur3d_discov3ry1_complete_um2plus_extruder_0.def.json | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json b/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json index c013c49e05..722f4dade5 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/extruders/structur3d_discov3ry1_complete_um2plus_extruder_0.def.json b/resources/extruders/structur3d_discov3ry1_complete_um2plus_extruder_0.def.json index 0258f9da9c..ec25298a5c 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 } } From d498a883333c67e782820a8922b5ef1252016b3e Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 5 Aug 2024 14:01:34 +0200 Subject: [PATCH 25/32] tam move --- resources/definitions/tam.def.json | 1 - resources/extruders/tam_extruder_0.def.json | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/tam.def.json b/resources/definitions/tam.def.json index 84bbc9c8fb..01437cebe7 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/extruders/tam_extruder_0.def.json b/resources/extruders/tam_extruder_0.def.json index b606474ff0..4e5cbe4216 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 } } From 98b007fb0ee033d3a256ec867839dd88dab362c1 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 5 Aug 2024 14:01:46 +0200 Subject: [PATCH 26/32] Um2 move --- resources/definitions/ultimaker2.def.json | 1 - resources/extruders/ultimaker2_extruder_0.def.json | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/ultimaker2.def.json b/resources/definitions/ultimaker2.def.json index 8c0e066cd1..d749c96a00 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/extruders/ultimaker2_extruder_0.def.json b/resources/extruders/ultimaker2_extruder_0.def.json index 17d0d425df..3432ace596 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 } } From 3c8f2f965b5fa04b529b6ddf31e71dad9d723b17 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 5 Aug 2024 14:02:16 +0200 Subject: [PATCH 27/32] Um2plus move --- resources/definitions/ultimaker2_plus.def.json | 1 - resources/extruders/ultimaker2_plus_extruder_0.def.json | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/ultimaker2_plus.def.json b/resources/definitions/ultimaker2_plus.def.json index b5ad30bb8d..c06d8b1e68 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/extruders/ultimaker2_plus_extruder_0.def.json b/resources/extruders/ultimaker2_plus_extruder_0.def.json index 3fec85805e..ace4b5b813 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 } } From ef17a72f1d163da62995835d9b06b7919f428c2f Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 5 Aug 2024 14:02:34 +0200 Subject: [PATCH 28/32] Um2 plus connect move --- resources/definitions/ultimaker2_plus_connect.def.json | 1 - resources/extruders/ultimaker2_plus_connect_extruder_0.def.json | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/ultimaker2_plus_connect.def.json b/resources/definitions/ultimaker2_plus_connect.def.json index 8aae2d4c19..6cdd3e9705 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/ultimaker2_plus_connect_extruder_0.def.json b/resources/extruders/ultimaker2_plus_connect_extruder_0.def.json index 0b74aae019..9ad61af313 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 } } From 882c57ec730c5c54f8ef97a0fb6ec110888a82b2 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 5 Aug 2024 12:03:32 +0000 Subject: [PATCH 29/32] Applied printer-linter format --- resources/definitions/fdmextruder.def.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/definitions/fdmextruder.def.json b/resources/definitions/fdmextruder.def.json index 19a114d972..101efee3b1 100644 --- a/resources/definitions/fdmextruder.def.json +++ b/resources/definitions/fdmextruder.def.json @@ -169,14 +169,14 @@ }, "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, + "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_meshgroup": false + "settable_per_mesh": false, + "settable_per_meshgroup": false, + "type": "float", + "unit": "mm" }, "machine_nozzle_id": { From 4d7a57822b3bd1e3eba4390558afc5f216347c5c Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 5 Aug 2024 15:21:07 +0200 Subject: [PATCH 30/32] Bump to 5.9.0-alpha.1 --- conandata.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/conandata.yml b/conandata.yml index 83bfd935a0..cbc7dec5a1 100644 --- a/conandata.yml +++ b/conandata.yml @@ -1,17 +1,17 @@ -version: "5.8.0" +version: "5.9.0-alpha.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.9.0-alpha.1" + - "uranium/5.9.0-alpha.1" + - "curaengine/5.9.0-alpha.1" + - "cura_binary_data/5.9.0-alpha.1" + - "fdm_materials/5.9.0-alpha.1" - "curaengine_plugin_gradual_flow/0.1.0-beta.4" - - "dulcificum/0.2.1" + - "dulcificum/latest@ultimaker/testing" - "pysavitar/5.3.0" - "pynest2d/5.3.0" - "native_cad_plugin/2.0.0" requirements_internal: - - "fdm_materials/5.8.0" + - "fdm_materials/5.9.0-alpha.1" - "cura_private_data/(latest)@internal/testing" urls: default: From fcca9ff18fd0bde5ee5f8c18ad4876364d14c62a Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 5 Aug 2024 15:29:28 +0200 Subject: [PATCH 31/32] Update conandata.yml --- conandata.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/conandata.yml b/conandata.yml index cbc7dec5a1..574bb794c5 100644 --- a/conandata.yml +++ b/conandata.yml @@ -1,17 +1,17 @@ -version: "5.9.0-alpha.1" +version: "5.9.0-alpha.0" requirements: - - "cura_resources/5.9.0-alpha.1" - - "uranium/5.9.0-alpha.1" - - "curaengine/5.9.0-alpha.1" - - "cura_binary_data/5.9.0-alpha.1" - - "fdm_materials/5.9.0-alpha.1" + - "cura_resources/(latest)@ultimaker/testing" + - "uranium/(latest)@ultimaker/testing" + - "curaengine/(latest)@ultimaker/testing" + - "cura_binary_data/(latest)@ultimaker/testing" + - "fdm_materials/(latest)@ultimaker/testing" - "curaengine_plugin_gradual_flow/0.1.0-beta.4" - - "dulcificum/latest@ultimaker/testing" + - "dulcificum/(latest)@ultimaker/testing" - "pysavitar/5.3.0" - "pynest2d/5.3.0" - "native_cad_plugin/2.0.0" requirements_internal: - - "fdm_materials/5.9.0-alpha.1" + - "fdm_materials/(latest)@internal/testing" - "cura_private_data/(latest)@internal/testing" urls: default: From 1edc45f9ae03f19e6aba7a4b70745bf3dfb95ee8 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 6 Aug 2024 16:23:27 +0200 Subject: [PATCH 32/32] Builds: Unbump dulcificum version. --- conandata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index 574bb794c5..0640813146 100644 --- a/conandata.yml +++ b/conandata.yml @@ -6,7 +6,7 @@ requirements: - "cura_binary_data/(latest)@ultimaker/testing" - "fdm_materials/(latest)@ultimaker/testing" - "curaengine_plugin_gradual_flow/0.1.0-beta.4" - - "dulcificum/(latest)@ultimaker/testing" + - "dulcificum/0.2.1" - "pysavitar/5.3.0" - "pynest2d/5.3.0" - "native_cad_plugin/2.0.0"