From 4b73d1cc2cbfc286f9745d0a95347ece73bab376 Mon Sep 17 00:00:00 2001 From: Tim Date: Tue, 1 Feb 2022 15:37:57 +0100 Subject: [PATCH 01/39] Add content_rating tags and fixes wrong url screenshot.png does not exist anymore on master use cura-logo.png instead Add content_rating tags according to https://hughsie.github.io/oars/index.html --- com.ultimaker.cura.appdata.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/com.ultimaker.cura.appdata.xml b/com.ultimaker.cura.appdata.xml index bdd25e5242..df5848ae47 100644 --- a/com.ultimaker.cura.appdata.xml +++ b/com.ultimaker.cura.appdata.xml @@ -25,9 +25,10 @@ - https://raw.githubusercontent.com/Ultimaker/Cura/master/screenshot.png + https://raw.githubusercontent.com/Ultimaker/Cura/4.13.1/cura-logo.PNG https://ultimaker.com/software/ultimaker-cura?utm_source=cura&utm_medium=software&utm_campaign=cura-update-linux Cura + From c3058b2d170beca0245645a9a93daa8f8162fe08 Mon Sep 17 00:00:00 2001 From: Tim Date: Wed, 16 Feb 2022 18:25:15 +0100 Subject: [PATCH 02/39] Appdata.xml use the logo of the master branch --- com.ultimaker.cura.appdata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.ultimaker.cura.appdata.xml b/com.ultimaker.cura.appdata.xml index df5848ae47..53d37535d4 100644 --- a/com.ultimaker.cura.appdata.xml +++ b/com.ultimaker.cura.appdata.xml @@ -25,7 +25,7 @@ - https://raw.githubusercontent.com/Ultimaker/Cura/4.13.1/cura-logo.PNG + https://raw.githubusercontent.com/Ultimaker/Cura/master/cura-logo.PNG https://ultimaker.com/software/ultimaker-cura?utm_source=cura&utm_medium=software&utm_campaign=cura-update-linux From 9fdeffd564aab5f896bd6405176b7a8491c69303 Mon Sep 17 00:00:00 2001 From: "p.kuiper" Date: Thu, 31 Mar 2022 15:20:00 +0200 Subject: [PATCH 03/39] Better default for the experimental bridge settings. See PP-3 for details. Relates to PP-3 --- resources/definitions/ultimaker.def.json | 61 ++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index 2f69ad27a7..cc28dfa526 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -82,6 +82,67 @@ }, "xy_offset": { "value": "-layer_height * 0.2" + }, + "bridge_settings_enabled": { + "value": false + }, + "bridge_wall_min_length": { + "value": 0 + }, + "bridge_skin_support_threshold": { + "value": 50 + }, + "bridge_sparse_infill_max_density": { + "value": 0 + }, + "bridge_wall_coast": { + "value": 0 + }, + "bridge_wall_speed": { + "value": "speed_wall" + }, + "bridge_wall_material_flow": { + "value": "wall_material_flow" + }, + "bridge_skin_speed": { + "value": "speed_topbottom" + }, + "bridge_skin_material_flow": { + "value": "skin_material_flow" + }, + "bridge_skin_density": { + "value": "80" + }, + "bridge_fan_speed": { + "value": "cool_fan_speed_max" + }, + "bridge_enable_more_layers": { + "value": false + }, + "bridge_skin_speed_2": { + "value": "speed_topbottom" + }, + "bridge_skin_material_flow_2": { + "value": "skin_material_flow" + }, + "bridge_skin_density_2": { + "value": 100 + }, + "bridge_fan_speed_2": { + "value": "cool_fan_speed_min" + }, + "bridge_skin_speed_3": { + "value": "speed_topbottom" + }, + "bridge_skin_material_flow_3": { + "value": "skin_material_flow" + }, + "bridge_skin_density_3": { + "value": 100 + }, + "bridge_fan_speed_3": { + "value": "cool_fan_speed_min" } + } } From 13a75827ce78e364773204e25fbc884a27c6e375 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Mon, 16 May 2022 21:49:09 +0200 Subject: [PATCH 04/39] Fix "view user manuals online" link --- plugins/MonitorStage/MonitorMain.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/MonitorStage/MonitorMain.qml b/plugins/MonitorStage/MonitorMain.qml index fdb67d0feb..5d63ac5b83 100644 --- a/plugins/MonitorStage/MonitorMain.qml +++ b/plugins/MonitorStage/MonitorMain.qml @@ -122,6 +122,7 @@ Rectangle } visible: !isNetworkConfigured && isNetworkConfigurable width: childrenRect.width + height: childrenRect.height UM.ColorImage { From 37ca436cadf0cba03a0f93facac9e5d022cd2bab Mon Sep 17 00:00:00 2001 From: fvrmr <77000924+fvrmr@users.noreply.github.com> Date: Tue, 17 May 2022 10:05:28 +0200 Subject: [PATCH 05/39] Update change_log.txt Added one more bug fix --- resources/texts/change_log.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/texts/change_log.txt b/resources/texts/change_log.txt index 3051b7c23e..33ac01743d 100644 --- a/resources/texts/change_log.txt +++ b/resources/texts/change_log.txt @@ -75,6 +75,7 @@ Ultimaker Cura 5.0 is now compatible with Apple M1. - Fixed a bug where travels would go through the model with printing PVA - Fixed a bug where Concentric ironing was affecting the print quality - Fixed a bug where there were missing infill layers +- Fixed AppRun permissions, contributed by probonopd * Printer definitions, profiles and materials: - Added Atom 3 and Atom 3 Lite printer definitions, contributed by Daniel-Kurth From 4d3f312cb6726488797df87ffde31675ce86c7e4 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 17 May 2022 11:42:43 +0200 Subject: [PATCH 06/39] Secure another 'environment-settable via Qt' DLL. SEC-258 a.k.a. CURA-8969 --- cura_app.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cura_app.py b/cura_app.py index e11e3c4232..905d8f4ee0 100755 --- a/cura_app.py +++ b/cura_app.py @@ -18,6 +18,7 @@ import os if sys.platform != "linux": # Turns out the Linux build _does_ use this, but we're not making an Enterprise release for that system anyway. os.environ["QT_PLUGIN_PATH"] = "" # Security workaround: Don't need it, and introduces an attack vector, so set to nul. os.environ["QML2_IMPORT_PATH"] = "" # Security workaround: Don't need it, and introduces an attack vector, so set to nul. + os.environ["QT_OPENGL_DLL"] = "" # Security workaround: Don't need it, and introduces an attack vector, so set to nul. from PyQt6.QtNetwork import QSslConfiguration, QSslSocket From 050a73166360106d2c2733b22e9c31be400f6db8 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Fri, 20 May 2022 14:32:28 +0200 Subject: [PATCH 07/39] In secure version: disable loading themes from unbundled folders. This was a bit more tricky then it at first seemed, since the information wether this is a 'secure version' comes from the user-application and is not known in the Uranium library. This is not normally such a point, but both the theme and the preferences objects are loaded _very_ early in the process, and that information needs to be injected before then. (Well, in the case of the Theme object it's less important, since in the implementation choseen that is now security wise at least only in charge of wheter or not to even show the theme as selectable in the interface, so that it only needs to be aware of the 'security' status any time before the user can see a preference screen, but not nescesarily earlier.) SEC-255 | CURA-8966 --- cura/CuraApplication.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index ee3c6e361e..a324168f31 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -315,7 +315,7 @@ class CuraApplication(QtApplication): def initialize(self) -> None: self.__addExpectedResourceDirsAndSearchPaths() # Must be added before init of super - super().initialize() + super().initialize(ApplicationMetadata.IsEnterpriseVersion) self._preferences.addPreference("cura/single_instance", False) self._use_single_instance = self._preferences.getValue("cura/single_instance") or self._cli_args.single_instance @@ -942,6 +942,7 @@ class CuraApplication(QtApplication): self._qml_import_paths.append(Resources.getPath(self.ResourceTypes.QmlFiles)) self._setLoadingHint(self._i18n_catalog.i18nc("@info:progress", "Initializing engine...")) self.initializeEngine() + self.getTheme().setCheckIfTrusted(ApplicationMetadata.IsEnterpriseVersion) # Initialize UI state controller.setActiveStage("PrepareStage") From be25029aca3bdd188f3e86f5f630d0dbae43eebd Mon Sep 17 00:00:00 2001 From: "j.delarago" Date: Tue, 24 May 2022 12:09:20 +0200 Subject: [PATCH 08/39] This fix will stop enterprise versions from searching the user config folder for non storage type resources. Refer to SEC-253 for more information SEC-253 --- cura/CuraApplication.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index a324168f31..3a3ac17cdf 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -257,6 +257,7 @@ class CuraApplication(QtApplication): from UM.CentralFileStorage import CentralFileStorage CentralFileStorage.setIsEnterprise(ApplicationMetadata.IsEnterpriseVersion) + Resources.setIsEnterprise(ApplicationMetadata.IsEnterpriseVersion) @pyqtProperty(str, constant=True) def ultimakerCloudApiRootUrl(self) -> str: @@ -348,12 +349,12 @@ class CuraApplication(QtApplication): Resources.addExpectedDirNameInData(dir_name) app_root = os.path.abspath(os.path.join(os.path.dirname(sys.executable))) - Resources.addSearchPath(os.path.join(app_root, "share", "cura", "resources")) + Resources.addSecureSearchPath(os.path.join(app_root, "share", "cura", "resources")) - Resources.addSearchPath(os.path.join(self._app_install_dir, "share", "cura", "resources")) + Resources.addSecureSearchPath(os.path.join(self._app_install_dir, "share", "cura", "resources")) if not hasattr(sys, "frozen"): resource_path = os.path.join(os.path.abspath(os.path.dirname(__file__)), "..", "resources") - Resources.addSearchPath(resource_path) + Resources.addSecureSearchPath(resource_path) @classmethod def _initializeSettingDefinitions(cls): From 46cf1f3a1d490974d29b453dd90d76b155167b38 Mon Sep 17 00:00:00 2001 From: p3d-dev <105526632+p3d-dev@users.noreply.github.com> Date: Thu, 26 May 2022 00:16:14 +0200 Subject: [PATCH 09/39] remove duplicated machine_heated_bed --- resources/definitions/zav_base.def.json | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/definitions/zav_base.def.json b/resources/definitions/zav_base.def.json index 1ef9398987..9f73419d46 100644 --- a/resources/definitions/zav_base.def.json +++ b/resources/definitions/zav_base.def.json @@ -147,7 +147,6 @@ "machine_height": {"default_value": 270}, "machine_extruder_count": {"value": 1}, "machine_buildplate_type": {"value": "glass"}, - "machine_heated_bed": {"default_value": true}, "machine_center_is_zero": {"default_value": false}, "machine_gcode_flavor": {"default_value": "RepRap (Marlin/Sprinter)"}, "machine_head_with_fans_polygon": {"default_value": [ From ec3aafb859ba72202e9c0dccfaced11c10f94fcb Mon Sep 17 00:00:00 2001 From: p3d-dev <105526632+p3d-dev@users.noreply.github.com> Date: Thu, 26 May 2022 00:18:18 +0200 Subject: [PATCH 10/39] remove duplicated machine_heated_bed --- resources/definitions/uni_base.def.json | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/definitions/uni_base.def.json b/resources/definitions/uni_base.def.json index 06ba86de2d..82b05f3366 100644 --- a/resources/definitions/uni_base.def.json +++ b/resources/definitions/uni_base.def.json @@ -138,7 +138,6 @@ "machine_height": {"default_value": 250}, "machine_extruder_count": {"value": 2}, "machine_buildplate_type": {"value": "glass"}, - "machine_heated_bed": {"default_value": true}, "machine_center_is_zero": {"default_value": false}, "machine_gcode_flavor": {"default_value": "RepRap (Marlin/Sprinter)"}, "machine_head_with_fans_polygon": {"default_value": [ From 9aa7e9a0066c3a1a87c545eb560aa270a103dbf6 Mon Sep 17 00:00:00 2001 From: p3d-dev <105526632+p3d-dev@users.noreply.github.com> Date: Thu, 26 May 2022 00:19:40 +0200 Subject: [PATCH 11/39] remove duplicated machine_heated_bed --- resources/definitions/SV02.def.json | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/definitions/SV02.def.json b/resources/definitions/SV02.def.json index 067422354e..352cd23394 100644 --- a/resources/definitions/SV02.def.json +++ b/resources/definitions/SV02.def.json @@ -44,7 +44,6 @@ "machine_max_jerk_xy": { "value": 8 }, "machine_max_jerk_z": { "value": 0.4 }, "machine_max_jerk_e": { "value": 5 }, - "machine_heated_bed": { "default_value": true }, "material_diameter": { "default_value": 1.75 }, "infill_overlap": { "default_value": 15 }, "acceleration_print": { "value": 500 }, From 7c2b84184b12b23c389514e591e8526c9df54b69 Mon Sep 17 00:00:00 2001 From: Rijk van Manen Date: Mon, 30 May 2022 14:00:16 +0200 Subject: [PATCH 12/39] reduce top/bottom flow by enabling top surface skin layers PP-93 --- resources/definitions/ultimaker.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index 2946a06c6d..24ffcb4758 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -60,13 +60,13 @@ "value": "'no_outer_surfaces'" }, "roofing_layer_count": { - "value": "0" + "value": "1" }, "roofing_material_flow": { "value": "material_flow" }, "skin_material_flow": { - "value": "0.97 * material_flow" + "value": "0.95 * material_flow" }, "skin_monotonic" : { "value": true From d352bbbbc5a8fe21241c2601bf75d8cc99ac0e20 Mon Sep 17 00:00:00 2001 From: Rijk van Manen Date: Mon, 30 May 2022 14:05:47 +0200 Subject: [PATCH 13/39] reduce support interface flow The reasoning of PP-86 also holds for the support interface layers, however we forgot about support when we implemented PP-86. When doing PP-108 we found this improvement. --- resources/definitions/ultimaker.def.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index 2946a06c6d..d482128ee1 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -68,6 +68,9 @@ "skin_material_flow": { "value": "0.97 * material_flow" }, + "support_interface_material_flow": { + "value": "skin_material_flow" + }, "skin_monotonic" : { "value": true }, From 8cf1afc770d884960d400142b5b55be5f500f4e7 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 30 May 2022 16:41:30 +0200 Subject: [PATCH 14/39] Update master branch to main in XML file link Because the default branch name changed. --- com.ultimaker.cura.appdata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.ultimaker.cura.appdata.xml b/com.ultimaker.cura.appdata.xml index 53d37535d4..3af0e9c352 100644 --- a/com.ultimaker.cura.appdata.xml +++ b/com.ultimaker.cura.appdata.xml @@ -25,7 +25,7 @@ - https://raw.githubusercontent.com/Ultimaker/Cura/master/cura-logo.PNG + https://raw.githubusercontent.com/Ultimaker/Cura/main/cura-logo.PNG https://ultimaker.com/software/ultimaker-cura?utm_source=cura&utm_medium=software&utm_campaign=cura-update-linux From 21d59e93492dc66198312bdd8dd17d91bc44d252 Mon Sep 17 00:00:00 2001 From: "j.delarago" Date: Mon, 30 May 2022 17:29:59 +0200 Subject: [PATCH 15/39] Write active material metadata to ufp when saving. Add function to fetch package_id using only information from XmlMaterialProfile material container. The only piece of information associating the material container and the package together is the file_name. To find the package that owns a material we have to search each of the material package paths. It would be great to find a cleaner solution (preferable one that doesn't require invalidating the cached containers). CURA-8610 --- cura/CuraPackageManager.py | 20 ++++++ plugins/UFPWriter/UFPWriter.py | 65 +++++++++++++------ .../XmlMaterialProfile/XmlMaterialProfile.py | 3 + 3 files changed, 69 insertions(+), 19 deletions(-) diff --git a/cura/CuraPackageManager.py b/cura/CuraPackageManager.py index 17d6832ac6..b23422fbbd 100644 --- a/cura/CuraPackageManager.py +++ b/cura/CuraPackageManager.py @@ -1,5 +1,6 @@ # Copyright (c) 2018 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. +import os from typing import Any, cast, Dict, List, Set, Tuple, TYPE_CHECKING, Optional @@ -51,6 +52,25 @@ class CuraPackageManager(PackageManager): super().initialize() + def getMaterialFilePackageId(self, file_name: str, guid: str) -> str: + """Get the id of the material package that contains file_name""" + for material_package in [f for f in os.scandir(self._installation_dirs_dict["materials"]) if f.is_dir()]: + package_id = material_package.name + + for root, _, file_names in os.walk(material_package.path): + if file_name not in file_names: + #File with the name we are looking for is not in this directory + continue + + with open(root + "/" + file_name, encoding="utf-8") as f: + # Make sure the file we found has the same guid as our material + # Parsing this xml would be better but the namespace is needed to search it. + if guid in f.read(): + return package_id + continue + + + def getMachinesUsingPackage(self, package_id: str) -> Tuple[List[Tuple[GlobalStack, str, str]], List[Tuple[GlobalStack, str, str]]]: """Returns a list of where the package is used diff --git a/plugins/UFPWriter/UFPWriter.py b/plugins/UFPWriter/UFPWriter.py index 52dab1efc7..59067b1932 100644 --- a/plugins/UFPWriter/UFPWriter.py +++ b/plugins/UFPWriter/UFPWriter.py @@ -16,13 +16,14 @@ from UM.MimeTypeDatabase import MimeTypeDatabase, MimeType from UM.PluginRegistry import PluginRegistry # To get the g-code writer. from UM.Scene.Iterator.DepthFirstIterator import DepthFirstIterator -from UM.Scene.SceneNode import SceneNode from cura.CuraApplication import CuraApplication +from cura.CuraPackageManager import CuraPackageManager from cura.Utils.Threading import call_on_qt_thread from UM.i18n import i18nCatalog METADATA_OBJECTS_PATH = "metadata/objects" +METADATA_MATERIALS_PATH = "metadata/packages" catalog = i18nCatalog("cura") @@ -49,7 +50,7 @@ class UFPWriter(MeshWriter): archive.openStream(stream, "application/x-ufp", OpenMode.WriteOnly) try: - self._writeObjectList(archive) + self._writeMetadata(archive) # Store the g-code from the scene. archive.addContentType(extension = "gcode", mime_type = "text/x-gcode") @@ -163,30 +164,56 @@ class UFPWriter(MeshWriter): return True @staticmethod - def _writeObjectList(archive): - """Write a json list of object names to the METADATA_OBJECTS_PATH metadata field + def _writeMetadata(archive: VirtualFile): + material_metadata = UFPWriter._getMaterialPackageMetadata() + object_metadata = UFPWriter._getObjectMetadata() - To retrieve, use: `archive.getMetadata(METADATA_OBJECTS_PATH)` - """ + data = {METADATA_MATERIALS_PATH: material_metadata, + METADATA_OBJECTS_PATH: object_metadata} - objects_model = CuraApplication.getInstance().getObjectsModel() - object_metas = [] - - for item in objects_model.items: - object_metas.extend(UFPWriter._getObjectMetadata(item["node"])) - - data = {METADATA_OBJECTS_PATH: object_metas} archive.setMetadata(data) @staticmethod - def _getObjectMetadata(node: SceneNode) -> List[Dict[str, str]]: + def _getObjectMetadata() -> List[Dict[str, str]]: """Get object metadata to write for a Node. :return: List of object metadata dictionaries. - Might contain > 1 element in case of a group node. - Might be empty in case of nonPrintingMesh """ + metadata = [] + + objects_model = CuraApplication.getInstance().getObjectsModel() + + for item in objects_model.items: + for node in DepthFirstIterator(item["node"]): + if node.getMeshData() is not None and not node.callDecoration("isNonPrintingMesh"): + metadata.extend({"name": node.getName()}) + + return metadata + + @staticmethod + def _getMaterialPackageMetadata() -> List[Dict[str, str]]: + """Get metadata for installed materials in active extruder stack, this does not include bundled materials. + + :return: List of material metadata dictionaries. + """ + metadata = [] + + package_manager = cast(CuraPackageManager, CuraApplication.getInstance().getPackageManager()) + + for extruder in CuraApplication.getInstance().getExtruderManager().getActiveExtruderStacks(): + package_id = package_manager.getMaterialFilePackageId(extruder.material.getFileName(), extruder.material.getMetaDataEntry("GUID")) + package_data = package_manager.getInstalledPackageInfo(package_id) + + if package_data.get("is_bundled"): + continue + + material_metadata = {"id": package_id, + "display_name": package_data.get("display_name"), + "website": package_data.get("website"), + "package_version": package_data.get("package_version"), + "sdk_version_semver": package_data.get("package_version_semver")} + + metadata.append(material_metadata) + + return metadata - return [{"name": item.getName()} - for item in DepthFirstIterator(node) - if item.getMeshData() is not None and not item.callDecoration("isNonPrintingMesh")] diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index 1b88272d49..d1da10399a 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -343,6 +343,9 @@ class XmlMaterialProfile(InstanceContainer): return stream.getvalue().decode("utf-8") + def getFileName(self): + return self.getMetaDataEntry("base_file") + ".xml.fdm_material" + # Recursively resolve loading inherited files def _resolveInheritance(self, file_name): xml = self._loadFile(file_name) From 3dec025cb881e171dc89fa293c18afe13c32ed15 Mon Sep 17 00:00:00 2001 From: "j.delarago" Date: Tue, 31 May 2022 08:54:08 +0200 Subject: [PATCH 16/39] Update comment to clarify function usage. CURA-8610 --- cura/CuraPackageManager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/CuraPackageManager.py b/cura/CuraPackageManager.py index b23422fbbd..813ce40763 100644 --- a/cura/CuraPackageManager.py +++ b/cura/CuraPackageManager.py @@ -53,7 +53,7 @@ class CuraPackageManager(PackageManager): super().initialize() def getMaterialFilePackageId(self, file_name: str, guid: str) -> str: - """Get the id of the material package that contains file_name""" + """Get the id of the installed material package that contains file_name""" for material_package in [f for f in os.scandir(self._installation_dirs_dict["materials"]) if f.is_dir()]: package_id = material_package.name From 1ec554ad1c90af993c769f2d6d0b511fa098b476 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 31 May 2022 09:19:34 +0200 Subject: [PATCH 17/39] Add "Status: Triage" to bug report --- .github/ISSUE_TEMPLATE/bugreport.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bugreport.yaml b/.github/ISSUE_TEMPLATE/bugreport.yaml index f31971ab2a..fe15f31a38 100644 --- a/.github/ISSUE_TEMPLATE/bugreport.yaml +++ b/.github/ISSUE_TEMPLATE/bugreport.yaml @@ -1,6 +1,6 @@ name: Bug Report description: Create a report to help us fix issues. -labels: "Type: Bug" +labels: ["Type: Bug", "Status: Triage"] body: - type: markdown attributes: From 67dec0dd3a26d081aad3e4a9eaa6decc1e73dfbb Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 31 May 2022 09:20:53 +0200 Subject: [PATCH 18/39] Update bugreport.yaml --- .github/ISSUE_TEMPLATE/bugreport.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bugreport.yaml b/.github/ISSUE_TEMPLATE/bugreport.yaml index fe15f31a38..e3d60e41e0 100644 --- a/.github/ISSUE_TEMPLATE/bugreport.yaml +++ b/.github/ISSUE_TEMPLATE/bugreport.yaml @@ -14,7 +14,7 @@ body: attributes: label: Application Version description: The version of Cura this issue occurs with. - placeholder: 4.9.0 + placeholder: 5.0.0 validations: required: true - type: input From 097cc9388a400b071735bd0cab8f10d790f1bd20 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 31 May 2022 09:37:58 +0200 Subject: [PATCH 19/39] Added orientiation plugin to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 02be81d48e..c1fd5477d9 100644 --- a/.gitignore +++ b/.gitignore @@ -65,6 +65,7 @@ plugins/CuraRemoteSupport plugins/ModelCutter plugins/PrintProfileCreator plugins/MultiPrintPlugin +plugins/CuraOrientationPlugin #Build stuff CMakeCache.txt From cdc08b5d54da9f9be7a8269fc549442db445b778 Mon Sep 17 00:00:00 2001 From: "j.delarago" Date: Tue, 31 May 2022 10:00:25 +0200 Subject: [PATCH 20/39] Improve GUID check by parsing xml and getting GUID specifically inside the metadata tag. Remove exporting materials from disabled extruders CURA-8610 --- cura/CuraPackageManager.py | 7 +++++-- plugins/UFPWriter/UFPWriter.py | 6 +++++- plugins/XmlMaterialProfile/XmlMaterialProfile.py | 9 +++++++++ 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/cura/CuraPackageManager.py b/cura/CuraPackageManager.py index 813ce40763..0cb18ccc92 100644 --- a/cura/CuraPackageManager.py +++ b/cura/CuraPackageManager.py @@ -10,6 +10,8 @@ from cura.Settings.GlobalStack import GlobalStack from UM.PackageManager import PackageManager # The class we're extending. from UM.Resources import Resources # To find storage paths for some resource types. from UM.i18n import i18nCatalog +from plugins.XmlMaterialProfile.XmlMaterialProfile import XmlMaterialProfile + catalog = i18nCatalog("cura") if TYPE_CHECKING: @@ -59,13 +61,14 @@ class CuraPackageManager(PackageManager): for root, _, file_names in os.walk(material_package.path): if file_name not in file_names: - #File with the name we are looking for is not in this directory + # File with the name we are looking for is not in this directory continue with open(root + "/" + file_name, encoding="utf-8") as f: # Make sure the file we found has the same guid as our material # Parsing this xml would be better but the namespace is needed to search it. - if guid in f.read(): + parsed_guid = XmlMaterialProfile.getMetadataFromSerialized(f.read(), "GUID") + if guid == parsed_guid: return package_id continue diff --git a/plugins/UFPWriter/UFPWriter.py b/plugins/UFPWriter/UFPWriter.py index 59067b1932..c14b5fbfe9 100644 --- a/plugins/UFPWriter/UFPWriter.py +++ b/plugins/UFPWriter/UFPWriter.py @@ -201,10 +201,14 @@ class UFPWriter(MeshWriter): package_manager = cast(CuraPackageManager, CuraApplication.getInstance().getPackageManager()) for extruder in CuraApplication.getInstance().getExtruderManager().getActiveExtruderStacks(): + if not extruder.isEnabled: + # Don't export materials not in use + continue + package_id = package_manager.getMaterialFilePackageId(extruder.material.getFileName(), extruder.material.getMetaDataEntry("GUID")) package_data = package_manager.getInstalledPackageInfo(package_id) - if package_data.get("is_bundled"): + if not package_data or package_data.get("is_bundled"): continue material_metadata = {"id": package_id, diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index d1da10399a..05ae9a79c9 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -480,6 +480,15 @@ class XmlMaterialProfile(InstanceContainer): return version * 1000000 + setting_version + @classmethod + def getMetadataFromSerialized(cls, serialized: str, property_name: str) -> str: + data = ET.fromstring(serialized) + metadata = data.find("./um:metadata", cls.__namespaces) + property = metadata.find("./um:" + property_name, cls.__namespaces) + + # This is a necessary property != None check, xml library overrides __bool__ to return False in cases when Element is not None. + return property.text if property != None else "" + def deserialize(self, serialized, file_name = None): """Overridden from InstanceContainer""" From 64478fb17d62ec081d431f0d7d359120a3ddc49a Mon Sep 17 00:00:00 2001 From: "j.delarago" Date: Tue, 31 May 2022 10:04:23 +0200 Subject: [PATCH 21/39] Fix typo fetching sdk version CURA-8610 --- plugins/UFPWriter/UFPWriter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/UFPWriter/UFPWriter.py b/plugins/UFPWriter/UFPWriter.py index c14b5fbfe9..0ff476e26b 100644 --- a/plugins/UFPWriter/UFPWriter.py +++ b/plugins/UFPWriter/UFPWriter.py @@ -215,7 +215,7 @@ class UFPWriter(MeshWriter): "display_name": package_data.get("display_name"), "website": package_data.get("website"), "package_version": package_data.get("package_version"), - "sdk_version_semver": package_data.get("package_version_semver")} + "sdk_version_semver": package_data.get("sdk_version_semver")} metadata.append(material_metadata) From 35147d7f5edc9947470439e123cff09e9b87d697 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 31 May 2022 11:23:53 +0200 Subject: [PATCH 22/39] Don't crash if machine_extruder_trains metadata is missing This old function is only necessary for upgrading from before v3.4. Best not let it crash in any other case, even if that would sometimes make very old machine instances corrupt if I made a mistake in thinking here. Fixes Sentry issue CURA-3XG. --- cura/Settings/ExtruderManager.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cura/Settings/ExtruderManager.py b/cura/Settings/ExtruderManager.py index 07c074254f..8d46ac41d8 100755 --- a/cura/Settings/ExtruderManager.py +++ b/cura/Settings/ExtruderManager.py @@ -1,4 +1,4 @@ -# Copyright (c) 2020 Ultimaker B.V. +# Copyright (c) 2022 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from PyQt6.QtCore import pyqtSignal, pyqtProperty, QObject, QVariant # For communicating data and events to Qt. @@ -382,7 +382,10 @@ class ExtruderManager(QObject): # "fdmextruder". We need to check a machine here so its extruder definition is correct according to this. def fixSingleExtrusionMachineExtruderDefinition(self, global_stack: "GlobalStack") -> None: container_registry = ContainerRegistry.getInstance() - expected_extruder_definition_0_id = global_stack.getMetaDataEntry("machine_extruder_trains")["0"] + expected_extruder_stack = global_stack.getMetadataEntry("machine_extruder_trains") + if expected_extruder_stack is None: + return + expected_extruder_definition_0_id = expected_extruder_stack["0"] try: extruder_stack_0 = global_stack.extruderList[0] except IndexError: From 6b04c736e97ac49142793175842a1a81be6687c6 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 31 May 2022 12:34:55 +0200 Subject: [PATCH 23/39] Revert "Disable the material sync message again" This reverts commit 1f6e1942d775d47dd48be4fd83c5346271827a5e. --- cura/Machines/Models/MaterialManagementModel.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cura/Machines/Models/MaterialManagementModel.py b/cura/Machines/Models/MaterialManagementModel.py index 53d0cca0a2..b2b888f431 100644 --- a/cura/Machines/Models/MaterialManagementModel.py +++ b/cura/Machines/Models/MaterialManagementModel.py @@ -45,8 +45,7 @@ class MaterialManagementModel(QObject): for package_id, package_data in application.getPackageManager().getPackagesInstalledOnStartup().items(): if package_data["package_info"]["package_type"] == "material": # At least one new material was installed - # TODO: This should be enabled again once CURA-8609 is merged - #self._showSyncNewMaterialsMessage() + self._showSyncNewMaterialsMessage() break def _showSyncNewMaterialsMessage(self) -> None: From ec60325a3fc722c5e54ae1e5451d9d6a9fd440d1 Mon Sep 17 00:00:00 2001 From: "j.delarago" Date: Tue, 31 May 2022 12:39:00 +0200 Subject: [PATCH 24/39] Move metadata exporting to 3mf CURA-8610 --- plugins/3MFWriter/ThreeMFWriter.py | 72 ++++++++++++++++--- .../XmlMaterialProfile/XmlMaterialProfile.py | 2 +- 2 files changed, 62 insertions(+), 12 deletions(-) diff --git a/plugins/3MFWriter/ThreeMFWriter.py b/plugins/3MFWriter/ThreeMFWriter.py index 853aa08513..4bb8ab5881 100644 --- a/plugins/3MFWriter/ThreeMFWriter.py +++ b/plugins/3MFWriter/ThreeMFWriter.py @@ -1,6 +1,8 @@ # Copyright (c) 2015-2022 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from typing import Optional +import json + +from typing import Optional, cast, List, Dict from UM.Mesh.MeshWriter import MeshWriter from UM.Math.Vector import Vector @@ -10,6 +12,7 @@ from UM.Application import Application from UM.Scene.SceneNode import SceneNode from cura.CuraApplication import CuraApplication +from cura.CuraPackageManager import CuraPackageManager from cura.Utils.Threading import call_on_qt_thread from cura.Snapshot import Snapshot @@ -34,6 +37,9 @@ import UM.Application from UM.i18n import i18nCatalog catalog = i18nCatalog("cura") +THUMBNAIL_PATH = "Metadata/thumbnail.png" +MODEL_PATH = "3D/3dmodel.model" +PACKAGE_METADATA_PATH = "Metadata/packages.json" class ThreeMFWriter(MeshWriter): def __init__(self): @@ -46,7 +52,7 @@ class ThreeMFWriter(MeshWriter): } self._unit_matrix_string = self._convertMatrixToString(Matrix()) - self._archive = None # type: Optional[zipfile.ZipFile] + self._archive: Optional[zipfile.ZipFile] = None self._store_archive = False def _convertMatrixToString(self, matrix): @@ -132,11 +138,11 @@ class ThreeMFWriter(MeshWriter): def getArchive(self): return self._archive - def write(self, stream, nodes, mode = MeshWriter.OutputMode.BinaryMode): + def write(self, stream, nodes, mode = MeshWriter.OutputMode.BinaryMode) -> bool: self._archive = None # Reset archive archive = zipfile.ZipFile(stream, "w", compression = zipfile.ZIP_DEFLATED) try: - model_file = zipfile.ZipInfo("3D/3dmodel.model") + model_file = zipfile.ZipInfo(MODEL_PATH) # Because zipfile is stupid and ignores archive-level compression settings when writing with ZipInfo. model_file.compress_type = zipfile.ZIP_DEFLATED @@ -151,7 +157,7 @@ class ThreeMFWriter(MeshWriter): relations_file = zipfile.ZipInfo("_rels/.rels") relations_file.compress_type = zipfile.ZIP_DEFLATED relations_element = ET.Element("Relationships", xmlns = self._namespaces["relationships"]) - model_relation_element = ET.SubElement(relations_element, "Relationship", Target = "/3D/3dmodel.model", Id = "rel0", Type = "http://schemas.microsoft.com/3dmanufacturing/2013/01/3dmodel") + model_relation_element = ET.SubElement(relations_element, "Relationship", Target = "/" + MODEL_PATH, Id = "rel0", Type = "http://schemas.microsoft.com/3dmanufacturing/2013/01/3dmodel") # Attempt to add a thumbnail snapshot = self._createSnapshot() @@ -160,28 +166,32 @@ class ThreeMFWriter(MeshWriter): thumbnail_buffer.open(QBuffer.OpenModeFlag.ReadWrite) snapshot.save(thumbnail_buffer, "PNG") - thumbnail_file = zipfile.ZipInfo("Metadata/thumbnail.png") + thumbnail_file = zipfile.ZipInfo(THUMBNAIL_PATH) # Don't try to compress snapshot file, because the PNG is pretty much as compact as it will get archive.writestr(thumbnail_file, thumbnail_buffer.data()) # Add PNG to content types file thumbnail_type = ET.SubElement(content_types, "Default", Extension = "png", ContentType = "image/png") # Add thumbnail relation to _rels/.rels file - thumbnail_relation_element = ET.SubElement(relations_element, "Relationship", Target = "/Metadata/thumbnail.png", Id = "rel1", Type = "http://schemas.openxmlformats.org/package/2006/relationships/metadata/thumbnail") + thumbnail_relation_element = ET.SubElement(relations_element, "Relationship", Target = "/" + THUMBNAIL_PATH, Id = "rel1", Type = "http://schemas.openxmlformats.org/package/2006/relationships/metadata/thumbnail") + + # Write material metadata + material_metadata = self._getMaterialPackageMetadata() + self._storeMetadataJson({"packages": material_metadata}, archive, PACKAGE_METADATA_PATH) savitar_scene = Savitar.Scene() - metadata_to_store = CuraApplication.getInstance().getController().getScene().getMetaData() + scene_metadata = CuraApplication.getInstance().getController().getScene().getMetaData() - for key, value in metadata_to_store.items(): + for key, value in scene_metadata.items(): savitar_scene.setMetaDataEntry(key, value) current_time_string = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S") - if "Application" not in metadata_to_store: + if "Application" not in scene_metadata: # This might sound a bit strange, but this field should store the original application that created # the 3mf. So if it was already set, leave it to whatever it was. savitar_scene.setMetaDataEntry("Application", CuraApplication.getInstance().getApplicationDisplayName()) - if "CreationDate" not in metadata_to_store: + if "CreationDate" not in scene_metadata: savitar_scene.setMetaDataEntry("CreationDate", current_time_string) savitar_scene.setMetaDataEntry("ModificationDate", current_time_string) @@ -233,6 +243,46 @@ class ThreeMFWriter(MeshWriter): return True + @staticmethod + def _storeMetadataJson(metadata: Dict[str, List[Dict[str, str]]], archive: zipfile.ZipFile, path: str) -> None: + """Stores metadata inside archive path as json file""" + metadata_file = zipfile.ZipInfo(path) + # We have to set the compress type of each file as well (it doesn't keep the type of the entire archive) + metadata_file.compress_type = zipfile.ZIP_DEFLATED + archive.writestr(metadata_file, json.dumps(metadata, separators=(", ", ": "), indent=4, skipkeys=True, ensure_ascii=False)) + + @staticmethod + def _getMaterialPackageMetadata() -> List[Dict[str, str]]: + """Get metadata for installed materials in active extruder stack, this does not include bundled materials. + + :return: List of material metadata dictionaries. + """ + metadata = {} + + package_manager = cast(CuraPackageManager, CuraApplication.getInstance().getPackageManager()) + + for extruder in CuraApplication.getInstance().getExtruderManager().getActiveExtruderStacks(): + if not extruder.isEnabled: + # Don't export materials not in use + continue + + package_id = package_manager.getMaterialFilePackageId(extruder.material.getFileName(), extruder.material.getMetaDataEntry("GUID")) + package_data = package_manager.getInstalledPackageInfo(package_id) + + if not package_data or package_data.get("is_bundled"): + continue + + material_metadata = {"id": package_id, + "display_name": package_data.get("display_name") if package_data.get("display_name") else "", + "website": package_data.get("website") if package_data.get("website") else "", + "package_version": package_data.get("package_version") if package_data.get("package_version") else "", + "sdk_version_semver": package_data.get("sdk_version_semver") if package_data.get("sdk_version_semver") else ""} + + metadata[package_id] = material_metadata + + # Storing in a dict and fetching values to avoid duplicates + return list(metadata.values()) + @call_on_qt_thread # must be called from the main thread because of OpenGL def _createSnapshot(self): Logger.log("d", "Creating thumbnail image...") diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index 05ae9a79c9..4cc3638f71 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -344,7 +344,7 @@ class XmlMaterialProfile(InstanceContainer): return stream.getvalue().decode("utf-8") def getFileName(self): - return self.getMetaDataEntry("base_file") + ".xml.fdm_material" + return (self.getMetaDataEntry("base_file") + ".xml.fdm_material").replace(" ", "+") # Recursively resolve loading inherited files def _resolveInheritance(self, file_name): From ca9955c7305b433f31eb314099afcc6dd77fd7c8 Mon Sep 17 00:00:00 2001 From: "j.delarago" Date: Tue, 31 May 2022 12:43:52 +0200 Subject: [PATCH 25/39] Remove metadata exporting to ufp CURA-8610 --- plugins/UFPWriter/UFPWriter.py | 69 ++++++++++------------------------ 1 file changed, 19 insertions(+), 50 deletions(-) diff --git a/plugins/UFPWriter/UFPWriter.py b/plugins/UFPWriter/UFPWriter.py index 0ff476e26b..52dab1efc7 100644 --- a/plugins/UFPWriter/UFPWriter.py +++ b/plugins/UFPWriter/UFPWriter.py @@ -16,14 +16,13 @@ from UM.MimeTypeDatabase import MimeTypeDatabase, MimeType from UM.PluginRegistry import PluginRegistry # To get the g-code writer. from UM.Scene.Iterator.DepthFirstIterator import DepthFirstIterator +from UM.Scene.SceneNode import SceneNode from cura.CuraApplication import CuraApplication -from cura.CuraPackageManager import CuraPackageManager from cura.Utils.Threading import call_on_qt_thread from UM.i18n import i18nCatalog METADATA_OBJECTS_PATH = "metadata/objects" -METADATA_MATERIALS_PATH = "metadata/packages" catalog = i18nCatalog("cura") @@ -50,7 +49,7 @@ class UFPWriter(MeshWriter): archive.openStream(stream, "application/x-ufp", OpenMode.WriteOnly) try: - self._writeMetadata(archive) + self._writeObjectList(archive) # Store the g-code from the scene. archive.addContentType(extension = "gcode", mime_type = "text/x-gcode") @@ -164,60 +163,30 @@ class UFPWriter(MeshWriter): return True @staticmethod - def _writeMetadata(archive: VirtualFile): - material_metadata = UFPWriter._getMaterialPackageMetadata() - object_metadata = UFPWriter._getObjectMetadata() + def _writeObjectList(archive): + """Write a json list of object names to the METADATA_OBJECTS_PATH metadata field - data = {METADATA_MATERIALS_PATH: material_metadata, - METADATA_OBJECTS_PATH: object_metadata} + To retrieve, use: `archive.getMetadata(METADATA_OBJECTS_PATH)` + """ + objects_model = CuraApplication.getInstance().getObjectsModel() + object_metas = [] + + for item in objects_model.items: + object_metas.extend(UFPWriter._getObjectMetadata(item["node"])) + + data = {METADATA_OBJECTS_PATH: object_metas} archive.setMetadata(data) @staticmethod - def _getObjectMetadata() -> List[Dict[str, str]]: + def _getObjectMetadata(node: SceneNode) -> List[Dict[str, str]]: """Get object metadata to write for a Node. :return: List of object metadata dictionaries. + Might contain > 1 element in case of a group node. + Might be empty in case of nonPrintingMesh """ - metadata = [] - - objects_model = CuraApplication.getInstance().getObjectsModel() - - for item in objects_model.items: - for node in DepthFirstIterator(item["node"]): - if node.getMeshData() is not None and not node.callDecoration("isNonPrintingMesh"): - metadata.extend({"name": node.getName()}) - - return metadata - - @staticmethod - def _getMaterialPackageMetadata() -> List[Dict[str, str]]: - """Get metadata for installed materials in active extruder stack, this does not include bundled materials. - - :return: List of material metadata dictionaries. - """ - metadata = [] - - package_manager = cast(CuraPackageManager, CuraApplication.getInstance().getPackageManager()) - - for extruder in CuraApplication.getInstance().getExtruderManager().getActiveExtruderStacks(): - if not extruder.isEnabled: - # Don't export materials not in use - continue - - package_id = package_manager.getMaterialFilePackageId(extruder.material.getFileName(), extruder.material.getMetaDataEntry("GUID")) - package_data = package_manager.getInstalledPackageInfo(package_id) - - if not package_data or package_data.get("is_bundled"): - continue - - material_metadata = {"id": package_id, - "display_name": package_data.get("display_name"), - "website": package_data.get("website"), - "package_version": package_data.get("package_version"), - "sdk_version_semver": package_data.get("sdk_version_semver")} - - metadata.append(material_metadata) - - return metadata + return [{"name": item.getName()} + for item in DepthFirstIterator(node) + if item.getMeshData() is not None and not item.callDecoration("isNonPrintingMesh")] From d6bd7cce9e936333d14898076fa952397401adbb Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 31 May 2022 13:39:47 +0200 Subject: [PATCH 26/39] Oops --- cura/Settings/ExtruderManager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Settings/ExtruderManager.py b/cura/Settings/ExtruderManager.py index 8d46ac41d8..52d63b611b 100755 --- a/cura/Settings/ExtruderManager.py +++ b/cura/Settings/ExtruderManager.py @@ -382,7 +382,7 @@ class ExtruderManager(QObject): # "fdmextruder". We need to check a machine here so its extruder definition is correct according to this. def fixSingleExtrusionMachineExtruderDefinition(self, global_stack: "GlobalStack") -> None: container_registry = ContainerRegistry.getInstance() - expected_extruder_stack = global_stack.getMetadataEntry("machine_extruder_trains") + expected_extruder_stack = global_stack.getMetaDataEntry("machine_extruder_trains") if expected_extruder_stack is None: return expected_extruder_definition_0_id = expected_extruder_stack["0"] From 094c781b02c0d39f999757c5f1ed94b29de01f0c Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Tue, 31 May 2022 15:49:57 +0200 Subject: [PATCH 27/39] Update plugins/XmlMaterialProfile/XmlMaterialProfile.py Co-authored-by: Remco Burema <41987080+rburema@users.noreply.github.com> --- plugins/XmlMaterialProfile/XmlMaterialProfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index 4cc3638f71..d7d11a1f44 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -343,7 +343,7 @@ class XmlMaterialProfile(InstanceContainer): return stream.getvalue().decode("utf-8") - def getFileName(self): + def getFileName(self) -> str: return (self.getMetaDataEntry("base_file") + ".xml.fdm_material").replace(" ", "+") # Recursively resolve loading inherited files From 29b645070475516484314cc846d63a38500f5ad3 Mon Sep 17 00:00:00 2001 From: "j.delarago" Date: Tue, 31 May 2022 16:29:56 +0200 Subject: [PATCH 28/39] Add some more information for the unhappy route and a message to inform the user. CURA-6990 --- cura/CuraPackageManager.py | 5 +++-- plugins/3MFWriter/ThreeMFWriter.py | 10 +++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/cura/CuraPackageManager.py b/cura/CuraPackageManager.py index 0cb18ccc92..720406fbc6 100644 --- a/cura/CuraPackageManager.py +++ b/cura/CuraPackageManager.py @@ -4,6 +4,7 @@ import os from typing import Any, cast, Dict, List, Set, Tuple, TYPE_CHECKING, Optional +from UM.Logger import Logger from cura.CuraApplication import CuraApplication # To find some resource types. from cura.Settings.GlobalStack import GlobalStack @@ -70,9 +71,9 @@ class CuraPackageManager(PackageManager): parsed_guid = XmlMaterialProfile.getMetadataFromSerialized(f.read(), "GUID") if guid == parsed_guid: return package_id - continue - + Logger.error("Could not find package_id for file: {} with GUID: {} ".format(file_name, guid)) + return "" def getMachinesUsingPackage(self, package_id: str) -> Tuple[List[Tuple[GlobalStack, str, str]], List[Tuple[GlobalStack, str, str]]]: """Returns a list of where the package is used diff --git a/plugins/3MFWriter/ThreeMFWriter.py b/plugins/3MFWriter/ThreeMFWriter.py index 4bb8ab5881..eb96490fdb 100644 --- a/plugins/3MFWriter/ThreeMFWriter.py +++ b/plugins/3MFWriter/ThreeMFWriter.py @@ -9,6 +9,7 @@ from UM.Math.Vector import Vector from UM.Logger import Logger from UM.Math.Matrix import Matrix from UM.Application import Application +from UM.Message import Message from UM.Scene.SceneNode import SceneNode from cura.CuraApplication import CuraApplication @@ -269,7 +270,14 @@ class ThreeMFWriter(MeshWriter): package_id = package_manager.getMaterialFilePackageId(extruder.material.getFileName(), extruder.material.getMetaDataEntry("GUID")) package_data = package_manager.getInstalledPackageInfo(package_id) - if not package_data or package_data.get("is_bundled"): + if not package_data: + message = Message(catalog.i18nc("@error:uninstall", + "It was not possible to store material package information in project file: {material}. This project may not open correctly on other systems.".format(material=extruder.getName())), + title=catalog.i18nc("@info:title", "Failed to save material package information"), + message_type=Message.MessageType.WARNING) + message.show() + + if package_data.get("is_bundled"): continue material_metadata = {"id": package_id, From aa83c68387e713452a1787c0f3504eec1572e9fd Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 31 May 2022 17:20:51 +0200 Subject: [PATCH 29/39] This error is not about materials, not uninstalling. --- plugins/3MFWriter/ThreeMFWriter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/3MFWriter/ThreeMFWriter.py b/plugins/3MFWriter/ThreeMFWriter.py index eb96490fdb..a4a53dd813 100644 --- a/plugins/3MFWriter/ThreeMFWriter.py +++ b/plugins/3MFWriter/ThreeMFWriter.py @@ -271,7 +271,7 @@ class ThreeMFWriter(MeshWriter): package_data = package_manager.getInstalledPackageInfo(package_id) if not package_data: - message = Message(catalog.i18nc("@error:uninstall", + message = Message(catalog.i18nc("@error:material", "It was not possible to store material package information in project file: {material}. This project may not open correctly on other systems.".format(material=extruder.getName())), title=catalog.i18nc("@info:title", "Failed to save material package information"), message_type=Message.MessageType.WARNING) From 61332b0845839c2c74f95b5413ec06a7dd7df39a Mon Sep 17 00:00:00 2001 From: "j.delarago" Date: Wed, 1 Jun 2022 10:14:24 +0200 Subject: [PATCH 30/39] Remove website CURA-8610 --- plugins/3MFWriter/ThreeMFWriter.py | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/3MFWriter/ThreeMFWriter.py b/plugins/3MFWriter/ThreeMFWriter.py index eb96490fdb..d6f08945a8 100644 --- a/plugins/3MFWriter/ThreeMFWriter.py +++ b/plugins/3MFWriter/ThreeMFWriter.py @@ -282,7 +282,6 @@ class ThreeMFWriter(MeshWriter): material_metadata = {"id": package_id, "display_name": package_data.get("display_name") if package_data.get("display_name") else "", - "website": package_data.get("website") if package_data.get("website") else "", "package_version": package_data.get("package_version") if package_data.get("package_version") else "", "sdk_version_semver": package_data.get("sdk_version_semver") if package_data.get("sdk_version_semver") else ""} From e6551821aaf6ab69f2fb4e1f735427506ead22b5 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 1 Jun 2022 11:07:01 +0200 Subject: [PATCH 31/39] Use intent category if no translation is available Previously we would only accept intents that had a translation. If we could not find one, we would use "unknown" as the intent category. However, we didn't really do this consistently. In some places it would show unkown and in others we'd show the intent type. This should make the behavior the same across the board. It will try to get a translation for the intent category and show that. If it's unable to find that it will use the category instead. Note that it will use the python title function to ensure it has nice capitalisation CURA-9297 --- cura/Machines/Models/IntentCategoryModel.py | 2 +- cura/Machines/Models/QualityManagementModel.py | 3 ++- cura/Settings/MachineManager.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cura/Machines/Models/IntentCategoryModel.py b/cura/Machines/Models/IntentCategoryModel.py index 14e3c4d35e..e94bbe6d00 100644 --- a/cura/Machines/Models/IntentCategoryModel.py +++ b/cura/Machines/Models/IntentCategoryModel.py @@ -111,7 +111,7 @@ class IntentCategoryModel(ListModel): except ValueError: weight = 99 result.append({ - "name": IntentCategoryModel.translation(category, "name", category), + "name": IntentCategoryModel.translation(category, "name", category.title()), "description": IntentCategoryModel.translation(category, "description", None), "intent_category": category, "weight": weight, diff --git a/cura/Machines/Models/QualityManagementModel.py b/cura/Machines/Models/QualityManagementModel.py index 8db8719784..b4fb8b38b5 100644 --- a/cura/Machines/Models/QualityManagementModel.py +++ b/cura/Machines/Models/QualityManagementModel.py @@ -358,8 +358,9 @@ class QualityManagementModel(ListModel): "quality_type": quality_type, "quality_changes_group": None, "intent_category": intent_category, - "section_name": catalog.i18nc("@label", intent_translations.get(intent_category, {}).get("name", catalog.i18nc("@label", "Unknown"))), + "section_name": catalog.i18nc("@label", intent_translations.get(intent_category, {}).get("name", catalog.i18nc("@label", intent_category.title()))), }) + # Sort by quality_type for each intent category intent_translations_list = list(intent_translations) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 1c7a8f0e98..9b98179bff 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1611,7 +1611,7 @@ class MachineManager(QObject): if intent_category != "default": intent_display_name = IntentCategoryModel.translation(intent_category, "name", - catalog.i18nc("@label", "Unknown")) + intent_category.title()) display_name = "{intent_name} - {the_rest}".format(intent_name = intent_display_name, the_rest = display_name) From 20efe02d8b09d5830bf6ce06d90acc3c1ac3557f Mon Sep 17 00:00:00 2001 From: "p.kuiper" Date: Wed, 1 Jun 2022 13:54:00 +0200 Subject: [PATCH 32/39] Also changed the jerk setting for support material to 20mm/s to prevent flow ringing in the support material and increase productivity. Relates to PP-19 --- resources/definitions/ultimaker3.def.json | 10 +++++----- resources/definitions/ultimaker_s3.def.json | 10 +++++----- resources/definitions/ultimaker_s5.def.json | 10 +++++----- resources/variants/ultimaker3_bb0.8.inst.cfg | 3 --- resources/variants/ultimaker3_extended_bb0.8.inst.cfg | 3 --- resources/variants/ultimaker3_extended_bb04.inst.cfg | 3 --- resources/variants/ultimaker_s3_bb0.8.inst.cfg | 3 --- resources/variants/ultimaker_s5_bb0.8.inst.cfg | 3 --- resources/variants/ultimaker_s5_bb04.inst.cfg | 3 --- 9 files changed, 15 insertions(+), 33 deletions(-) diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index fd21ab5271..5505cf4ddf 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -108,13 +108,13 @@ "jerk_roofing": {"minimum_value_warning": 20 }, "jerk_topbottom": { "value": "jerk_print", "minimum_value_warning": 20 }, "jerk_support": { "value": "jerk_print", "minimum_value_warning": 20 }, - "jerk_support_infill": {"minimum_value_warning": 20 }, - "jerk_support_interface": { "value": "math.ceil(jerk_print * 5 / 20)"}, + "jerk_support_infill": {"value": "jerk_print", "minimum_value_warning": 20 }, + "jerk_support_interface": {"value": "jerk_topbottom", "minimum_value_warning": 20}, "jerk_prime_tower": { "value": "jerk_print", "minimum_value_warning": 20 }, "jerk_layer_0": { "value": "jerk_topbottom", "minimum_value_warning": 20}, - "jerk_print_layer_0": {"minimum_value_warning": 20 }, - "jerk_travel_layer_0": {"minimum_value_warning": 20 }, - "jerk_skirt_brim": {"minimum_value_warning": 20 }, + "jerk_print_layer_0": {"value": "jerk_print", "minimum_value_warning": 20 }, + "jerk_travel_layer_0": {"value": "jerk_travel", "minimum_value_warning": 20 }, + "jerk_skirt_brim": {"value": "jerk_print", "minimum_value_warning": 20 }, "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" }, "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json index 640a062c6d..5761b09c19 100644 --- a/resources/definitions/ultimaker_s3.def.json +++ b/resources/definitions/ultimaker_s3.def.json @@ -100,13 +100,13 @@ "jerk_roofing": {"minimum_value_warning": 20 }, "jerk_topbottom": { "value": "jerk_print", "minimum_value_warning": 20 }, "jerk_support": { "value": "jerk_print", "minimum_value_warning": 20 }, - "jerk_support_infill": {"minimum_value_warning": 20 }, - "jerk_support_interface": { "value": "math.ceil(jerk_print * 5 / 20)"}, + "jerk_support_infill": {"value": "jerk_print", "minimum_value_warning": 20 }, + "jerk_support_interface": {"value": "jerk_topbottom", "minimum_value_warning": 20}, "jerk_prime_tower": { "value": "jerk_print", "minimum_value_warning": 20 }, "jerk_layer_0": { "value": "jerk_topbottom", "minimum_value_warning": 20}, - "jerk_print_layer_0": {"minimum_value_warning": 20 }, - "jerk_travel_layer_0": {"minimum_value_warning": 20 }, - "jerk_skirt_brim": {"minimum_value_warning": 20 }, + "jerk_print_layer_0": {"value": "jerk_print", "minimum_value_warning": 20 }, + "jerk_travel_layer_0": {"value": "jerk_travel", "minimum_value_warning": 20 }, + "jerk_skirt_brim": {"value": "jerk_print", "minimum_value_warning": 20 }, "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" }, "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index 0d5d7499cc..bfd80caeab 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -102,13 +102,13 @@ "jerk_roofing": {"minimum_value_warning": 20 }, "jerk_topbottom": { "value": "jerk_print", "minimum_value_warning": 20 }, "jerk_support": { "value": "jerk_print", "minimum_value_warning": 20 }, - "jerk_support_infill": {"minimum_value_warning": 20 }, - "jerk_support_interface": { "value": "math.ceil(jerk_print * 5 / 20)"}, + "jerk_support_infill": {"value": "jerk_print", "minimum_value_warning": 20 }, + "jerk_support_interface": {"value": "jerk_topbottom", "minimum_value_warning": 20}, "jerk_prime_tower": { "value": "jerk_print", "minimum_value_warning": 20 }, "jerk_layer_0": { "value": "jerk_topbottom", "minimum_value_warning": 20}, - "jerk_print_layer_0": {"minimum_value_warning": 20 }, - "jerk_travel_layer_0": {"minimum_value_warning": 20 }, - "jerk_skirt_brim": {"minimum_value_warning": 20 }, + "jerk_print_layer_0": {"value": "jerk_print", "minimum_value_warning": 20 }, + "jerk_travel_layer_0": {"value": "jerk_travel", "minimum_value_warning": 20 }, + "jerk_skirt_brim": {"value": "jerk_print", "minimum_value_warning": 20 }, "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" }, "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, diff --git a/resources/variants/ultimaker3_bb0.8.inst.cfg b/resources/variants/ultimaker3_bb0.8.inst.cfg index 09706598ab..8b9b575a46 100644 --- a/resources/variants/ultimaker3_bb0.8.inst.cfg +++ b/resources/variants/ultimaker3_bb0.8.inst.cfg @@ -24,9 +24,6 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0 jerk_enabled = True jerk_print = 25 -jerk_support = =max(math.ceil(jerk_print * 15 / 25), 20) -jerk_support_interface = =max(math.ceil(jerk_support * 10 / 15), 20) -jerk_support_bottom = =max(math.ceil(jerk_support_interface * 1 / 10), 20) layer_height = 0.2 machine_min_cool_heat_time_window = 15 machine_nozzle_heat_up_speed = 1.5 diff --git a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg index b50c9cc81b..e5caf082c6 100644 --- a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg +++ b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg @@ -24,9 +24,6 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0 jerk_enabled = True jerk_print = 25 -jerk_support = =max(math.ceil(jerk_print * 15 / 25), 20) -jerk_support_interface = =max(math.ceil(jerk_support * 10 / 15), 20) -jerk_support_bottom = =max(math.ceil(jerk_support_interface * 1 / 10), 20) layer_height = 0.2 machine_min_cool_heat_time_window = 15 machine_nozzle_heat_up_speed = 1.5 diff --git a/resources/variants/ultimaker3_extended_bb04.inst.cfg b/resources/variants/ultimaker3_extended_bb04.inst.cfg index 798685946f..deb96bb5b4 100644 --- a/resources/variants/ultimaker3_extended_bb04.inst.cfg +++ b/resources/variants/ultimaker3_extended_bb04.inst.cfg @@ -15,9 +15,6 @@ acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000) acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500) cool_fan_speed_max = =cool_fan_speed gradual_support_infill_steps = 2 -jerk_support = =math.ceil(jerk_print * 15 / 25) -jerk_support_interface = =math.ceil(jerk_support * 10 / 15) -jerk_support_bottom = =math.ceil(jerk_support_interface * 1 / 10) machine_nozzle_heat_up_speed = 1.5 machine_nozzle_id = BB 0.4 machine_nozzle_tip_outer_diameter = 1.0 diff --git a/resources/variants/ultimaker_s3_bb0.8.inst.cfg b/resources/variants/ultimaker_s3_bb0.8.inst.cfg index 56b2d3a5c3..cdd8c4814f 100644 --- a/resources/variants/ultimaker_s3_bb0.8.inst.cfg +++ b/resources/variants/ultimaker_s3_bb0.8.inst.cfg @@ -23,9 +23,6 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0 jerk_enabled = True jerk_print = 25 -jerk_support = =max(math.ceil(jerk_print * 15 / 25), 20) -jerk_support_interface = =max(math.ceil(jerk_support * 10 / 15), 20) -jerk_support_bottom = =max(math.ceil(jerk_support_interface * 1 / 10), 20) layer_height = 0.2 machine_min_cool_heat_time_window = 15 machine_nozzle_heat_up_speed = 1.5 diff --git a/resources/variants/ultimaker_s5_bb0.8.inst.cfg b/resources/variants/ultimaker_s5_bb0.8.inst.cfg index 0c0e162745..57c9ab6193 100644 --- a/resources/variants/ultimaker_s5_bb0.8.inst.cfg +++ b/resources/variants/ultimaker_s5_bb0.8.inst.cfg @@ -23,9 +23,6 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0 jerk_enabled = True jerk_print = 25 -jerk_support = =math.ceil(jerk_print * 15 / 25) -jerk_support_interface = =math.ceil(jerk_support * 10 / 15) -jerk_support_bottom = =math.ceil(jerk_support_interface * 1 / 10) layer_height = 0.2 machine_min_cool_heat_time_window = 15 machine_nozzle_heat_up_speed = 1.5 diff --git a/resources/variants/ultimaker_s5_bb04.inst.cfg b/resources/variants/ultimaker_s5_bb04.inst.cfg index 90c19685ba..553a6a9903 100644 --- a/resources/variants/ultimaker_s5_bb04.inst.cfg +++ b/resources/variants/ultimaker_s5_bb04.inst.cfg @@ -15,9 +15,6 @@ acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 3500) cool_fan_speed_max = =cool_fan_speed gradual_support_infill_steps = 2 -jerk_support = =math.ceil(jerk_print * 15 / 25) -jerk_support_interface = =math.ceil(jerk_support * 10 / 15) -jerk_support_bottom = =math.ceil(jerk_support_interface * 1 / 10) machine_nozzle_heat_up_speed = 1.5 machine_nozzle_id = BB 0.4 machine_nozzle_tip_outer_diameter = 1.0 From d35c862bb845157463388ede4411706019850b1f Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 1 Jun 2022 14:26:44 +0200 Subject: [PATCH 33/39] Prevent run of out-of-install executable in secure context. SEC-257 | CURA-8968 --- .../CuraEngineBackend/CuraEngineBackend.py | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py index d7ed5fac21..18088a99c6 100755 --- a/plugins/CuraEngineBackend/CuraEngineBackend.py +++ b/plugins/CuraEngineBackend/CuraEngineBackend.py @@ -60,7 +60,7 @@ class CuraEngineBackend(QObject, Backend): executable_name = "CuraEngine" if Platform.isWindows(): executable_name += ".exe" - default_engine_location = executable_name + self._default_engine_location = executable_name search_path = [ os.path.abspath(os.path.dirname(sys.executable)), @@ -74,29 +74,29 @@ class CuraEngineBackend(QObject, Backend): for path in search_path: engine_path = os.path.join(path, executable_name) if os.path.isfile(engine_path): - default_engine_location = engine_path + self._default_engine_location = engine_path break - if Platform.isLinux() and not default_engine_location: + if Platform.isLinux() and not self._default_engine_location: if not os.getenv("PATH"): raise OSError("There is something wrong with your Linux installation.") for pathdir in cast(str, os.getenv("PATH")).split(os.pathsep): execpath = os.path.join(pathdir, executable_name) if os.path.exists(execpath): - default_engine_location = execpath + self._default_engine_location = execpath break application = CuraApplication.getInstance() #type: CuraApplication self._multi_build_plate_model = None #type: Optional[MultiBuildPlateModel] self._machine_error_checker = None #type: Optional[MachineErrorChecker] - if not default_engine_location: + if not self._default_engine_location: raise EnvironmentError("Could not find CuraEngine") - Logger.log("i", "Found CuraEngine at: %s", default_engine_location) + Logger.log("i", "Found CuraEngine at: %s", self._default_engine_location) - default_engine_location = os.path.abspath(default_engine_location) - application.getPreferences().addPreference("backend/location", default_engine_location) + self._default_engine_location = os.path.abspath(self._default_engine_location) + application.getPreferences().addPreference("backend/location", self._default_engine_location) # Workaround to disable layer view processing if layer view is not active. self._layer_view_active = False #type: bool @@ -215,7 +215,12 @@ class CuraEngineBackend(QObject, Backend): This is useful for debugging and used to actually start the engine. :return: list of commands and args / parameters. """ - command = [CuraApplication.getInstance().getPreferences().getValue("backend/location"), "connect", "127.0.0.1:{0}".format(self._port), ""] + from cura import ApplicationMetadata + if ApplicationMetadata.IsEnterpriseVersion: + command = [self._default_engine_location] + else: + command = [CuraApplication.getInstance().getPreferences().getValue("backend/location")] + command += ["connect", "127.0.0.1:{0}".format(self._port), ""] parser = argparse.ArgumentParser(prog = "cura", add_help = False) parser.add_argument("--debug", action = "store_true", default = False, help = "Turn on the debug mode by setting this option.") From 0c28756d45dd7e06f95b062a98d0c54dca39dabe Mon Sep 17 00:00:00 2001 From: Rijk van Manen <37628975+rijkvanmanen@users.noreply.github.com> Date: Wed, 1 Jun 2022 15:29:25 +0200 Subject: [PATCH 34/39] These settings are already default in fdmprinter PP-19 --- resources/definitions/ultimaker3.def.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index 5505cf4ddf..cdcc621d6d 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -107,9 +107,6 @@ "jerk_wall_0": { "value": "jerk_wall", "minimum_value_warning": 20 }, "jerk_roofing": {"minimum_value_warning": 20 }, "jerk_topbottom": { "value": "jerk_print", "minimum_value_warning": 20 }, - "jerk_support": { "value": "jerk_print", "minimum_value_warning": 20 }, - "jerk_support_infill": {"value": "jerk_print", "minimum_value_warning": 20 }, - "jerk_support_interface": {"value": "jerk_topbottom", "minimum_value_warning": 20}, "jerk_prime_tower": { "value": "jerk_print", "minimum_value_warning": 20 }, "jerk_layer_0": { "value": "jerk_topbottom", "minimum_value_warning": 20}, "jerk_print_layer_0": {"value": "jerk_print", "minimum_value_warning": 20 }, From 877f8ca1cf04a46bb5e4f424026aebd289746239 Mon Sep 17 00:00:00 2001 From: Rijk van Manen Date: Wed, 1 Jun 2022 15:38:30 +0200 Subject: [PATCH 35/39] revert PP-37 PP-37 is not needed anymore because of PP-27. This solves the problem of PP-46 as well. For more details see PP-46 --- resources/definitions/ultimaker.def.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index 2946a06c6d..0d612905d4 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -50,9 +50,6 @@ "wall_thickness": { "value": "wall_line_width_0 + wall_line_width_x" }, - "infill_before_walls": { - "value": "False" - }, "infill_material_flow": { "value": "(1.95-infill_sparse_density / 100 if infill_sparse_density > 95 else 1) * material_flow" }, From 8f2dff712ec18046bf76211fa3a8dd7d20647d30 Mon Sep 17 00:00:00 2001 From: Rijk van Manen Date: Wed, 1 Jun 2022 15:43:12 +0200 Subject: [PATCH 36/39] disable travel_avoid_supports While CURA-9337 is not implemented this a mitigation to avoid unnecessary combing. PP-172 --- resources/definitions/ultimaker_s3.def.json | 1 - resources/definitions/ultimaker_s5.def.json | 1 - 2 files changed, 2 deletions(-) diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json index 640a062c6d..7a794c311d 100644 --- a/resources/definitions/ultimaker_s3.def.json +++ b/resources/definitions/ultimaker_s3.def.json @@ -155,7 +155,6 @@ "switch_extruder_prime_speed": { "value": "15" }, "switch_extruder_retraction_amount": { "value": "8" }, "top_bottom_thickness": { "value": "1" }, - "travel_avoid_supports": { "value": "True" }, "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, "wall_0_inset": { "value": "0" }, "initial_layer_line_width_factor": { "value": "120" }, diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index 0d5d7499cc..f3fb9dbea5 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -157,7 +157,6 @@ "switch_extruder_prime_speed": { "value": "15" }, "switch_extruder_retraction_amount": { "value": "8" }, "top_bottom_thickness": { "value": "1" }, - "travel_avoid_supports": { "value": "True" }, "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, "wall_0_inset": { "value": "0" }, "optimize_wall_printing_order": { "value": "True" }, From fec488898976f8bd38317fb7d624e9731eff6466 Mon Sep 17 00:00:00 2001 From: "p.kuiper" Date: Thu, 2 Jun 2022 09:01:26 +0200 Subject: [PATCH 37/39] Clean up of jerk settings. Moved the jerk setting up to ultimaker.def.json. Removed duplicate entries in quality profiles and removed a number of strange jerk entries in the quality profiles. Relates to PP-19 --- resources/definitions/ultimaker.def.json | 53 +++++++++++++++++-- resources/definitions/ultimaker3.def.json | 14 ----- resources/definitions/ultimaker_s3.def.json | 14 ----- resources/definitions/ultimaker_s5.def.json | 14 ----- ...s3_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg | 6 --- ...a0.4_TPLA_Normal_Quality_Accurate.inst.cfg | 6 --- ...aa0.4_ABS_Normal_Quality_Accurate.inst.cfg | 6 --- ...s5_aa0.4_PETG_Fast_Print_Accurate.inst.cfg | 6 --- .../um_s3_aa0.4_CPEP_High_Quality.inst.cfg | 1 - .../um_s5_aa0.4_CPEP_High_Quality.inst.cfg | 1 - .../um_s5_aa0.4_TPLA_Draft_Print.inst.cfg | 1 - 11 files changed, 50 insertions(+), 72 deletions(-) diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index 2946a06c6d..3b4e830238 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -89,9 +89,6 @@ "meshfix_maximum_deviation": { "value": "machine_nozzle_size / 10" }, - "jerk_travel": { - "value": "jerk_print" - }, "acceleration_travel": { "value": "acceleration_wall" }, @@ -154,6 +151,56 @@ }, "bridge_fan_speed_3": { "value": "cool_fan_speed_min" + }, + "bridge_fan_speed_3": { + "value": "cool_fan_speed_min" + }, + "jerk_print": { + "value": "20", + "minimum_value_warning": 20 + }, + "jerk_infill": { + "minimum_value_warning": 20 + }, + "jerk_wall": { + "minimum_value_warning": 20 + }, + "jerk_wall_0": { + "minimum_value_warning": 20 + }, + "jerk_roofing": { + "minimum_value_warning": 20 + }, + "jerk_topbottom": { + "minimum_value_warning": 20 + }, + "jerk_support": { + "minimum_value_warning": 20 + }, + "jerk_support_infill": { + "minimum_value_warning": 20 + }, + "jerk_support_interface": { + "minimum_value_warning": 20 + }, + "jerk_prime_tower": { + "minimum_value_warning": 20 + }, + "jerk_layer_0": { + "minimum_value_warning": 20 + }, + "jerk_print_layer_0": { + "minimum_value_warning": 20 + }, + "jerk_travel": { + "value": "jerk_print", + "minimum_value_warning": 20 + }, + "jerk_travel_layer_0": { + "minimum_value_warning": 20 + }, + "jerk_skirt_brim": { + "minimum_value_warning": 20 } } } diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index 5505cf4ddf..99e4ab4176 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -101,20 +101,6 @@ "infill_wipe_dist": { "value": "0" }, "initial_layer_line_width_factor": { "value": "120" }, "jerk_enabled": { "value": "True" }, - "jerk_print": { "value": "20", "minimum_value_warning": 20 }, - "jerk_infill": {"minimum_value_warning": 20 }, - "jerk_wall": { "value": "jerk_print", "minimum_value_warning": 20 }, - "jerk_wall_0": { "value": "jerk_wall", "minimum_value_warning": 20 }, - "jerk_roofing": {"minimum_value_warning": 20 }, - "jerk_topbottom": { "value": "jerk_print", "minimum_value_warning": 20 }, - "jerk_support": { "value": "jerk_print", "minimum_value_warning": 20 }, - "jerk_support_infill": {"value": "jerk_print", "minimum_value_warning": 20 }, - "jerk_support_interface": {"value": "jerk_topbottom", "minimum_value_warning": 20}, - "jerk_prime_tower": { "value": "jerk_print", "minimum_value_warning": 20 }, - "jerk_layer_0": { "value": "jerk_topbottom", "minimum_value_warning": 20}, - "jerk_print_layer_0": {"value": "jerk_print", "minimum_value_warning": 20 }, - "jerk_travel_layer_0": {"value": "jerk_travel", "minimum_value_warning": 20 }, - "jerk_skirt_brim": {"value": "jerk_print", "minimum_value_warning": 20 }, "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" }, "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json index 5761b09c19..cff2fe741d 100644 --- a/resources/definitions/ultimaker_s3.def.json +++ b/resources/definitions/ultimaker_s3.def.json @@ -93,20 +93,6 @@ "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" }, "infill_wipe_dist": { "value": "0" }, "jerk_enabled": { "value": "True" }, - "jerk_print": { "value": "20", "minimum_value_warning": 20 }, - "jerk_infill": {"minimum_value_warning": 20 }, - "jerk_wall": { "value": "jerk_print", "minimum_value_warning": 20 }, - "jerk_wall_0": { "value": "jerk_wall", "minimum_value_warning": 20 }, - "jerk_roofing": {"minimum_value_warning": 20 }, - "jerk_topbottom": { "value": "jerk_print", "minimum_value_warning": 20 }, - "jerk_support": { "value": "jerk_print", "minimum_value_warning": 20 }, - "jerk_support_infill": {"value": "jerk_print", "minimum_value_warning": 20 }, - "jerk_support_interface": {"value": "jerk_topbottom", "minimum_value_warning": 20}, - "jerk_prime_tower": { "value": "jerk_print", "minimum_value_warning": 20 }, - "jerk_layer_0": { "value": "jerk_topbottom", "minimum_value_warning": 20}, - "jerk_print_layer_0": {"value": "jerk_print", "minimum_value_warning": 20 }, - "jerk_travel_layer_0": {"value": "jerk_travel", "minimum_value_warning": 20 }, - "jerk_skirt_brim": {"value": "jerk_print", "minimum_value_warning": 20 }, "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" }, "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index bfd80caeab..f59250f908 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -95,20 +95,6 @@ "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" }, "infill_wipe_dist": { "value": "0" }, "jerk_enabled": { "value": "True" }, - "jerk_print": { "value": "20", "minimum_value_warning": 20 }, - "jerk_infill": {"minimum_value_warning": 20 }, - "jerk_wall": { "value": "jerk_print", "minimum_value_warning": 20 }, - "jerk_wall_0": { "value": "jerk_wall", "minimum_value_warning": 20 }, - "jerk_roofing": {"minimum_value_warning": 20 }, - "jerk_topbottom": { "value": "jerk_print", "minimum_value_warning": 20 }, - "jerk_support": { "value": "jerk_print", "minimum_value_warning": 20 }, - "jerk_support_infill": {"value": "jerk_print", "minimum_value_warning": 20 }, - "jerk_support_interface": {"value": "jerk_topbottom", "minimum_value_warning": 20}, - "jerk_prime_tower": { "value": "jerk_print", "minimum_value_warning": 20 }, - "jerk_layer_0": { "value": "jerk_topbottom", "minimum_value_warning": 20}, - "jerk_print_layer_0": {"value": "jerk_print", "minimum_value_warning": 20 }, - "jerk_travel_layer_0": {"value": "jerk_travel", "minimum_value_warning": 20 }, - "jerk_skirt_brim": {"value": "jerk_print", "minimum_value_warning": 20 }, "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" }, "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg index 48fb654a87..b74cd522ac 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg @@ -14,12 +14,6 @@ variant = AA 0.4 [values] jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 speed_print = 30 speed_infill = =speed_print diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg index 0ca960acd7..b92e07a877 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg @@ -14,12 +14,6 @@ variant = AA 0.4 [values] jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 speed_print = 30 speed_infill = =speed_print diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg index 1fcbb95940..44f76d561f 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg @@ -14,12 +14,6 @@ variant = AA 0.4 [values] jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 speed_print = 30 speed_infill = =speed_print diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print_Accurate.inst.cfg index f13476802c..186281c17c 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print_Accurate.inst.cfg @@ -14,12 +14,6 @@ variant = AA 0.4 [values] jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 speed_print = 30 speed_infill = =speed_print diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg index f895647971..dbcd95a344 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg @@ -17,7 +17,6 @@ cool_min_speed = 5 infill_overlap = 0 infill_wipe_dist = 0 -jerk_enabled = True jerk_print = 25 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg index eb4db520bd..d6749fb862 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg @@ -17,7 +17,6 @@ cool_min_speed = 5 infill_overlap = 0 infill_wipe_dist = 0 -jerk_enabled = True jerk_print = 25 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg index e102ff7ac3..535b85955a 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg @@ -16,7 +16,6 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed cool_min_speed = 7 jerk_print = 25 -jerk_roofing = 1 layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 From 977b81da7feb64de03ca4be18bba9af8672e7258 Mon Sep 17 00:00:00 2001 From: "p.kuiper" Date: Thu, 2 Jun 2022 09:48:46 +0200 Subject: [PATCH 38/39] Removed duplicate entry bridge fan speed 3. Relates to PP-19 --- resources/definitions/ultimaker.def.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index 3b4e830238..585d3d63ac 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -152,9 +152,6 @@ "bridge_fan_speed_3": { "value": "cool_fan_speed_min" }, - "bridge_fan_speed_3": { - "value": "cool_fan_speed_min" - }, "jerk_print": { "value": "20", "minimum_value_warning": 20 From a103d377f79dd1042584fe62a5321603d4cced38 Mon Sep 17 00:00:00 2001 From: "p.kuiper" Date: Thu, 2 Jun 2022 11:33:22 +0200 Subject: [PATCH 39/39] Further cleanup of the jerk settings. UM2 based machine have no jerk settings, removed them. Set first layer jerk equal to print jerk and removed all jerk settings (except for jerk_print) in the quality and variant files. Relates to PP-19 --- .../um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg | 7 +------ .../um_s3_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg | 6 ------ .../um_s3_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg | 6 ------ .../um_s3_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg | 6 ------ .../um_s3_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg | 6 ------ .../um_s3_aa0.4_PC_Fast_Print_Accurate.inst.cfg | 6 ------ .../um_s3_aa0.4_PC_Normal_Quality_Accurate.inst.cfg | 6 ------ .../um_s3_aa0.4_PETG_Fast_Print_Accurate.inst.cfg | 6 ------ .../um_s3_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg | 6 ------ .../um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg | 6 ------ .../um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg | 6 ------ .../um_s3_aa0.4_PLA_VeryDraft_Print_Quick.inst.cfg | 6 ------ .../um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg | 6 ------ .../um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg | 7 +------ .../um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg | 6 ------ .../um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg | 6 ------ .../um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg | 6 ------ .../um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg | 6 ------ .../um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg | 6 ------ .../um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg | 6 ------ .../um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg | 6 ------ .../um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg | 6 ------ .../um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg | 6 ------ .../um_s5_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg | 6 ------ .../um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg | 7 +------ .../um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg | 6 ------ .../um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg | 6 ------ .../um_s5_aa0.4_PLA_VeryDraft_Print_Quick.inst.cfg | 6 ------ .../um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg | 7 +------ .../um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg | 6 ------ .../um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg | 6 ------ .../um_s5_aa0.4_TPLA_VeryDraft_Print_Quick.inst.cfg | 6 ------ .../quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg | 9 --------- .../quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg | 9 --------- .../quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg | 9 --------- .../ultimaker2_plus_connect/um2pc_pp_0.4_fast.inst.cfg | 9 --------- .../ultimaker2_plus_connect/um2pc_pp_0.4_normal.inst.cfg | 9 --------- .../ultimaker2_plus_connect/um2pc_pp_0.6_draft.inst.cfg | 9 --------- .../ultimaker2_plus_connect/um2pc_pp_0.6_fast.inst.cfg | 9 --------- .../um2pc_pp_0.8_verydraft.inst.cfg | 9 --------- .../ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg | 1 - .../ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg | 1 - .../ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg | 1 - .../ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg | 1 - .../ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg | 1 - .../quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg | 1 - .../quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg | 1 - .../ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg | 1 - .../ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg | 1 - .../ultimaker3/um3_aa0.4_PP_Normal_Quality.inst.cfg | 1 - .../ultimaker3/um3_aa0.4_TPLA_Draft_Print.inst.cfg | 1 - .../ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg | 1 - .../quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg | 1 - .../ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg | 1 - .../ultimaker_s3/um_s3_aa0.25_PP_Normal_Quality.inst.cfg | 1 - .../ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg | 1 - .../um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg | 1 - .../ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg | 1 - .../ultimaker_s3/um_s3_aa0.4_PP_Draft_Print.inst.cfg | 1 - .../ultimaker_s3/um_s3_aa0.4_PP_Fast_Print.inst.cfg | 1 - .../ultimaker_s3/um_s3_aa0.4_PP_Normal_Quality.inst.cfg | 1 - .../ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg | 1 - .../ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg | 2 -- .../ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg | 1 - .../ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg | 1 - .../ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg | 1 - .../ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg | 1 - .../ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg | 1 - .../um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg | 1 - .../ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg | 1 - .../ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg | 1 - .../ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg | 1 - .../ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg | 1 - .../ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg | 2 -- .../ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg | 2 -- .../ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg | 1 - .../ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg | 1 - .../ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg | 1 - .../ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg | 1 - resources/variants/ultimaker3_aa0.8.inst.cfg | 1 - resources/variants/ultimaker3_bb0.8.inst.cfg | 1 - resources/variants/ultimaker3_bb04.inst.cfg | 3 --- resources/variants/ultimaker3_extended_aa0.8.inst.cfg | 1 - resources/variants/ultimaker3_extended_bb0.8.inst.cfg | 1 - resources/variants/ultimaker_s3_aa0.8.inst.cfg | 1 - resources/variants/ultimaker_s3_bb0.8.inst.cfg | 1 - resources/variants/ultimaker_s3_bb04.inst.cfg | 3 --- resources/variants/ultimaker_s5_bb0.8.inst.cfg | 1 - 88 files changed, 4 insertions(+), 319 deletions(-) diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg index ed1312583e..f2095ba055 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg @@ -22,11 +22,6 @@ top_bottom_thickness = 0.8 infill_sparse_density = 15 jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 + diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg index b98688044f..1caacdf72f 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg @@ -14,12 +14,6 @@ variant = AA 0.4 [values] jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 speed_print = 30 speed_infill = =speed_print diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg index 344cd30b8d..315b26a3b1 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg @@ -14,12 +14,6 @@ variant = AA 0.4 [values] jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 speed_print = 30 speed_infill = =speed_print diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg index 4e33b36ee1..d4a999d8eb 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg @@ -14,12 +14,6 @@ variant = AA 0.4 [values] jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 speed_print = 30 speed_infill = =speed_print diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg index 8cdf66b6fe..aa371be6f3 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg @@ -14,12 +14,6 @@ variant = AA 0.4 [values] jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 speed_print = 30 speed_infill = =speed_print diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print_Accurate.inst.cfg index ff9e5755b3..abd125f483 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print_Accurate.inst.cfg @@ -14,12 +14,6 @@ variant = AA 0.4 [values] jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 speed_print = 30 speed_infill = =speed_print diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality_Accurate.inst.cfg index 1d68116a7f..c8cf2a3bd4 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality_Accurate.inst.cfg @@ -14,12 +14,6 @@ variant = AA 0.4 [values] jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 speed_print = 30 speed_infill = =speed_print diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print_Accurate.inst.cfg index 168b920b80..b4bbdddff7 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print_Accurate.inst.cfg @@ -14,12 +14,6 @@ variant = AA 0.4 [values] jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 speed_print = 30 speed_infill = =speed_print diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg index 70347ae80f..19418812af 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg @@ -14,12 +14,6 @@ variant = AA 0.4 [values] jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 speed_print = 30 speed_infill = =speed_print diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg index 9b2de341e6..36ea7c975e 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg @@ -14,12 +14,6 @@ variant = AA 0.4 [values] jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 speed_print = 30 speed_infill = =speed_print diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg index b9193339bf..88691ef1d6 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg @@ -14,12 +14,6 @@ variant = AA 0.4 [values] jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 speed_print = 30 speed_infill = =speed_print diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print_Quick.inst.cfg index 70abf19142..b59ed875b4 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print_Quick.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print_Quick.inst.cfg @@ -16,12 +16,6 @@ is_experimental = True infill_sparse_density = 10 jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 acceleration_print = 4000 acceleration_wall = 2000 diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg index 0cf2b8f993..924edf577d 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg @@ -14,12 +14,6 @@ variant = AA 0.4 [values] jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 speed_print = 30 speed_infill = =speed_print diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg index 95d4d65b4a..98ad3af40b 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg @@ -22,11 +22,6 @@ top_bottom_thickness = 0.8 infill_sparse_density = 15 jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 + diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg index ad0eda8726..8939d670b1 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg @@ -14,12 +14,6 @@ variant = AA 0.4 [values] jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 speed_print = 30 speed_infill = =speed_print diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg index 7d1026b479..7bf1fc834a 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg @@ -14,12 +14,6 @@ variant = AA 0.4 [values] jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 speed_print = 30 speed_infill = =speed_print diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg index 52bd47103f..a95862c35a 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg @@ -14,12 +14,6 @@ variant = AA 0.4 [values] jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 speed_print = 30 speed_infill = =speed_print diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg index 55eaac45cf..bfdd35017c 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg @@ -14,12 +14,6 @@ variant = AA 0.4 [values] jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 speed_print = 30 speed_infill = =speed_print diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg index b831e25ce6..022fb2b50d 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg @@ -14,12 +14,6 @@ variant = AA 0.4 [values] jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 speed_print = 30 speed_infill = =speed_print diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg index e1b8a1c712..3637040c4c 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg @@ -14,12 +14,6 @@ variant = AA 0.4 [values] jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 speed_print = 30 speed_infill = =speed_print diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg index ed808aaf03..6cce98ca60 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg @@ -14,12 +14,6 @@ variant = AA 0.4 [values] jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 speed_print = 30 speed_infill = =speed_print diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg index adc4169968..32e0463447 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg @@ -14,12 +14,6 @@ variant = AA 0.4 [values] jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 speed_print = 30 speed_infill = =speed_print diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg index bccd269c87..0b7ffb4154 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg @@ -14,12 +14,6 @@ variant = AA 0.4 [values] jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 speed_print = 30 speed_infill = =speed_print diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg index 585c2f72b5..545a8b5654 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg @@ -14,12 +14,6 @@ variant = AA 0.4 [values] jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 speed_print = 30 speed_infill = =speed_print diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg index 4c9608ddaf..76d9191fc1 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg @@ -22,11 +22,6 @@ top_bottom_thickness = 0.8 infill_sparse_density = 15 jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 + diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg index 11a2c5e134..ca098b5bfa 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg @@ -14,12 +14,6 @@ variant = AA 0.4 [values] jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 speed_print = 30 speed_infill = =speed_print diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg index f9a3c3f775..472c0b4359 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg @@ -14,12 +14,6 @@ variant = AA 0.4 [values] jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 speed_print = 30 speed_infill = =speed_print diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print_Quick.inst.cfg index 12752123f4..51cfaebe34 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print_Quick.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print_Quick.inst.cfg @@ -16,12 +16,6 @@ is_experimental = True infill_sparse_density = 10 jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 acceleration_print = 4000 acceleration_wall = 2000 diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg index 7aaff9a062..7851ecd793 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg @@ -22,11 +22,6 @@ top_bottom_thickness = 0.8 infill_sparse_density = 15 jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 + diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg index 84c9293467..2b1b769595 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg @@ -14,12 +14,6 @@ variant = AA 0.4 [values] jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 speed_print = 30 speed_infill = =speed_print diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg index 8d8825ca41..daa327a2f5 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg @@ -14,12 +14,6 @@ variant = AA 0.4 [values] jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 speed_print = 30 speed_infill = =speed_print diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print_Quick.inst.cfg index a3e850c05d..ec93cc5599 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print_Quick.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print_Quick.inst.cfg @@ -16,12 +16,6 @@ is_experimental = True infill_sparse_density = 10 jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 acceleration_print = 4000 acceleration_wall = 2000 diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg index 5e84e3f167..2fbee8d9c2 100644 --- a/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg @@ -29,15 +29,6 @@ cool_min_speed = 20 infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic' infill_wipe_dist = 0 -jerk_enabled = True -jerk_layer_0 = =jerk_topbottom -jerk_prime_tower = =math.ceil(jerk_print * 15 / 25) -jerk_print = 25 -jerk_support = =math.ceil(jerk_print * 15 / 25) -jerk_support_interface = =jerk_topbottom -jerk_topbottom = =math.ceil(jerk_print * 5 / 25) -jerk_wall = =math.ceil(jerk_print * 10 / 25) -jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10) multiple_mesh_overlap = 0 retraction_count_max = 12 retraction_extrusion_window = 1 diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg index 10cbfab427..f21e02d5d7 100644 --- a/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg @@ -29,15 +29,6 @@ cool_min_speed = 20 infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic' infill_wipe_dist = 0 -jerk_enabled = True -jerk_layer_0 = =jerk_topbottom -jerk_prime_tower = =math.ceil(jerk_print * 15 / 25) -jerk_print = 25 -jerk_support = =math.ceil(jerk_print * 15 / 25) -jerk_support_interface = =jerk_topbottom -jerk_topbottom = =math.ceil(jerk_print * 5 / 25) -jerk_wall = =math.ceil(jerk_print * 10 / 25) -jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10) multiple_mesh_overlap = 0 retraction_count_max = 12 retraction_extrusion_window = 1 diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg index e88b527308..dd8cfd35d2 100644 --- a/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg @@ -29,15 +29,6 @@ cool_min_speed = 20 infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic' infill_wipe_dist = 0 -jerk_enabled = True -jerk_layer_0 = =jerk_topbottom -jerk_prime_tower = =math.ceil(jerk_print * 15 / 25) -jerk_print = 25 -jerk_support = =math.ceil(jerk_print * 15 / 25) -jerk_support_interface = =jerk_topbottom -jerk_topbottom = =math.ceil(jerk_print * 5 / 25) -jerk_wall = =math.ceil(jerk_print * 10 / 25) -jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10) multiple_mesh_overlap = 0 retraction_count_max = 12 retraction_extrusion_window = 1 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_fast.inst.cfg index 70aecc029f..381dc5d6f8 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_fast.inst.cfg @@ -29,15 +29,6 @@ cool_min_speed = 20 infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0 -jerk_enabled = True -jerk_layer_0 = =jerk_topbottom -jerk_prime_tower = =math.ceil(jerk_print * 15 / 25) -jerk_print = 25 -jerk_support = =math.ceil(jerk_print * 15 / 25) -jerk_support_interface = =jerk_topbottom -jerk_topbottom = =math.ceil(jerk_print * 5 / 25) -jerk_wall = =math.ceil(jerk_print * 10 / 25) -jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10) multiple_mesh_overlap = 0 retraction_count_max = 12 retraction_extrusion_window = 1 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_normal.inst.cfg index 8b28161b09..7586904bb5 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_normal.inst.cfg @@ -29,15 +29,6 @@ cool_min_speed = 20 infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0 -jerk_enabled = True -jerk_layer_0 = =jerk_topbottom -jerk_prime_tower = =math.ceil(jerk_print * 15 / 25) -jerk_print = 25 -jerk_support = =math.ceil(jerk_print * 15 / 25) -jerk_support_interface = =jerk_topbottom -jerk_topbottom = =math.ceil(jerk_print * 5 / 25) -jerk_wall = =math.ceil(jerk_print * 10 / 25) -jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10) multiple_mesh_overlap = 0 retraction_count_max = 12 retraction_extrusion_window = 1 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_draft.inst.cfg index b1d7adfd0b..2d8d2a1225 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_draft.inst.cfg @@ -29,15 +29,6 @@ cool_min_speed = 20 infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0 -jerk_enabled = True -jerk_layer_0 = =jerk_topbottom -jerk_prime_tower = =math.ceil(jerk_print * 15 / 25) -jerk_print = 25 -jerk_support = =math.ceil(jerk_print * 15 / 25) -jerk_support_interface = =jerk_topbottom -jerk_topbottom = =math.ceil(jerk_print * 5 / 25) -jerk_wall = =math.ceil(jerk_print * 10 / 25) -jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10) multiple_mesh_overlap = 0 retraction_count_max = 12 retraction_extrusion_window = 1 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_fast.inst.cfg index a64996c8f0..61ea9914b9 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_fast.inst.cfg @@ -29,15 +29,6 @@ cool_min_speed = 20 infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0 -jerk_enabled = True -jerk_layer_0 = =jerk_topbottom -jerk_prime_tower = =math.ceil(jerk_print * 15 / 25) -jerk_print = 25 -jerk_support = =math.ceil(jerk_print * 15 / 25) -jerk_support_interface = =jerk_topbottom -jerk_topbottom = =math.ceil(jerk_print * 5 / 25) -jerk_wall = =math.ceil(jerk_print * 10 / 25) -jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10) multiple_mesh_overlap = 0 retraction_count_max = 12 retraction_extrusion_window = 1 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_verydraft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_verydraft.inst.cfg index 232d74d602..238a9aa1ce 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_verydraft.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_verydraft.inst.cfg @@ -29,15 +29,6 @@ cool_min_speed = 20 infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0 -jerk_enabled = True -jerk_layer_0 = =jerk_topbottom -jerk_prime_tower = =math.ceil(jerk_print * 15 / 25) -jerk_print = 25 -jerk_support = =math.ceil(jerk_print * 15 / 25) -jerk_support_interface = =jerk_topbottom -jerk_topbottom = =math.ceil(jerk_print * 5 / 25) -jerk_wall = =math.ceil(jerk_print * 10 / 25) -jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10) multiple_mesh_overlap = 0 retraction_count_max = 12 retraction_extrusion_window = 1 diff --git a/resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg index c17554a0cc..1b06cb31b2 100644 --- a/resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg @@ -21,7 +21,6 @@ cool_min_layer_time_fan_speed_max = 5 cool_min_speed = 5 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0.1 -jerk_enabled = True jerk_print = 25 machine_min_cool_heat_time_window = 15 multiple_mesh_overlap = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg index f2b4caf168..7780c5a4f5 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg @@ -17,7 +17,6 @@ cool_min_speed = 5 infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0 -jerk_enabled = True jerk_print = 25 layer_height = 0.2 machine_min_cool_heat_time_window = 15 diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg index addd4790db..cf7e671740 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg @@ -17,7 +17,6 @@ cool_min_speed = 6 infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0 -jerk_enabled = True jerk_print = 25 layer_height = 0.15 machine_min_cool_heat_time_window = 15 diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg index 3c1baa8640..c5584d8ebd 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg @@ -17,7 +17,6 @@ cool_min_speed = 5 infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0 -jerk_enabled = True jerk_print = 25 layer_height = 0.06 machine_min_cool_heat_time_window = 15 diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg index e0c239c536..a1c956235c 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg @@ -17,7 +17,6 @@ cool_min_speed = 7 infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0 -jerk_enabled = True jerk_print = 25 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg index f33132ee5b..06a399982b 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg @@ -23,7 +23,6 @@ infill_overlap = 0 infill_overlap_mm = =0 if infill_sparse_density > 80 else 0.05 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0.1 -jerk_enabled = True jerk_print = 25 layer_height = 0.2 machine_min_cool_heat_time_window = 15 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg index 8c02c9c816..bc82123384 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg @@ -21,7 +21,6 @@ cool_min_speed = 7 infill_overlap_mm = =0 if infill_sparse_density > 80 else 0.05 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0.1 -jerk_enabled = True jerk_print = 25 layer_height = 0.15 machine_min_cool_heat_time_window = 15 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg index 4ff801f4fa..746e1bf4a2 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg @@ -23,7 +23,6 @@ infill_overlap = 0 infill_overlap_mm = =0 if infill_sparse_density > 80 else 0.05 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0.1 -jerk_enabled = True jerk_print = 25 layer_height = 0.06 machine_min_cool_heat_time_window = 15 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg index 180d96011d..f0e0e97ab3 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg @@ -22,7 +22,6 @@ cool_min_speed = 5 infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0.1 -jerk_enabled = True jerk_print = 25 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PP_Normal_Quality.inst.cfg index 52aadd5b2d..7beb3697cf 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PP_Normal_Quality.inst.cfg @@ -21,7 +21,6 @@ cool_min_speed = 2.5 infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0.1 -jerk_enabled = True jerk_print = 25 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Draft_Print.inst.cfg index e20587931f..227b16db92 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Draft_Print.inst.cfg @@ -16,7 +16,6 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed cool_min_speed = 7 jerk_print = 25 -jerk_roofing = 1 layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg index b5cc9b7261..47939c1a8d 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg @@ -22,7 +22,6 @@ infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 10 infill_wipe_dist = 0.1 -jerk_enabled = True jerk_print = 25 layer_height = 0.2 machine_min_cool_heat_time_window = 15 diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg index 4e7696c0b3..1baadf59a0 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg @@ -22,7 +22,6 @@ infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 10 infill_wipe_dist = 0.1 -jerk_enabled = True jerk_print = 25 layer_height = 0.15 machine_min_cool_heat_time_window = 15 diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg index caed386864..4e9aa528df 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg @@ -22,7 +22,6 @@ infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 10 infill_wipe_dist = 0.1 -jerk_enabled = True jerk_print = 25 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.5 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_PP_Normal_Quality.inst.cfg index d0668b64f6..cd5a6ece36 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_PP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_PP_Normal_Quality.inst.cfg @@ -19,7 +19,6 @@ cool_min_layer_time_fan_speed_max = 5 cool_min_speed = 2.5 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0.1 -jerk_enabled = True jerk_print = 25 machine_min_cool_heat_time_window = 15 material_bed_temperature_layer_0 = =material_bed_temperature + 5 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg index 0b8555734e..04feb8bc3e 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg @@ -17,7 +17,6 @@ cool_min_speed = 5 infill_overlap = 0 infill_wipe_dist = 0 -jerk_enabled = True jerk_print = 25 machine_min_cool_heat_time_window = 15 material_final_print_temperature = =material_print_temperature - 10 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg index bba0f354c9..a4f6670bb6 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg @@ -17,7 +17,6 @@ cool_min_speed = 7 infill_overlap = 0 infill_wipe_dist = 0 -jerk_enabled = True jerk_print = 25 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg index a9cdf6336d..9581f95cf0 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg @@ -21,7 +21,6 @@ cool_min_speed = 7 infill_overlap_mm = =0 if infill_sparse_density > 80 else 0.05 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0.1 -jerk_enabled = True jerk_print = 25 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Draft_Print.inst.cfg index 75eba5b995..17ff0c29c0 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Draft_Print.inst.cfg @@ -21,7 +21,6 @@ cool_min_speed = 2.5 infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0.1 -jerk_enabled = True jerk_print = 25 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Fast_Print.inst.cfg index fdf769ed38..98af956680 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Fast_Print.inst.cfg @@ -20,7 +20,6 @@ cool_min_speed = 2.5 infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0.1 -jerk_enabled = True jerk_print = 25 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Normal_Quality.inst.cfg index 821e1f4840..377756def0 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Normal_Quality.inst.cfg @@ -21,7 +21,6 @@ cool_min_speed = 2.5 infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0.1 -jerk_enabled = True jerk_print = 25 machine_min_cool_heat_time_window = 15 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg index a9e32a5283..c3837c7850 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg @@ -16,7 +16,6 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed cool_min_speed = 7 jerk_print = 25 -jerk_roofing = 1 layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg index 566f474dc4..49882c937e 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg @@ -22,9 +22,7 @@ infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 10 infill_wipe_dist = 0.1 -jerk_enabled = True jerk_print = 25 - machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.5 machine_nozzle_heat_up_speed = 2.5 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg index e968507192..722a6bd2e8 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg @@ -22,7 +22,6 @@ infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 10 infill_wipe_dist = 0.1 -jerk_enabled = True jerk_print = 25 machine_min_cool_heat_time_window = 15 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg index e77d2a2dd9..7f83286f73 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg @@ -21,7 +21,6 @@ cool_min_layer_time_fan_speed_max = 5 cool_min_speed = 5 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0.1 -jerk_enabled = True jerk_print = 25 machine_min_cool_heat_time_window = 15 multiple_mesh_overlap = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg index 85a608c293..338bb22d26 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg @@ -19,7 +19,6 @@ cool_min_layer_time_fan_speed_max = 5 cool_min_speed = 2.5 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0.1 -jerk_enabled = True jerk_print = 25 machine_min_cool_heat_time_window = 15 material_bed_temperature_layer_0 = =material_bed_temperature + 5 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg index 1d12f8f8d9..495cf61bb5 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg @@ -17,7 +17,6 @@ cool_min_speed = 5 infill_overlap = 0 infill_wipe_dist = 0 -jerk_enabled = True jerk_print = 25 machine_min_cool_heat_time_window = 15 material_final_print_temperature = =material_print_temperature - 10 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg index 12db110133..004a2d1e3b 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg @@ -17,7 +17,6 @@ cool_min_speed = 6 infill_overlap = 0 infill_wipe_dist = 0 -jerk_enabled = True jerk_print = 25 machine_min_cool_heat_time_window = 15 material_final_print_temperature = =material_print_temperature - 10 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg index 71102926d8..f6ec122e53 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg @@ -16,7 +16,6 @@ cool_fan_speed_max = 50 cool_min_speed = 7 infill_overlap = 0 infill_wipe_dist = 0 -jerk_enabled = True jerk_print = 25 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg index d9bc39705b..a1a6c983d3 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg @@ -22,7 +22,6 @@ infill_overlap = 0 infill_overlap_mm = =0 if infill_sparse_density > 80 else 0.05 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0.1 -jerk_enabled = True jerk_print = 25 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg index 03999c27e1..605322ee27 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg @@ -21,7 +21,6 @@ cool_min_speed = 7 infill_overlap_mm = =0 if infill_sparse_density > 80 else 0.05 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0.1 -jerk_enabled = True jerk_print = 25 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg index de05aa5cac..6445e2deb0 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg @@ -23,7 +23,6 @@ infill_overlap = 0 infill_overlap_mm = =0 if infill_sparse_density > 80 else 0.05 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0.1 -jerk_enabled = True jerk_print = 25 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg index 658e118686..3d7242cf56 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg @@ -22,7 +22,6 @@ cool_min_speed = 5 infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0.1 -jerk_enabled = True jerk_print = 25 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg index 5da2b96e2d..5f42de95a2 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg @@ -21,9 +21,7 @@ cool_min_speed = 2.5 infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0.1 -jerk_enabled = True jerk_print = 25 - machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg index cc5a911809..31e7216706 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg @@ -21,9 +21,7 @@ cool_min_speed = 2.5 infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0.1 -jerk_enabled = True jerk_print = 25 - machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg index 82646132a0..1121fe6507 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg @@ -21,7 +21,6 @@ cool_min_speed = 2.5 infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0.1 -jerk_enabled = True jerk_print = 25 machine_min_cool_heat_time_window = 15 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg index 8778abc64e..5bc61f0fbe 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg @@ -22,7 +22,6 @@ infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 10 infill_wipe_dist = 0.1 -jerk_enabled = True jerk_print = 25 machine_min_cool_heat_time_window = 15 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg index 1725470319..0b38a609ba 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg @@ -22,7 +22,6 @@ infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 10 infill_wipe_dist = 0.1 -jerk_enabled = True jerk_print = 25 machine_min_cool_heat_time_window = 15 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg index 782b9d896a..276f497bb3 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg @@ -22,7 +22,6 @@ infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 10 infill_wipe_dist = 0.1 -jerk_enabled = True jerk_print = 25 machine_min_cool_heat_time_window = 15 diff --git a/resources/variants/ultimaker3_aa0.8.inst.cfg b/resources/variants/ultimaker3_aa0.8.inst.cfg index ead9c3b87a..7f81c8e8fb 100644 --- a/resources/variants/ultimaker3_aa0.8.inst.cfg +++ b/resources/variants/ultimaker3_aa0.8.inst.cfg @@ -17,7 +17,6 @@ default_material_print_temperature = 200 infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0 -jerk_enabled = True jerk_print = 25 layer_height = 0.2 machine_min_cool_heat_time_window = 15 diff --git a/resources/variants/ultimaker3_bb0.8.inst.cfg b/resources/variants/ultimaker3_bb0.8.inst.cfg index 8b9b575a46..3073a91365 100644 --- a/resources/variants/ultimaker3_bb0.8.inst.cfg +++ b/resources/variants/ultimaker3_bb0.8.inst.cfg @@ -22,7 +22,6 @@ gradual_support_infill_steps = 2 infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0 -jerk_enabled = True jerk_print = 25 layer_height = 0.2 machine_min_cool_heat_time_window = 15 diff --git a/resources/variants/ultimaker3_bb04.inst.cfg b/resources/variants/ultimaker3_bb04.inst.cfg index 60dfc44e8c..ff60b47f48 100644 --- a/resources/variants/ultimaker3_bb04.inst.cfg +++ b/resources/variants/ultimaker3_bb04.inst.cfg @@ -15,9 +15,6 @@ acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000) acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500) cool_fan_speed_max = =cool_fan_speed gradual_support_infill_steps = 2 -jerk_support = =math.ceil(jerk_print * 15 / 25) -jerk_support_interface = =math.ceil(jerk_support * 10 / 15) -jerk_support_bottom = =math.ceil(jerk_support_interface * 1 / 10) machine_nozzle_heat_up_speed = 1.5 machine_nozzle_id = BB 0.4 machine_nozzle_tip_outer_diameter = 1.0 diff --git a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg index df7e9486a2..c751dfd6fc 100644 --- a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg +++ b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg @@ -17,7 +17,6 @@ default_material_print_temperature = 200 infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0 -jerk_enabled = True jerk_print = 25 layer_height = 0.2 machine_min_cool_heat_time_window = 15 diff --git a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg index e5caf082c6..d8e5b8f865 100644 --- a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg +++ b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg @@ -22,7 +22,6 @@ gradual_support_infill_steps = 2 infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0 -jerk_enabled = True jerk_print = 25 layer_height = 0.2 machine_min_cool_heat_time_window = 15 diff --git a/resources/variants/ultimaker_s3_aa0.8.inst.cfg b/resources/variants/ultimaker_s3_aa0.8.inst.cfg index 237b38fa11..e88d5aa64a 100644 --- a/resources/variants/ultimaker_s3_aa0.8.inst.cfg +++ b/resources/variants/ultimaker_s3_aa0.8.inst.cfg @@ -17,7 +17,6 @@ default_material_print_temperature = 200 infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0 -jerk_enabled = True jerk_print = 25 layer_height = 0.2 machine_min_cool_heat_time_window = 15 diff --git a/resources/variants/ultimaker_s3_bb0.8.inst.cfg b/resources/variants/ultimaker_s3_bb0.8.inst.cfg index cdd8c4814f..c4a73a2ef3 100644 --- a/resources/variants/ultimaker_s3_bb0.8.inst.cfg +++ b/resources/variants/ultimaker_s3_bb0.8.inst.cfg @@ -21,7 +21,6 @@ gradual_support_infill_steps = 2 infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0 -jerk_enabled = True jerk_print = 25 layer_height = 0.2 machine_min_cool_heat_time_window = 15 diff --git a/resources/variants/ultimaker_s3_bb04.inst.cfg b/resources/variants/ultimaker_s3_bb04.inst.cfg index 2fad997372..3619fbc9b5 100644 --- a/resources/variants/ultimaker_s3_bb04.inst.cfg +++ b/resources/variants/ultimaker_s3_bb04.inst.cfg @@ -15,9 +15,6 @@ acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 3500) cool_fan_speed_max = =cool_fan_speed gradual_support_infill_steps = 2 -jerk_support = =math.ceil(jerk_print * 15 / 25) -jerk_support_interface = =math.ceil(jerk_support * 10 / 15) -jerk_support_bottom = =math.ceil(jerk_support_interface * 1 / 10) machine_nozzle_heat_up_speed = 1.5 machine_nozzle_id = BB 0.4 machine_nozzle_tip_outer_diameter = 1.0 diff --git a/resources/variants/ultimaker_s5_bb0.8.inst.cfg b/resources/variants/ultimaker_s5_bb0.8.inst.cfg index 57c9ab6193..759bab3f6b 100644 --- a/resources/variants/ultimaker_s5_bb0.8.inst.cfg +++ b/resources/variants/ultimaker_s5_bb0.8.inst.cfg @@ -21,7 +21,6 @@ gradual_support_infill_steps = 2 infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0 -jerk_enabled = True jerk_print = 25 layer_height = 0.2 machine_min_cool_heat_time_window = 15