From ed14e3bd44890ff15406f7f53c7199f3fa6018e6 Mon Sep 17 00:00:00 2001 From: Julian Date: Wed, 7 Sep 2022 16:29:55 +0200 Subject: [PATCH 001/103] Added machine action buttons dynamic visibility Based on this change, users now will be able to manage the visibility of their machine action plugin implementations. For example, a machine action only visible when loggedIn. --- cura/MachineAction.py | 12 ++++++++++++ resources/qml/Preferences/MachinesPage.qml | 1 + 2 files changed, 13 insertions(+) diff --git a/cura/MachineAction.py b/cura/MachineAction.py index c38be5261f..98e156d834 100644 --- a/cura/MachineAction.py +++ b/cura/MachineAction.py @@ -114,3 +114,15 @@ class MachineAction(QObject, PluginObject): @pyqtSlot(result = QObject) def getDisplayItem(self) -> Optional["QObject"]: return self._createViewFromQML() + + @pyqtSlot(result = bool) + def isVisible(self) -> bool: + """Whether this action button will be visible. + + Example: Show only when isLoggedIn + + :return: Defaults to true to be in line with the old behaviour. + """ + + return True + \ No newline at end of file diff --git a/resources/qml/Preferences/MachinesPage.qml b/resources/qml/Preferences/MachinesPage.qml index 258b45292e..d728be6dfa 100644 --- a/resources/qml/Preferences/MachinesPage.qml +++ b/resources/qml/Preferences/MachinesPage.qml @@ -67,6 +67,7 @@ UM.ManagementPage { width: Math.round(childrenRect.width + 2 * screenScaleFactor) height: childrenRect.height + visible: machineActionRepeater.model[index].isVisible() Cura.SecondaryButton { text: machineActionRepeater.model[index].label From 75840426d735ddc421b594e6fa2378ed03ad2364 Mon Sep 17 00:00:00 2001 From: Julian Date: Wed, 7 Sep 2022 16:32:58 +0200 Subject: [PATCH 002/103] Added machine action dialog optional Based on this change, users will be able to run their machine action plugins code just by clicking the action button, so without having to open a modal. --- cura/MachineAction.py | 21 +++++++++++++++++++++ resources/qml/Preferences/MachinesPage.qml | 12 ++++++++---- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/cura/MachineAction.py b/cura/MachineAction.py index 98e156d834..8ca9b63679 100644 --- a/cura/MachineAction.py +++ b/cura/MachineAction.py @@ -33,6 +33,7 @@ class MachineAction(QObject, PluginObject): self._qml_url = "" self._view = None self._finished = False + self._open_as_dialog = True labelChanged = pyqtSignal() onFinished = pyqtSignal() @@ -79,6 +80,15 @@ class MachineAction(QObject, PluginObject): pass + @pyqtSlot() + def execute(self) -> None: + self._execute() + + def _execute(self) -> None: + """Protected implementation of execute.""" + + pass + @pyqtSlot() def setFinished(self) -> None: self._finished = True @@ -115,6 +125,17 @@ class MachineAction(QObject, PluginObject): def getDisplayItem(self) -> Optional["QObject"]: return self._createViewFromQML() + @pyqtSlot(result = bool) + def openAsDialog(self) -> bool: + """Whether this action will show a dialog. + + If not, the action will directly run the function inside execute(). + + :return: Defaults to true to be in line with the old behaviour. + """ + + return self._open_as_dialog + @pyqtSlot(result = bool) def isVisible(self) -> bool: """Whether this action button will be visible. diff --git a/resources/qml/Preferences/MachinesPage.qml b/resources/qml/Preferences/MachinesPage.qml index d728be6dfa..4ecc70b404 100644 --- a/resources/qml/Preferences/MachinesPage.qml +++ b/resources/qml/Preferences/MachinesPage.qml @@ -74,10 +74,14 @@ UM.ManagementPage onClicked: { var currentItem = machineActionRepeater.model[index] - actionDialog.loader.manager = currentItem - actionDialog.loader.source = currentItem.qmlPath - actionDialog.title = currentItem.label - actionDialog.show() + if (currentItem.openAsDialog()) { + actionDialog.loader.manager = currentItem + actionDialog.loader.source = currentItem.qmlPath + actionDialog.title = currentItem.label + actionDialog.show() + } else { + currentItem.execute() + } } } } From 681d33de817ea8387f22807025695e826316249a Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 16 Sep 2022 14:29:34 +0200 Subject: [PATCH 003/103] Fix spacing between extruders in selector card CURA-9278 --- resources/qml/PrinterSelector/PrintSelectorCard.qml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/resources/qml/PrinterSelector/PrintSelectorCard.qml b/resources/qml/PrinterSelector/PrintSelectorCard.qml index 517a0e164a..e1fab02db4 100644 --- a/resources/qml/PrinterSelector/PrintSelectorCard.qml +++ b/resources/qml/PrinterSelector/PrintSelectorCard.qml @@ -50,7 +50,7 @@ Rectangle Layout.fillWidth: true Layout.preferredWidth: parent.width / 2 Layout.alignment: Qt.AlignTop - spacing: UM.Theme.getSize("default_margin").width + spacing: UM.Theme.getSize("narrow_margin").width Repeater { @@ -88,7 +88,6 @@ Rectangle text: modelData.materials.length == 1 ? `${modelData.materials[0].brand} ${modelData.materials[0].name}` : "" visible: modelData.materials.length == 1 } - ColumnLayout { id: multiMaterialText @@ -98,7 +97,7 @@ Rectangle visible: modelData.materials.length > 1 Repeater { - model: modelData.materials + model: modelData.materials.length > 1 ? modelData.materials: null UM.Label { text: `${modelData.brand} ${modelData.name}` From 614ab8ee7af6b9c09f055148f6cd4d827ccb30b7 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 16 Sep 2022 14:30:06 +0200 Subject: [PATCH 004/103] Increase size of print button for selector card CURA-9278 --- resources/qml/PrinterSelector/PrintSelectorCard.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/qml/PrinterSelector/PrintSelectorCard.qml b/resources/qml/PrinterSelector/PrintSelectorCard.qml index e1fab02db4..dedad37a9d 100644 --- a/resources/qml/PrinterSelector/PrintSelectorCard.qml +++ b/resources/qml/PrinterSelector/PrintSelectorCard.qml @@ -112,7 +112,7 @@ Rectangle { id: printButton - implicitWidth: UM.Theme.getSize("medium_button").width + implicitWidth: UM.Theme.getSize("large_button").width implicitHeight: implicitWidth Layout.alignment: Qt.AlignTop padding: 0 @@ -131,7 +131,7 @@ Rectangle anchors.centerIn: parent source: UM.Theme.getIcon("Printer") color: UM.Theme.getColor("border_accent_1") - width: UM.Theme.getSize("small_button_icon").width + width: UM.Theme.getSize("medium_button_icon").width height: width } } From 017560480a89bf9a25366928c436eb2e56078ae3 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 16 Sep 2022 14:34:36 +0200 Subject: [PATCH 005/103] Ensure that alignment is as set in the design CURA-9278 --- resources/qml/PrinterSelector/PrintSelectorCard.qml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/resources/qml/PrinterSelector/PrintSelectorCard.qml b/resources/qml/PrinterSelector/PrintSelectorCard.qml index dedad37a9d..943ad8077c 100644 --- a/resources/qml/PrinterSelector/PrintSelectorCard.qml +++ b/resources/qml/PrinterSelector/PrintSelectorCard.qml @@ -15,6 +15,7 @@ Rectangle property var extruders property var manager + width: parent.width height: childrenRect.height + 2 * UM.Theme.getSize("default_margin").height @@ -35,7 +36,7 @@ Rectangle Layout.preferredWidth: parent.width / 3 Layout.fillWidth: true - Layout.alignment: Qt.AlignTop + Layout.alignment: extruders[0].materials.length > 1 ? Qt.AlignTop: Qt.AlignCenter Layout.fillHeight: false source: UM.Theme.getIcon("Printer") @@ -114,7 +115,7 @@ Rectangle implicitWidth: UM.Theme.getSize("large_button").width implicitHeight: implicitWidth - Layout.alignment: Qt.AlignTop + Layout.alignment: extruders[0].materials.length > 1 ? Qt.AlignTop: Qt.AlignCenter padding: 0 background: Rectangle From 1dc42cb69aa0333a676de6e93f665956c53ac905 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 16 Sep 2022 14:39:20 +0200 Subject: [PATCH 006/103] Fix refresh of ChoosePrinterDialog not working CURA-9278 --- cura/Machines/Models/CompatibleMachineModel.py | 4 ++++ resources/qml/Dialogs/ChoosePrinterDialog.qml | 10 +++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/cura/Machines/Models/CompatibleMachineModel.py b/cura/Machines/Models/CompatibleMachineModel.py index 029567cdec..639bba88a0 100644 --- a/cura/Machines/Models/CompatibleMachineModel.py +++ b/cura/Machines/Models/CompatibleMachineModel.py @@ -31,6 +31,10 @@ class CompatibleMachineModel(ListModel): machine_manager.globalContainerChanged.connect(self._update) machine_manager.outputDevicesChanged.connect(self._update) + @pyqtSlot() + def forceUpdate(self): + self._update() + def _update(self) -> None: self.clear() diff --git a/resources/qml/Dialogs/ChoosePrinterDialog.qml b/resources/qml/Dialogs/ChoosePrinterDialog.qml index b7079fcabd..69d9fc44cc 100644 --- a/resources/qml/Dialogs/ChoosePrinterDialog.qml +++ b/resources/qml/Dialogs/ChoosePrinterDialog.qml @@ -11,7 +11,7 @@ import Cura 1.0 as Cura UM.Dialog { property var manager - + property var compatible_machine_model: Cura.CompatibleMachineModel {} id: base title: catalog.i18nc("@title:window", "Select Printer") @@ -65,7 +65,11 @@ UM.Dialog color: UM.Theme.getColor("text_link") hoverColor: UM.Theme.getColor("text_scene_hover") - onClicked: manager.refresh() + onClicked: + { + manager.refresh() + base.compatible_machine_model.forceUpdate() + } } } @@ -73,7 +77,7 @@ UM.Dialog { id: contents - model: Cura.CompatibleMachineModel {} + model: base.compatible_machine_model delegate: Cura.PrintSelectorCard { From d64b07d11fe21d11d45845ec908dbde8f695c0b1 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 20 Sep 2022 13:43:02 +0200 Subject: [PATCH 007/103] Revert "Pp 230 enable conical support (#13295)" This reverts commit 47b414a4ae287311b7dba359de6b7eff9452b4cd. --- resources/definitions/fdmprinter.def.json | 75 ++++++++++++----------- resources/definitions/ultimaker.def.json | 6 -- 2 files changed, 39 insertions(+), 42 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 7c3dbc63b3..2d7712daf7 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -4614,42 +4614,6 @@ "settable_per_mesh": false, "settable_per_extruder": true }, - "support_conical_enabled": { - "label": "Enable Conical Support", - "description": "Make support areas smaller at the bottom than at the overhang.", - "type": "bool", - "default_value": false, - "enabled": "support_enable and support_structure != 'tree'", - "limit_to_extruder": "support_infill_extruder_nr", - "settable_per_mesh": true - }, - "support_conical_angle": { - "label": "Conical Support Angle", - "description": "The angle of the tilt of conical support. With 0 degrees being vertical, and 90 degrees being horizontal. Smaller angles cause the support to be more sturdy, but consist of more material. Negative angles cause the base of the support to be wider than the top.", - "unit": "°", - "type": "float", - "minimum_value": "-90", - "minimum_value_warning": "-45", - "maximum_value_warning": "45", - "maximum_value": "90", - "default_value": 30, - "enabled": "support_conical_enabled and support_enable and support_structure != 'tree'", - "limit_to_extruder": "support_infill_extruder_nr", - "settable_per_mesh": true - }, - "support_conical_min_width": { - "label": "Conical Support Minimum Width", - "description": "Minimum width to which the base of the conical support area is reduced. Small widths can lead to unstable support structures.", - "unit": "mm", - "default_value": 5.0, - "minimum_value": "0", - "minimum_value_warning": "machine_nozzle_size * 3", - "maximum_value_warning": "100.0", - "type": "float", - "enabled": "support_conical_enabled and support_enable and support_structure != 'tree' and support_conical_angle > 0", - "limit_to_extruder": "support_infill_extruder_nr", - "settable_per_mesh": true - }, "support_type": { "label": "Support Placement", @@ -7034,6 +6998,45 @@ "settable_per_mesh": false, "settable_per_extruder": true }, + "support_conical_enabled": + { + "label": "Enable Conical Support", + "description": "Make support areas smaller at the bottom than at the overhang.", + "type": "bool", + "default_value": false, + "enabled": "support_enable and support_structure != 'tree'", + "limit_to_extruder": "support_infill_extruder_nr", + "settable_per_mesh": true + }, + "support_conical_angle": + { + "label": "Conical Support Angle", + "description": "The angle of the tilt of conical support. With 0 degrees being vertical, and 90 degrees being horizontal. Smaller angles cause the support to be more sturdy, but consist of more material. Negative angles cause the base of the support to be wider than the top.", + "unit": "°", + "type": "float", + "minimum_value": "-90", + "minimum_value_warning": "-45", + "maximum_value_warning": "45", + "maximum_value": "90", + "default_value": 30, + "enabled": "support_conical_enabled and support_enable and support_structure != 'tree'", + "limit_to_extruder": "support_infill_extruder_nr", + "settable_per_mesh": true + }, + "support_conical_min_width": + { + "label": "Conical Support Minimum Width", + "description": "Minimum width to which the base of the conical support area is reduced. Small widths can lead to unstable support structures.", + "unit": "mm", + "default_value": 5.0, + "minimum_value": "0", + "minimum_value_warning": "machine_nozzle_size * 3", + "maximum_value_warning": "100.0", + "type": "float", + "enabled": "support_conical_enabled and support_enable and support_structure != 'tree' and support_conical_angle > 0", + "limit_to_extruder": "support_infill_extruder_nr", + "settable_per_mesh": true + }, "magic_fuzzy_skin_enabled": { "label": "Fuzzy Skin", diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index aab796e0a8..c63169fc3a 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -293,12 +293,6 @@ "support_z_distance": { "value": "0" }, - "support_conical_enabled": { - "value": true - }, - "support_conical_min_width": { - "value": 10 - }, "top_bottom_pattern": { "value": "'zigzag'" } From d8f304ca4964236b325498bc2881e3bb35d5729c Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 20 Sep 2022 14:13:00 +0200 Subject: [PATCH 008/103] Fix description of wall_x_material_flow_layer_0 CURA-9433 --- resources/definitions/fdmprinter.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 2d7712daf7..cc49213a6c 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -2989,7 +2989,7 @@ "wall_x_material_flow_layer_0": { "label": "Initial Layer Inner Wall Flow", - "description": "Flow compensation on the outermost wall line of the first layer.", + "description": "Flow compensation on wall lines for all wall lines except the outermost one, but only for the first layer", "unit": "%", "type": "float", "default_value": 100, From 836764a237063c5e2e8a226f6ede3f1a790b6c13 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 21 Sep 2022 08:09:40 +0200 Subject: [PATCH 009/103] Revert "Auto generated print profiles. They settings will be reordered and some of the profile names have changed with the "" - Experimental" tag if the isExperimental flag was set." This reverts commit 4785371f26b0722c2abf585b43054ed5baacb41a. --- .../um_s3_aa0.4_ABS_Fast_Visual.inst.cfg | 2 +- .../um_s3_aa0.4_ABS_High_Visual.inst.cfg | 2 +- .../um_s3_aa0.4_ABS_Normal_Visual.inst.cfg | 2 +- .../um_s3_aa0.4_PLA_Fast_Visual.inst.cfg | 2 +- .../um_s3_aa0.4_PLA_High_Visual.inst.cfg | 2 +- .../um_s3_aa0.4_PLA_Normal_Visual.inst.cfg | 2 +- .../um_s3_aa0.4_TPLA_Fast_Visual.inst.cfg | 2 +- .../um_s3_aa0.4_TPLA_High_Visual.inst.cfg | 2 +- .../um_s3_aa0.4_TPLA_Normal_Visual.inst.cfg | 2 +- .../um_s5_aa0.4_ABS_Fast_Visual.inst.cfg | 2 +- .../um_s5_aa0.4_ABS_High_Visual.inst.cfg | 2 +- .../um_s5_aa0.4_ABS_Normal_Visual.inst.cfg | 2 +- .../um_s5_aa0.4_PLA_Fast_Visual.inst.cfg | 2 +- .../um_s5_aa0.4_PLA_High_Visual.inst.cfg | 2 +- .../um_s5_aa0.4_PLA_Normal_Visual.inst.cfg | 2 +- .../um_s5_aa0.4_TPLA_Fast_Visual.inst.cfg | 2 +- .../um_s5_aa0.4_TPLA_High_Visual.inst.cfg | 2 +- .../um_s5_aa0.4_TPLA_Normal_Visual.inst.cfg | 2 +- ...um_s3_aa0.25_Nylon_Normal_Quality.inst.cfg | 2 +- .../um_s3_aa0.25_PC_Normal_Quality.inst.cfg | 1 + .../um_s3_aa0.25_PETG_Normal_Quality.inst.cfg | 5 +-- .../um_s3_aa0.25_PP_Normal_Quality.inst.cfg | 1 + .../um_s3_aa0.4_ABS_Draft_Print.inst.cfg | 11 +++--- .../um_s3_aa0.4_ABS_Fast_Print.inst.cfg | 13 ++++--- .../um_s3_aa0.4_ABS_High_Quality.inst.cfg | 13 ++++--- .../um_s3_aa0.4_ABS_Normal_Quality.inst.cfg | 13 ++++--- .../um_s3_aa0.4_BAM_Draft_Print.inst.cfg | 13 +++---- .../um_s3_aa0.4_BAM_Fast_Print.inst.cfg | 17 ++++----- .../um_s3_aa0.4_BAM_Normal_Quality.inst.cfg | 9 ++--- .../um_s3_aa0.4_BAM_VeryDraft_Print.inst.cfg | 17 ++++----- .../um_s3_aa0.4_CPEP_Draft_Print.inst.cfg | 2 ++ .../um_s3_aa0.4_CPEP_Fast_Print.inst.cfg | 2 ++ .../um_s3_aa0.4_CPEP_High_Quality.inst.cfg | 1 + .../um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg | 1 + .../um_s3_aa0.4_CPE_Draft_Print.inst.cfg | 11 +++--- .../um_s3_aa0.4_CPE_Fast_Print.inst.cfg | 11 +++--- .../um_s3_aa0.4_CPE_High_Quality.inst.cfg | 11 +++--- .../um_s3_aa0.4_CPE_Normal_Quality.inst.cfg | 9 ++--- .../um_s3_aa0.4_Nylon_Draft_Print.inst.cfg | 6 ++-- .../um_s3_aa0.4_Nylon_Fast_Print.inst.cfg | 6 ++-- .../um_s3_aa0.4_Nylon_High_Quality.inst.cfg | 4 +-- .../um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg | 2 +- .../um_s3_aa0.4_PC_High_Quality.inst.cfg | 1 + .../um_s3_aa0.4_PC_Normal_Quality.inst.cfg | 1 + .../um_s3_aa0.4_PETG_Draft_Print.inst.cfg | 13 +++---- .../um_s3_aa0.4_PETG_Fast_Print.inst.cfg | 13 +++---- .../um_s3_aa0.4_PETG_High_Quality.inst.cfg | 13 +++---- .../um_s3_aa0.4_PETG_Normal_Quality.inst.cfg | 13 +++---- .../um_s3_aa0.4_PLA_Draft_Print.inst.cfg | 11 +++--- .../um_s3_aa0.4_PLA_Fast_Print.inst.cfg | 7 ++-- .../um_s3_aa0.4_PLA_High_Quality.inst.cfg | 7 ++-- .../um_s3_aa0.4_PLA_Normal_Quality.inst.cfg | 5 +-- .../um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg | 35 ++++++++++-------- .../um_s3_aa0.4_PP_Draft_Print.inst.cfg | 1 + .../um_s3_aa0.4_PP_Fast_Print.inst.cfg | 1 + .../um_s3_aa0.4_PP_Normal_Quality.inst.cfg | 2 ++ .../um_s3_aa0.4_TPLA_High_Quality.inst.cfg | 5 +-- .../um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg | 35 ++++++++++-------- .../um_s3_aa0.4_TPU_Draft_Print.inst.cfg | 1 + .../um_s3_aa0.4_TPU_Fast_Print.inst.cfg | 1 + .../um_s3_aa0.4_TPU_Normal_Quality.inst.cfg | 1 + .../um_s3_aa0.8_ABS_Draft_Print.inst.cfg | 1 + .../um_s3_aa0.8_ABS_Superdraft_Print.inst.cfg | 3 +- .../um_s3_aa0.8_ABS_Verydraft_Print.inst.cfg | 1 + .../um_s3_aa0.8_CPEP_Fast_Print.inst.cfg | 9 +++-- ...um_s3_aa0.8_CPEP_Superdraft_Print.inst.cfg | 5 ++- .../um_s3_aa0.8_CPEP_Verydraft_Print.inst.cfg | 3 ++ .../um_s3_aa0.8_CPE_Draft_Print.inst.cfg | 1 + .../um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg | 4 ++- .../um_s3_aa0.8_CPE_Verydraft_Print.inst.cfg | 1 + .../um_s3_aa0.8_Nylon_Draft_Print.inst.cfg | 2 ++ ...m_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg | 2 ++ ...um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg | 2 ++ .../um_s3_aa0.8_PC_Fast_Print.inst.cfg | 9 +++-- .../um_s3_aa0.8_PC_Superdraft_Print.inst.cfg | 5 ++- .../um_s3_aa0.8_PC_Verydraft_Print.inst.cfg | 3 ++ .../um_s3_aa0.8_PETG_Draft_Print.inst.cfg | 5 +-- ...um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg | 7 ++-- .../um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg | 8 +++-- .../um_s3_aa0.8_PLA_Draft_Print.inst.cfg | 8 ++--- .../um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg | 10 +++--- .../um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg | 8 ++--- .../um_s3_aa0.8_PP_Draft_Print.inst.cfg | 2 +- .../um_s3_aa0.8_PP_Superdraft_Print.inst.cfg | 4 +-- .../um_s3_aa0.8_PP_Verydraft_Print.inst.cfg | 2 +- .../um_s3_aa0.8_TPU_Draft_Print.inst.cfg | 2 +- .../um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg | 4 +-- .../um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg | 2 +- .../um_s3_bb0.4_PVA_Draft_Print.inst.cfg | 4 +-- .../um_s3_bb0.4_PVA_Fast_Print.inst.cfg | 6 ++-- .../um_s3_bb0.4_PVA_High_Quality.inst.cfg | 6 ++-- .../um_s3_bb0.4_PVA_Normal_Quality.inst.cfg | 6 ++-- .../um_s3_bb0.4_PVA_Verydraft_Print.inst.cfg | 7 ++-- .../um_s3_bb0.8_PVA_Draft_Print.inst.cfg | 4 +-- .../um_s3_bb0.8_PVA_Superdraft_Print.inst.cfg | 4 +-- .../um_s3_bb0.8_PVA_Verydraft_Print.inst.cfg | 4 +-- .../um_s3_cc0.4_CFFCPE_Draft_Print.inst.cfg | 3 ++ .../um_s3_cc0.4_CFFCPE_Fast_Print.inst.cfg | 5 ++- .../um_s3_cc0.4_CFFPA_Draft_Print.inst.cfg | 3 ++ .../um_s3_cc0.4_CFFPA_Fast_Print.inst.cfg | 5 ++- .../um_s3_cc0.4_GFFCPE_Draft_Print.inst.cfg | 3 ++ .../um_s3_cc0.4_GFFCPE_Fast_Print.inst.cfg | 5 ++- .../um_s3_cc0.4_GFFPA_Draft_Print.inst.cfg | 3 ++ .../um_s3_cc0.4_GFFPA_Fast_Print.inst.cfg | 3 +- .../um_s3_cc0.4_PLA_Draft_Print.inst.cfg | 7 ++-- .../um_s3_cc0.4_PLA_Fast_Print.inst.cfg | 7 ++-- .../um_s3_cc0.6_CFFCPE_Draft_Print.inst.cfg | 1 + .../um_s3_cc0.6_CFFPA_Draft_Print.inst.cfg | 1 + .../um_s3_cc0.6_GFFCPE_Draft_Print.inst.cfg | 1 + .../um_s3_cc0.6_GFFPA_Draft_Print.inst.cfg | 1 + .../um_s3_cc0.6_PLA_Draft_Print.inst.cfg | 7 ++-- .../um_s3_cc0.6_PLA_Fast_Print.inst.cfg | 7 ++-- ...um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg | 2 ++ .../um_s5_aa0.25_PC_Normal_Quality.inst.cfg | 1 + .../um_s5_aa0.25_PETG_Normal_Quality.inst.cfg | 4 +-- .../um_s5_aa0.25_PP_Normal_Quality.inst.cfg | 1 + .../um_s5_aa0.4_ABS_Draft_Print.inst.cfg | 10 +++--- .../um_s5_aa0.4_ABS_Fast_Print.inst.cfg | 10 +++--- .../um_s5_aa0.4_ABS_High_Quality.inst.cfg | 13 ++++--- .../um_s5_aa0.4_ABS_Normal_Quality.inst.cfg | 12 ++++--- .../um_s5_aa0.4_BAM_Draft_Print.inst.cfg | 13 +++---- .../um_s5_aa0.4_BAM_Fast_Print.inst.cfg | 17 ++++----- .../um_s5_aa0.4_BAM_Normal_Quality.inst.cfg | 9 ++--- .../um_s5_aa0.4_BAM_VeryDraft_Print.inst.cfg | 17 ++++----- .../um_s5_aa0.4_CPEP_Draft_Print.inst.cfg | 2 ++ .../um_s5_aa0.4_CPEP_Fast_Print.inst.cfg | 2 ++ .../um_s5_aa0.4_CPEP_High_Quality.inst.cfg | 2 ++ .../um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg | 1 + .../um_s5_aa0.4_CPE_Draft_Print.inst.cfg | 10 +++--- .../um_s5_aa0.4_CPE_Fast_Print.inst.cfg | 11 +++--- .../um_s5_aa0.4_CPE_High_Quality.inst.cfg | 11 +++--- .../um_s5_aa0.4_CPE_Normal_Quality.inst.cfg | 9 ++--- .../um_s5_aa0.4_Nylon_Draft_Print.inst.cfg | 4 +-- .../um_s5_aa0.4_Nylon_Fast_Print.inst.cfg | 4 +-- .../um_s5_aa0.4_Nylon_High_Quality.inst.cfg | 4 +-- .../um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg | 4 +-- .../um_s5_aa0.4_PC_Fast_Print.inst.cfg | 1 + .../um_s5_aa0.4_PETG_Draft_Print.inst.cfg | 12 +++---- .../um_s5_aa0.4_PETG_Fast_Print.inst.cfg | 13 +++---- .../um_s5_aa0.4_PETG_High_Quality.inst.cfg | 13 +++---- .../um_s5_aa0.4_PETG_Normal_Quality.inst.cfg | 12 +++---- .../um_s5_aa0.4_PLA_Draft_Print.inst.cfg | 10 +++--- .../um_s5_aa0.4_PLA_Fast_Print.inst.cfg | 6 ++-- .../um_s5_aa0.4_PLA_High_Quality.inst.cfg | 6 ++-- .../um_s5_aa0.4_PLA_Normal_Quality.inst.cfg | 4 +-- .../um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg | 36 +++++++++++-------- .../um_s5_aa0.4_PP_Draft_Print.inst.cfg | 1 + .../um_s5_aa0.4_PP_Fast_Print.inst.cfg | 2 ++ .../um_s5_aa0.4_PP_Normal_Quality.inst.cfg | 2 ++ .../um_s5_aa0.4_TPLA_High_Quality.inst.cfg | 4 +-- .../um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg | 35 ++++++++++-------- .../um_s5_aa0.4_TPU_Draft_Print.inst.cfg | 1 + .../um_s5_aa0.4_TPU_Fast_Print.inst.cfg | 1 + .../um_s5_aa0.4_TPU_Normal_Quality.inst.cfg | 1 + .../um_s5_aa0.8_ABS_Draft_Print.inst.cfg | 1 + .../um_s5_aa0.8_ABS_Superdraft_Print.inst.cfg | 3 +- .../um_s5_aa0.8_ABS_Verydraft_Print.inst.cfg | 1 + .../um_s5_aa0.8_CPEP_Fast_Print.inst.cfg | 8 +++-- ...um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg | 5 ++- .../um_s5_aa0.8_CPEP_Verydraft_Print.inst.cfg | 3 ++ .../um_s5_aa0.8_CPE_Draft_Print.inst.cfg | 1 + .../um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg | 3 +- .../um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg | 1 + ...um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg | 2 ++ .../um_s5_aa0.8_PC_Fast_Print.inst.cfg | 10 ++++-- .../um_s5_aa0.8_PC_Superdraft_Print.inst.cfg | 5 ++- .../um_s5_aa0.8_PC_Verydraft_Print.inst.cfg | 1 + .../um_s5_aa0.8_PETG_Draft_Print.inst.cfg | 5 +-- ...um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg | 7 ++-- .../um_s5_aa0.8_PETG_Verydraft_Print.inst.cfg | 6 ++-- .../um_s5_aa0.8_PLA_Draft_Print.inst.cfg | 8 ++--- .../um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg | 10 +++--- .../um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg | 8 ++--- .../um_s5_aa0.8_PP_Draft_Print.inst.cfg | 2 +- .../um_s5_aa0.8_PP_Superdraft_Print.inst.cfg | 4 +-- .../um_s5_aa0.8_PP_Verydraft_Print.inst.cfg | 2 +- .../um_s5_aa0.8_TPU_Draft_Print.inst.cfg | 2 +- .../um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg | 4 +-- .../um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg | 2 +- .../um_s5_bb0.4_PVA_Draft_Print.inst.cfg | 4 +-- .../um_s5_bb0.4_PVA_Fast_Print.inst.cfg | 6 ++-- .../um_s5_bb0.4_PVA_High_Quality.inst.cfg | 6 ++-- .../um_s5_bb0.4_PVA_Normal_Quality.inst.cfg | 6 ++-- .../um_s5_bb0.4_PVA_Verydraft_Print.inst.cfg | 7 ++-- .../um_s5_bb0.8_PVA_Draft_Print.inst.cfg | 4 +-- .../um_s5_bb0.8_PVA_Superdraft_Print.inst.cfg | 4 +-- .../um_s5_bb0.8_PVA_Verydraft_Print.inst.cfg | 4 +-- .../um_s5_cc0.4_CFFCPE_Draft_Print.inst.cfg | 1 + .../um_s5_cc0.4_CFFCPE_Fast_Print.inst.cfg | 3 +- .../um_s5_cc0.4_CFFPA_Draft_Print.inst.cfg | 1 + .../um_s5_cc0.4_CFFPA_Fast_Print.inst.cfg | 3 +- .../um_s5_cc0.4_GFFCPE_Draft_Print.inst.cfg | 1 + .../um_s5_cc0.4_GFFCPE_Fast_Print.inst.cfg | 3 +- .../um_s5_cc0.4_GFFPA_Draft_Print.inst.cfg | 1 + .../um_s5_cc0.4_GFFPA_Fast_Print.inst.cfg | 3 +- .../um_s5_cc0.4_PLA_Draft_Print.inst.cfg | 7 ++-- .../um_s5_cc0.4_PLA_Fast_Print.inst.cfg | 7 ++-- .../um_s5_cc0.6_CFFCPE_Draft_Print.inst.cfg | 1 + .../um_s5_cc0.6_CFFPA_Draft_Print.inst.cfg | 1 + .../um_s5_cc0.6_GFFCPE_Draft_Print.inst.cfg | 1 + .../um_s5_cc0.6_GFFPA_Draft_Print.inst.cfg | 1 + .../um_s5_cc0.6_PLA_Draft_Print.inst.cfg | 7 ++-- .../um_s5_cc0.6_PLA_Fast_Print.inst.cfg | 7 ++-- 203 files changed, 668 insertions(+), 457 deletions(-) diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Visual.inst.cfg index 21b37abac1..694f4f1591 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s3 [metadata] setting_version = 20 type = intent -intent_category = visual quality_type = fast +intent_category = visual material = generic_abs variant = AA 0.4 diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_High_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_High_Visual.inst.cfg index 898c8e3112..3874bc0cce 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_High_Visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_High_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s3 [metadata] setting_version = 20 type = intent -intent_category = visual quality_type = high +intent_category = visual material = generic_abs variant = AA 0.4 diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Visual.inst.cfg index fd4cda4565..bf3dcdc208 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s3 [metadata] setting_version = 20 type = intent -intent_category = visual quality_type = normal +intent_category = visual material = generic_abs variant = AA 0.4 diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Visual.inst.cfg index e465f40ed2..2c9b008765 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s3 [metadata] setting_version = 20 type = intent -intent_category = visual quality_type = fast +intent_category = visual material = generic_pla variant = AA 0.4 diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_High_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_High_Visual.inst.cfg index c50fa33475..64a25cd046 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_High_Visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_High_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s3 [metadata] setting_version = 20 type = intent -intent_category = visual quality_type = high +intent_category = visual material = generic_pla variant = AA 0.4 diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Visual.inst.cfg index 15f4d17fad..5b9177f803 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s3 [metadata] setting_version = 20 type = intent -intent_category = visual quality_type = normal +intent_category = visual material = generic_pla variant = AA 0.4 diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Visual.inst.cfg index 3afd626d8e..d9c514676d 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s3 [metadata] setting_version = 20 type = intent -intent_category = visual quality_type = fast +intent_category = visual material = generic_tough_pla variant = AA 0.4 diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_High_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_High_Visual.inst.cfg index 2ef6dc756a..05b6b33857 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_High_Visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_High_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s3 [metadata] setting_version = 20 type = intent -intent_category = visual quality_type = high +intent_category = visual material = generic_tough_pla variant = AA 0.4 diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Visual.inst.cfg index fd0e3499e5..a7e1e2f83e 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s3 [metadata] setting_version = 20 type = intent -intent_category = visual quality_type = normal +intent_category = visual material = generic_tough_pla variant = AA 0.4 diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Visual.inst.cfg index dec4e9a252..e6d8d67c8b 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s5 [metadata] setting_version = 20 type = intent -intent_category = visual quality_type = fast +intent_category = visual material = generic_abs variant = AA 0.4 diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_High_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_High_Visual.inst.cfg index 9df38c762d..4d7510de6d 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_High_Visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_High_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s5 [metadata] setting_version = 20 type = intent -intent_category = visual quality_type = high +intent_category = visual material = generic_abs variant = AA 0.4 diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Visual.inst.cfg index a9578315ff..a0778dcb25 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s5 [metadata] setting_version = 20 type = intent -intent_category = visual quality_type = normal +intent_category = visual material = generic_abs variant = AA 0.4 diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Visual.inst.cfg index db38a543f4..35bb47e546 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s5 [metadata] setting_version = 20 type = intent -intent_category = visual quality_type = fast +intent_category = visual material = generic_pla variant = AA 0.4 diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_High_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_High_Visual.inst.cfg index e0e9dab04d..5d5d433d9a 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_High_Visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_High_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s5 [metadata] setting_version = 20 type = intent -intent_category = visual quality_type = high +intent_category = visual material = generic_pla variant = AA 0.4 diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Visual.inst.cfg index 1874a846e4..ad280d6142 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s5 [metadata] setting_version = 20 type = intent -intent_category = visual quality_type = normal +intent_category = visual material = generic_pla variant = AA 0.4 diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Visual.inst.cfg index 31a8fa8ef7..2c0ca34f03 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s5 [metadata] setting_version = 20 type = intent -intent_category = visual quality_type = fast +intent_category = visual material = generic_tough_pla variant = AA 0.4 diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_High_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_High_Visual.inst.cfg index 99b390a03a..84ab765c21 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_High_Visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_High_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s5 [metadata] setting_version = 20 type = intent -intent_category = visual quality_type = high +intent_category = visual material = generic_tough_pla variant = AA 0.4 diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Visual.inst.cfg index e5022cfad4..a3740c80c3 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s5 [metadata] setting_version = 20 type = intent -intent_category = visual quality_type = normal +intent_category = visual material = generic_tough_pla variant = AA 0.4 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_Nylon_Normal_Quality.inst.cfg index afb105b535..4e2114909a 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_Nylon_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_Nylon_Normal_Quality.inst.cfg @@ -20,10 +20,10 @@ ooze_shield_angle = 40 raft_airgap = 0.4 retraction_min_travel = 5 skin_overlap = 50 -speed_layer_0 = 10 speed_print = 70 speed_topbottom = =math.ceil(speed_print * 30 / 70) speed_wall = =math.ceil(speed_print * 30 / 70) switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 +speed_layer_0 = 10 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg index a269239781..705b63ad02 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg @@ -11,6 +11,7 @@ weight = 0 material = generic_pc variant = AA 0.25 is_experimental = True + [values] brim_width = 20 cool_fan_full_at_height = =layer_height_0 + layer_height diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg index d9ee0e629b..376af254f9 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg @@ -12,9 +12,10 @@ material = generic_petg variant = AA 0.25 [values] -initial_layer_line_width_factor = 100 -material_print_temperature = =default_material_print_temperature - 5 retraction_combing_max_distance = 8 speed_infill = =math.ceil(speed_print * 40 / 55) speed_topbottom = =math.ceil(speed_print * 30 / 55) top_bottom_thickness = 0.8 +initial_layer_line_width_factor = 100 + +material_print_temperature = =default_material_print_temperature - 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 16c0c0d676..74c7370130 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 @@ -11,6 +11,7 @@ weight = 0 material = generic_pp variant = AA 0.25 is_experimental = True + [values] brim_width = 10 cool_fan_speed_max = 100 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print.inst.cfg index a695827302..1ba0ffd3cd 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print.inst.cfg @@ -14,15 +14,16 @@ variant = AA 0.4 [values] machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 -material_final_print_temperature = =material_print_temperature - 20 -material_initial_print_temperature = =material_print_temperature - 15 material_print_temperature = =default_material_print_temperature + 20 +material_initial_print_temperature = =material_print_temperature - 15 +material_final_print_temperature = =material_print_temperature - 20 prime_tower_enable = False -raft_airgap = 0.15 skin_overlap = 20 -speed_infill = =math.ceil(speed_print * 50 / 60) -speed_layer_0 = 10 speed_print = 60 +speed_layer_0 = 10 speed_topbottom = =math.ceil(speed_print * 35 / 60) speed_wall = =math.ceil(speed_print * 45 / 60) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) +speed_infill = =math.ceil(speed_print * 50 / 60) + +raft_airgap = 0.15 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print.inst.cfg index 802e5c9d00..33d620ede2 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print.inst.cfg @@ -15,14 +15,17 @@ variant = AA 0.4 cool_min_speed = 7 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 -material_final_print_temperature = =material_print_temperature - 20 -material_initial_print_temperature = =material_print_temperature - 15 material_print_temperature = =default_material_print_temperature + 15 +material_initial_print_temperature = =material_print_temperature - 15 +material_final_print_temperature = =material_print_temperature - 20 prime_tower_enable = False -raft_airgap = 0.15 -speed_infill = =math.ceil(speed_print * 45 / 60) -speed_layer_0 = 10 speed_print = 60 +speed_layer_0 = 10 speed_topbottom = =math.ceil(speed_print * 30 / 60) speed_wall = =math.ceil(speed_print * 40 / 60) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) + + +speed_infill = =math.ceil(speed_print * 45 / 60) + +raft_airgap = 0.15 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_High_Quality.inst.cfg index d83461ee9c..5e6ec3e259 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_High_Quality.inst.cfg @@ -15,13 +15,16 @@ variant = AA 0.4 cool_min_speed = 12 machine_nozzle_cool_down_speed = 0.8 machine_nozzle_heat_up_speed = 1.5 -material_final_print_temperature = =material_print_temperature - 20 -material_initial_print_temperature = =material_print_temperature - 15 material_print_temperature = =default_material_print_temperature + 5 +material_initial_print_temperature = =material_print_temperature - 15 +material_final_print_temperature = =material_print_temperature - 20 prime_tower_enable = False -raft_airgap = 0.15 -speed_infill = =math.ceil(speed_print * 40 / 50) -speed_layer_0 = 10 speed_print = 50 +speed_layer_0 = 10 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 30 / 50) + + +speed_infill = =math.ceil(speed_print * 40 / 50) + +raft_airgap = 0.15 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality.inst.cfg index bed87d7b95..4141c023aa 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality.inst.cfg @@ -14,13 +14,16 @@ variant = AA 0.4 [values] machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 -material_final_print_temperature = =material_print_temperature - 20 -material_initial_print_temperature = =material_print_temperature - 15 material_print_temperature = =default_material_print_temperature + 10 +material_initial_print_temperature = =material_print_temperature - 15 +material_final_print_temperature = =material_print_temperature - 20 prime_tower_enable = False -raft_airgap = 0.15 -speed_infill = =math.ceil(speed_print * 40 / 55) -speed_layer_0 = 10 speed_print = 55 +speed_layer_0 = 10 speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_wall = =math.ceil(speed_print * 30 / 55) + + +speed_infill = =math.ceil(speed_print * 40 / 55) + +raft_airgap = 0.15 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg index 2c4432db17..593781314a 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg @@ -18,16 +18,17 @@ cool_fan_speed_max = =cool_fan_speed machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 +# prime_tower_enable: see CURA-4248 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 skin_overlap = 20 speed_layer_0 = =math.ceil(speed_print * 20 / 70) speed_topbottom = =math.ceil(speed_print * 35 / 70) speed_wall = =math.ceil(speed_print * 50 / 70) speed_wall_0 = =math.ceil(speed_wall * 35 / 50) -support_angle = 45 -support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height -support_brim_enable = True -support_interface_density = =min(extruderValues('material_surface_energy')) -support_interface_enable = True -support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height top_bottom_thickness = 1 +support_brim_enable = True +support_interface_enable = True +support_interface_density = =min(extruderValues('material_surface_energy')) +support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height +support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height +support_angle = 45 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg index 7886cc164f..577362391f 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg @@ -12,22 +12,23 @@ material = generic_bam variant = AA 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 +# prime_tower_enable: see CURA-4248 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 -speed_layer_0 = =math.ceil(speed_print * 20 / 80) speed_print = 80 +speed_layer_0 = =math.ceil(speed_print * 20 / 80) speed_topbottom = =math.ceil(speed_print * 30 / 80) speed_wall = =math.ceil(speed_print * 40 / 80) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -support_angle = 45 -support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height -support_brim_enable = True -support_infill_sparse_thickness = =2*layer_height -support_interface_density = =min(extruderValues('material_surface_energy')) -support_interface_enable = True -support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 1) * layer_height top_bottom_thickness = 1 +support_brim_enable = True +support_interface_enable = True +support_interface_density = =min(extruderValues('material_surface_energy')) +support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 1) * layer_height +support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height +support_angle = 45 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg index 8731404e73..416a175c81 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg @@ -12,20 +12,21 @@ material = generic_bam variant = AA 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed cool_min_speed = 7 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 +# prime_tower_enable: see CURA-4248 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 skin_overlap = 10 speed_layer_0 = =math.ceil(speed_print * 20 / 70) -support_angle = 45 -support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height support_brim_enable = True -support_infill_sparse_thickness = =2*layer_height -support_interface_density = =min(extruderValues('material_surface_energy')) support_interface_enable = True +support_interface_density = =min(extruderValues('material_surface_energy')) support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 1) * layer_height +support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height +support_angle = 45 top_bottom_thickness = 1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_VeryDraft_Print.inst.cfg index 8de2272716..a8b51892c7 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_VeryDraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_VeryDraft_Print.inst.cfg @@ -1,16 +1,17 @@ [general] version = 4 -name = Extra Fast - Experimental +name = Extra Fast definition = ultimaker_s3 [metadata] setting_version = 20 type = quality quality_type = verydraft -weight = -3 +weight = -2 material = generic_bam variant = AA 0.4 is_experimental = True + [values] brim_replaces_support = False cool_fan_full_at_height = =layer_height_0 + 2 * layer_height @@ -24,10 +25,10 @@ speed_layer_0 = =math.ceil(speed_print * 20 / 70) speed_topbottom = =math.ceil(speed_print * 35 / 70) speed_wall = =math.ceil(speed_print * 50 / 70) speed_wall_0 = =math.ceil(speed_wall * 35 / 50) -support_angle = 45 -support_bottom_distance = 0.3 -support_brim_enable = True -support_interface_density = =min(extruderValues('material_surface_energy')) -support_interface_enable = True -support_top_distance = 0.3 top_bottom_thickness = 1 +support_brim_enable = True +support_interface_enable = True +support_interface_density = =min(extruderValues('material_surface_energy')) +support_top_distance = 0.3 +support_bottom_distance = 0.3 +support_angle = 45 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 04df2951fa..5d01e40230 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 @@ -14,6 +14,7 @@ variant = AA 0.4 [values] cool_fan_speed_max = 80 cool_min_speed = 5 + infill_overlap = 0 infill_wipe_dist = 0 machine_min_cool_heat_time_window = 15 @@ -33,6 +34,7 @@ skin_overlap = 20 speed_layer_0 = =math.ceil(speed_print * 20 / 50) speed_print = 50 speed_topbottom = =math.ceil(speed_print * 40 / 50) + speed_wall = =math.ceil(speed_print * 50 / 50) speed_wall_0 = =math.ceil(speed_wall * 40 / 50) support_z_distance = =layer_height diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg index d90b6c0a04..73ea3d5cea 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg @@ -14,6 +14,7 @@ variant = AA 0.4 [values] cool_fan_speed_max = 80 cool_min_speed = 6 + infill_overlap = 0 infill_wipe_dist = 0 machine_min_cool_heat_time_window = 15 @@ -33,6 +34,7 @@ skin_overlap = 20 speed_layer_0 = =math.ceil(speed_print * 20 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) + speed_wall = =math.ceil(speed_print * 45 / 45) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) support_z_distance = =layer_height 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 c043bb9bb7..56ec94d871 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 @@ -14,6 +14,7 @@ variant = AA 0.4 [values] cool_fan_speed_max = 50 cool_min_speed = 5 + infill_overlap = 0 infill_wipe_dist = 0 machine_min_cool_heat_time_window = 15 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 3196fc777f..8fda5b84c6 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 @@ -14,6 +14,7 @@ variant = AA 0.4 [values] cool_fan_speed_max = 50 cool_min_speed = 7 + infill_overlap = 0 infill_wipe_dist = 0 machine_min_cool_heat_time_window = 15 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Draft_Print.inst.cfg index 00dad75b09..2553121d76 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Draft_Print.inst.cfg @@ -12,16 +12,17 @@ material = generic_cpe variant = AA 0.4 [values] -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -material_final_print_temperature = =material_print_temperature - 10 -material_initial_print_temperature = =material_print_temperature - 5 material_print_temperature = =default_material_print_temperature + 10 +material_initial_print_temperature = =material_print_temperature - 5 +material_final_print_temperature = =material_print_temperature - 10 retraction_combing_max_distance = 50 retraction_prime_speed = =retraction_speed skin_overlap = 20 -speed_infill = =math.ceil(speed_print * 50 / 60) -speed_layer_0 = =math.ceil(speed_print * 20 / 60) speed_print = 60 +speed_layer_0 = =math.ceil(speed_print * 20 / 60) speed_topbottom = =math.ceil(speed_print * 35 / 60) speed_wall = =math.ceil(speed_print * 45 / 60) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) + +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +speed_infill = =math.ceil(speed_print * 50 / 60) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print.inst.cfg index df68316eb1..b8c8538a00 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print.inst.cfg @@ -13,15 +13,16 @@ variant = AA 0.4 [values] cool_min_speed = 7 -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -material_final_print_temperature = =material_print_temperature - 10 -material_initial_print_temperature = =material_print_temperature - 5 material_print_temperature = =default_material_print_temperature + 5 +material_initial_print_temperature = =material_print_temperature - 5 +material_final_print_temperature = =material_print_temperature - 10 retraction_combing_max_distance = 50 retraction_prime_speed = =retraction_speed -speed_infill = =math.ceil(speed_print * 50 / 60) -speed_layer_0 = =math.ceil(speed_print * 20 / 60) speed_print = 60 +speed_layer_0 = =math.ceil(speed_print * 20 / 60) speed_topbottom = =math.ceil(speed_print * 30 / 60) speed_wall = =math.ceil(speed_print * 40 / 60) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) + +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +speed_infill = =math.ceil(speed_print * 50 / 60) \ No newline at end of file diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_High_Quality.inst.cfg index 4850bc393c..360984cc12 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_High_Quality.inst.cfg @@ -13,16 +13,17 @@ variant = AA 0.4 [values] cool_min_speed = 12 -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 -material_final_print_temperature = =material_print_temperature - 10 -material_initial_print_temperature = =material_print_temperature - 5 material_print_temperature = =default_material_print_temperature - 5 +material_initial_print_temperature = =material_print_temperature - 5 +material_final_print_temperature = =material_print_temperature - 10 retraction_combing_max_distance = 50 retraction_prime_speed = =retraction_speed -speed_infill = =math.ceil(speed_print * 40 / 50) -speed_layer_0 = =math.ceil(speed_print * 20 / 50) speed_print = 50 +speed_layer_0 = =math.ceil(speed_print * 20 / 50) speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 30 / 50) + +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +speed_infill = =math.ceil(speed_print * 40 / 50) \ No newline at end of file diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality.inst.cfg index 41594ab90f..8db4957fa9 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality.inst.cfg @@ -12,15 +12,16 @@ material = generic_cpe variant = AA 0.4 [values] -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 -material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 +material_final_print_temperature = =material_print_temperature - 10 retraction_combing_max_distance = 50 retraction_prime_speed = =retraction_speed -speed_infill = =math.ceil(speed_print * 45 / 55) -speed_layer_0 = =math.ceil(speed_print * 20 / 55) speed_print = 55 +speed_layer_0 = =math.ceil(speed_print * 20 / 55) speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_wall = =math.ceil(speed_print * 30 / 55) + +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +speed_infill = =math.ceil(speed_print * 45 / 55) \ No newline at end of file diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg index 9d4069eead..a0c909af75 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg @@ -14,9 +14,9 @@ variant = AA 0.4 [values] cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -material_final_print_temperature = =material_print_temperature - 10 -material_initial_print_temperature = =material_print_temperature - 5 material_print_temperature = =default_material_print_temperature + 10 +material_initial_print_temperature = =material_print_temperature - 5 +material_final_print_temperature = =material_print_temperature - 10 ooze_shield_angle = 40 raft_airgap = 0.4 retraction_prime_speed = =retraction_speed @@ -24,4 +24,4 @@ skin_overlap = 50 speed_layer_0 = 10 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 -switch_extruder_retraction_speeds = 40 +switch_extruder_retraction_speeds = 40 \ No newline at end of file diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg index df0aa521c3..58b6f80f5d 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg @@ -14,9 +14,9 @@ variant = AA 0.4 [values] cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -material_final_print_temperature = =material_print_temperature - 10 -material_initial_print_temperature = =material_print_temperature - 5 material_print_temperature = =default_material_print_temperature + 5 +material_initial_print_temperature = =material_print_temperature - 5 +material_final_print_temperature = =material_print_temperature - 10 ooze_shield_angle = 40 raft_airgap = 0.4 retraction_prime_speed = =retraction_speed @@ -24,4 +24,4 @@ skin_overlap = 50 speed_layer_0 = 10 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 -switch_extruder_retraction_speeds = 40 +switch_extruder_retraction_speeds = 40 \ No newline at end of file diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg index fcc766e14a..0dd7ec5a0d 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg @@ -14,8 +14,8 @@ variant = AA 0.4 [values] cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 15 -material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 +material_final_print_temperature = =material_print_temperature - 10 ooze_shield_angle = 40 raft_airgap = 0.4 retraction_prime_speed = =retraction_speed @@ -23,4 +23,4 @@ skin_overlap = 50 speed_layer_0 = 10 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 -switch_extruder_retraction_speeds = 40 +switch_extruder_retraction_speeds = 40 \ No newline at end of file diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg index bd46912a8d..8f17f79616 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg @@ -14,8 +14,8 @@ variant = AA 0.4 [values] cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 12 -material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 +material_final_print_temperature = =material_print_temperature - 10 ooze_shield_angle = 40 raft_airgap = 0.4 retraction_prime_speed = =retraction_speed diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg index 016a66ea60..b3f3aa6cd0 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg @@ -17,6 +17,7 @@ cool_fan_full_at_height = =layer_height_0 + layer_height cool_fan_speed_max = 50 cool_min_layer_time_fan_speed_max = 5 cool_min_speed = 8 + 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' diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg index 3cb5249538..eaf031fe52 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg @@ -17,6 +17,7 @@ cool_fan_full_at_height = =layer_height_0 + layer_height cool_fan_speed_max = 50 cool_min_layer_time_fan_speed_max = 5 cool_min_speed = 5 + infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0.1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Draft_Print.inst.cfg index f40c3d9968..e77195665a 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Draft_Print.inst.cfg @@ -12,16 +12,17 @@ material = generic_petg variant = AA 0.4 [values] -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -initial_layer_line_width_factor = 100 -material_final_print_temperature = =material_print_temperature - 5 -material_initial_print_temperature = =material_print_temperature material_print_temperature = =default_material_print_temperature + 5 +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature - 5 retraction_combing_max_distance = 8 skin_overlap = 20 -speed_infill = =math.ceil(speed_print * 50 / 60) -speed_layer_0 = =math.ceil(speed_print * 20 / 60) speed_print = 60 +speed_layer_0 = =math.ceil(speed_print * 20 / 60) speed_topbottom = =math.ceil(speed_print * 35 / 60) speed_wall = =math.ceil(speed_print * 45 / 60) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) + +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +speed_infill = =math.ceil(speed_print * 50 / 60) +initial_layer_line_width_factor = 100 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print.inst.cfg index 496e5662ca..8117c60edc 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print.inst.cfg @@ -13,15 +13,16 @@ variant = AA 0.4 [values] cool_min_speed = 7 -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -initial_layer_line_width_factor = 100 -material_final_print_temperature = =material_print_temperature - 10 -material_initial_print_temperature = =material_print_temperature - 5 material_print_temperature = =default_material_print_temperature +material_initial_print_temperature = =material_print_temperature - 5 +material_final_print_temperature = =material_print_temperature - 10 retraction_combing_max_distance = 8 -speed_infill = =math.ceil(speed_print * 50 / 60) -speed_layer_0 = =math.ceil(speed_print * 20 / 60) speed_print = 60 +speed_layer_0 = =math.ceil(speed_print * 20 / 60) speed_topbottom = =math.ceil(speed_print * 30 / 60) speed_wall = =math.ceil(speed_print * 40 / 60) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) + +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +speed_infill = =math.ceil(speed_print * 50 / 60) +initial_layer_line_width_factor = 100 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_High_Quality.inst.cfg index f710c0fa58..85a05b576a 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_High_Quality.inst.cfg @@ -13,16 +13,17 @@ variant = AA 0.4 [values] cool_min_speed = 12 -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -initial_layer_line_width_factor = 100 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 -material_final_print_temperature = =material_print_temperature - 15 -material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature - 10 +material_initial_print_temperature = =material_print_temperature - 10 +material_final_print_temperature = =material_print_temperature - 15 retraction_combing_max_distance = 8 -speed_infill = =math.ceil(speed_print * 40 / 50) -speed_layer_0 = =math.ceil(speed_print * 20 / 50) speed_print = 50 +speed_layer_0 = =math.ceil(speed_print * 20 / 50) speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 30 / 50) + +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +speed_infill = =math.ceil(speed_print * 40 / 50) +initial_layer_line_width_factor = 100 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality.inst.cfg index a3ef8347f1..b75ab359b4 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality.inst.cfg @@ -12,16 +12,17 @@ material = generic_petg variant = AA 0.4 [values] -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -initial_layer_line_width_factor = 100 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 -material_final_print_temperature = =material_print_temperature - 15 -material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature - 5 +material_initial_print_temperature = =material_print_temperature - 10 +material_final_print_temperature = =material_print_temperature - 15 retraction_combing_max_distance = 8 -speed_infill = =math.ceil(speed_print * 45 / 55) -speed_layer_0 = =math.ceil(speed_print * 20 / 55) speed_print = 55 +speed_layer_0 = =math.ceil(speed_print * 20 / 55) speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_wall = =math.ceil(speed_print * 30 / 55) + +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +speed_infill = =math.ceil(speed_print * 45 / 55) +initial_layer_line_width_factor = 100 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg index 9e4855a3cc..8daad94c4c 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg @@ -12,17 +12,12 @@ material = generic_pla variant = AA 0.4 [values] -acceleration_wall = 2000 -acceleration_wall_0 = 2000 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed -infill_sparse_density = 15 -layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 prime_tower_enable = False -raft_airgap = 0.25 retraction_prime_speed = =retraction_speed skin_overlap = 20 speed_layer_0 = 10 @@ -30,3 +25,9 @@ speed_topbottom = =math.ceil(speed_print * 40 / 70) speed_wall = =math.ceil(speed_print * 55 / 70) speed_wall_0 = =math.ceil(speed_wall * 45 / 50) top_bottom_thickness = 0.8 +infill_sparse_density = 15 +layer_height_0 = 0.2 +acceleration_wall = 2000 +acceleration_wall_0 = 2000 + +raft_airgap = 0.25 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg index cd95a1ec89..16b0868446 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg @@ -14,15 +14,16 @@ variant = AA 0.4 [values] cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed -layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 prime_tower_enable = False -raft_airgap = 0.25 retraction_prime_speed = =retraction_speed -speed_layer_0 = 10 speed_print = 70 +speed_layer_0 = 10 speed_topbottom = =math.ceil(speed_print * 35 / 70) speed_wall = =math.ceil(speed_print * 45 / 70) speed_wall_0 = =math.ceil(speed_wall * 35 / 70) top_bottom_thickness = 1 +layer_height_0 = 0.2 + +raft_airgap = 0.25 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg index 789bccd411..6ec0425176 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg @@ -15,16 +15,17 @@ variant = AA 0.4 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed cool_min_speed = 10 -layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature - 5 prime_tower_enable = False -raft_airgap = 0.25 retraction_prime_speed = =retraction_speed skin_overlap = 10 -speed_layer_0 = 10 speed_print = 50 +speed_layer_0 = 10 speed_topbottom = =math.ceil(speed_print * 35 / 50) speed_wall = =math.ceil(speed_print * 35 / 50) top_bottom_thickness = 1 +layer_height_0 = 0.2 + +raft_airgap = 0.25 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg index 9ef1ae8e0a..4928a166b4 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg @@ -15,12 +15,13 @@ variant = AA 0.4 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed cool_min_speed = 7 -layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 prime_tower_enable = False -raft_airgap = 0.25 retraction_prime_speed = =retraction_speed skin_overlap = 10 speed_layer_0 = 10 top_bottom_thickness = 1 +layer_height_0 = 0.2 + +raft_airgap = 0.25 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg index d89657527b..d20c1303b8 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg @@ -1,33 +1,38 @@ [general] version = 4 -name = Extra Fast - Experimental +name = Extra Fast definition = ultimaker_s3 [metadata] setting_version = 20 type = quality quality_type = verydraft -weight = -3 +weight = -2 material = generic_pla variant = AA 0.4 is_experimental = True + [values] +infill_sparse_density = 15 acceleration_print = 2000 -acceleration_topbottom = 1000 acceleration_wall = 1500 acceleration_wall_0 = 1000 -cool_fan_full_at_height = =layer_height_0 + 2 * layer_height -cool_fan_speed_max = =cool_fan_speed -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -infill_sparse_density = 15 -machine_nozzle_cool_down_speed = 0.75 -machine_nozzle_heat_up_speed = 1.6 -material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = False -raft_airgap = 0.25 -retraction_prime_speed = =retraction_speed -skin_overlap = 20 +acceleration_topbottom = 1000 speed_print = 50 speed_wall = 50 + +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_fan_speed_max = =cool_fan_speed + +material_print_temperature = =default_material_print_temperature + 10 +machine_nozzle_cool_down_speed = 0.75 +machine_nozzle_heat_up_speed = 1.6 +prime_tower_enable = False +retraction_prime_speed = =retraction_speed +skin_overlap = 20 top_bottom_thickness = 0.9 -wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) + +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' + +raft_airgap = 0.25 +wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) \ No newline at end of file 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 a26e442819..d68e3dd779 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 @@ -17,6 +17,7 @@ cool_fan_speed_max = 100 cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 7 cool_min_speed = 2.5 + infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0.1 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 06cf202bc6..7eed793e6a 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 @@ -40,6 +40,7 @@ retraction_min_travel = 0.8 speed_layer_0 = =math.ceil(speed_print * 15 / 25) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 25 / 25) + speed_travel_layer_0 = 50 speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 25) 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 61453c278c..97c92f934c 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 @@ -17,6 +17,7 @@ cool_fan_speed_max = 100 cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 7 cool_min_speed = 2.5 + infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0.1 @@ -40,6 +41,7 @@ retraction_min_travel = 0.8 speed_layer_0 = =math.ceil(speed_print * 15 / 25) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 25 / 25) + speed_travel_layer_0 = 50 speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 25) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg index 72be73dc22..ae44c3f019 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg @@ -15,16 +15,17 @@ variant = AA 0.4 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed cool_min_speed = 10 -layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature - 15 prime_tower_enable = False retraction_prime_speed = =retraction_speed skin_overlap = 10 -speed_layer_0 = =math.ceil(speed_print * 20 / 45) speed_print = 45 +speed_layer_0 = =math.ceil(speed_print * 20 / 45) speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) top_bottom_thickness = 1.2 +layer_height_0 = 0.2 + diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg index 4f594f4dc4..2d05a15f3c 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg @@ -1,33 +1,38 @@ [general] version = 4 -name = Extra Fast - Experimental +name = Extra Fast definition = ultimaker_s3 [metadata] setting_version = 20 type = quality quality_type = verydraft -weight = -3 +weight = -2 material = generic_tough_pla variant = AA 0.4 is_experimental = True + [values] +infill_sparse_density = 15 acceleration_print = 2000 -acceleration_topbottom = 1000 acceleration_wall = 1500 acceleration_wall_0 = 1000 -cool_fan_full_at_height = =layer_height_0 + 2 * layer_height -cool_fan_speed_max = =cool_fan_speed -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -infill_sparse_density = 15 -machine_nozzle_cool_down_speed = 0.75 -machine_nozzle_heat_up_speed = 1.6 -material_print_temperature = =default_material_print_temperature - 5 -prime_tower_enable = False -raft_airgap = 0.25 -retraction_prime_speed = =retraction_speed -skin_overlap = 20 +acceleration_topbottom = 1000 speed_print = 50 speed_wall = 50 + +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_fan_speed_max = =cool_fan_speed + +material_print_temperature = =default_material_print_temperature - 5 +machine_nozzle_cool_down_speed = 0.75 +machine_nozzle_heat_up_speed = 1.6 +prime_tower_enable = False +retraction_prime_speed = =retraction_speed +skin_overlap = 20 top_bottom_thickness = 1.2 -wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) + +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' + +raft_airgap = 0.25 +wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) \ No newline at end of file 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 b461efb73b..24ae39f8b1 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 @@ -17,6 +17,7 @@ cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 4 gradual_infill_step_height = =5 * layer_height + infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 10 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 08fcbc3187..468184028c 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 @@ -17,6 +17,7 @@ cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 4 gradual_infill_step_height = =5 * layer_height + infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 10 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg index 0be0f52120..333307e533 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg @@ -17,6 +17,7 @@ cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 4 gradual_infill_step_height = =5 * layer_height + infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 10 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Draft_Print.inst.cfg index 7afbea4788..e314a6080d 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Draft_Print.inst.cfg @@ -12,6 +12,7 @@ material = generic_abs variant = AA 0.8 [values] + material_print_temperature = =default_material_print_temperature + 20 speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Superdraft_Print.inst.cfg index e473cd6f28..c983a4558c 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Superdraft_Print.inst.cfg @@ -12,9 +12,10 @@ material = generic_abs variant = AA 0.8 [values] + material_print_temperature = =default_material_print_temperature + 25 -speed_infill = =math.ceil(speed_print * 37 / 50) speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 37 / 50) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) +speed_infill = =math.ceil(speed_print * 37 / 50) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Verydraft_Print.inst.cfg index 2571776d35..199e80e9ac 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Verydraft_Print.inst.cfg @@ -12,6 +12,7 @@ material = generic_abs variant = AA 0.8 [values] + material_print_temperature = =default_material_print_temperature + 22 speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Fast_Print.inst.cfg index 4ba71e0357..a694688d41 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Fast_Print.inst.cfg @@ -1,19 +1,22 @@ [general] version = 4 -name = Normal - Experimental +name = Fast - Experimental definition = ultimaker_s3 [metadata] setting_version = 20 type = quality -quality_type = fast -weight = -1 +quality_type = draft +weight = -2 material = generic_cpe_plus variant = AA 0.8 is_experimental = True + [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 14 * layer_height + + machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 10 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Superdraft_Print.inst.cfg index b54dec7fff..38413229e0 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Superdraft_Print.inst.cfg @@ -11,9 +11,12 @@ weight = -4 material = generic_cpe_plus variant = AA 0.8 is_experimental = True + [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 7 * layer_height + + machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 5 @@ -23,12 +26,12 @@ retraction_combing_max_distance = 50 retraction_hop = 0.1 retraction_hop_enabled = False skin_overlap = 0 -speed_infill = =math.ceil(speed_print * 40 / 50) speed_layer_0 = =math.ceil(speed_print * 15 / 50) speed_print = 50 speed_slowdown_layers = 8 speed_topbottom = =math.ceil(speed_print * 35 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 35 / 40) +speed_infill = =math.ceil(speed_print * 40 / 50) support_z_distance = =layer_height top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Verydraft_Print.inst.cfg index 47d12c3da7..b238164e4f 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Verydraft_Print.inst.cfg @@ -11,9 +11,12 @@ weight = -3 material = generic_cpe_plus variant = AA 0.8 is_experimental = True + [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 9 * layer_height + + machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 7 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Draft_Print.inst.cfg index c05205a9f2..6421e5ea77 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Draft_Print.inst.cfg @@ -13,6 +13,7 @@ variant = AA 0.8 [values] brim_width = 15 + material_print_temperature = =default_material_print_temperature + 15 prime_tower_enable = True retraction_combing_max_distance = 50 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg index 8cd5ba4ac2..93756a3621 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg @@ -13,11 +13,13 @@ variant = AA 0.8 [values] brim_width = 15 + material_print_temperature = =default_material_print_temperature + 20 prime_tower_enable = True retraction_combing_max_distance = 50 -speed_infill = =math.ceil(speed_print * 33 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 30 / 45) speed_wall = =math.ceil(speed_print * 33 / 45) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) + +speed_infill = =math.ceil(speed_print * 33 / 45) \ No newline at end of file diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Verydraft_Print.inst.cfg index 1d619bf42c..2afb9dc78a 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Verydraft_Print.inst.cfg @@ -13,6 +13,7 @@ variant = AA 0.8 [values] brim_width = 15 + material_print_temperature = =default_material_print_temperature + 17 prime_tower_enable = True retraction_combing_max_distance = 50 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Draft_Print.inst.cfg index c11350773c..09de59ba20 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Draft_Print.inst.cfg @@ -15,6 +15,8 @@ variant = AA 0.8 brim_width = 5.6 cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 + + machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 ooze_shield_angle = 40 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg index 4539cab117..d6e11ca953 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg @@ -15,6 +15,8 @@ variant = AA 0.8 brim_width = 5.6 cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 + + machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 ooze_shield_angle = 40 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg index 3736e729e9..599789f528 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg @@ -15,6 +15,8 @@ variant = AA 0.8 brim_width = 5.6 cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 + + machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 ooze_shield_angle = 40 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Fast_Print.inst.cfg index a5a7ff0018..61d0cc5109 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Fast_Print.inst.cfg @@ -1,19 +1,22 @@ [general] version = 4 -name = Normal - Experimental +name = Fast - Experimental definition = ultimaker_s3 [metadata] setting_version = 20 type = quality -quality_type = fast -weight = -1 +quality_type = draft +weight = -2 material = generic_pc variant = AA 0.8 is_experimental = True + [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 14 * layer_height + + material_print_temperature = =default_material_print_temperature - 5 material_print_temperature_layer_0 = =material_print_temperature raft_airgap = 0.5 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Superdraft_Print.inst.cfg index b34df4a1ac..f441c0acac 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Superdraft_Print.inst.cfg @@ -11,16 +11,19 @@ weight = -4 material = generic_pc variant = AA 0.8 is_experimental = True + [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 7 * layer_height + + material_print_temperature_layer_0 = =material_print_temperature raft_airgap = 0.5 skin_overlap = 0 -speed_infill = =math.ceil(speed_print * 37 / 50) speed_layer_0 = =math.ceil(speed_print * 15 / 50) speed_print = 50 speed_slowdown_layers = 8 speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 37 / 50) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) +speed_infill = =math.ceil(speed_print * 37 / 50) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Verydraft_Print.inst.cfg index 546f3a80ae..a044987670 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Verydraft_Print.inst.cfg @@ -11,9 +11,12 @@ weight = -3 material = generic_pc variant = AA 0.8 is_experimental = True + [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 9 * layer_height + + material_print_temperature = =default_material_print_temperature - 2 material_print_temperature_layer_0 = =material_print_temperature raft_airgap = 0.5 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg index 9e900c5658..5b4142f762 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg @@ -13,11 +13,12 @@ variant = AA 0.8 [values] brim_width = 7 -cool_fan_speed = 20 -initial_layer_line_width_factor = 100 + material_print_temperature = =default_material_print_temperature - 5 prime_tower_enable = True retraction_combing_max_distance = 8 speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) +cool_fan_speed = 20 +initial_layer_line_width_factor = 100 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg index 8b9fa7de7f..2aae9c8933 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg @@ -13,13 +13,14 @@ variant = AA 0.8 [values] brim_width = 7 -cool_fan_speed = 20 -initial_layer_line_width_factor = 100 + material_print_temperature = =default_material_print_temperature - 5 prime_tower_enable = True retraction_combing_max_distance = 8 -speed_infill = =math.ceil(speed_print * 33 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 30 / 45) speed_wall = =math.ceil(speed_print * 33 / 45) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) +speed_infill = =math.ceil(speed_print * 33 / 45) +cool_fan_speed = 20 +initial_layer_line_width_factor = 100 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg index 4dbd1099f4..85b076551c 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg @@ -13,12 +13,14 @@ variant = AA 0.8 [values] brim_width = 7 -cool_fan_speed = 20 -initial_layer_line_width_factor = 100 -layer_height_0 = 0.27 + material_print_temperature = =default_material_print_temperature - 5 prime_tower_enable = True retraction_combing_max_distance = 8 speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) +cool_fan_speed = 20 +layer_height_0 = 0.27 +initial_layer_line_width_factor = 100 + diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg index 4aad3505c6..60244f52af 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg @@ -16,17 +16,17 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height -layer_height_0 = 0.4 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = True +support_angle = 70 +top_bottom_thickness = =layer_height * 4 speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) -speed_wall_0 = =math.ceil(speed_wall * 35 / 40) speed_wall_x = =speed_wall -support_angle = 70 -top_bottom_thickness = =layer_height * 4 +speed_wall_0 = =math.ceil(speed_wall * 35 / 40) +layer_height_0 = 0.4 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg index a5aef78a45..a2e863cb8d 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg @@ -16,18 +16,18 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height -layer_height_0 = 0.4 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 15 prime_tower_enable = True -speed_infill = =math.ceil(speed_print * 35 / 45) +support_angle = 70 +top_bottom_thickness = =layer_height * 4 speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 35 / 45) -speed_wall_0 = =math.ceil(speed_wall * 35 / 40) speed_wall_x = =speed_wall -support_angle = 70 -top_bottom_thickness = =layer_height * 4 +speed_wall_0 = =math.ceil(speed_wall * 35 / 40) +speed_infill = =math.ceil(speed_print * 35 / 45) +layer_height_0 = 0.4 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg index 0e1200ea48..a67dc3be1b 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg @@ -16,17 +16,17 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height -layer_height_0 = 0.4 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = True +support_angle = 70 +top_bottom_thickness = =layer_height * 4 speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) -speed_wall_0 = =math.ceil(speed_wall * 35 / 40) speed_wall_x = =speed_wall -support_angle = 70 -top_bottom_thickness = =layer_height * 4 +speed_wall_0 = =math.ceil(speed_wall * 35 / 40) +layer_height_0 = 0.4 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg index 2ed16d2428..e2904aa1e7 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg @@ -15,6 +15,7 @@ variant = AA 0.8 brim_width = 25 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 17 +top_skin_expand_distance = =line_width * 2 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' material_bed_temperature_layer_0 = =material_bed_temperature material_print_temperature = =default_material_print_temperature - 2 @@ -33,5 +34,4 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.6 -top_skin_expand_distance = =line_width * 2 wall_0_wipe_dist = =line_width * 2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg index 932e74a409..d4508c05c0 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg @@ -15,6 +15,7 @@ variant = AA 0.8 brim_width = 25 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 17 +top_skin_expand_distance = =line_width * 2 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' material_bed_temperature_layer_0 = =material_bed_temperature material_print_temperature = =default_material_print_temperature + 2 @@ -28,11 +29,10 @@ retraction_extra_prime_amount = 0.5 retraction_hop = 0.5 retraction_min_travel = 1.5 retraction_prime_speed = 15 -speed_infill = =math.ceil(speed_wall * 30 / 30) speed_wall_x = =math.ceil(speed_wall * 30 / 30) +speed_infill = =math.ceil(speed_wall * 30 / 30) switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.6 -top_skin_expand_distance = =line_width * 2 wall_0_wipe_dist = =line_width * 2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg index 19c2b14c99..b68839785f 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg @@ -15,6 +15,7 @@ variant = AA 0.8 brim_width = 25 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 17 +top_skin_expand_distance = =line_width * 2 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' material_bed_temperature_layer_0 = =material_bed_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 2 @@ -32,5 +33,4 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.6 -top_skin_expand_distance = =line_width * 2 wall_0_wipe_dist = =line_width * 2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg index a03f52f4c2..f611f7d17e 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg @@ -14,6 +14,7 @@ variant = AA 0.8 [values] brim_width = 8.75 cool_min_layer_time_fan_speed_max = 6 +top_skin_expand_distance = =line_width * 2 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' machine_nozzle_cool_down_speed = 0.5 machine_nozzle_heat_up_speed = 2.5 @@ -40,6 +41,5 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.2 -top_skin_expand_distance = =line_width * 2 travel_avoid_distance = 1.5 wall_0_wipe_dist = =line_width * 2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg index b881b5d3a6..e7d370cb8a 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg @@ -14,6 +14,7 @@ variant = AA 0.8 [values] brim_width = 8.75 cool_min_layer_time_fan_speed_max = 6 +top_skin_expand_distance = =line_width * 2 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 15 machine_nozzle_cool_down_speed = 0.5 @@ -32,16 +33,15 @@ retraction_hop = 1.5 retraction_hop_only_when_collides = False retraction_min_travel = =line_width * 2 retraction_prime_speed = 15 -speed_infill = =speed_print speed_print = 30 speed_topbottom = =math.ceil(speed_print * 20 / 30) speed_wall = =speed_print speed_wall_x = =speed_print +speed_infill = =speed_print support_angle = 50 switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.2 -top_skin_expand_distance = =line_width * 2 travel_avoid_distance = 1.5 wall_0_wipe_dist = =line_width * 2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg index f8d758abb0..f318034971 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg @@ -14,6 +14,7 @@ variant = AA 0.8 [values] brim_width = 8.75 cool_min_layer_time_fan_speed_max = 6 +top_skin_expand_distance = =line_width * 2 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 15 machine_nozzle_cool_down_speed = 0.5 @@ -40,6 +41,5 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.2 -top_skin_expand_distance = =line_width * 2 travel_avoid_distance = 1.5 wall_0_wipe_dist = =line_width * 2 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Draft_Print.inst.cfg index 8e517d0ee5..f9ea2ed4db 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Draft_Print.inst.cfg @@ -13,12 +13,12 @@ variant = BB 0.4 [values] brim_replaces_support = False -cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = False retraction_count_max = 5 skin_overlap = 20 -skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) support_brim_enable = True support_interface_enable = True +skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) support_use_towers = True diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg index e4bd6f7f98..9ca8ea51ec 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg @@ -12,14 +12,14 @@ material = generic_pva variant = BB 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False -cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) material_print_temperature = =default_material_print_temperature + 5 prime_tower_enable = False retraction_count_max = 5 skin_overlap = 15 -skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) support_brim_enable = True -support_infill_sparse_thickness = =2*layer_height support_interface_enable = True +skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) support_use_towers = True diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg index 3708aaf544..018298d706 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg @@ -12,12 +12,12 @@ material = generic_pva variant = BB 0.4 [values] +support_infill_sparse_thickness = =3*layer_height brim_replaces_support = False -cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) prime_tower_enable = False retraction_count_max = 5 -skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) support_brim_enable = True -support_infill_sparse_thickness = =3*layer_height support_interface_enable = True +skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) support_use_towers = True diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg index d9cdfe4f58..48394a8feb 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg @@ -12,12 +12,12 @@ material = generic_pva variant = BB 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False -cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) prime_tower_enable = False retraction_count_max = 5 -skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) support_brim_enable = True -support_infill_sparse_thickness = =2*layer_height support_interface_enable = True +skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) support_use_towers = True diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Verydraft_Print.inst.cfg index 8a10923b48..85e530fdc1 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Verydraft_Print.inst.cfg @@ -1,6 +1,6 @@ [general] version = 4 -name = Extra Fast - Experimental +name = Extra Fast definition = ultimaker_s3 [metadata] @@ -11,12 +11,13 @@ weight = -3 material = generic_pva variant = BB 0.4 is_experimental = True + [values] brim_replaces_support = False -cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) retraction_count_max = 5 -skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) support_brim_enable = True support_infill_sparse_thickness = 0.3 support_interface_enable = True +skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) support_use_towers = True diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Draft_Print.inst.cfg index 78d4987cab..ab1a289761 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Draft_Print.inst.cfg @@ -13,10 +13,10 @@ variant = BB 0.8 [values] brim_replaces_support = False -cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) material_print_temperature = =default_material_print_temperature + 5 retraction_count_max = 5 -skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) support_brim_enable = True support_interface_enable = True +skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) support_use_towers = True diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Superdraft_Print.inst.cfg index 97cc65b8ce..0e2f072d03 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Superdraft_Print.inst.cfg @@ -13,9 +13,9 @@ variant = BB 0.8 [values] brim_replaces_support = False -cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) retraction_count_max = 5 -skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) support_brim_enable = True support_interface_enable = True +skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) support_use_towers = True diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Verydraft_Print.inst.cfg index 87d10a7987..d5ff375abb 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Verydraft_Print.inst.cfg @@ -13,10 +13,10 @@ variant = BB 0.8 [values] brim_replaces_support = False -cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) retraction_count_max = 5 -skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) support_brim_enable = True support_infill_sparse_thickness = 0.3 support_interface_enable = True +skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) support_use_towers = True diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Draft_Print.inst.cfg index e90b9c6d2b..0ad61736ab 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Draft_Print.inst.cfg @@ -16,7 +16,9 @@ cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 + initial_layer_line_width_factor = 130.0 + material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature @@ -24,3 +26,4 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 + diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Fast_Print.inst.cfg index 36a0eb09c8..758a81d3a8 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Fast_Print.inst.cfg @@ -7,7 +7,7 @@ definition = ultimaker_s3 setting_version = 20 type = quality quality_type = fast -weight = -1 +weight = -2 material = generic_cffcpe variant = CC 0.4 @@ -16,7 +16,9 @@ cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 + initial_layer_line_width_factor = 130.0 + material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature @@ -24,3 +26,4 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 + diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Draft_Print.inst.cfg index 6c380d6295..a0ca08eb8a 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Draft_Print.inst.cfg @@ -16,7 +16,9 @@ cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 + initial_layer_line_width_factor = 130.0 + material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature @@ -24,3 +26,4 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 + diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Fast_Print.inst.cfg index faf738c643..d538f95bea 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Fast_Print.inst.cfg @@ -7,7 +7,7 @@ definition = ultimaker_s3 setting_version = 20 type = quality quality_type = fast -weight = -1 +weight = -2 material = generic_cffpa variant = CC 0.4 @@ -16,7 +16,9 @@ cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 + initial_layer_line_width_factor = 130.0 + material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature @@ -24,3 +26,4 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 + diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Draft_Print.inst.cfg index 1173c7339c..2caa3776eb 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Draft_Print.inst.cfg @@ -16,7 +16,9 @@ cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 + initial_layer_line_width_factor = 130.0 + material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature @@ -24,3 +26,4 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 + diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Fast_Print.inst.cfg index 6d5ccf3855..f9fffb3171 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Fast_Print.inst.cfg @@ -7,7 +7,7 @@ definition = ultimaker_s3 setting_version = 20 type = quality quality_type = fast -weight = -1 +weight = -2 material = generic_gffcpe variant = CC 0.4 @@ -16,7 +16,9 @@ cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 + initial_layer_line_width_factor = 130.0 + material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature @@ -24,3 +26,4 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 + diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Draft_Print.inst.cfg index c91e9a0fff..465bff3d8d 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Draft_Print.inst.cfg @@ -16,7 +16,9 @@ cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 + initial_layer_line_width_factor = 130.0 + material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature @@ -24,3 +26,4 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 + diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Fast_Print.inst.cfg index b6d9f5e2a1..40df72973c 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Fast_Print.inst.cfg @@ -7,7 +7,7 @@ definition = ultimaker_s3 setting_version = 20 type = quality quality_type = fast -weight = -1 +weight = -2 material = generic_gffpa variant = CC 0.4 @@ -24,3 +24,4 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 + diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Draft_Print.inst.cfg index 7e063af586..1a4abc69eb 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Draft_Print.inst.cfg @@ -1,16 +1,17 @@ [general] version = 4 -name = Fast - Experimental +name = Fast definition = ultimaker_s3 [metadata] setting_version = 20 type = quality quality_type = draft -weight = -2 +weight = -3 material = generic_pla variant = CC 0.4 is_experimental = True + [values] cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 @@ -26,7 +27,7 @@ prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) -speed_wall_0 = =math.ceil(speed_wall * 35 / 40) speed_wall_x = =speed_wall +speed_wall_0 = =math.ceil(speed_wall * 35 / 40) support_angle = 70 top_bottom_thickness = =layer_height * 4 diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Fast_Print.inst.cfg index 6844077345..64640ddc5f 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Fast_Print.inst.cfg @@ -1,16 +1,17 @@ [general] version = 4 -name = Normal - Experimental +name = Normal definition = ultimaker_s3 [metadata] setting_version = 20 type = quality quality_type = fast -weight = -1 +weight = -2 material = generic_pla variant = CC 0.4 is_experimental = True + [values] cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 @@ -26,7 +27,7 @@ prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) -speed_wall_0 = =math.ceil(speed_wall * 35 / 40) speed_wall_x = =speed_wall +speed_wall_0 = =math.ceil(speed_wall * 35 / 40) support_angle = 70 top_bottom_thickness = =layer_height * 4 diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFCPE_Draft_Print.inst.cfg index 1e19814d67..8a617f2d04 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFCPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFCPE_Draft_Print.inst.cfg @@ -24,3 +24,4 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 + diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFPA_Draft_Print.inst.cfg index 662f167f69..9c396012bb 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFPA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFPA_Draft_Print.inst.cfg @@ -24,3 +24,4 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 + diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFCPE_Draft_Print.inst.cfg index 6975526d71..de38df43ee 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFCPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFCPE_Draft_Print.inst.cfg @@ -24,3 +24,4 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 + diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFPA_Draft_Print.inst.cfg index 986dda1437..5b3c0024ab 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFPA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFPA_Draft_Print.inst.cfg @@ -24,3 +24,4 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 + diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg index 981136de08..b80ecb7ed0 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg @@ -1,16 +1,17 @@ [general] version = 4 -name = Fast - Experimental +name = Fast definition = ultimaker_s3 [metadata] setting_version = 20 type = quality quality_type = draft -weight = -2 +weight = -3 material = generic_pla variant = CC 0.6 is_experimental = True + [values] cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 @@ -26,7 +27,7 @@ prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) -speed_wall_0 = =math.ceil(speed_wall * 35 / 40) speed_wall_x = =speed_wall +speed_wall_0 = =math.ceil(speed_wall * 35 / 40) support_angle = 70 top_bottom_thickness = =layer_height * 4 diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg index 7bcd60381e..1644b7d2ff 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg @@ -1,16 +1,17 @@ [general] version = 4 -name = Normal - Experimental +name = Normal definition = ultimaker_s3 [metadata] setting_version = 20 type = quality quality_type = fast -weight = -1 +weight = -2 material = generic_pla variant = CC 0.6 is_experimental = True + [values] cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 @@ -26,7 +27,7 @@ prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) -speed_wall_0 = =math.ceil(speed_wall * 35 / 40) speed_wall_x = =speed_wall +speed_wall_0 = =math.ceil(speed_wall * 35 / 40) support_angle = 70 top_bottom_thickness = =layer_height * 4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg index f31ea87a5c..b06a514334 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg @@ -14,6 +14,7 @@ variant = AA 0.25 [values] cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 12 + machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 ooze_shield_angle = 40 @@ -26,3 +27,4 @@ speed_wall = =math.ceil(speed_print * 30 / 70) switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 + 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 93f97670ef..abb891489e 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 @@ -11,6 +11,7 @@ weight = 0 material = generic_pc variant = AA 0.25 is_experimental = True + [values] brim_width = 20 cool_fan_full_at_height = =layer_height_0 + layer_height diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg index 5f7d46dc8b..3df31368bd 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg @@ -12,9 +12,9 @@ material = generic_petg variant = AA 0.25 [values] -initial_layer_line_width_factor = 100 -material_print_temperature = =default_material_print_temperature - 5 retraction_combing_max_distance = 8 speed_infill = =math.ceil(speed_print * 40 / 55) speed_topbottom = =math.ceil(speed_print * 30 / 55) top_bottom_thickness = 0.8 +initial_layer_line_width_factor = 100 +material_print_temperature = =default_material_print_temperature - 5 \ No newline at end of file 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 178e738069..e49dce4989 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 @@ -11,6 +11,7 @@ weight = 0 material = generic_pp variant = AA 0.25 is_experimental = True + [values] brim_width = 10 cool_fan_speed_max = 100 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print.inst.cfg index 41b2f693fd..4769b27977 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print.inst.cfg @@ -14,15 +14,15 @@ variant = AA 0.4 [values] machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 -material_final_print_temperature = =material_print_temperature - 20 -material_initial_print_temperature = =material_print_temperature - 15 material_print_temperature = =default_material_print_temperature + 20 +material_initial_print_temperature = =material_print_temperature - 15 +material_final_print_temperature = =material_print_temperature - 20 prime_tower_enable = False -raft_airgap = 0.15 skin_overlap = 20 -speed_infill = =math.ceil(speed_print * 50 / 60) -speed_layer_0 = 10 speed_print = 60 +speed_layer_0 = 10 speed_topbottom = =math.ceil(speed_print * 35 / 60) speed_wall = =math.ceil(speed_print * 45 / 60) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) +speed_infill = =math.ceil(speed_print * 50 / 60) +raft_airgap = 0.15 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print.inst.cfg index a6fc9c5462..7001d74a46 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print.inst.cfg @@ -15,14 +15,14 @@ variant = AA 0.4 cool_min_speed = 7 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 -material_final_print_temperature = =material_print_temperature - 20 -material_initial_print_temperature = =material_print_temperature - 15 material_print_temperature = =default_material_print_temperature + 15 +material_initial_print_temperature = =material_print_temperature - 15 +material_final_print_temperature = =material_print_temperature - 20 prime_tower_enable = False -raft_airgap = 0.15 -speed_infill = =math.ceil(speed_print * 45 / 60) -speed_layer_0 = 10 speed_print = 60 +speed_layer_0 = 10 speed_topbottom = =math.ceil(speed_print * 30 / 60) speed_wall = =math.ceil(speed_print * 40 / 60) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) +speed_infill = =math.ceil(speed_print * 45 / 60) +raft_airgap = 0.15 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_High_Quality.inst.cfg index 496d17b2e8..0383c18746 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_High_Quality.inst.cfg @@ -15,13 +15,16 @@ variant = AA 0.4 cool_min_speed = 12 machine_nozzle_cool_down_speed = 0.8 machine_nozzle_heat_up_speed = 1.5 -material_final_print_temperature = =material_print_temperature - 20 -material_initial_print_temperature = =material_print_temperature - 15 material_print_temperature = =default_material_print_temperature + 5 +material_initial_print_temperature = =material_print_temperature - 15 +material_final_print_temperature = =material_print_temperature - 20 prime_tower_enable = False -raft_airgap = 0.15 -speed_infill = =math.ceil(speed_print * 40 / 50) -speed_layer_0 = 10 speed_print = 50 +speed_layer_0 = 10 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 30 / 50) + + +speed_infill = =math.ceil(speed_print * 40 / 50) + +raft_airgap = 0.15 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality.inst.cfg index d7f7be3a31..004a29cf0a 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality.inst.cfg @@ -14,13 +14,15 @@ variant = AA 0.4 [values] machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 -material_final_print_temperature = =material_print_temperature - 20 -material_initial_print_temperature = =material_print_temperature - 15 material_print_temperature = =default_material_print_temperature + 10 +material_initial_print_temperature = =material_print_temperature - 15 +material_final_print_temperature = =material_print_temperature - 20 prime_tower_enable = False -raft_airgap = 0.15 -speed_infill = =math.ceil(speed_print * 40 / 55) -speed_layer_0 = 10 speed_print = 55 +speed_layer_0 = 10 speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_wall = =math.ceil(speed_print * 30 / 55) + + +speed_infill = =math.ceil(speed_print * 40 / 55) +raft_airgap = 0.15 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg index 3271e26dba..28d7691462 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg @@ -18,16 +18,17 @@ cool_fan_speed_max = =cool_fan_speed machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 +# prime_tower_enable: see CURA-4248 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 skin_overlap = 20 speed_layer_0 = =math.ceil(speed_print * 20 / 70) speed_topbottom = =math.ceil(speed_print * 35 / 70) speed_wall = =math.ceil(speed_print * 50 / 70) speed_wall_0 = =math.ceil(speed_wall * 35 / 50) -support_angle = 45 -support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height -support_brim_enable = True -support_interface_density = =min(extruderValues('material_surface_energy')) -support_interface_enable = True -support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height top_bottom_thickness = 1 +support_brim_enable = True +support_interface_enable = True +support_interface_density = =min(extruderValues('material_surface_energy')) +support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height +support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height +support_angle = 45 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg index 2ff072d0e1..e2450cd6b0 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg @@ -12,22 +12,23 @@ material = generic_bam variant = AA 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 +# prime_tower_enable: see CURA-4248 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 -speed_layer_0 = =math.ceil(speed_print * 20 / 80) speed_print = 80 +speed_layer_0 = =math.ceil(speed_print * 20 / 80) speed_topbottom = =math.ceil(speed_print * 30 / 80) speed_wall = =math.ceil(speed_print * 40 / 80) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -support_angle = 45 -support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height -support_brim_enable = True -support_infill_sparse_thickness = =2*layer_height -support_interface_density = =min(extruderValues('material_surface_energy')) -support_interface_enable = True -support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 1) * layer_height top_bottom_thickness = 1 +support_brim_enable = True +support_interface_enable = True +support_interface_density = =min(extruderValues('material_surface_energy')) +support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 1) * layer_height +support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height +support_angle = 45 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg index 5e6203dbbf..24f007b99b 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg @@ -12,20 +12,21 @@ material = generic_bam variant = AA 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed cool_min_speed = 7 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 +# prime_tower_enable: see CURA-4248 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 skin_overlap = 10 speed_layer_0 = =math.ceil(speed_print * 20 / 70) -support_angle = 45 -support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height support_brim_enable = True -support_infill_sparse_thickness = =2*layer_height -support_interface_density = =min(extruderValues('material_surface_energy')) support_interface_enable = True +support_interface_density = =min(extruderValues('material_surface_energy')) support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 1) * layer_height +support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height +support_angle = 45 top_bottom_thickness = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_VeryDraft_Print.inst.cfg index 7417ee6c6f..f6769a439f 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_VeryDraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_VeryDraft_Print.inst.cfg @@ -1,16 +1,17 @@ [general] version = 4 -name = Extra Fast - Experimental +name = Extra Fast definition = ultimaker_s5 [metadata] setting_version = 20 type = quality quality_type = verydraft -weight = -3 +weight = -2 material = generic_bam variant = AA 0.4 is_experimental = True + [values] brim_replaces_support = False cool_fan_full_at_height = =layer_height_0 + 2 * layer_height @@ -24,10 +25,10 @@ speed_layer_0 = =math.ceil(speed_print * 20 / 70) speed_topbottom = =math.ceil(speed_print * 35 / 70) speed_wall = =math.ceil(speed_print * 50 / 70) speed_wall_0 = =math.ceil(speed_wall * 35 / 50) -support_angle = 45 -support_bottom_distance = 0.3 -support_brim_enable = True -support_interface_density = =min(extruderValues('material_surface_energy')) -support_interface_enable = True -support_top_distance = 0.3 top_bottom_thickness = 1 +support_brim_enable = True +support_interface_enable = True +support_interface_density = =min(extruderValues('material_surface_energy')) +support_top_distance = 0.3 +support_bottom_distance = 0.3 +support_angle = 45 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 c39d1516af..ecc8682f28 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 @@ -14,6 +14,7 @@ variant = AA 0.4 [values] cool_fan_speed_max = 80 cool_min_speed = 5 + infill_overlap = 0 infill_wipe_dist = 0 machine_min_cool_heat_time_window = 15 @@ -33,6 +34,7 @@ skin_overlap = 20 speed_layer_0 = =math.ceil(speed_print * 20 / 50) speed_print = 50 speed_topbottom = =math.ceil(speed_print * 40 / 50) + speed_wall = =math.ceil(speed_print * 50 / 50) speed_wall_0 = =math.ceil(speed_wall * 40 / 50) support_z_distance = =layer_height 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 5d74e6164b..fa3b571769 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 @@ -14,6 +14,7 @@ variant = AA 0.4 [values] cool_fan_speed_max = 80 cool_min_speed = 6 + infill_overlap = 0 infill_wipe_dist = 0 machine_min_cool_heat_time_window = 15 @@ -33,6 +34,7 @@ skin_overlap = 20 speed_layer_0 = =math.ceil(speed_print * 20 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) + speed_wall = =math.ceil(speed_print * 45 / 45) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) support_z_distance = =layer_height 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 cef6d64e99..26a8059fed 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 @@ -14,6 +14,7 @@ variant = AA 0.4 [values] cool_fan_speed_max = 50 cool_min_speed = 5 + infill_overlap = 0 infill_wipe_dist = 0 machine_min_cool_heat_time_window = 15 @@ -35,6 +36,7 @@ skin_overlap = 20 speed_layer_0 = =math.ceil(speed_print * 20 / 40) speed_print = 40 speed_topbottom = =math.ceil(speed_print * 30 / 35) + speed_wall = =math.ceil(speed_print * 35 / 40) speed_wall_0 = =math.ceil(speed_wall * 30 / 35) support_z_distance = =layer_height 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 2d33b40631..1795b2086f 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 @@ -35,6 +35,7 @@ skin_overlap = 20 speed_layer_0 = =math.ceil(speed_print * 20 / 40) speed_print = 40 speed_topbottom = =math.ceil(speed_print * 30 / 35) + speed_wall = =math.ceil(speed_print * 35 / 40) speed_wall_0 = =math.ceil(speed_wall * 30 / 35) support_z_distance = =layer_height diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg index 6b1f8504d2..bdfd6aadea 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg @@ -12,16 +12,16 @@ material = generic_cpe variant = AA 0.4 [values] -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -material_final_print_temperature = =material_print_temperature - 10 -material_initial_print_temperature = =material_print_temperature - 5 material_print_temperature = =default_material_print_temperature + 10 +material_initial_print_temperature = =material_print_temperature - 5 +material_final_print_temperature = =material_print_temperature - 10 retraction_combing_max_distance = 50 retraction_prime_speed = =retraction_speed skin_overlap = 20 -speed_infill = =math.ceil(speed_print * 50 / 60) -speed_layer_0 = =math.ceil(speed_print * 20 / 60) speed_print = 60 +speed_layer_0 = =math.ceil(speed_print * 20 / 60) speed_topbottom = =math.ceil(speed_print * 35 / 60) speed_wall = =math.ceil(speed_print * 45 / 60) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +speed_infill = =math.ceil(speed_print * 50 / 60) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg index de3910f816..68d2879f47 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg @@ -13,15 +13,16 @@ variant = AA 0.4 [values] cool_min_speed = 7 -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -material_final_print_temperature = =material_print_temperature - 10 -material_initial_print_temperature = =material_print_temperature - 5 material_print_temperature = =default_material_print_temperature + 5 +material_initial_print_temperature = =material_print_temperature - 5 +material_final_print_temperature = =material_print_temperature - 10 retraction_combing_max_distance = 50 retraction_prime_speed = =retraction_speed -speed_infill = =math.ceil(speed_print * 50 / 60) -speed_layer_0 = =math.ceil(speed_print * 20 / 60) speed_print = 60 +speed_layer_0 = =math.ceil(speed_print * 20 / 60) speed_topbottom = =math.ceil(speed_print * 30 / 60) speed_wall = =math.ceil(speed_print * 40 / 60) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) + +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +speed_infill = =math.ceil(speed_print * 50 / 60) \ No newline at end of file diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg index 546af06919..40d950871d 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg @@ -13,16 +13,17 @@ variant = AA 0.4 [values] cool_min_speed = 12 -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 -material_final_print_temperature = =material_print_temperature - 10 -material_initial_print_temperature = =material_print_temperature - 5 material_print_temperature = =default_material_print_temperature - 5 +material_initial_print_temperature = =material_print_temperature - 5 +material_final_print_temperature = =material_print_temperature - 10 retraction_combing_max_distance = 50 retraction_prime_speed = =retraction_speed -speed_infill = =math.ceil(speed_print * 40 / 50) -speed_layer_0 = =math.ceil(speed_print * 20 / 50) speed_print = 50 +speed_layer_0 = =math.ceil(speed_print * 20 / 50) speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 30 / 50) + +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +speed_infill = =math.ceil(speed_print * 40 / 50) \ No newline at end of file diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg index 2614b40d60..a5cab8a96c 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg @@ -12,15 +12,16 @@ material = generic_cpe variant = AA 0.4 [values] -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 -material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 +material_final_print_temperature = =material_print_temperature - 10 retraction_combing_max_distance = 50 retraction_prime_speed = =retraction_speed -speed_infill = =math.ceil(speed_print * 45 / 55) -speed_layer_0 = =math.ceil(speed_print * 20 / 55) speed_print = 55 +speed_layer_0 = =math.ceil(speed_print * 20 / 55) speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_wall = =math.ceil(speed_print * 30 / 55) + +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +speed_infill = =math.ceil(speed_print * 45 / 55) \ No newline at end of file diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg index e4d6d270ee..f0ced52d33 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg @@ -14,9 +14,9 @@ variant = AA 0.4 [values] cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -material_final_print_temperature = =material_print_temperature - 10 -material_initial_print_temperature = =material_print_temperature - 5 material_print_temperature = =default_material_print_temperature + 10 +material_initial_print_temperature = =material_print_temperature - 5 +material_final_print_temperature = =material_print_temperature - 10 ooze_shield_angle = 40 raft_airgap = 0.4 retraction_prime_speed = =retraction_speed diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg index 8b77d7010f..90fd37a5fb 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg @@ -14,9 +14,9 @@ variant = AA 0.4 [values] cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -material_final_print_temperature = =material_print_temperature - 10 -material_initial_print_temperature = =material_print_temperature - 5 material_print_temperature = =default_material_print_temperature + 5 +material_initial_print_temperature = =material_print_temperature - 5 +material_final_print_temperature = =material_print_temperature - 10 ooze_shield_angle = 40 raft_airgap = 0.4 retraction_prime_speed = =retraction_speed diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg index 72c3e257d1..c6a9e2b017 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg @@ -14,8 +14,8 @@ variant = AA 0.4 [values] cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 15 -material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 +material_final_print_temperature = =material_print_temperature - 10 ooze_shield_angle = 40 raft_airgap = 0.4 retraction_prime_speed = =retraction_speed @@ -23,4 +23,4 @@ skin_overlap = 50 speed_layer_0 = 10 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 -switch_extruder_retraction_speeds = 40 +switch_extruder_retraction_speeds = 40 \ No newline at end of file diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg index e3fbfc5b6e..0b0ea1fb9f 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg @@ -14,8 +14,8 @@ variant = AA 0.4 [values] cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 12 -material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 +material_final_print_temperature = =material_print_temperature - 10 ooze_shield_angle = 40 raft_airgap = 0.4 retraction_prime_speed = =retraction_speed @@ -23,4 +23,4 @@ skin_overlap = 50 speed_layer_0 = 10 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 -switch_extruder_retraction_speeds = 40 +switch_extruder_retraction_speeds = 40 \ No newline at end of file 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 739e168d62..3fa9480c24 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 @@ -38,6 +38,7 @@ skin_overlap = 30 speed_layer_0 = =math.ceil(speed_print * 25 / 50) speed_print = 50 speed_topbottom = =math.ceil(speed_print * 25 / 50) + speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 25 / 40) support_interface_density = 87.5 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Draft_Print.inst.cfg index 62d24807b6..3e0bd8d4b8 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Draft_Print.inst.cfg @@ -12,16 +12,16 @@ material = generic_petg variant = AA 0.4 [values] -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -initial_layer_line_width_factor = 100 -material_final_print_temperature = =material_print_temperature - 5 -material_initial_print_temperature = =material_print_temperature material_print_temperature = =default_material_print_temperature + 5 +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature - 5 retraction_combing_max_distance = 8 skin_overlap = 20 -speed_infill = =math.ceil(speed_print * 50 / 60) -speed_layer_0 = =math.ceil(speed_print * 20 / 60) speed_print = 60 +speed_layer_0 = =math.ceil(speed_print * 20 / 60) speed_topbottom = =math.ceil(speed_print * 35 / 60) speed_wall = =math.ceil(speed_print * 45 / 60) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +speed_infill = =math.ceil(speed_print * 50 / 60) +initial_layer_line_width_factor = 100 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print.inst.cfg index d5a87efce1..f9a8aa8915 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print.inst.cfg @@ -13,15 +13,16 @@ variant = AA 0.4 [values] cool_min_speed = 7 -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -initial_layer_line_width_factor = 100 -material_final_print_temperature = =material_print_temperature - 10 -material_initial_print_temperature = =material_print_temperature - 5 material_print_temperature = =default_material_print_temperature +material_initial_print_temperature = =material_print_temperature - 5 +material_final_print_temperature = =material_print_temperature - 10 retraction_combing_max_distance = 8 -speed_infill = =math.ceil(speed_print * 50 / 60) -speed_layer_0 = =math.ceil(speed_print * 20 / 60) speed_print = 60 +speed_layer_0 = =math.ceil(speed_print * 20 / 60) speed_topbottom = =math.ceil(speed_print * 30 / 60) speed_wall = =math.ceil(speed_print * 40 / 60) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) + +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +speed_infill = =math.ceil(speed_print * 50 / 60) +initial_layer_line_width_factor = 100 \ No newline at end of file diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_High_Quality.inst.cfg index 49978a1b46..289521bd01 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_High_Quality.inst.cfg @@ -13,16 +13,17 @@ variant = AA 0.4 [values] cool_min_speed = 12 -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -initial_layer_line_width_factor = 100 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 -material_final_print_temperature = =material_print_temperature - 15 -material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature - 10 +material_initial_print_temperature = =material_print_temperature - 10 +material_final_print_temperature = =material_print_temperature - 15 retraction_combing_max_distance = 8 -speed_infill = =math.ceil(speed_print * 40 / 50) -speed_layer_0 = =math.ceil(speed_print * 20 / 50) speed_print = 50 +speed_layer_0 = =math.ceil(speed_print * 20 / 50) speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 30 / 50) + +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +speed_infill = =math.ceil(speed_print * 40 / 50) +initial_layer_line_width_factor = 100 \ No newline at end of file diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality.inst.cfg index 6e4a6907de..8129f66fc3 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality.inst.cfg @@ -12,16 +12,16 @@ material = generic_petg variant = AA 0.4 [values] -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -initial_layer_line_width_factor = 100 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 -material_final_print_temperature = =material_print_temperature - 15 -material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature - 5 +material_initial_print_temperature = =material_print_temperature - 10 +material_final_print_temperature = =material_print_temperature - 15 retraction_combing_max_distance = 8 -speed_infill = =math.ceil(speed_print * 45 / 55) -speed_layer_0 = =math.ceil(speed_print * 20 / 55) speed_print = 55 +speed_layer_0 = =math.ceil(speed_print * 20 / 55) speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_wall = =math.ceil(speed_print * 30 / 55) +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +speed_infill = =math.ceil(speed_print * 45 / 55) +initial_layer_line_width_factor = 100 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg index bda40276c4..41944ad06e 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg @@ -12,17 +12,12 @@ material = generic_pla variant = AA 0.4 [values] -acceleration_wall = 2000 -acceleration_wall_0 = 2000 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed -infill_sparse_density = 15 -layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 prime_tower_enable = False -raft_airgap = 0.25 retraction_prime_speed = =retraction_speed skin_overlap = 20 speed_layer_0 = 10 @@ -30,3 +25,8 @@ speed_topbottom = =math.ceil(speed_print * 40 / 70) speed_wall = =math.ceil(speed_print * 55 / 70) speed_wall_0 = =math.ceil(speed_wall * 45 / 50) top_bottom_thickness = 0.8 +infill_sparse_density = 15 +layer_height_0 = 0.2 +acceleration_wall = 2000 +acceleration_wall_0 = 2000 +raft_airgap = 0.25 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg index b58cabc738..66aa89a6a7 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg @@ -14,15 +14,15 @@ variant = AA 0.4 [values] cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed -layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 prime_tower_enable = False -raft_airgap = 0.25 retraction_prime_speed = =retraction_speed -speed_layer_0 = 10 speed_print = 70 +speed_layer_0 = 10 speed_topbottom = =math.ceil(speed_print * 35 / 70) speed_wall = =math.ceil(speed_print * 45 / 70) speed_wall_0 = =math.ceil(speed_wall * 35 / 70) top_bottom_thickness = 1 +layer_height_0 = 0.2 +raft_airgap = 0.25 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg index 5a7f57ac29..1d498d252a 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg @@ -15,16 +15,16 @@ variant = AA 0.4 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed cool_min_speed = 10 -layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature - 5 prime_tower_enable = False -raft_airgap = 0.25 retraction_prime_speed = =retraction_speed skin_overlap = 10 -speed_layer_0 = 10 speed_print = 50 +speed_layer_0 = 10 speed_topbottom = =math.ceil(speed_print * 35 / 50) speed_wall = =math.ceil(speed_print * 35 / 50) top_bottom_thickness = 1 +layer_height_0 = 0.2 +raft_airgap = 0.25 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg index 7d6815f135..1eb4fd8735 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg @@ -15,12 +15,12 @@ variant = AA 0.4 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed cool_min_speed = 7 -layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 prime_tower_enable = False -raft_airgap = 0.25 retraction_prime_speed = =retraction_speed skin_overlap = 10 speed_layer_0 = 10 top_bottom_thickness = 1 +layer_height_0 = 0.2 +raft_airgap = 0.25 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg index e89b30990c..962f906e74 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg @@ -1,33 +1,39 @@ [general] version = 4 -name = Extra Fast - Experimental +name = Extra Fast definition = ultimaker_s5 [metadata] setting_version = 20 type = quality quality_type = verydraft -weight = -3 +weight = -2 material = generic_pla variant = AA 0.4 is_experimental = True + [values] +infill_sparse_density = 15 acceleration_print = 2000 -acceleration_topbottom = 1000 acceleration_wall = 1500 acceleration_wall_0 = 1000 -cool_fan_full_at_height = =layer_height_0 + 2 * layer_height -cool_fan_speed_max = =cool_fan_speed -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -infill_sparse_density = 15 -machine_nozzle_cool_down_speed = 0.75 -machine_nozzle_heat_up_speed = 1.6 -material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = False -raft_airgap = 0.25 -retraction_prime_speed = =retraction_speed -skin_overlap = 20 +acceleration_topbottom = 1000 speed_print = 50 speed_wall = 50 + +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_fan_speed_max = =cool_fan_speed + +material_print_temperature = =default_material_print_temperature + 10 +machine_nozzle_cool_down_speed = 0.75 +machine_nozzle_heat_up_speed = 1.6 + +prime_tower_enable = False +retraction_prime_speed = =retraction_speed +skin_overlap = 20 top_bottom_thickness = 0.9 -wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) + +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' + +raft_airgap = 0.25 +wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) \ No newline at end of file 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 ebb514af89..082e20d372 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 @@ -17,6 +17,7 @@ cool_fan_speed_max = 100 cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 7 cool_min_speed = 2.5 + infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0.1 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 0abc43467b..d98cbc9037 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 @@ -17,6 +17,7 @@ cool_fan_speed_max = 100 cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 7 cool_min_speed = 2.5 + infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0.1 @@ -40,6 +41,7 @@ retraction_min_travel = 0.8 speed_layer_0 = =math.ceil(speed_print * 15 / 25) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 25 / 25) + speed_travel_layer_0 = 50 speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 25) 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 bd8ab98e55..ebc2639424 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 @@ -17,6 +17,7 @@ cool_fan_speed_max = 100 cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 7 cool_min_speed = 2.5 + infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0.1 @@ -40,6 +41,7 @@ retraction_min_travel = 0.8 speed_layer_0 = =math.ceil(speed_print * 15 / 25) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 25 / 25) + speed_travel_layer_0 = 50 speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 25) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg index bf8686d358..3bb7ba5d2f 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg @@ -15,16 +15,16 @@ variant = AA 0.4 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed cool_min_speed = 10 -layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature - 15 prime_tower_enable = False retraction_prime_speed = =retraction_speed skin_overlap = 10 -speed_layer_0 = =math.ceil(speed_print * 20 / 45) speed_print = 45 +speed_layer_0 = =math.ceil(speed_print * 20 / 45) speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) top_bottom_thickness = 1.2 +layer_height_0 = 0.2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg index 1758a95b61..5150537256 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg @@ -1,33 +1,38 @@ [general] version = 4 -name = Extra Fast - Experimental +name = Extra Fast definition = ultimaker_s5 [metadata] setting_version = 20 type = quality quality_type = verydraft -weight = -3 +weight = -2 material = generic_tough_pla variant = AA 0.4 is_experimental = True + [values] +infill_sparse_density = 15 acceleration_print = 2000 -acceleration_topbottom = 1000 acceleration_wall = 1500 acceleration_wall_0 = 1000 -cool_fan_full_at_height = =layer_height_0 + 2 * layer_height -cool_fan_speed_max = =cool_fan_speed -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -infill_sparse_density = 15 -machine_nozzle_cool_down_speed = 0.75 -machine_nozzle_heat_up_speed = 1.6 -material_print_temperature = =default_material_print_temperature - 5 -prime_tower_enable = False -raft_airgap = 0.25 -retraction_prime_speed = =retraction_speed -skin_overlap = 20 +acceleration_topbottom = 1000 speed_print = 50 speed_wall = 50 + +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_fan_speed_max = =cool_fan_speed + +material_print_temperature = =default_material_print_temperature - 5 +machine_nozzle_cool_down_speed = 0.75 +machine_nozzle_heat_up_speed = 1.6 +prime_tower_enable = False +retraction_prime_speed = =retraction_speed +skin_overlap = 20 top_bottom_thickness = 1.2 -wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) + +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' + +raft_airgap = 0.25 +wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) \ No newline at end of file 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 19324e1777..dc8fb80084 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 @@ -17,6 +17,7 @@ cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 4 gradual_infill_step_height = =5 * layer_height + infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 10 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 86c8817c5d..ed9a9e7756 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 @@ -17,6 +17,7 @@ cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 4 gradual_infill_step_height = =5 * layer_height + infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 10 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 42ad6c4cd2..61602c2e7b 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 @@ -17,6 +17,7 @@ cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 4 gradual_infill_step_height = =5 * layer_height + infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 10 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Draft_Print.inst.cfg index 72f29e606b..ee5dff1264 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Draft_Print.inst.cfg @@ -12,6 +12,7 @@ material = generic_abs variant = AA 0.8 [values] + material_print_temperature = =default_material_print_temperature + 20 speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Superdraft_Print.inst.cfg index 6b352edb2d..8de9e328d9 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Superdraft_Print.inst.cfg @@ -12,9 +12,10 @@ material = generic_abs variant = AA 0.8 [values] + material_print_temperature = =default_material_print_temperature + 25 -speed_infill = =math.ceil(speed_print * 37 / 50) speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 37 / 50) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) +speed_infill = =math.ceil(speed_print * 37 / 50) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Verydraft_Print.inst.cfg index b90f30046d..3255684648 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Verydraft_Print.inst.cfg @@ -12,6 +12,7 @@ material = generic_abs variant = AA 0.8 [values] + material_print_temperature = =default_material_print_temperature + 22 speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Fast_Print.inst.cfg index b04bc2227f..3c1491befd 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Fast_Print.inst.cfg @@ -1,19 +1,21 @@ [general] version = 4 -name = Normal - Experimental +name = Fast - Experimental definition = ultimaker_s5 [metadata] setting_version = 20 type = quality -quality_type = fast -weight = -1 +quality_type = draft +weight = -2 material = generic_cpe_plus variant = AA 0.8 is_experimental = True + [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 14 * layer_height + machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 10 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg index d3f95d449f..30b1940b9c 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg @@ -11,9 +11,12 @@ weight = -4 material = generic_cpe_plus variant = AA 0.8 is_experimental = True + [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 7 * layer_height + + machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 5 @@ -23,12 +26,12 @@ retraction_combing_max_distance = 50 retraction_hop = 0.1 retraction_hop_enabled = False skin_overlap = 0 -speed_infill = =math.ceil(speed_print * 40 / 50) speed_layer_0 = =math.ceil(speed_print * 15 / 50) speed_print = 50 speed_slowdown_layers = 8 speed_topbottom = =math.ceil(speed_print * 35 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 35 / 40) +speed_infill = =math.ceil(speed_print * 40 / 50) support_z_distance = =layer_height top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Verydraft_Print.inst.cfg index a2c896836f..01cdfb6142 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Verydraft_Print.inst.cfg @@ -11,9 +11,12 @@ weight = -3 material = generic_cpe_plus variant = AA 0.8 is_experimental = True + [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 9 * layer_height + + machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 7 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg index 19f7e7be37..ed90985548 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg @@ -13,6 +13,7 @@ variant = AA 0.8 [values] brim_width = 15 + material_print_temperature = =default_material_print_temperature + 15 prime_tower_enable = True retraction_combing_max_distance = 50 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg index d15f1a7c84..87d8bb69e1 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg @@ -13,11 +13,12 @@ variant = AA 0.8 [values] brim_width = 15 + material_print_temperature = =default_material_print_temperature + 20 prime_tower_enable = True retraction_combing_max_distance = 50 -speed_infill = =math.ceil(speed_print * 33 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 30 / 45) speed_wall = =math.ceil(speed_print * 33 / 45) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) +speed_infill = =math.ceil(speed_print * 33 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg index 721d0a8752..970964203f 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg @@ -13,6 +13,7 @@ variant = AA 0.8 [values] brim_width = 15 + material_print_temperature = =default_material_print_temperature + 17 prime_tower_enable = True retraction_combing_max_distance = 50 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg index 8e73a5a755..fc9d586503 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg @@ -15,6 +15,8 @@ variant = AA 0.8 brim_width = 5.6 cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 + + machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 ooze_shield_angle = 40 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg index 354b187085..30877bf726 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg @@ -1,19 +1,22 @@ [general] version = 4 -name = Normal - Experimental +name = Fast - Experimental definition = ultimaker_s5 [metadata] setting_version = 20 type = quality -quality_type = fast -weight = -1 +quality_type = draft +weight = -2 material = generic_pc variant = AA 0.8 is_experimental = True + [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 14 * layer_height + + material_print_temperature = =default_material_print_temperature - 5 material_print_temperature_layer_0 = =material_print_temperature raft_airgap = 0.5 @@ -24,3 +27,4 @@ speed_slowdown_layers = 15 speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) + diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Superdraft_Print.inst.cfg index 6cfd2c8d94..fd3ae94a9e 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Superdraft_Print.inst.cfg @@ -11,16 +11,19 @@ weight = -4 material = generic_pc variant = AA 0.8 is_experimental = True + [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 7 * layer_height + + material_print_temperature_layer_0 = =material_print_temperature raft_airgap = 0.5 skin_overlap = 0 -speed_infill = =math.ceil(speed_print * 37 / 50) speed_layer_0 = =math.ceil(speed_print * 15 / 50) speed_print = 50 speed_slowdown_layers = 8 speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 37 / 50) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) +speed_infill = =math.ceil(speed_print * 37 / 50) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Verydraft_Print.inst.cfg index 0b9e0f27bf..6fe4bd5999 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Verydraft_Print.inst.cfg @@ -11,6 +11,7 @@ weight = -3 material = generic_pc variant = AA 0.8 is_experimental = True + [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 9 * layer_height diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Draft_Print.inst.cfg index 47a26097f5..926a1394bd 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Draft_Print.inst.cfg @@ -13,11 +13,12 @@ variant = AA 0.8 [values] brim_width = 7 -cool_fan_speed = 20 -initial_layer_line_width_factor = 100 + material_print_temperature = =default_material_print_temperature - 5 prime_tower_enable = True retraction_combing_max_distance = 8 speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) +cool_fan_speed = 20 +initial_layer_line_width_factor = 100 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg index f13991359d..1d2b4bf257 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg @@ -13,13 +13,14 @@ variant = AA 0.8 [values] brim_width = 7 -cool_fan_speed = 20 -initial_layer_line_width_factor = 100 + material_print_temperature = =default_material_print_temperature - 5 prime_tower_enable = True retraction_combing_max_distance = 8 -speed_infill = =math.ceil(speed_print * 33 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 30 / 45) speed_wall = =math.ceil(speed_print * 33 / 45) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) +speed_infill = =math.ceil(speed_print * 33 / 45) +cool_fan_speed = 20 +initial_layer_line_width_factor = 100 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Verydraft_Print.inst.cfg index 41e42809cf..d9a6c58217 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Verydraft_Print.inst.cfg @@ -13,11 +13,13 @@ variant = AA 0.8 [values] brim_width = 7 -cool_fan_speed = 20 -initial_layer_line_width_factor = 100 + material_print_temperature = =default_material_print_temperature - 5 prime_tower_enable = True retraction_combing_max_distance = 8 speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) +cool_fan_speed = 20 +initial_layer_line_width_factor = 100 + diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg index cac2e008fc..5a75d250ae 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg @@ -16,17 +16,17 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height -layer_height_0 = 0.4 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = True +support_angle = 70 +top_bottom_thickness = =layer_height * 4 speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) -speed_wall_0 = =math.ceil(speed_wall * 35 / 40) speed_wall_x = =speed_wall -support_angle = 70 -top_bottom_thickness = =layer_height * 4 +speed_wall_0 = =math.ceil(speed_wall * 35 / 40) +layer_height_0 = 0.4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg index 1703c141e2..7f1cf80f12 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg @@ -16,18 +16,18 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height -layer_height_0 = 0.4 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 15 prime_tower_enable = True -speed_infill = =math.ceil(speed_print * 35 / 45) +support_angle = 70 +top_bottom_thickness = =layer_height * 4 speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 35 / 45) -speed_wall_0 = =math.ceil(speed_wall * 35 / 40) speed_wall_x = =speed_wall -support_angle = 70 -top_bottom_thickness = =layer_height * 4 +speed_wall_0 = =math.ceil(speed_wall * 35 / 40) +speed_infill = =math.ceil(speed_print * 35 / 45) +layer_height_0 = 0.4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg index 07f93e993f..9da869a34e 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg @@ -16,17 +16,17 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height -layer_height_0 = 0.4 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = True +support_angle = 70 +top_bottom_thickness = =layer_height * 4 speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) -speed_wall_0 = =math.ceil(speed_wall * 35 / 40) speed_wall_x = =speed_wall -support_angle = 70 -top_bottom_thickness = =layer_height * 4 +speed_wall_0 = =math.ceil(speed_wall * 35 / 40) +layer_height_0 = 0.4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg index 4c262310e8..f3deb0b0f9 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg @@ -15,6 +15,7 @@ variant = AA 0.8 brim_width = 25 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 17 +top_skin_expand_distance = =line_width * 2 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' material_bed_temperature_layer_0 = =material_bed_temperature material_print_temperature = =default_material_print_temperature - 2 @@ -33,5 +34,4 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.6 -top_skin_expand_distance = =line_width * 2 wall_0_wipe_dist = =line_width * 2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg index 539e6335c7..859f408ffb 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg @@ -15,6 +15,7 @@ variant = AA 0.8 brim_width = 25 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 17 +top_skin_expand_distance = =line_width * 2 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' material_bed_temperature_layer_0 = =material_bed_temperature material_print_temperature = =default_material_print_temperature + 2 @@ -28,11 +29,10 @@ retraction_extra_prime_amount = 0.5 retraction_hop = 0.5 retraction_min_travel = 1.5 retraction_prime_speed = 15 -speed_infill = =math.ceil(speed_wall * 30 / 30) speed_wall_x = =math.ceil(speed_wall * 30 / 30) +speed_infill = =math.ceil(speed_wall * 30 / 30) switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.6 -top_skin_expand_distance = =line_width * 2 wall_0_wipe_dist = =line_width * 2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg index 9c3cb44e07..85ca930444 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg @@ -15,6 +15,7 @@ variant = AA 0.8 brim_width = 25 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 17 +top_skin_expand_distance = =line_width * 2 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' material_bed_temperature_layer_0 = =material_bed_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 2 @@ -32,5 +33,4 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.6 -top_skin_expand_distance = =line_width * 2 wall_0_wipe_dist = =line_width * 2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg index 57dc15f243..32351241f7 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg @@ -14,6 +14,7 @@ variant = AA 0.8 [values] brim_width = 8.75 cool_min_layer_time_fan_speed_max = 6 +top_skin_expand_distance = =line_width * 2 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' machine_nozzle_cool_down_speed = 0.5 machine_nozzle_heat_up_speed = 2.5 @@ -40,6 +41,5 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.2 -top_skin_expand_distance = =line_width * 2 travel_avoid_distance = 1.5 wall_0_wipe_dist = =line_width * 2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg index 1d8cf0809c..6e3732f812 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg @@ -14,6 +14,7 @@ variant = AA 0.8 [values] brim_width = 8.75 cool_min_layer_time_fan_speed_max = 6 +top_skin_expand_distance = =line_width * 2 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 15 machine_nozzle_cool_down_speed = 0.5 @@ -31,16 +32,15 @@ retraction_extra_prime_amount = 0.5 retraction_hop = 1.5 retraction_hop_only_when_collides = False retraction_min_travel = =line_width * 2 -speed_infill = =speed_print speed_print = 30 speed_topbottom = =math.ceil(speed_print * 20 / 30) speed_wall = =speed_print speed_wall_x = =speed_print +speed_infill = =speed_print support_angle = 50 switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.2 -top_skin_expand_distance = =line_width * 2 travel_avoid_distance = 1.5 wall_0_wipe_dist = =line_width * 2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg index 95e5da677d..ab43aa6af3 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg @@ -14,6 +14,7 @@ variant = AA 0.8 [values] brim_width = 8.75 cool_min_layer_time_fan_speed_max = 6 +top_skin_expand_distance = =line_width * 2 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 15 machine_nozzle_cool_down_speed = 0.5 @@ -40,6 +41,5 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.2 -top_skin_expand_distance = =line_width * 2 travel_avoid_distance = 1.5 wall_0_wipe_dist = =line_width * 2 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Draft_Print.inst.cfg index 325692a5b7..05069e722c 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Draft_Print.inst.cfg @@ -13,12 +13,12 @@ variant = BB 0.4 [values] brim_replaces_support = False -cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = False retraction_count_max = 5 skin_overlap = 20 -skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) support_brim_enable = True support_interface_enable = True +skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) support_use_towers = True diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg index e445afe911..7539f5fdb1 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg @@ -12,14 +12,14 @@ material = generic_pva variant = BB 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False -cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) material_print_temperature = =default_material_print_temperature + 5 prime_tower_enable = False retraction_count_max = 5 skin_overlap = 15 -skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) support_brim_enable = True -support_infill_sparse_thickness = =2*layer_height support_interface_enable = True +skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) support_use_towers = True diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg index 4f70be3b8c..c320676f02 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg @@ -12,12 +12,12 @@ material = generic_pva variant = BB 0.4 [values] +support_infill_sparse_thickness = =3*layer_height brim_replaces_support = False -cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) prime_tower_enable = False retraction_count_max = 5 -skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) support_brim_enable = True -support_infill_sparse_thickness = =3*layer_height support_interface_enable = True +skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) support_use_towers = True diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg index 50ca204965..a068c96756 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg @@ -12,12 +12,12 @@ material = generic_pva variant = BB 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False -cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) prime_tower_enable = False retraction_count_max = 5 -skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) support_brim_enable = True -support_infill_sparse_thickness = =2*layer_height support_interface_enable = True +skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) support_use_towers = True diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Verydraft_Print.inst.cfg index fd239c5343..c8c7971f09 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Verydraft_Print.inst.cfg @@ -1,6 +1,6 @@ [general] version = 4 -name = Extra Fast - Experimental +name = Extra Fast definition = ultimaker_s5 [metadata] @@ -11,13 +11,14 @@ weight = -3 material = generic_pva variant = BB 0.4 is_experimental = True + [values] brim_replaces_support = False -cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) prime_tower_enable = False retraction_count_max = 5 -skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) support_brim_enable = True support_infill_sparse_thickness = 0.3 support_interface_enable = True +skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) support_use_towers = True diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Draft_Print.inst.cfg index 27618f9478..e526fc6426 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Draft_Print.inst.cfg @@ -13,10 +13,10 @@ variant = BB 0.8 [values] brim_replaces_support = False -cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) material_print_temperature = =default_material_print_temperature + 5 retraction_count_max = 5 -skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) support_brim_enable = True support_interface_enable = True +skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) support_use_towers = True diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Superdraft_Print.inst.cfg index 45c178e704..ae5b0aacfe 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Superdraft_Print.inst.cfg @@ -13,9 +13,9 @@ variant = BB 0.8 [values] brim_replaces_support = False -cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) retraction_count_max = 5 -skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) support_brim_enable = True support_interface_enable = True +skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) support_use_towers = True diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Verydraft_Print.inst.cfg index 60a70fcda4..b37122ab7e 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Verydraft_Print.inst.cfg @@ -13,10 +13,10 @@ variant = BB 0.8 [values] brim_replaces_support = False -cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) retraction_count_max = 5 -skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) support_brim_enable = True support_infill_sparse_thickness = 0.3 support_interface_enable = True +skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) support_use_towers = True diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFCPE_Draft_Print.inst.cfg index c0e20f1584..0e738f1e3d 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFCPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFCPE_Draft_Print.inst.cfg @@ -24,3 +24,4 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 + diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFCPE_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFCPE_Fast_Print.inst.cfg index 8b3030ce09..e0d01ba82f 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFCPE_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFCPE_Fast_Print.inst.cfg @@ -7,7 +7,7 @@ definition = ultimaker_s5 setting_version = 20 type = quality quality_type = fast -weight = -1 +weight = -2 material = generic_cffcpe variant = CC 0.4 @@ -24,3 +24,4 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 + diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFPA_Draft_Print.inst.cfg index 0307bbff4a..52d0a07ea5 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFPA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFPA_Draft_Print.inst.cfg @@ -24,3 +24,4 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 + diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFPA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFPA_Fast_Print.inst.cfg index ac6883ca44..86dad3779b 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFPA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFPA_Fast_Print.inst.cfg @@ -7,7 +7,7 @@ definition = ultimaker_s5 setting_version = 20 type = quality quality_type = fast -weight = -1 +weight = -2 material = generic_cffpa variant = CC 0.4 @@ -24,3 +24,4 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 + diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFCPE_Draft_Print.inst.cfg index c44b25bd94..da79e206cf 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFCPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFCPE_Draft_Print.inst.cfg @@ -24,3 +24,4 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 + diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFCPE_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFCPE_Fast_Print.inst.cfg index a79662a65d..644b964c28 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFCPE_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFCPE_Fast_Print.inst.cfg @@ -7,7 +7,7 @@ definition = ultimaker_s5 setting_version = 20 type = quality quality_type = fast -weight = -1 +weight = -2 material = generic_gffcpe variant = CC 0.4 @@ -24,3 +24,4 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 + diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFPA_Draft_Print.inst.cfg index ee1ac1ef7a..2977a497eb 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFPA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFPA_Draft_Print.inst.cfg @@ -24,3 +24,4 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 + diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFPA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFPA_Fast_Print.inst.cfg index c0a4cb9a4a..a339098b6a 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFPA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFPA_Fast_Print.inst.cfg @@ -7,7 +7,7 @@ definition = ultimaker_s5 setting_version = 20 type = quality quality_type = fast -weight = -1 +weight = -2 material = generic_gffpa variant = CC 0.4 @@ -24,3 +24,4 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 + diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Draft_Print.inst.cfg index ec88e11d72..16d916f56a 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Draft_Print.inst.cfg @@ -1,16 +1,17 @@ [general] version = 4 -name = Fast - Experimental +name = Fast definition = ultimaker_s5 [metadata] setting_version = 20 type = quality quality_type = draft -weight = -2 +weight = -3 material = generic_pla variant = CC 0.4 is_experimental = True + [values] cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 @@ -26,7 +27,7 @@ prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) -speed_wall_0 = =math.ceil(speed_wall * 35 / 40) speed_wall_x = =speed_wall +speed_wall_0 = =math.ceil(speed_wall * 35 / 40) support_angle = 70 top_bottom_thickness = =layer_height * 4 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Fast_Print.inst.cfg index 98da59afd9..80e101c1a6 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Fast_Print.inst.cfg @@ -1,16 +1,17 @@ [general] version = 4 -name = Normal - Experimental +name = Normal definition = ultimaker_s5 [metadata] setting_version = 20 type = quality quality_type = fast -weight = -1 +weight = -2 material = generic_pla variant = CC 0.4 is_experimental = True + [values] cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 @@ -26,7 +27,7 @@ prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) -speed_wall_0 = =math.ceil(speed_wall * 35 / 40) speed_wall_x = =speed_wall +speed_wall_0 = =math.ceil(speed_wall * 35 / 40) support_angle = 70 top_bottom_thickness = =layer_height * 4 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFCPE_Draft_Print.inst.cfg index 02430694b3..dd2f4231c7 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFCPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFCPE_Draft_Print.inst.cfg @@ -24,3 +24,4 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 + diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFPA_Draft_Print.inst.cfg index ab1c73641e..eb2cc63b78 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFPA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFPA_Draft_Print.inst.cfg @@ -24,3 +24,4 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 + diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFCPE_Draft_Print.inst.cfg index e4019fea55..e5bc3d2e5b 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFCPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFCPE_Draft_Print.inst.cfg @@ -24,3 +24,4 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 + diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFPA_Draft_Print.inst.cfg index 2d45c63fcf..72e1c0f4fe 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFPA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFPA_Draft_Print.inst.cfg @@ -24,3 +24,4 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 + diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg index 0589c86926..af5bb5b9b2 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg @@ -1,16 +1,17 @@ [general] version = 4 -name = Fast - Experimental +name = Fast definition = ultimaker_s5 [metadata] setting_version = 20 type = quality quality_type = draft -weight = -2 +weight = -3 material = generic_pla variant = CC 0.6 is_experimental = True + [values] cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 @@ -26,7 +27,7 @@ prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) -speed_wall_0 = =math.ceil(speed_wall * 35 / 40) speed_wall_x = =speed_wall +speed_wall_0 = =math.ceil(speed_wall * 35 / 40) support_angle = 70 top_bottom_thickness = =layer_height * 4 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg index fff2fdb4d2..e2dbe4a511 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg @@ -1,16 +1,17 @@ [general] version = 4 -name = Normal - Experimental +name = Normal definition = ultimaker_s5 [metadata] setting_version = 20 type = quality quality_type = fast -weight = -1 +weight = -2 material = generic_pla variant = CC 0.6 is_experimental = True + [values] cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 @@ -26,7 +27,7 @@ prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) -speed_wall_0 = =math.ceil(speed_wall * 35 / 40) speed_wall_x = =speed_wall +speed_wall_0 = =math.ceil(speed_wall * 35 / 40) support_angle = 70 top_bottom_thickness = =layer_height * 4 From 2440730e23cfc7d5f7b401a59b5b636556200843 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Wed, 21 Sep 2022 11:23:05 +0200 Subject: [PATCH 010/103] Fix bug in monitor page In commit b7fd75b2dd202f2516f9188e342eccc8a15ae6ab the component with id `printerTypeSelectorRow` was removed. As the `tabBar` element was anchored to this component the monitor page was broken. Fixed by anchoring to the component that was previously above `printerTypeSelectorRow`. CURA-9665 --- resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml index f0d09516b9..d1bf323e7d 100644 --- a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml +++ b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml @@ -40,7 +40,7 @@ Item UM.TabRow { id: tabBar - anchors.top: printerTypeSelectorRow.bottom + anchors.top: header.bottom anchors.topMargin: UM.Theme.getSize("default_margin").height visible: extrudersModel.count > 1 From 3665227c5aa0e521e350a1a05329be3d840f68fd Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Wed, 21 Sep 2022 14:35:19 +0200 Subject: [PATCH 011/103] Ordered settings and fixed white spaces in formulas. Relates to PP-238 --- .../um_s3_aa0.4_ABS_Fast_Visual.inst.cfg | 2 +- .../um_s3_aa0.4_ABS_High_Visual.inst.cfg | 2 +- .../um_s3_aa0.4_ABS_Normal_Visual.inst.cfg | 2 +- .../um_s3_aa0.4_PLA_Fast_Visual.inst.cfg | 2 +- .../um_s3_aa0.4_PLA_High_Visual.inst.cfg | 2 +- .../um_s3_aa0.4_PLA_Normal_Visual.inst.cfg | 2 +- ...3_aa0.4_PLA_VeryDraft_Print_Quick.inst.cfg | 1 + .../um_s3_aa0.4_TPLA_Fast_Visual.inst.cfg | 2 +- .../um_s3_aa0.4_TPLA_High_Visual.inst.cfg | 2 +- .../um_s3_aa0.4_TPLA_Normal_Visual.inst.cfg | 2 +- ..._aa0.4_TPLA_VeryDraft_Print_Quick.inst.cfg | 1 + .../um_s5_aa0.4_ABS_Fast_Visual.inst.cfg | 2 +- .../um_s5_aa0.4_ABS_High_Visual.inst.cfg | 2 +- .../um_s5_aa0.4_ABS_Normal_Visual.inst.cfg | 2 +- .../um_s5_aa0.4_PLA_Fast_Visual.inst.cfg | 2 +- .../um_s5_aa0.4_PLA_High_Visual.inst.cfg | 2 +- .../um_s5_aa0.4_PLA_Normal_Visual.inst.cfg | 2 +- ...5_aa0.4_PLA_VeryDraft_Print_Quick.inst.cfg | 1 + .../um_s5_aa0.4_TPLA_Fast_Visual.inst.cfg | 2 +- .../um_s5_aa0.4_TPLA_High_Visual.inst.cfg | 2 +- .../um_s5_aa0.4_TPLA_Normal_Visual.inst.cfg | 2 +- ..._aa0.4_TPLA_VeryDraft_Print_Quick.inst.cfg | 1 + ...um_s3_aa0.25_Nylon_Normal_Quality.inst.cfg | 2 +- .../um_s3_aa0.25_PETG_Normal_Quality.inst.cfg | 5 ++-- .../um_s3_aa0.25_PLA_Normal_Quality.inst.cfg | 4 +-- .../um_s3_aa0.25_TPLA_Normal_Quality.inst.cfg | 4 +-- .../um_s3_aa0.4_ABS_Draft_Print.inst.cfg | 11 ++++---- .../um_s3_aa0.4_ABS_Fast_Print.inst.cfg | 13 ++++------ .../um_s3_aa0.4_ABS_High_Quality.inst.cfg | 13 ++++------ .../um_s3_aa0.4_ABS_Normal_Quality.inst.cfg | 13 ++++------ .../um_s3_aa0.4_BAM_Draft_Print.inst.cfg | 13 +++++----- .../um_s3_aa0.4_BAM_Fast_Print.inst.cfg | 17 ++++++------- .../um_s3_aa0.4_BAM_Normal_Quality.inst.cfg | 13 +++++----- .../um_s3_aa0.4_BAM_VeryDraft_Print.inst.cfg | 16 ++++++------ .../um_s3_aa0.4_CPEP_Draft_Print.inst.cfg | 2 -- .../um_s3_aa0.4_CPEP_Fast_Print.inst.cfg | 2 -- .../um_s3_aa0.4_CPEP_High_Quality.inst.cfg | 1 - .../um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg | 1 - .../um_s3_aa0.4_CPE_Draft_Print.inst.cfg | 11 ++++---- .../um_s3_aa0.4_CPE_Fast_Print.inst.cfg | 11 ++++---- .../um_s3_aa0.4_CPE_High_Quality.inst.cfg | 11 ++++---- .../um_s3_aa0.4_CPE_Normal_Quality.inst.cfg | 9 +++---- .../um_s3_aa0.4_Nylon_Draft_Print.inst.cfg | 6 ++--- .../um_s3_aa0.4_Nylon_Fast_Print.inst.cfg | 6 ++--- .../um_s3_aa0.4_Nylon_High_Quality.inst.cfg | 4 +-- .../um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg | 2 +- .../um_s3_aa0.4_PC_High_Quality.inst.cfg | 1 - .../um_s3_aa0.4_PC_Normal_Quality.inst.cfg | 1 - .../um_s3_aa0.4_PETG_Draft_Print.inst.cfg | 13 +++++----- .../um_s3_aa0.4_PETG_Fast_Print.inst.cfg | 13 +++++----- .../um_s3_aa0.4_PETG_High_Quality.inst.cfg | 13 +++++----- .../um_s3_aa0.4_PETG_Normal_Quality.inst.cfg | 13 +++++----- .../um_s3_aa0.4_PLA_Draft_Print.inst.cfg | 11 ++++---- .../um_s3_aa0.4_PLA_Fast_Print.inst.cfg | 7 +++--- .../um_s3_aa0.4_PLA_High_Quality.inst.cfg | 7 +++--- .../um_s3_aa0.4_PLA_Normal_Quality.inst.cfg | 5 ++-- .../um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg | 24 ++++++++---------- .../um_s3_aa0.4_PP_Draft_Print.inst.cfg | 1 - .../um_s3_aa0.4_PP_Fast_Print.inst.cfg | 1 - .../um_s3_aa0.4_PP_Normal_Quality.inst.cfg | 2 -- .../um_s3_aa0.4_TPLA_Draft_Print.inst.cfg | 2 +- .../um_s3_aa0.4_TPLA_Fast_Print.inst.cfg | 2 +- .../um_s3_aa0.4_TPLA_High_Quality.inst.cfg | 5 ++-- .../um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg | 24 ++++++++---------- .../um_s3_aa0.4_TPU_Draft_Print.inst.cfg | 1 - .../um_s3_aa0.4_TPU_Fast_Print.inst.cfg | 1 - .../um_s3_aa0.4_TPU_Normal_Quality.inst.cfg | 1 - .../um_s3_aa0.8_ABS_Draft_Print.inst.cfg | 1 - .../um_s3_aa0.8_ABS_Superdraft_Print.inst.cfg | 3 +-- .../um_s3_aa0.8_ABS_Verydraft_Print.inst.cfg | 1 - .../um_s3_aa0.8_CPEP_Fast_Print.inst.cfg | 8 +++--- ...um_s3_aa0.8_CPEP_Superdraft_Print.inst.cfg | 4 +-- .../um_s3_aa0.8_CPEP_Verydraft_Print.inst.cfg | 2 -- .../um_s3_aa0.8_CPE_Draft_Print.inst.cfg | 1 - .../um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg | 4 +-- .../um_s3_aa0.8_CPE_Verydraft_Print.inst.cfg | 1 - .../um_s3_aa0.8_Nylon_Draft_Print.inst.cfg | 2 -- ...m_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg | 2 -- ...um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg | 2 -- .../um_s3_aa0.8_PC_Fast_Print.inst.cfg | 8 +++--- .../um_s3_aa0.8_PC_Superdraft_Print.inst.cfg | 4 +-- .../um_s3_aa0.8_PC_Verydraft_Print.inst.cfg | 2 -- .../um_s3_aa0.8_PETG_Draft_Print.inst.cfg | 5 ++-- ...um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg | 7 +++--- .../um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg | 8 +++--- .../um_s3_aa0.8_PLA_Draft_Print.inst.cfg | 12 ++++----- .../um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg | 14 +++++------ .../um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg | 12 ++++----- .../um_s3_aa0.8_PP_Draft_Print.inst.cfg | 2 +- .../um_s3_aa0.8_PP_Superdraft_Print.inst.cfg | 4 +-- .../um_s3_aa0.8_PP_Verydraft_Print.inst.cfg | 2 +- .../um_s3_aa0.8_TPLA_Draft_Print.inst.cfg | 4 +-- ...um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg | 6 ++--- .../um_s3_aa0.8_TPLA_Verydraft_Print.inst.cfg | 6 ++--- .../um_s3_aa0.8_TPU_Draft_Print.inst.cfg | 2 +- .../um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg | 4 +-- .../um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg | 2 +- .../um_s3_bb0.4_PVA_Draft_Print.inst.cfg | 4 +-- .../um_s3_bb0.4_PVA_Fast_Print.inst.cfg | 6 ++--- .../um_s3_bb0.4_PVA_High_Quality.inst.cfg | 6 ++--- .../um_s3_bb0.4_PVA_Normal_Quality.inst.cfg | 6 ++--- .../um_s3_bb0.4_PVA_Verydraft_Print.inst.cfg | 6 ++--- .../um_s3_bb0.8_PVA_Draft_Print.inst.cfg | 4 +-- .../um_s3_bb0.8_PVA_Superdraft_Print.inst.cfg | 4 +-- .../um_s3_bb0.8_PVA_Verydraft_Print.inst.cfg | 4 +-- .../um_s3_cc0.4_CFFCPE_Draft_Print.inst.cfg | 3 --- .../um_s3_cc0.4_CFFCPE_Fast_Print.inst.cfg | 5 +--- .../um_s3_cc0.4_CFFPA_Draft_Print.inst.cfg | 3 --- .../um_s3_cc0.4_CFFPA_Fast_Print.inst.cfg | 5 +--- .../um_s3_cc0.4_GFFCPE_Draft_Print.inst.cfg | 3 --- .../um_s3_cc0.4_GFFCPE_Fast_Print.inst.cfg | 5 +--- .../um_s3_cc0.4_GFFPA_Draft_Print.inst.cfg | 3 --- .../um_s3_cc0.4_GFFPA_Fast_Print.inst.cfg | 3 +-- .../um_s3_cc0.4_PLA_Draft_Print.inst.cfg | 10 ++++---- .../um_s3_cc0.4_PLA_Fast_Print.inst.cfg | 10 ++++---- .../um_s3_cc0.6_CFFCPE_Draft_Print.inst.cfg | 1 - .../um_s3_cc0.6_CFFPA_Draft_Print.inst.cfg | 1 - .../um_s3_cc0.6_GFFCPE_Draft_Print.inst.cfg | 1 - .../um_s3_cc0.6_GFFPA_Draft_Print.inst.cfg | 1 - .../um_s3_cc0.6_PLA_Draft_Print.inst.cfg | 10 ++++---- .../um_s3_cc0.6_PLA_Fast_Print.inst.cfg | 10 ++++---- ...um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg | 2 -- .../um_s5_aa0.25_PETG_Normal_Quality.inst.cfg | 4 +-- .../um_s5_aa0.25_PLA_Normal_Quality.inst.cfg | 4 +-- .../um_s5_aa0.25_TPLA_Normal_Quality.inst.cfg | 4 +-- .../um_s5_aa0.4_ABS_Draft_Print.inst.cfg | 10 ++++---- .../um_s5_aa0.4_ABS_Fast_Print.inst.cfg | 10 ++++---- .../um_s5_aa0.4_ABS_High_Quality.inst.cfg | 13 ++++------ .../um_s5_aa0.4_ABS_Normal_Quality.inst.cfg | 12 ++++----- .../um_s5_aa0.4_BAM_Draft_Print.inst.cfg | 13 +++++----- .../um_s5_aa0.4_BAM_Fast_Print.inst.cfg | 17 ++++++------- .../um_s5_aa0.4_BAM_Normal_Quality.inst.cfg | 13 +++++----- .../um_s5_aa0.4_BAM_VeryDraft_Print.inst.cfg | 16 ++++++------ .../um_s5_aa0.4_CPEP_Draft_Print.inst.cfg | 2 -- .../um_s5_aa0.4_CPEP_Fast_Print.inst.cfg | 2 -- .../um_s5_aa0.4_CPEP_High_Quality.inst.cfg | 2 -- .../um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg | 1 - .../um_s5_aa0.4_CPE_Draft_Print.inst.cfg | 10 ++++---- .../um_s5_aa0.4_CPE_Fast_Print.inst.cfg | 11 ++++---- .../um_s5_aa0.4_CPE_High_Quality.inst.cfg | 11 ++++---- .../um_s5_aa0.4_CPE_Normal_Quality.inst.cfg | 9 +++---- .../um_s5_aa0.4_Nylon_Draft_Print.inst.cfg | 4 +-- .../um_s5_aa0.4_Nylon_Fast_Print.inst.cfg | 4 +-- .../um_s5_aa0.4_Nylon_High_Quality.inst.cfg | 4 +-- .../um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg | 4 +-- .../um_s5_aa0.4_PC_Fast_Print.inst.cfg | 1 - .../um_s5_aa0.4_PETG_Draft_Print.inst.cfg | 12 ++++----- .../um_s5_aa0.4_PETG_Fast_Print.inst.cfg | 13 +++++----- .../um_s5_aa0.4_PETG_High_Quality.inst.cfg | 13 +++++----- .../um_s5_aa0.4_PETG_Normal_Quality.inst.cfg | 12 ++++----- .../um_s5_aa0.4_PLA_Draft_Print.inst.cfg | 10 ++++---- .../um_s5_aa0.4_PLA_Fast_Print.inst.cfg | 6 ++--- .../um_s5_aa0.4_PLA_High_Quality.inst.cfg | 6 ++--- .../um_s5_aa0.4_PLA_Normal_Quality.inst.cfg | 4 +-- .../um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg | 25 ++++++++----------- .../um_s5_aa0.4_PP_Draft_Print.inst.cfg | 1 - .../um_s5_aa0.4_PP_Fast_Print.inst.cfg | 2 -- .../um_s5_aa0.4_PP_Normal_Quality.inst.cfg | 2 -- .../um_s5_aa0.4_TPLA_Draft_Print.inst.cfg | 2 +- .../um_s5_aa0.4_TPLA_Fast_Print.inst.cfg | 2 +- .../um_s5_aa0.4_TPLA_High_Quality.inst.cfg | 4 +-- .../um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg | 24 ++++++++---------- .../um_s5_aa0.4_TPU_Draft_Print.inst.cfg | 1 - .../um_s5_aa0.4_TPU_Fast_Print.inst.cfg | 1 - .../um_s5_aa0.4_TPU_Normal_Quality.inst.cfg | 1 - .../um_s5_aa0.8_ABS_Draft_Print.inst.cfg | 1 - .../um_s5_aa0.8_ABS_Superdraft_Print.inst.cfg | 3 +-- .../um_s5_aa0.8_ABS_Verydraft_Print.inst.cfg | 1 - .../um_s5_aa0.8_CPEP_Fast_Print.inst.cfg | 7 +++--- ...um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg | 4 +-- .../um_s5_aa0.8_CPEP_Verydraft_Print.inst.cfg | 2 -- .../um_s5_aa0.8_CPE_Draft_Print.inst.cfg | 1 - .../um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg | 3 +-- .../um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg | 1 - ...um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg | 2 -- .../um_s5_aa0.8_PC_Fast_Print.inst.cfg | 9 +++---- .../um_s5_aa0.8_PC_Superdraft_Print.inst.cfg | 4 +-- .../um_s5_aa0.8_PETG_Draft_Print.inst.cfg | 5 ++-- ...um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg | 7 +++--- .../um_s5_aa0.8_PETG_Verydraft_Print.inst.cfg | 6 ++--- .../um_s5_aa0.8_PLA_Draft_Print.inst.cfg | 12 ++++----- .../um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg | 14 +++++------ .../um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg | 12 ++++----- .../um_s5_aa0.8_PP_Draft_Print.inst.cfg | 2 +- .../um_s5_aa0.8_PP_Superdraft_Print.inst.cfg | 4 +-- .../um_s5_aa0.8_PP_Verydraft_Print.inst.cfg | 2 +- .../um_s5_aa0.8_TPLA_Draft_Print.inst.cfg | 4 +-- ...um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg | 6 ++--- .../um_s5_aa0.8_TPLA_Verydraft_Print.inst.cfg | 6 ++--- .../um_s5_aa0.8_TPU_Draft_Print.inst.cfg | 2 +- .../um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg | 4 +-- .../um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg | 2 +- .../um_s5_bb0.4_PVA_Draft_Print.inst.cfg | 4 +-- .../um_s5_bb0.4_PVA_Fast_Print.inst.cfg | 6 ++--- .../um_s5_bb0.4_PVA_High_Quality.inst.cfg | 6 ++--- .../um_s5_bb0.4_PVA_Normal_Quality.inst.cfg | 6 ++--- .../um_s5_bb0.4_PVA_Verydraft_Print.inst.cfg | 6 ++--- .../um_s5_bb0.8_PVA_Draft_Print.inst.cfg | 4 +-- .../um_s5_bb0.8_PVA_Superdraft_Print.inst.cfg | 4 +-- .../um_s5_bb0.8_PVA_Verydraft_Print.inst.cfg | 4 +-- .../um_s5_cc0.4_CFFCPE_Draft_Print.inst.cfg | 1 - .../um_s5_cc0.4_CFFCPE_Fast_Print.inst.cfg | 3 +-- .../um_s5_cc0.4_CFFPA_Draft_Print.inst.cfg | 1 - .../um_s5_cc0.4_CFFPA_Fast_Print.inst.cfg | 3 +-- .../um_s5_cc0.4_GFFCPE_Draft_Print.inst.cfg | 1 - .../um_s5_cc0.4_GFFCPE_Fast_Print.inst.cfg | 3 +-- .../um_s5_cc0.4_GFFPA_Draft_Print.inst.cfg | 1 - .../um_s5_cc0.4_GFFPA_Fast_Print.inst.cfg | 3 +-- .../um_s5_cc0.4_PLA_Draft_Print.inst.cfg | 10 ++++---- .../um_s5_cc0.4_PLA_Fast_Print.inst.cfg | 10 ++++---- .../um_s5_cc0.6_CFFCPE_Draft_Print.inst.cfg | 1 - .../um_s5_cc0.6_CFFPA_Draft_Print.inst.cfg | 1 - .../um_s5_cc0.6_GFFCPE_Draft_Print.inst.cfg | 1 - .../um_s5_cc0.6_GFFPA_Draft_Print.inst.cfg | 1 - .../um_s5_cc0.6_PLA_Draft_Print.inst.cfg | 10 ++++---- .../um_s5_cc0.6_PLA_Fast_Print.inst.cfg | 10 ++++---- 216 files changed, 501 insertions(+), 676 deletions(-) diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Visual.inst.cfg index 694f4f1591..21b37abac1 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s3 [metadata] setting_version = 20 type = intent -quality_type = fast intent_category = visual +quality_type = fast material = generic_abs variant = AA 0.4 diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_High_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_High_Visual.inst.cfg index 3874bc0cce..898c8e3112 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_High_Visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_High_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s3 [metadata] setting_version = 20 type = intent -quality_type = high intent_category = visual +quality_type = high material = generic_abs variant = AA 0.4 diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Visual.inst.cfg index bf3dcdc208..fd4cda4565 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s3 [metadata] setting_version = 20 type = intent -quality_type = normal intent_category = visual +quality_type = normal material = generic_abs variant = AA 0.4 diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Visual.inst.cfg index 2c9b008765..e465f40ed2 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s3 [metadata] setting_version = 20 type = intent -quality_type = fast intent_category = visual +quality_type = fast material = generic_pla variant = AA 0.4 diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_High_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_High_Visual.inst.cfg index 64a25cd046..c50fa33475 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_High_Visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_High_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s3 [metadata] setting_version = 20 type = intent -quality_type = high intent_category = visual +quality_type = high material = generic_pla variant = AA 0.4 diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Visual.inst.cfg index 5b9177f803..15f4d17fad 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s3 [metadata] setting_version = 20 type = intent -quality_type = normal intent_category = visual +quality_type = normal material = generic_pla variant = AA 0.4 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 3b6a5b6486..635949e3c8 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 @@ -11,6 +11,7 @@ quality_type = verydraft material = generic_pla variant = AA 0.4 is_experimental = True + [values] acceleration_print = 4000 acceleration_wall = 2000 diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Visual.inst.cfg index d9c514676d..3afd626d8e 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s3 [metadata] setting_version = 20 type = intent -quality_type = fast intent_category = visual +quality_type = fast material = generic_tough_pla variant = AA 0.4 diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_High_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_High_Visual.inst.cfg index 05b6b33857..2ef6dc756a 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_High_Visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_High_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s3 [metadata] setting_version = 20 type = intent -quality_type = high intent_category = visual +quality_type = high material = generic_tough_pla variant = AA 0.4 diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Visual.inst.cfg index a7e1e2f83e..fd0e3499e5 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s3 [metadata] setting_version = 20 type = intent -quality_type = normal intent_category = visual +quality_type = normal material = generic_tough_pla variant = AA 0.4 diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print_Quick.inst.cfg index 48fe33a990..95c584bdad 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print_Quick.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print_Quick.inst.cfg @@ -11,6 +11,7 @@ quality_type = verydraft material = generic_tough_pla variant = AA 0.4 is_experimental = True + [values] acceleration_print = 4000 acceleration_wall = 2000 diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Visual.inst.cfg index e6d8d67c8b..dec4e9a252 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s5 [metadata] setting_version = 20 type = intent -quality_type = fast intent_category = visual +quality_type = fast material = generic_abs variant = AA 0.4 diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_High_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_High_Visual.inst.cfg index 4d7510de6d..9df38c762d 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_High_Visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_High_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s5 [metadata] setting_version = 20 type = intent -quality_type = high intent_category = visual +quality_type = high material = generic_abs variant = AA 0.4 diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Visual.inst.cfg index a0778dcb25..a9578315ff 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s5 [metadata] setting_version = 20 type = intent -quality_type = normal intent_category = visual +quality_type = normal material = generic_abs variant = AA 0.4 diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Visual.inst.cfg index 35bb47e546..db38a543f4 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s5 [metadata] setting_version = 20 type = intent -quality_type = fast intent_category = visual +quality_type = fast material = generic_pla variant = AA 0.4 diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_High_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_High_Visual.inst.cfg index 5d5d433d9a..e0e9dab04d 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_High_Visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_High_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s5 [metadata] setting_version = 20 type = intent -quality_type = high intent_category = visual +quality_type = high material = generic_pla variant = AA 0.4 diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Visual.inst.cfg index ad280d6142..1874a846e4 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s5 [metadata] setting_version = 20 type = intent -quality_type = normal intent_category = visual +quality_type = normal material = generic_pla variant = AA 0.4 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 97d631d300..d38dd5d366 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 @@ -11,6 +11,7 @@ quality_type = verydraft material = generic_pla variant = AA 0.4 is_experimental = True + [values] acceleration_print = 4000 acceleration_wall = 2000 diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Visual.inst.cfg index 2c0ca34f03..31a8fa8ef7 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s5 [metadata] setting_version = 20 type = intent -quality_type = fast intent_category = visual +quality_type = fast material = generic_tough_pla variant = AA 0.4 diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_High_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_High_Visual.inst.cfg index 84ab765c21..99b390a03a 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_High_Visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_High_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s5 [metadata] setting_version = 20 type = intent -quality_type = high intent_category = visual +quality_type = high material = generic_tough_pla variant = AA 0.4 diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Visual.inst.cfg index a3740c80c3..e5022cfad4 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s5 [metadata] setting_version = 20 type = intent -quality_type = normal intent_category = visual +quality_type = normal material = generic_tough_pla variant = AA 0.4 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 0b2666bf23..3d4390e7a4 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 @@ -11,6 +11,7 @@ quality_type = verydraft material = generic_tough_pla variant = AA 0.4 is_experimental = True + [values] acceleration_print = 4000 acceleration_wall = 2000 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_Nylon_Normal_Quality.inst.cfg index 4e2114909a..afb105b535 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_Nylon_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_Nylon_Normal_Quality.inst.cfg @@ -20,10 +20,10 @@ ooze_shield_angle = 40 raft_airgap = 0.4 retraction_min_travel = 5 skin_overlap = 50 +speed_layer_0 = 10 speed_print = 70 speed_topbottom = =math.ceil(speed_print * 30 / 70) speed_wall = =math.ceil(speed_print * 30 / 70) switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 -speed_layer_0 = 10 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg index 376af254f9..d9ee0e629b 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg @@ -12,10 +12,9 @@ material = generic_petg variant = AA 0.25 [values] +initial_layer_line_width_factor = 100 +material_print_temperature = =default_material_print_temperature - 5 retraction_combing_max_distance = 8 speed_infill = =math.ceil(speed_print * 40 / 55) speed_topbottom = =math.ceil(speed_print * 30 / 55) top_bottom_thickness = 0.8 -initial_layer_line_width_factor = 100 - -material_print_temperature = =default_material_print_temperature - 5 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_PLA_Normal_Quality.inst.cfg index 6bef64658f..33409c4ef2 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_PLA_Normal_Quality.inst.cfg @@ -19,8 +19,8 @@ infill_overlap = =0 if infill_sparse_density > 80 else 10 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 -material_final_print_temperature = =max(-273.15, material_print_temperature - 15) -material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) +material_final_print_temperature = =material_print_temperature - 15 +material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = 190 retraction_hop = 0.2 skin_overlap = 5 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_TPLA_Normal_Quality.inst.cfg index 61ec5d977d..02c7e10466 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_TPLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_TPLA_Normal_Quality.inst.cfg @@ -19,8 +19,8 @@ infill_overlap = =0 if infill_sparse_density > 80 else 10 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 -material_final_print_temperature = =max(-273.15, material_print_temperature - 15) -material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) +material_final_print_temperature = =material_print_temperature - 15 +material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature - 15 skin_overlap = 5 speed_layer_0 = =math.ceil(speed_print * 30 / 30) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print.inst.cfg index 1ba0ffd3cd..a695827302 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print.inst.cfg @@ -14,16 +14,15 @@ variant = AA 0.4 [values] machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 -material_print_temperature = =default_material_print_temperature + 20 -material_initial_print_temperature = =material_print_temperature - 15 material_final_print_temperature = =material_print_temperature - 20 +material_initial_print_temperature = =material_print_temperature - 15 +material_print_temperature = =default_material_print_temperature + 20 prime_tower_enable = False +raft_airgap = 0.15 skin_overlap = 20 -speed_print = 60 +speed_infill = =math.ceil(speed_print * 50 / 60) speed_layer_0 = 10 +speed_print = 60 speed_topbottom = =math.ceil(speed_print * 35 / 60) speed_wall = =math.ceil(speed_print * 45 / 60) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) -speed_infill = =math.ceil(speed_print * 50 / 60) - -raft_airgap = 0.15 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print.inst.cfg index 33d620ede2..802e5c9d00 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print.inst.cfg @@ -15,17 +15,14 @@ variant = AA 0.4 cool_min_speed = 7 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 -material_print_temperature = =default_material_print_temperature + 15 -material_initial_print_temperature = =material_print_temperature - 15 material_final_print_temperature = =material_print_temperature - 20 +material_initial_print_temperature = =material_print_temperature - 15 +material_print_temperature = =default_material_print_temperature + 15 prime_tower_enable = False -speed_print = 60 +raft_airgap = 0.15 +speed_infill = =math.ceil(speed_print * 45 / 60) speed_layer_0 = 10 +speed_print = 60 speed_topbottom = =math.ceil(speed_print * 30 / 60) speed_wall = =math.ceil(speed_print * 40 / 60) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) - - -speed_infill = =math.ceil(speed_print * 45 / 60) - -raft_airgap = 0.15 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_High_Quality.inst.cfg index 5e6ec3e259..d83461ee9c 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_High_Quality.inst.cfg @@ -15,16 +15,13 @@ variant = AA 0.4 cool_min_speed = 12 machine_nozzle_cool_down_speed = 0.8 machine_nozzle_heat_up_speed = 1.5 -material_print_temperature = =default_material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature - 15 material_final_print_temperature = =material_print_temperature - 20 +material_initial_print_temperature = =material_print_temperature - 15 +material_print_temperature = =default_material_print_temperature + 5 prime_tower_enable = False -speed_print = 50 +raft_airgap = 0.15 +speed_infill = =math.ceil(speed_print * 40 / 50) speed_layer_0 = 10 +speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 30 / 50) - - -speed_infill = =math.ceil(speed_print * 40 / 50) - -raft_airgap = 0.15 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality.inst.cfg index 4141c023aa..bed87d7b95 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality.inst.cfg @@ -14,16 +14,13 @@ variant = AA 0.4 [values] machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 -material_print_temperature = =default_material_print_temperature + 10 -material_initial_print_temperature = =material_print_temperature - 15 material_final_print_temperature = =material_print_temperature - 20 +material_initial_print_temperature = =material_print_temperature - 15 +material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = False -speed_print = 55 +raft_airgap = 0.15 +speed_infill = =math.ceil(speed_print * 40 / 55) speed_layer_0 = 10 +speed_print = 55 speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_wall = =math.ceil(speed_print * 30 / 55) - - -speed_infill = =math.ceil(speed_print * 40 / 55) - -raft_airgap = 0.15 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg index 593781314a..2c4432db17 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg @@ -18,17 +18,16 @@ cool_fan_speed_max = =cool_fan_speed machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 -# prime_tower_enable: see CURA-4248 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 skin_overlap = 20 speed_layer_0 = =math.ceil(speed_print * 20 / 70) speed_topbottom = =math.ceil(speed_print * 35 / 70) speed_wall = =math.ceil(speed_print * 50 / 70) speed_wall_0 = =math.ceil(speed_wall * 35 / 50) -top_bottom_thickness = 1 -support_brim_enable = True -support_interface_enable = True -support_interface_density = =min(extruderValues('material_surface_energy')) -support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height -support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height support_angle = 45 +support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height +support_brim_enable = True +support_interface_density = =min(extruderValues('material_surface_energy')) +support_interface_enable = True +support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height +top_bottom_thickness = 1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg index 577362391f..076286fc6b 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg @@ -12,23 +12,22 @@ material = generic_bam variant = AA 0.4 [values] -support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -# prime_tower_enable: see CURA-4248 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 -speed_print = 80 speed_layer_0 = =math.ceil(speed_print * 20 / 80) +speed_print = 80 speed_topbottom = =math.ceil(speed_print * 30 / 80) speed_wall = =math.ceil(speed_print * 40 / 80) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -top_bottom_thickness = 1 -support_brim_enable = True -support_interface_enable = True -support_interface_density = =min(extruderValues('material_surface_energy')) -support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 1) * layer_height -support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height support_angle = 45 +support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height +support_brim_enable = True +support_infill_sparse_thickness = =2 * layer_height +support_interface_density = =min(extruderValues('material_surface_energy')) +support_interface_enable = True +support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 1) * layer_height +top_bottom_thickness = 1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg index 416a175c81..92c8448d77 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg @@ -12,21 +12,20 @@ material = generic_bam variant = AA 0.4 [values] -support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed cool_min_speed = 7 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -# prime_tower_enable: see CURA-4248 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 skin_overlap = 10 speed_layer_0 = =math.ceil(speed_print * 20 / 70) -support_brim_enable = True -support_interface_enable = True -support_interface_density = =min(extruderValues('material_surface_energy')) -support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 1) * layer_height -support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height support_angle = 45 +support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height +support_brim_enable = True +support_infill_sparse_thickness = =2 * layer_height +support_interface_density = =min(extruderValues('material_surface_energy')) +support_interface_enable = True +support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 1) * layer_height top_bottom_thickness = 1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_VeryDraft_Print.inst.cfg index a8b51892c7..3883b17f6c 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_VeryDraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_VeryDraft_Print.inst.cfg @@ -1,13 +1,13 @@ [general] version = 4 -name = Extra Fast +name = Extra Fast - Experimental definition = ultimaker_s3 [metadata] setting_version = 20 type = quality quality_type = verydraft -weight = -2 +weight = -3 material = generic_bam variant = AA 0.4 is_experimental = True @@ -25,10 +25,10 @@ speed_layer_0 = =math.ceil(speed_print * 20 / 70) speed_topbottom = =math.ceil(speed_print * 35 / 70) speed_wall = =math.ceil(speed_print * 50 / 70) speed_wall_0 = =math.ceil(speed_wall * 35 / 50) -top_bottom_thickness = 1 -support_brim_enable = True -support_interface_enable = True -support_interface_density = =min(extruderValues('material_surface_energy')) -support_top_distance = 0.3 -support_bottom_distance = 0.3 support_angle = 45 +support_bottom_distance = 0.3 +support_brim_enable = True +support_interface_density = =min(extruderValues('material_surface_energy')) +support_interface_enable = True +support_top_distance = 0.3 +top_bottom_thickness = 1 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 5d01e40230..04df2951fa 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 @@ -14,7 +14,6 @@ variant = AA 0.4 [values] cool_fan_speed_max = 80 cool_min_speed = 5 - infill_overlap = 0 infill_wipe_dist = 0 machine_min_cool_heat_time_window = 15 @@ -34,7 +33,6 @@ skin_overlap = 20 speed_layer_0 = =math.ceil(speed_print * 20 / 50) speed_print = 50 speed_topbottom = =math.ceil(speed_print * 40 / 50) - speed_wall = =math.ceil(speed_print * 50 / 50) speed_wall_0 = =math.ceil(speed_wall * 40 / 50) support_z_distance = =layer_height diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg index 73ea3d5cea..d90b6c0a04 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg @@ -14,7 +14,6 @@ variant = AA 0.4 [values] cool_fan_speed_max = 80 cool_min_speed = 6 - infill_overlap = 0 infill_wipe_dist = 0 machine_min_cool_heat_time_window = 15 @@ -34,7 +33,6 @@ skin_overlap = 20 speed_layer_0 = =math.ceil(speed_print * 20 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) - speed_wall = =math.ceil(speed_print * 45 / 45) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) support_z_distance = =layer_height 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 56ec94d871..c043bb9bb7 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 @@ -14,7 +14,6 @@ variant = AA 0.4 [values] cool_fan_speed_max = 50 cool_min_speed = 5 - infill_overlap = 0 infill_wipe_dist = 0 machine_min_cool_heat_time_window = 15 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 8fda5b84c6..3196fc777f 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 @@ -14,7 +14,6 @@ variant = AA 0.4 [values] cool_fan_speed_max = 50 cool_min_speed = 7 - infill_overlap = 0 infill_wipe_dist = 0 machine_min_cool_heat_time_window = 15 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Draft_Print.inst.cfg index 2553121d76..00dad75b09 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Draft_Print.inst.cfg @@ -12,17 +12,16 @@ material = generic_cpe variant = AA 0.4 [values] -material_print_temperature = =default_material_print_temperature + 10 -material_initial_print_temperature = =material_print_temperature - 5 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' material_final_print_temperature = =material_print_temperature - 10 +material_initial_print_temperature = =material_print_temperature - 5 +material_print_temperature = =default_material_print_temperature + 10 retraction_combing_max_distance = 50 retraction_prime_speed = =retraction_speed skin_overlap = 20 -speed_print = 60 +speed_infill = =math.ceil(speed_print * 50 / 60) speed_layer_0 = =math.ceil(speed_print * 20 / 60) +speed_print = 60 speed_topbottom = =math.ceil(speed_print * 35 / 60) speed_wall = =math.ceil(speed_print * 45 / 60) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) - -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -speed_infill = =math.ceil(speed_print * 50 / 60) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print.inst.cfg index b8c8538a00..df68316eb1 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print.inst.cfg @@ -13,16 +13,15 @@ variant = AA 0.4 [values] cool_min_speed = 7 -material_print_temperature = =default_material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature - 5 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' material_final_print_temperature = =material_print_temperature - 10 +material_initial_print_temperature = =material_print_temperature - 5 +material_print_temperature = =default_material_print_temperature + 5 retraction_combing_max_distance = 50 retraction_prime_speed = =retraction_speed -speed_print = 60 +speed_infill = =math.ceil(speed_print * 50 / 60) speed_layer_0 = =math.ceil(speed_print * 20 / 60) +speed_print = 60 speed_topbottom = =math.ceil(speed_print * 30 / 60) speed_wall = =math.ceil(speed_print * 40 / 60) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) - -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -speed_infill = =math.ceil(speed_print * 50 / 60) \ No newline at end of file diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_High_Quality.inst.cfg index 360984cc12..4850bc393c 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_High_Quality.inst.cfg @@ -13,17 +13,16 @@ variant = AA 0.4 [values] cool_min_speed = 12 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 -material_print_temperature = =default_material_print_temperature - 5 -material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 +material_initial_print_temperature = =material_print_temperature - 5 +material_print_temperature = =default_material_print_temperature - 5 retraction_combing_max_distance = 50 retraction_prime_speed = =retraction_speed -speed_print = 50 +speed_infill = =math.ceil(speed_print * 40 / 50) speed_layer_0 = =math.ceil(speed_print * 20 / 50) +speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 30 / 50) - -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -speed_infill = =math.ceil(speed_print * 40 / 50) \ No newline at end of file diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality.inst.cfg index 8db4957fa9..41594ab90f 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality.inst.cfg @@ -12,16 +12,15 @@ material = generic_cpe variant = AA 0.4 [values] +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 -material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 +material_initial_print_temperature = =material_print_temperature - 5 retraction_combing_max_distance = 50 retraction_prime_speed = =retraction_speed -speed_print = 55 +speed_infill = =math.ceil(speed_print * 45 / 55) speed_layer_0 = =math.ceil(speed_print * 20 / 55) +speed_print = 55 speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_wall = =math.ceil(speed_print * 30 / 55) - -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -speed_infill = =math.ceil(speed_print * 45 / 55) \ No newline at end of file diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg index a0c909af75..9d4069eead 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg @@ -14,9 +14,9 @@ variant = AA 0.4 [values] cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -material_print_temperature = =default_material_print_temperature + 10 -material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 +material_initial_print_temperature = =material_print_temperature - 5 +material_print_temperature = =default_material_print_temperature + 10 ooze_shield_angle = 40 raft_airgap = 0.4 retraction_prime_speed = =retraction_speed @@ -24,4 +24,4 @@ skin_overlap = 50 speed_layer_0 = 10 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 -switch_extruder_retraction_speeds = 40 \ No newline at end of file +switch_extruder_retraction_speeds = 40 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg index 58b6f80f5d..df0aa521c3 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg @@ -14,9 +14,9 @@ variant = AA 0.4 [values] cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -material_print_temperature = =default_material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 +material_initial_print_temperature = =material_print_temperature - 5 +material_print_temperature = =default_material_print_temperature + 5 ooze_shield_angle = 40 raft_airgap = 0.4 retraction_prime_speed = =retraction_speed @@ -24,4 +24,4 @@ skin_overlap = 50 speed_layer_0 = 10 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 -switch_extruder_retraction_speeds = 40 \ No newline at end of file +switch_extruder_retraction_speeds = 40 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg index 0dd7ec5a0d..fcc766e14a 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg @@ -14,8 +14,8 @@ variant = AA 0.4 [values] cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 15 -material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 +material_initial_print_temperature = =material_print_temperature - 5 ooze_shield_angle = 40 raft_airgap = 0.4 retraction_prime_speed = =retraction_speed @@ -23,4 +23,4 @@ skin_overlap = 50 speed_layer_0 = 10 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 -switch_extruder_retraction_speeds = 40 \ No newline at end of file +switch_extruder_retraction_speeds = 40 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg index 8f17f79616..bd46912a8d 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg @@ -14,8 +14,8 @@ variant = AA 0.4 [values] cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 12 -material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 +material_initial_print_temperature = =material_print_temperature - 5 ooze_shield_angle = 40 raft_airgap = 0.4 retraction_prime_speed = =retraction_speed diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg index b3f3aa6cd0..016a66ea60 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg @@ -17,7 +17,6 @@ cool_fan_full_at_height = =layer_height_0 + layer_height cool_fan_speed_max = 50 cool_min_layer_time_fan_speed_max = 5 cool_min_speed = 8 - 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' diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg index eaf031fe52..3cb5249538 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg @@ -17,7 +17,6 @@ cool_fan_full_at_height = =layer_height_0 + layer_height cool_fan_speed_max = 50 cool_min_layer_time_fan_speed_max = 5 cool_min_speed = 5 - infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0.1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Draft_Print.inst.cfg index e77195665a..f40c3d9968 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Draft_Print.inst.cfg @@ -12,17 +12,16 @@ material = generic_petg variant = AA 0.4 [values] -material_print_temperature = =default_material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +initial_layer_line_width_factor = 100 material_final_print_temperature = =material_print_temperature - 5 +material_initial_print_temperature = =material_print_temperature +material_print_temperature = =default_material_print_temperature + 5 retraction_combing_max_distance = 8 skin_overlap = 20 -speed_print = 60 +speed_infill = =math.ceil(speed_print * 50 / 60) speed_layer_0 = =math.ceil(speed_print * 20 / 60) +speed_print = 60 speed_topbottom = =math.ceil(speed_print * 35 / 60) speed_wall = =math.ceil(speed_print * 45 / 60) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) - -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -speed_infill = =math.ceil(speed_print * 50 / 60) -initial_layer_line_width_factor = 100 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print.inst.cfg index 8117c60edc..496e5662ca 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print.inst.cfg @@ -13,16 +13,15 @@ variant = AA 0.4 [values] cool_min_speed = 7 -material_print_temperature = =default_material_print_temperature -material_initial_print_temperature = =material_print_temperature - 5 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +initial_layer_line_width_factor = 100 material_final_print_temperature = =material_print_temperature - 10 +material_initial_print_temperature = =material_print_temperature - 5 +material_print_temperature = =default_material_print_temperature retraction_combing_max_distance = 8 -speed_print = 60 +speed_infill = =math.ceil(speed_print * 50 / 60) speed_layer_0 = =math.ceil(speed_print * 20 / 60) +speed_print = 60 speed_topbottom = =math.ceil(speed_print * 30 / 60) speed_wall = =math.ceil(speed_print * 40 / 60) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) - -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -speed_infill = =math.ceil(speed_print * 50 / 60) -initial_layer_line_width_factor = 100 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_High_Quality.inst.cfg index 85a05b576a..f710c0fa58 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_High_Quality.inst.cfg @@ -13,17 +13,16 @@ variant = AA 0.4 [values] cool_min_speed = 12 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +initial_layer_line_width_factor = 100 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 -material_print_temperature = =default_material_print_temperature - 10 -material_initial_print_temperature = =material_print_temperature - 10 material_final_print_temperature = =material_print_temperature - 15 +material_initial_print_temperature = =material_print_temperature - 10 +material_print_temperature = =default_material_print_temperature - 10 retraction_combing_max_distance = 8 -speed_print = 50 +speed_infill = =math.ceil(speed_print * 40 / 50) speed_layer_0 = =math.ceil(speed_print * 20 / 50) +speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 30 / 50) - -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -speed_infill = =math.ceil(speed_print * 40 / 50) -initial_layer_line_width_factor = 100 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality.inst.cfg index b75ab359b4..a3ef8347f1 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality.inst.cfg @@ -12,17 +12,16 @@ material = generic_petg variant = AA 0.4 [values] +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +initial_layer_line_width_factor = 100 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 -material_print_temperature = =default_material_print_temperature - 5 -material_initial_print_temperature = =material_print_temperature - 10 material_final_print_temperature = =material_print_temperature - 15 +material_initial_print_temperature = =material_print_temperature - 10 +material_print_temperature = =default_material_print_temperature - 5 retraction_combing_max_distance = 8 -speed_print = 55 +speed_infill = =math.ceil(speed_print * 45 / 55) speed_layer_0 = =math.ceil(speed_print * 20 / 55) +speed_print = 55 speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_wall = =math.ceil(speed_print * 30 / 55) - -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -speed_infill = =math.ceil(speed_print * 45 / 55) -initial_layer_line_width_factor = 100 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg index 8daad94c4c..9e4855a3cc 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg @@ -12,12 +12,17 @@ material = generic_pla variant = AA 0.4 [values] +acceleration_wall = 2000 +acceleration_wall_0 = 2000 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed +infill_sparse_density = 15 +layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 prime_tower_enable = False +raft_airgap = 0.25 retraction_prime_speed = =retraction_speed skin_overlap = 20 speed_layer_0 = 10 @@ -25,9 +30,3 @@ speed_topbottom = =math.ceil(speed_print * 40 / 70) speed_wall = =math.ceil(speed_print * 55 / 70) speed_wall_0 = =math.ceil(speed_wall * 45 / 50) top_bottom_thickness = 0.8 -infill_sparse_density = 15 -layer_height_0 = 0.2 -acceleration_wall = 2000 -acceleration_wall_0 = 2000 - -raft_airgap = 0.25 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg index 16b0868446..cd95a1ec89 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg @@ -14,16 +14,15 @@ variant = AA 0.4 [values] cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed +layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 prime_tower_enable = False +raft_airgap = 0.25 retraction_prime_speed = =retraction_speed -speed_print = 70 speed_layer_0 = 10 +speed_print = 70 speed_topbottom = =math.ceil(speed_print * 35 / 70) speed_wall = =math.ceil(speed_print * 45 / 70) speed_wall_0 = =math.ceil(speed_wall * 35 / 70) top_bottom_thickness = 1 -layer_height_0 = 0.2 - -raft_airgap = 0.25 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg index 6ec0425176..789bccd411 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg @@ -15,17 +15,16 @@ variant = AA 0.4 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed cool_min_speed = 10 +layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature - 5 prime_tower_enable = False +raft_airgap = 0.25 retraction_prime_speed = =retraction_speed skin_overlap = 10 -speed_print = 50 speed_layer_0 = 10 +speed_print = 50 speed_topbottom = =math.ceil(speed_print * 35 / 50) speed_wall = =math.ceil(speed_print * 35 / 50) top_bottom_thickness = 1 -layer_height_0 = 0.2 - -raft_airgap = 0.25 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg index 4928a166b4..9ef1ae8e0a 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg @@ -15,13 +15,12 @@ variant = AA 0.4 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed cool_min_speed = 7 +layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 prime_tower_enable = False +raft_airgap = 0.25 retraction_prime_speed = =retraction_speed skin_overlap = 10 speed_layer_0 = 10 top_bottom_thickness = 1 -layer_height_0 = 0.2 - -raft_airgap = 0.25 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg index d20c1303b8..11f9e4c3d8 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg @@ -1,38 +1,34 @@ [general] version = 4 -name = Extra Fast +name = Extra Fast - Experimental definition = ultimaker_s3 [metadata] setting_version = 20 type = quality quality_type = verydraft -weight = -2 +weight = -3 material = generic_pla variant = AA 0.4 is_experimental = True [values] -infill_sparse_density = 15 acceleration_print = 2000 +acceleration_topbottom = 1000 acceleration_wall = 1500 acceleration_wall_0 = 1000 -acceleration_topbottom = 1000 -speed_print = 50 -speed_wall = 50 - cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed - -material_print_temperature = =default_material_print_temperature + 10 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +infill_sparse_density = 15 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 +material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = False +raft_airgap = 0.25 retraction_prime_speed = =retraction_speed skin_overlap = 20 +speed_print = 50 +speed_wall = 50 top_bottom_thickness = 0.9 - -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' - -raft_airgap = 0.25 -wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) \ No newline at end of file +wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) 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 d68e3dd779..a26e442819 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 @@ -17,7 +17,6 @@ cool_fan_speed_max = 100 cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 7 cool_min_speed = 2.5 - infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0.1 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 7eed793e6a..06cf202bc6 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 @@ -40,7 +40,6 @@ retraction_min_travel = 0.8 speed_layer_0 = =math.ceil(speed_print * 15 / 25) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 25 / 25) - speed_travel_layer_0 = 50 speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 25) 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 97c92f934c..61453c278c 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 @@ -17,7 +17,6 @@ cool_fan_speed_max = 100 cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 7 cool_min_speed = 2.5 - infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0.1 @@ -41,7 +40,6 @@ retraction_min_travel = 0.8 speed_layer_0 = =math.ceil(speed_print * 15 / 25) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 25 / 25) - speed_travel_layer_0 = 50 speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 25) 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 f2625cd9d7..758a2ea878 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 @@ -18,7 +18,7 @@ cool_min_speed = 7 layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -material_print_temperature = =default_material_print_temperature -10 +material_print_temperature = =default_material_print_temperature - 10 prime_tower_enable = False retraction_prime_speed = =retraction_speed skin_overlap = 20 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print.inst.cfg index 3c1ec73d54..ae8efe7a72 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print.inst.cfg @@ -17,7 +17,7 @@ cool_fan_speed_max = =cool_fan_speed layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -material_print_temperature = =default_material_print_temperature -10 +material_print_temperature = =default_material_print_temperature - 10 prime_tower_enable = False retraction_prime_speed = =retraction_speed speed_layer_0 = =math.ceil(speed_print * 20 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg index ae44c3f019..72be73dc22 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg @@ -15,17 +15,16 @@ variant = AA 0.4 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed cool_min_speed = 10 +layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature - 15 prime_tower_enable = False retraction_prime_speed = =retraction_speed skin_overlap = 10 -speed_print = 45 speed_layer_0 = =math.ceil(speed_print * 20 / 45) +speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) top_bottom_thickness = 1.2 -layer_height_0 = 0.2 - diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg index 2d05a15f3c..23feb0619a 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg @@ -1,38 +1,34 @@ [general] version = 4 -name = Extra Fast +name = Extra Fast - Experimental definition = ultimaker_s3 [metadata] setting_version = 20 type = quality quality_type = verydraft -weight = -2 +weight = -3 material = generic_tough_pla variant = AA 0.4 is_experimental = True [values] -infill_sparse_density = 15 acceleration_print = 2000 +acceleration_topbottom = 1000 acceleration_wall = 1500 acceleration_wall_0 = 1000 -acceleration_topbottom = 1000 -speed_print = 50 -speed_wall = 50 - cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed - -material_print_temperature = =default_material_print_temperature - 5 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +infill_sparse_density = 15 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 +material_print_temperature = =default_material_print_temperature - 5 prime_tower_enable = False +raft_airgap = 0.25 retraction_prime_speed = =retraction_speed skin_overlap = 20 +speed_print = 50 +speed_wall = 50 top_bottom_thickness = 1.2 - -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' - -raft_airgap = 0.25 -wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) \ No newline at end of file +wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) 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 24ae39f8b1..b461efb73b 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 @@ -17,7 +17,6 @@ cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 4 gradual_infill_step_height = =5 * layer_height - infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 10 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 468184028c..08fcbc3187 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 @@ -17,7 +17,6 @@ cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 4 gradual_infill_step_height = =5 * layer_height - infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 10 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg index 333307e533..0be0f52120 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg @@ -17,7 +17,6 @@ cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 4 gradual_infill_step_height = =5 * layer_height - infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 10 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Draft_Print.inst.cfg index e314a6080d..7afbea4788 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Draft_Print.inst.cfg @@ -12,7 +12,6 @@ material = generic_abs variant = AA 0.8 [values] - material_print_temperature = =default_material_print_temperature + 20 speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Superdraft_Print.inst.cfg index c983a4558c..e473cd6f28 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Superdraft_Print.inst.cfg @@ -12,10 +12,9 @@ material = generic_abs variant = AA 0.8 [values] - material_print_temperature = =default_material_print_temperature + 25 +speed_infill = =math.ceil(speed_print * 37 / 50) speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 37 / 50) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -speed_infill = =math.ceil(speed_print * 37 / 50) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Verydraft_Print.inst.cfg index 199e80e9ac..2571776d35 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Verydraft_Print.inst.cfg @@ -12,7 +12,6 @@ material = generic_abs variant = AA 0.8 [values] - material_print_temperature = =default_material_print_temperature + 22 speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Fast_Print.inst.cfg index a694688d41..72f064a87f 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Fast_Print.inst.cfg @@ -1,13 +1,13 @@ [general] version = 4 -name = Fast - Experimental +name = Normal - Experimental definition = ultimaker_s3 [metadata] setting_version = 20 type = quality -quality_type = draft -weight = -2 +quality_type = fast +weight = -1 material = generic_cpe_plus variant = AA 0.8 is_experimental = True @@ -15,8 +15,6 @@ is_experimental = True [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 14 * layer_height - - machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 10 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Superdraft_Print.inst.cfg index 38413229e0..8a2cd3eafd 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Superdraft_Print.inst.cfg @@ -15,8 +15,6 @@ is_experimental = True [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 7 * layer_height - - machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 5 @@ -26,12 +24,12 @@ retraction_combing_max_distance = 50 retraction_hop = 0.1 retraction_hop_enabled = False skin_overlap = 0 +speed_infill = =math.ceil(speed_print * 40 / 50) speed_layer_0 = =math.ceil(speed_print * 15 / 50) speed_print = 50 speed_slowdown_layers = 8 speed_topbottom = =math.ceil(speed_print * 35 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 35 / 40) -speed_infill = =math.ceil(speed_print * 40 / 50) support_z_distance = =layer_height top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Verydraft_Print.inst.cfg index b238164e4f..fc0520f510 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Verydraft_Print.inst.cfg @@ -15,8 +15,6 @@ is_experimental = True [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 9 * layer_height - - machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 7 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Draft_Print.inst.cfg index 6421e5ea77..c05205a9f2 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Draft_Print.inst.cfg @@ -13,7 +13,6 @@ variant = AA 0.8 [values] brim_width = 15 - material_print_temperature = =default_material_print_temperature + 15 prime_tower_enable = True retraction_combing_max_distance = 50 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg index 93756a3621..8cd5ba4ac2 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg @@ -13,13 +13,11 @@ variant = AA 0.8 [values] brim_width = 15 - material_print_temperature = =default_material_print_temperature + 20 prime_tower_enable = True retraction_combing_max_distance = 50 +speed_infill = =math.ceil(speed_print * 33 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 30 / 45) speed_wall = =math.ceil(speed_print * 33 / 45) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) - -speed_infill = =math.ceil(speed_print * 33 / 45) \ No newline at end of file diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Verydraft_Print.inst.cfg index 2afb9dc78a..1d619bf42c 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Verydraft_Print.inst.cfg @@ -13,7 +13,6 @@ variant = AA 0.8 [values] brim_width = 15 - material_print_temperature = =default_material_print_temperature + 17 prime_tower_enable = True retraction_combing_max_distance = 50 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Draft_Print.inst.cfg index 09de59ba20..c11350773c 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Draft_Print.inst.cfg @@ -15,8 +15,6 @@ variant = AA 0.8 brim_width = 5.6 cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 - - machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 ooze_shield_angle = 40 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg index d6e11ca953..4539cab117 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg @@ -15,8 +15,6 @@ variant = AA 0.8 brim_width = 5.6 cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 - - machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 ooze_shield_angle = 40 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg index 599789f528..3736e729e9 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg @@ -15,8 +15,6 @@ variant = AA 0.8 brim_width = 5.6 cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 - - machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 ooze_shield_angle = 40 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Fast_Print.inst.cfg index 61d0cc5109..23c5f9d81e 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Fast_Print.inst.cfg @@ -1,13 +1,13 @@ [general] version = 4 -name = Fast - Experimental +name = Normal - Experimental definition = ultimaker_s3 [metadata] setting_version = 20 type = quality -quality_type = draft -weight = -2 +quality_type = fast +weight = -1 material = generic_pc variant = AA 0.8 is_experimental = True @@ -15,8 +15,6 @@ is_experimental = True [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 14 * layer_height - - material_print_temperature = =default_material_print_temperature - 5 material_print_temperature_layer_0 = =material_print_temperature raft_airgap = 0.5 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Superdraft_Print.inst.cfg index f441c0acac..51568ba5e7 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Superdraft_Print.inst.cfg @@ -15,15 +15,13 @@ is_experimental = True [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 7 * layer_height - - material_print_temperature_layer_0 = =material_print_temperature raft_airgap = 0.5 skin_overlap = 0 +speed_infill = =math.ceil(speed_print * 37 / 50) speed_layer_0 = =math.ceil(speed_print * 15 / 50) speed_print = 50 speed_slowdown_layers = 8 speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 37 / 50) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -speed_infill = =math.ceil(speed_print * 37 / 50) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Verydraft_Print.inst.cfg index a044987670..e8dcf64d3d 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Verydraft_Print.inst.cfg @@ -15,8 +15,6 @@ is_experimental = True [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 9 * layer_height - - material_print_temperature = =default_material_print_temperature - 2 material_print_temperature_layer_0 = =material_print_temperature raft_airgap = 0.5 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg index 5b4142f762..9e900c5658 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg @@ -13,12 +13,11 @@ variant = AA 0.8 [values] brim_width = 7 - +cool_fan_speed = 20 +initial_layer_line_width_factor = 100 material_print_temperature = =default_material_print_temperature - 5 prime_tower_enable = True retraction_combing_max_distance = 8 speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) -cool_fan_speed = 20 -initial_layer_line_width_factor = 100 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg index 2aae9c8933..8b9fa7de7f 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg @@ -13,14 +13,13 @@ variant = AA 0.8 [values] brim_width = 7 - +cool_fan_speed = 20 +initial_layer_line_width_factor = 100 material_print_temperature = =default_material_print_temperature - 5 prime_tower_enable = True retraction_combing_max_distance = 8 +speed_infill = =math.ceil(speed_print * 33 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 30 / 45) speed_wall = =math.ceil(speed_print * 33 / 45) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -speed_infill = =math.ceil(speed_print * 33 / 45) -cool_fan_speed = 20 -initial_layer_line_width_factor = 100 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg index 85b076551c..4dbd1099f4 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg @@ -13,14 +13,12 @@ variant = AA 0.8 [values] brim_width = 7 - +cool_fan_speed = 20 +initial_layer_line_width_factor = 100 +layer_height_0 = 0.27 material_print_temperature = =default_material_print_temperature - 5 prime_tower_enable = True retraction_combing_max_distance = 8 speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) -cool_fan_speed = 20 -layer_height_0 = 0.27 -initial_layer_line_width_factor = 100 - diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg index 60244f52af..abe6fcbecc 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg @@ -16,17 +16,17 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height +layer_height_0 = 0.4 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -material_final_print_temperature = =max(-273.15, material_print_temperature - 15) -material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) +material_final_print_temperature = =material_print_temperature - 15 +material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = True -support_angle = 70 -top_bottom_thickness = =layer_height * 4 speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) -speed_wall_x = =speed_wall speed_wall_0 = =math.ceil(speed_wall * 35 / 40) -layer_height_0 = 0.4 +speed_wall_x = =speed_wall +support_angle = 70 +top_bottom_thickness = =layer_height * 4 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg index a2e863cb8d..01d301f178 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg @@ -16,18 +16,18 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height +layer_height_0 = 0.4 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -material_final_print_temperature = =max(-273.15, material_print_temperature - 15) -material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) +material_final_print_temperature = =material_print_temperature - 15 +material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature + 15 prime_tower_enable = True -support_angle = 70 -top_bottom_thickness = =layer_height * 4 +speed_infill = =math.ceil(speed_print * 35 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 35 / 45) -speed_wall_x = =speed_wall speed_wall_0 = =math.ceil(speed_wall * 35 / 40) -speed_infill = =math.ceil(speed_print * 35 / 45) -layer_height_0 = 0.4 +speed_wall_x = =speed_wall +support_angle = 70 +top_bottom_thickness = =layer_height * 4 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg index a67dc3be1b..be71c1faee 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg @@ -16,17 +16,17 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height +layer_height_0 = 0.4 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -material_final_print_temperature = =max(-273.15, material_print_temperature - 15) -material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) +material_final_print_temperature = =material_print_temperature - 15 +material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = True -support_angle = 70 -top_bottom_thickness = =layer_height * 4 speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) -speed_wall_x = =speed_wall speed_wall_0 = =math.ceil(speed_wall * 35 / 40) -layer_height_0 = 0.4 +speed_wall_x = =speed_wall +support_angle = 70 +top_bottom_thickness = =layer_height * 4 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg index e2904aa1e7..2ed16d2428 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg @@ -15,7 +15,6 @@ variant = AA 0.8 brim_width = 25 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 17 -top_skin_expand_distance = =line_width * 2 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' material_bed_temperature_layer_0 = =material_bed_temperature material_print_temperature = =default_material_print_temperature - 2 @@ -34,4 +33,5 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.6 +top_skin_expand_distance = =line_width * 2 wall_0_wipe_dist = =line_width * 2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg index d4508c05c0..932e74a409 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg @@ -15,7 +15,6 @@ variant = AA 0.8 brim_width = 25 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 17 -top_skin_expand_distance = =line_width * 2 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' material_bed_temperature_layer_0 = =material_bed_temperature material_print_temperature = =default_material_print_temperature + 2 @@ -29,10 +28,11 @@ retraction_extra_prime_amount = 0.5 retraction_hop = 0.5 retraction_min_travel = 1.5 retraction_prime_speed = 15 -speed_wall_x = =math.ceil(speed_wall * 30 / 30) speed_infill = =math.ceil(speed_wall * 30 / 30) +speed_wall_x = =math.ceil(speed_wall * 30 / 30) switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.6 +top_skin_expand_distance = =line_width * 2 wall_0_wipe_dist = =line_width * 2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg index b68839785f..19c2b14c99 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg @@ -15,7 +15,6 @@ variant = AA 0.8 brim_width = 25 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 17 -top_skin_expand_distance = =line_width * 2 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' material_bed_temperature_layer_0 = =material_bed_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 2 @@ -33,4 +32,5 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.6 +top_skin_expand_distance = =line_width * 2 wall_0_wipe_dist = =line_width * 2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Draft_Print.inst.cfg index 2c322c0565..046e1a3f75 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Draft_Print.inst.cfg @@ -20,8 +20,8 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic' layer_height_0 = 0.4 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -material_final_print_temperature = =max(-273.15, material_print_temperature - 15) -material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) +material_final_print_temperature = =material_print_temperature - 15 +material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature + 0 prime_tower_enable = False speed_print = 45 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg index 3b47b687ab..69f24e6ba1 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg @@ -20,14 +20,14 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic' layer_height_0 = 0.4 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -material_final_print_temperature = =max(-273.15, material_print_temperature - 15) -material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) +material_final_print_temperature = =material_print_temperature - 15 +material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature + 5 prime_tower_enable = False speed_infill = =math.ceil(speed_print * 30 / 30) speed_print = 30 speed_topbottom = =math.ceil(speed_print * 20 / 30) -speed_wall = =math.ceil(speed_print * 25/ 30) +speed_wall = =math.ceil(speed_print * 25 / 30) speed_wall_0 = =math.ceil(speed_print * 20 / 30) support_angle = 70 top_bottom_thickness = =layer_height * 4 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Verydraft_Print.inst.cfg index b024316179..91f260f523 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Verydraft_Print.inst.cfg @@ -20,15 +20,15 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic' layer_height_0 = 0.4 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -material_final_print_temperature = =max(-273.15, material_print_temperature - 15) -material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) +material_final_print_temperature = =material_print_temperature - 15 +material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =material_print_temperature prime_tower_enable = False speed_infill = =math.ceil(speed_print * 30 / 35) speed_print = 35 speed_topbottom = =math.ceil(speed_print * 20 / 35) -speed_wall = =math.ceil(speed_print * 25/ 35) +speed_wall = =math.ceil(speed_print * 25 / 35) speed_wall_0 = =math.ceil(speed_print * 20 / 35) support_angle = 70 top_bottom_thickness = =layer_height * 4 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg index f611f7d17e..a03f52f4c2 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg @@ -14,7 +14,6 @@ variant = AA 0.8 [values] brim_width = 8.75 cool_min_layer_time_fan_speed_max = 6 -top_skin_expand_distance = =line_width * 2 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' machine_nozzle_cool_down_speed = 0.5 machine_nozzle_heat_up_speed = 2.5 @@ -41,5 +40,6 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.2 +top_skin_expand_distance = =line_width * 2 travel_avoid_distance = 1.5 wall_0_wipe_dist = =line_width * 2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg index e7d370cb8a..b881b5d3a6 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg @@ -14,7 +14,6 @@ variant = AA 0.8 [values] brim_width = 8.75 cool_min_layer_time_fan_speed_max = 6 -top_skin_expand_distance = =line_width * 2 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 15 machine_nozzle_cool_down_speed = 0.5 @@ -33,15 +32,16 @@ retraction_hop = 1.5 retraction_hop_only_when_collides = False retraction_min_travel = =line_width * 2 retraction_prime_speed = 15 +speed_infill = =speed_print speed_print = 30 speed_topbottom = =math.ceil(speed_print * 20 / 30) speed_wall = =speed_print speed_wall_x = =speed_print -speed_infill = =speed_print support_angle = 50 switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.2 +top_skin_expand_distance = =line_width * 2 travel_avoid_distance = 1.5 wall_0_wipe_dist = =line_width * 2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg index f318034971..f8d758abb0 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg @@ -14,7 +14,6 @@ variant = AA 0.8 [values] brim_width = 8.75 cool_min_layer_time_fan_speed_max = 6 -top_skin_expand_distance = =line_width * 2 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 15 machine_nozzle_cool_down_speed = 0.5 @@ -41,5 +40,6 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.2 +top_skin_expand_distance = =line_width * 2 travel_avoid_distance = 1.5 wall_0_wipe_dist = =line_width * 2 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Draft_Print.inst.cfg index f9ea2ed4db..b50a51e49f 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Draft_Print.inst.cfg @@ -13,12 +13,12 @@ variant = BB 0.4 [values] brim_replaces_support = False +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = False retraction_count_max = 5 skin_overlap = 20 +skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) support_brim_enable = True support_interface_enable = True -skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) -cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) support_use_towers = True diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg index 9ca8ea51ec..a64ef6cf73 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg @@ -12,14 +12,14 @@ material = generic_pva variant = BB 0.4 [values] -support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) material_print_temperature = =default_material_print_temperature + 5 prime_tower_enable = False retraction_count_max = 5 skin_overlap = 15 +skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) support_brim_enable = True +support_infill_sparse_thickness = =2 * layer_height support_interface_enable = True -skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) -cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) support_use_towers = True diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg index 018298d706..0301fbdde7 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg @@ -12,12 +12,12 @@ material = generic_pva variant = BB 0.4 [values] -support_infill_sparse_thickness = =3*layer_height brim_replaces_support = False +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) prime_tower_enable = False retraction_count_max = 5 +skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) support_brim_enable = True +support_infill_sparse_thickness = =3 * layer_height support_interface_enable = True -skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) -cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) support_use_towers = True diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg index 48394a8feb..916c08e706 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg @@ -12,12 +12,12 @@ material = generic_pva variant = BB 0.4 [values] -support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) prime_tower_enable = False retraction_count_max = 5 +skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) support_brim_enable = True +support_infill_sparse_thickness = =2 * layer_height support_interface_enable = True -skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) -cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) support_use_towers = True diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Verydraft_Print.inst.cfg index 85e530fdc1..2c9796d3df 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Verydraft_Print.inst.cfg @@ -1,6 +1,6 @@ [general] version = 4 -name = Extra Fast +name = Extra Fast - Experimental definition = ultimaker_s3 [metadata] @@ -14,10 +14,10 @@ is_experimental = True [values] brim_replaces_support = False +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) retraction_count_max = 5 +skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) support_brim_enable = True support_infill_sparse_thickness = 0.3 support_interface_enable = True -skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) -cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) support_use_towers = True diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Draft_Print.inst.cfg index ab1a289761..a7abea7ede 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Draft_Print.inst.cfg @@ -13,10 +13,10 @@ variant = BB 0.8 [values] brim_replaces_support = False +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) material_print_temperature = =default_material_print_temperature + 5 retraction_count_max = 5 +skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) support_brim_enable = True support_interface_enable = True -skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) -cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) support_use_towers = True diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Superdraft_Print.inst.cfg index 0e2f072d03..bb9e2934ab 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Superdraft_Print.inst.cfg @@ -13,9 +13,9 @@ variant = BB 0.8 [values] brim_replaces_support = False +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) retraction_count_max = 5 +skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) support_brim_enable = True support_interface_enable = True -skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) -cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) support_use_towers = True diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Verydraft_Print.inst.cfg index d5ff375abb..bd02771fab 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Verydraft_Print.inst.cfg @@ -13,10 +13,10 @@ variant = BB 0.8 [values] brim_replaces_support = False +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) retraction_count_max = 5 +skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) support_brim_enable = True support_infill_sparse_thickness = 0.3 support_interface_enable = True -skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) -cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) support_use_towers = True diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Draft_Print.inst.cfg index 0ad61736ab..e90b9c6d2b 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Draft_Print.inst.cfg @@ -16,9 +16,7 @@ cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 - initial_layer_line_width_factor = 130.0 - material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature @@ -26,4 +24,3 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 - diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Fast_Print.inst.cfg index 758a81d3a8..36a0eb09c8 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Fast_Print.inst.cfg @@ -7,7 +7,7 @@ definition = ultimaker_s3 setting_version = 20 type = quality quality_type = fast -weight = -2 +weight = -1 material = generic_cffcpe variant = CC 0.4 @@ -16,9 +16,7 @@ cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 - initial_layer_line_width_factor = 130.0 - material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature @@ -26,4 +24,3 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 - diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Draft_Print.inst.cfg index a0ca08eb8a..6c380d6295 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Draft_Print.inst.cfg @@ -16,9 +16,7 @@ cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 - initial_layer_line_width_factor = 130.0 - material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature @@ -26,4 +24,3 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 - diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Fast_Print.inst.cfg index d538f95bea..faf738c643 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Fast_Print.inst.cfg @@ -7,7 +7,7 @@ definition = ultimaker_s3 setting_version = 20 type = quality quality_type = fast -weight = -2 +weight = -1 material = generic_cffpa variant = CC 0.4 @@ -16,9 +16,7 @@ cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 - initial_layer_line_width_factor = 130.0 - material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature @@ -26,4 +24,3 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 - diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Draft_Print.inst.cfg index 2caa3776eb..1173c7339c 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Draft_Print.inst.cfg @@ -16,9 +16,7 @@ cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 - initial_layer_line_width_factor = 130.0 - material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature @@ -26,4 +24,3 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 - diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Fast_Print.inst.cfg index f9fffb3171..6d5ccf3855 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Fast_Print.inst.cfg @@ -7,7 +7,7 @@ definition = ultimaker_s3 setting_version = 20 type = quality quality_type = fast -weight = -2 +weight = -1 material = generic_gffcpe variant = CC 0.4 @@ -16,9 +16,7 @@ cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 - initial_layer_line_width_factor = 130.0 - material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature @@ -26,4 +24,3 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 - diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Draft_Print.inst.cfg index 465bff3d8d..c91e9a0fff 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Draft_Print.inst.cfg @@ -16,9 +16,7 @@ cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 - initial_layer_line_width_factor = 130.0 - material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature @@ -26,4 +24,3 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 - diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Fast_Print.inst.cfg index 40df72973c..b6d9f5e2a1 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Fast_Print.inst.cfg @@ -7,7 +7,7 @@ definition = ultimaker_s3 setting_version = 20 type = quality quality_type = fast -weight = -2 +weight = -1 material = generic_gffpa variant = CC 0.4 @@ -24,4 +24,3 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 - diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Draft_Print.inst.cfg index 1a4abc69eb..a4f923c5fe 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Draft_Print.inst.cfg @@ -1,13 +1,13 @@ [general] version = 4 -name = Fast +name = Fast - Experimental definition = ultimaker_s3 [metadata] setting_version = 20 type = quality quality_type = draft -weight = -3 +weight = -2 material = generic_pla variant = CC 0.4 is_experimental = True @@ -20,14 +20,14 @@ gradual_infill_step_height = =3 * layer_height infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -material_final_print_temperature = =max(-273.15, material_print_temperature - 15) -material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) +material_final_print_temperature = =material_print_temperature - 15 +material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) -speed_wall_x = =speed_wall speed_wall_0 = =math.ceil(speed_wall * 35 / 40) +speed_wall_x = =speed_wall support_angle = 70 top_bottom_thickness = =layer_height * 4 diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Fast_Print.inst.cfg index 64640ddc5f..f6a3920608 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Fast_Print.inst.cfg @@ -1,13 +1,13 @@ [general] version = 4 -name = Normal +name = Normal - Experimental definition = ultimaker_s3 [metadata] setting_version = 20 type = quality quality_type = fast -weight = -2 +weight = -1 material = generic_pla variant = CC 0.4 is_experimental = True @@ -20,14 +20,14 @@ gradual_infill_step_height = =3 * layer_height infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -material_final_print_temperature = =max(-273.15, material_print_temperature - 15) -material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) +material_final_print_temperature = =material_print_temperature - 15 +material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) -speed_wall_x = =speed_wall speed_wall_0 = =math.ceil(speed_wall * 35 / 40) +speed_wall_x = =speed_wall support_angle = 70 top_bottom_thickness = =layer_height * 4 diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFCPE_Draft_Print.inst.cfg index 8a617f2d04..1e19814d67 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFCPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFCPE_Draft_Print.inst.cfg @@ -24,4 +24,3 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 - diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFPA_Draft_Print.inst.cfg index 9c396012bb..662f167f69 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFPA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFPA_Draft_Print.inst.cfg @@ -24,4 +24,3 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 - diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFCPE_Draft_Print.inst.cfg index de38df43ee..6975526d71 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFCPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFCPE_Draft_Print.inst.cfg @@ -24,4 +24,3 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 - diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFPA_Draft_Print.inst.cfg index 5b3c0024ab..986dda1437 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFPA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFPA_Draft_Print.inst.cfg @@ -24,4 +24,3 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 - diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg index b80ecb7ed0..1f8cc8ad71 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg @@ -1,13 +1,13 @@ [general] version = 4 -name = Fast +name = Fast - Experimental definition = ultimaker_s3 [metadata] setting_version = 20 type = quality quality_type = draft -weight = -3 +weight = -2 material = generic_pla variant = CC 0.6 is_experimental = True @@ -20,14 +20,14 @@ gradual_infill_step_height = =3 * layer_height infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -material_final_print_temperature = =max(-273.15, material_print_temperature - 15) -material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) +material_final_print_temperature = =material_print_temperature - 15 +material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) -speed_wall_x = =speed_wall speed_wall_0 = =math.ceil(speed_wall * 35 / 40) +speed_wall_x = =speed_wall support_angle = 70 top_bottom_thickness = =layer_height * 4 diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg index 1644b7d2ff..9372890f24 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg @@ -1,13 +1,13 @@ [general] version = 4 -name = Normal +name = Normal - Experimental definition = ultimaker_s3 [metadata] setting_version = 20 type = quality quality_type = fast -weight = -2 +weight = -1 material = generic_pla variant = CC 0.6 is_experimental = True @@ -20,14 +20,14 @@ gradual_infill_step_height = =3 * layer_height infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -material_final_print_temperature = =max(-273.15, material_print_temperature - 15) -material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) +material_final_print_temperature = =material_print_temperature - 15 +material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) -speed_wall_x = =speed_wall speed_wall_0 = =math.ceil(speed_wall * 35 / 40) +speed_wall_x = =speed_wall support_angle = 70 top_bottom_thickness = =layer_height * 4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg index b06a514334..f31ea87a5c 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg @@ -14,7 +14,6 @@ variant = AA 0.25 [values] cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 12 - machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 ooze_shield_angle = 40 @@ -27,4 +26,3 @@ speed_wall = =math.ceil(speed_print * 30 / 70) switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 - diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg index 3df31368bd..5f7d46dc8b 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg @@ -12,9 +12,9 @@ material = generic_petg variant = AA 0.25 [values] +initial_layer_line_width_factor = 100 +material_print_temperature = =default_material_print_temperature - 5 retraction_combing_max_distance = 8 speed_infill = =math.ceil(speed_print * 40 / 55) speed_topbottom = =math.ceil(speed_print * 30 / 55) top_bottom_thickness = 0.8 -initial_layer_line_width_factor = 100 -material_print_temperature = =default_material_print_temperature - 5 \ No newline at end of file diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_PLA_Normal_Quality.inst.cfg index 6c82905859..553506a43c 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_PLA_Normal_Quality.inst.cfg @@ -19,8 +19,8 @@ infill_overlap = =0 if infill_sparse_density > 80 else 10 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 -material_final_print_temperature = =max(-273.15, material_print_temperature - 15) -material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) +material_final_print_temperature = =material_print_temperature - 15 +material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = 190 retraction_hop = 0.2 skin_overlap = 5 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_TPLA_Normal_Quality.inst.cfg index 37a15aa1ba..52f616b1d5 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_TPLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_TPLA_Normal_Quality.inst.cfg @@ -19,8 +19,8 @@ infill_overlap = =0 if infill_sparse_density > 80 else 10 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 -material_final_print_temperature = =max(-273.15, material_print_temperature - 15) -material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) +material_final_print_temperature = =material_print_temperature - 15 +material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature - 15 skin_overlap = 5 speed_layer_0 = =math.ceil(speed_print * 30 / 30) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print.inst.cfg index 4769b27977..41b2f693fd 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print.inst.cfg @@ -14,15 +14,15 @@ variant = AA 0.4 [values] machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 -material_print_temperature = =default_material_print_temperature + 20 -material_initial_print_temperature = =material_print_temperature - 15 material_final_print_temperature = =material_print_temperature - 20 +material_initial_print_temperature = =material_print_temperature - 15 +material_print_temperature = =default_material_print_temperature + 20 prime_tower_enable = False +raft_airgap = 0.15 skin_overlap = 20 -speed_print = 60 +speed_infill = =math.ceil(speed_print * 50 / 60) speed_layer_0 = 10 +speed_print = 60 speed_topbottom = =math.ceil(speed_print * 35 / 60) speed_wall = =math.ceil(speed_print * 45 / 60) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) -speed_infill = =math.ceil(speed_print * 50 / 60) -raft_airgap = 0.15 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print.inst.cfg index 7001d74a46..a6fc9c5462 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print.inst.cfg @@ -15,14 +15,14 @@ variant = AA 0.4 cool_min_speed = 7 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 -material_print_temperature = =default_material_print_temperature + 15 -material_initial_print_temperature = =material_print_temperature - 15 material_final_print_temperature = =material_print_temperature - 20 +material_initial_print_temperature = =material_print_temperature - 15 +material_print_temperature = =default_material_print_temperature + 15 prime_tower_enable = False -speed_print = 60 +raft_airgap = 0.15 +speed_infill = =math.ceil(speed_print * 45 / 60) speed_layer_0 = 10 +speed_print = 60 speed_topbottom = =math.ceil(speed_print * 30 / 60) speed_wall = =math.ceil(speed_print * 40 / 60) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -speed_infill = =math.ceil(speed_print * 45 / 60) -raft_airgap = 0.15 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_High_Quality.inst.cfg index 0383c18746..496d17b2e8 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_High_Quality.inst.cfg @@ -15,16 +15,13 @@ variant = AA 0.4 cool_min_speed = 12 machine_nozzle_cool_down_speed = 0.8 machine_nozzle_heat_up_speed = 1.5 -material_print_temperature = =default_material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature - 15 material_final_print_temperature = =material_print_temperature - 20 +material_initial_print_temperature = =material_print_temperature - 15 +material_print_temperature = =default_material_print_temperature + 5 prime_tower_enable = False -speed_print = 50 +raft_airgap = 0.15 +speed_infill = =math.ceil(speed_print * 40 / 50) speed_layer_0 = 10 +speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 30 / 50) - - -speed_infill = =math.ceil(speed_print * 40 / 50) - -raft_airgap = 0.15 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality.inst.cfg index 004a29cf0a..d7f7be3a31 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality.inst.cfg @@ -14,15 +14,13 @@ variant = AA 0.4 [values] machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 -material_print_temperature = =default_material_print_temperature + 10 -material_initial_print_temperature = =material_print_temperature - 15 material_final_print_temperature = =material_print_temperature - 20 +material_initial_print_temperature = =material_print_temperature - 15 +material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = False -speed_print = 55 +raft_airgap = 0.15 +speed_infill = =math.ceil(speed_print * 40 / 55) speed_layer_0 = 10 +speed_print = 55 speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_wall = =math.ceil(speed_print * 30 / 55) - - -speed_infill = =math.ceil(speed_print * 40 / 55) -raft_airgap = 0.15 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg index 28d7691462..3271e26dba 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg @@ -18,17 +18,16 @@ cool_fan_speed_max = =cool_fan_speed machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 -# prime_tower_enable: see CURA-4248 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 skin_overlap = 20 speed_layer_0 = =math.ceil(speed_print * 20 / 70) speed_topbottom = =math.ceil(speed_print * 35 / 70) speed_wall = =math.ceil(speed_print * 50 / 70) speed_wall_0 = =math.ceil(speed_wall * 35 / 50) -top_bottom_thickness = 1 -support_brim_enable = True -support_interface_enable = True -support_interface_density = =min(extruderValues('material_surface_energy')) -support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height -support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height support_angle = 45 +support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height +support_brim_enable = True +support_interface_density = =min(extruderValues('material_surface_energy')) +support_interface_enable = True +support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height +top_bottom_thickness = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg index e2450cd6b0..0bc81f38c0 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg @@ -12,23 +12,22 @@ material = generic_bam variant = AA 0.4 [values] -support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -# prime_tower_enable: see CURA-4248 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 -speed_print = 80 speed_layer_0 = =math.ceil(speed_print * 20 / 80) +speed_print = 80 speed_topbottom = =math.ceil(speed_print * 30 / 80) speed_wall = =math.ceil(speed_print * 40 / 80) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -top_bottom_thickness = 1 -support_brim_enable = True -support_interface_enable = True -support_interface_density = =min(extruderValues('material_surface_energy')) -support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 1) * layer_height -support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height support_angle = 45 +support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height +support_brim_enable = True +support_infill_sparse_thickness = =2 * layer_height +support_interface_density = =min(extruderValues('material_surface_energy')) +support_interface_enable = True +support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 1) * layer_height +top_bottom_thickness = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg index 24f007b99b..0324976b7a 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg @@ -12,21 +12,20 @@ material = generic_bam variant = AA 0.4 [values] -support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed cool_min_speed = 7 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -# prime_tower_enable: see CURA-4248 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 skin_overlap = 10 speed_layer_0 = =math.ceil(speed_print * 20 / 70) -support_brim_enable = True -support_interface_enable = True -support_interface_density = =min(extruderValues('material_surface_energy')) -support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 1) * layer_height -support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height support_angle = 45 +support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height +support_brim_enable = True +support_infill_sparse_thickness = =2 * layer_height +support_interface_density = =min(extruderValues('material_surface_energy')) +support_interface_enable = True +support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 1) * layer_height top_bottom_thickness = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_VeryDraft_Print.inst.cfg index f6769a439f..cfa00238e3 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_VeryDraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_VeryDraft_Print.inst.cfg @@ -1,13 +1,13 @@ [general] version = 4 -name = Extra Fast +name = Extra Fast - Experimental definition = ultimaker_s5 [metadata] setting_version = 20 type = quality quality_type = verydraft -weight = -2 +weight = -3 material = generic_bam variant = AA 0.4 is_experimental = True @@ -25,10 +25,10 @@ speed_layer_0 = =math.ceil(speed_print * 20 / 70) speed_topbottom = =math.ceil(speed_print * 35 / 70) speed_wall = =math.ceil(speed_print * 50 / 70) speed_wall_0 = =math.ceil(speed_wall * 35 / 50) -top_bottom_thickness = 1 -support_brim_enable = True -support_interface_enable = True -support_interface_density = =min(extruderValues('material_surface_energy')) -support_top_distance = 0.3 -support_bottom_distance = 0.3 support_angle = 45 +support_bottom_distance = 0.3 +support_brim_enable = True +support_interface_density = =min(extruderValues('material_surface_energy')) +support_interface_enable = True +support_top_distance = 0.3 +top_bottom_thickness = 1 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 ecc8682f28..c39d1516af 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 @@ -14,7 +14,6 @@ variant = AA 0.4 [values] cool_fan_speed_max = 80 cool_min_speed = 5 - infill_overlap = 0 infill_wipe_dist = 0 machine_min_cool_heat_time_window = 15 @@ -34,7 +33,6 @@ skin_overlap = 20 speed_layer_0 = =math.ceil(speed_print * 20 / 50) speed_print = 50 speed_topbottom = =math.ceil(speed_print * 40 / 50) - speed_wall = =math.ceil(speed_print * 50 / 50) speed_wall_0 = =math.ceil(speed_wall * 40 / 50) support_z_distance = =layer_height 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 fa3b571769..5d74e6164b 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 @@ -14,7 +14,6 @@ variant = AA 0.4 [values] cool_fan_speed_max = 80 cool_min_speed = 6 - infill_overlap = 0 infill_wipe_dist = 0 machine_min_cool_heat_time_window = 15 @@ -34,7 +33,6 @@ skin_overlap = 20 speed_layer_0 = =math.ceil(speed_print * 20 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) - speed_wall = =math.ceil(speed_print * 45 / 45) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) support_z_distance = =layer_height 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 26a8059fed..cef6d64e99 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 @@ -14,7 +14,6 @@ variant = AA 0.4 [values] cool_fan_speed_max = 50 cool_min_speed = 5 - infill_overlap = 0 infill_wipe_dist = 0 machine_min_cool_heat_time_window = 15 @@ -36,7 +35,6 @@ skin_overlap = 20 speed_layer_0 = =math.ceil(speed_print * 20 / 40) speed_print = 40 speed_topbottom = =math.ceil(speed_print * 30 / 35) - speed_wall = =math.ceil(speed_print * 35 / 40) speed_wall_0 = =math.ceil(speed_wall * 30 / 35) support_z_distance = =layer_height 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 1795b2086f..2d33b40631 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 @@ -35,7 +35,6 @@ skin_overlap = 20 speed_layer_0 = =math.ceil(speed_print * 20 / 40) speed_print = 40 speed_topbottom = =math.ceil(speed_print * 30 / 35) - speed_wall = =math.ceil(speed_print * 35 / 40) speed_wall_0 = =math.ceil(speed_wall * 30 / 35) support_z_distance = =layer_height diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg index bdfd6aadea..6b1f8504d2 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg @@ -12,16 +12,16 @@ material = generic_cpe variant = AA 0.4 [values] -material_print_temperature = =default_material_print_temperature + 10 -material_initial_print_temperature = =material_print_temperature - 5 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' material_final_print_temperature = =material_print_temperature - 10 +material_initial_print_temperature = =material_print_temperature - 5 +material_print_temperature = =default_material_print_temperature + 10 retraction_combing_max_distance = 50 retraction_prime_speed = =retraction_speed skin_overlap = 20 -speed_print = 60 +speed_infill = =math.ceil(speed_print * 50 / 60) speed_layer_0 = =math.ceil(speed_print * 20 / 60) +speed_print = 60 speed_topbottom = =math.ceil(speed_print * 35 / 60) speed_wall = =math.ceil(speed_print * 45 / 60) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -speed_infill = =math.ceil(speed_print * 50 / 60) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg index 68d2879f47..de3910f816 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg @@ -13,16 +13,15 @@ variant = AA 0.4 [values] cool_min_speed = 7 -material_print_temperature = =default_material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature - 5 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' material_final_print_temperature = =material_print_temperature - 10 +material_initial_print_temperature = =material_print_temperature - 5 +material_print_temperature = =default_material_print_temperature + 5 retraction_combing_max_distance = 50 retraction_prime_speed = =retraction_speed -speed_print = 60 +speed_infill = =math.ceil(speed_print * 50 / 60) speed_layer_0 = =math.ceil(speed_print * 20 / 60) +speed_print = 60 speed_topbottom = =math.ceil(speed_print * 30 / 60) speed_wall = =math.ceil(speed_print * 40 / 60) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) - -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -speed_infill = =math.ceil(speed_print * 50 / 60) \ No newline at end of file diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg index 40d950871d..546af06919 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg @@ -13,17 +13,16 @@ variant = AA 0.4 [values] cool_min_speed = 12 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 -material_print_temperature = =default_material_print_temperature - 5 -material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 +material_initial_print_temperature = =material_print_temperature - 5 +material_print_temperature = =default_material_print_temperature - 5 retraction_combing_max_distance = 50 retraction_prime_speed = =retraction_speed -speed_print = 50 +speed_infill = =math.ceil(speed_print * 40 / 50) speed_layer_0 = =math.ceil(speed_print * 20 / 50) +speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 30 / 50) - -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -speed_infill = =math.ceil(speed_print * 40 / 50) \ No newline at end of file diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg index a5cab8a96c..2614b40d60 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg @@ -12,16 +12,15 @@ material = generic_cpe variant = AA 0.4 [values] +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 -material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 +material_initial_print_temperature = =material_print_temperature - 5 retraction_combing_max_distance = 50 retraction_prime_speed = =retraction_speed -speed_print = 55 +speed_infill = =math.ceil(speed_print * 45 / 55) speed_layer_0 = =math.ceil(speed_print * 20 / 55) +speed_print = 55 speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_wall = =math.ceil(speed_print * 30 / 55) - -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -speed_infill = =math.ceil(speed_print * 45 / 55) \ No newline at end of file diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg index f0ced52d33..e4d6d270ee 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg @@ -14,9 +14,9 @@ variant = AA 0.4 [values] cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -material_print_temperature = =default_material_print_temperature + 10 -material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 +material_initial_print_temperature = =material_print_temperature - 5 +material_print_temperature = =default_material_print_temperature + 10 ooze_shield_angle = 40 raft_airgap = 0.4 retraction_prime_speed = =retraction_speed diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg index 90fd37a5fb..8b77d7010f 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg @@ -14,9 +14,9 @@ variant = AA 0.4 [values] cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -material_print_temperature = =default_material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 +material_initial_print_temperature = =material_print_temperature - 5 +material_print_temperature = =default_material_print_temperature + 5 ooze_shield_angle = 40 raft_airgap = 0.4 retraction_prime_speed = =retraction_speed diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg index c6a9e2b017..72c3e257d1 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg @@ -14,8 +14,8 @@ variant = AA 0.4 [values] cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 15 -material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 +material_initial_print_temperature = =material_print_temperature - 5 ooze_shield_angle = 40 raft_airgap = 0.4 retraction_prime_speed = =retraction_speed @@ -23,4 +23,4 @@ skin_overlap = 50 speed_layer_0 = 10 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 -switch_extruder_retraction_speeds = 40 \ No newline at end of file +switch_extruder_retraction_speeds = 40 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg index 0b0ea1fb9f..e3fbfc5b6e 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg @@ -14,8 +14,8 @@ variant = AA 0.4 [values] cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 12 -material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 +material_initial_print_temperature = =material_print_temperature - 5 ooze_shield_angle = 40 raft_airgap = 0.4 retraction_prime_speed = =retraction_speed @@ -23,4 +23,4 @@ skin_overlap = 50 speed_layer_0 = 10 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 -switch_extruder_retraction_speeds = 40 \ No newline at end of file +switch_extruder_retraction_speeds = 40 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 3fa9480c24..739e168d62 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 @@ -38,7 +38,6 @@ skin_overlap = 30 speed_layer_0 = =math.ceil(speed_print * 25 / 50) speed_print = 50 speed_topbottom = =math.ceil(speed_print * 25 / 50) - speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 25 / 40) support_interface_density = 87.5 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Draft_Print.inst.cfg index 3e0bd8d4b8..62d24807b6 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Draft_Print.inst.cfg @@ -12,16 +12,16 @@ material = generic_petg variant = AA 0.4 [values] -material_print_temperature = =default_material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +initial_layer_line_width_factor = 100 material_final_print_temperature = =material_print_temperature - 5 +material_initial_print_temperature = =material_print_temperature +material_print_temperature = =default_material_print_temperature + 5 retraction_combing_max_distance = 8 skin_overlap = 20 -speed_print = 60 +speed_infill = =math.ceil(speed_print * 50 / 60) speed_layer_0 = =math.ceil(speed_print * 20 / 60) +speed_print = 60 speed_topbottom = =math.ceil(speed_print * 35 / 60) speed_wall = =math.ceil(speed_print * 45 / 60) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -speed_infill = =math.ceil(speed_print * 50 / 60) -initial_layer_line_width_factor = 100 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print.inst.cfg index f9a8aa8915..d5a87efce1 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print.inst.cfg @@ -13,16 +13,15 @@ variant = AA 0.4 [values] cool_min_speed = 7 -material_print_temperature = =default_material_print_temperature -material_initial_print_temperature = =material_print_temperature - 5 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +initial_layer_line_width_factor = 100 material_final_print_temperature = =material_print_temperature - 10 +material_initial_print_temperature = =material_print_temperature - 5 +material_print_temperature = =default_material_print_temperature retraction_combing_max_distance = 8 -speed_print = 60 +speed_infill = =math.ceil(speed_print * 50 / 60) speed_layer_0 = =math.ceil(speed_print * 20 / 60) +speed_print = 60 speed_topbottom = =math.ceil(speed_print * 30 / 60) speed_wall = =math.ceil(speed_print * 40 / 60) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) - -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -speed_infill = =math.ceil(speed_print * 50 / 60) -initial_layer_line_width_factor = 100 \ No newline at end of file diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_High_Quality.inst.cfg index 289521bd01..49978a1b46 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_High_Quality.inst.cfg @@ -13,17 +13,16 @@ variant = AA 0.4 [values] cool_min_speed = 12 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +initial_layer_line_width_factor = 100 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 -material_print_temperature = =default_material_print_temperature - 10 -material_initial_print_temperature = =material_print_temperature - 10 material_final_print_temperature = =material_print_temperature - 15 +material_initial_print_temperature = =material_print_temperature - 10 +material_print_temperature = =default_material_print_temperature - 10 retraction_combing_max_distance = 8 -speed_print = 50 +speed_infill = =math.ceil(speed_print * 40 / 50) speed_layer_0 = =math.ceil(speed_print * 20 / 50) +speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 30 / 50) - -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -speed_infill = =math.ceil(speed_print * 40 / 50) -initial_layer_line_width_factor = 100 \ No newline at end of file diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality.inst.cfg index 8129f66fc3..6e4a6907de 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality.inst.cfg @@ -12,16 +12,16 @@ material = generic_petg variant = AA 0.4 [values] +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +initial_layer_line_width_factor = 100 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 -material_print_temperature = =default_material_print_temperature - 5 -material_initial_print_temperature = =material_print_temperature - 10 material_final_print_temperature = =material_print_temperature - 15 +material_initial_print_temperature = =material_print_temperature - 10 +material_print_temperature = =default_material_print_temperature - 5 retraction_combing_max_distance = 8 -speed_print = 55 +speed_infill = =math.ceil(speed_print * 45 / 55) speed_layer_0 = =math.ceil(speed_print * 20 / 55) +speed_print = 55 speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_wall = =math.ceil(speed_print * 30 / 55) -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -speed_infill = =math.ceil(speed_print * 45 / 55) -initial_layer_line_width_factor = 100 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg index 41944ad06e..bda40276c4 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg @@ -12,12 +12,17 @@ material = generic_pla variant = AA 0.4 [values] +acceleration_wall = 2000 +acceleration_wall_0 = 2000 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed +infill_sparse_density = 15 +layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 prime_tower_enable = False +raft_airgap = 0.25 retraction_prime_speed = =retraction_speed skin_overlap = 20 speed_layer_0 = 10 @@ -25,8 +30,3 @@ speed_topbottom = =math.ceil(speed_print * 40 / 70) speed_wall = =math.ceil(speed_print * 55 / 70) speed_wall_0 = =math.ceil(speed_wall * 45 / 50) top_bottom_thickness = 0.8 -infill_sparse_density = 15 -layer_height_0 = 0.2 -acceleration_wall = 2000 -acceleration_wall_0 = 2000 -raft_airgap = 0.25 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg index 66aa89a6a7..b58cabc738 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg @@ -14,15 +14,15 @@ variant = AA 0.4 [values] cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed +layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 prime_tower_enable = False +raft_airgap = 0.25 retraction_prime_speed = =retraction_speed -speed_print = 70 speed_layer_0 = 10 +speed_print = 70 speed_topbottom = =math.ceil(speed_print * 35 / 70) speed_wall = =math.ceil(speed_print * 45 / 70) speed_wall_0 = =math.ceil(speed_wall * 35 / 70) top_bottom_thickness = 1 -layer_height_0 = 0.2 -raft_airgap = 0.25 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg index 1d498d252a..5a7f57ac29 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg @@ -15,16 +15,16 @@ variant = AA 0.4 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed cool_min_speed = 10 +layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature - 5 prime_tower_enable = False +raft_airgap = 0.25 retraction_prime_speed = =retraction_speed skin_overlap = 10 -speed_print = 50 speed_layer_0 = 10 +speed_print = 50 speed_topbottom = =math.ceil(speed_print * 35 / 50) speed_wall = =math.ceil(speed_print * 35 / 50) top_bottom_thickness = 1 -layer_height_0 = 0.2 -raft_airgap = 0.25 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg index 1eb4fd8735..7d6815f135 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg @@ -15,12 +15,12 @@ variant = AA 0.4 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed cool_min_speed = 7 +layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 prime_tower_enable = False +raft_airgap = 0.25 retraction_prime_speed = =retraction_speed skin_overlap = 10 speed_layer_0 = 10 top_bottom_thickness = 1 -layer_height_0 = 0.2 -raft_airgap = 0.25 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg index 962f906e74..09838eb4d1 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg @@ -1,39 +1,34 @@ [general] version = 4 -name = Extra Fast +name = Extra Fast - Experimental definition = ultimaker_s5 [metadata] setting_version = 20 type = quality quality_type = verydraft -weight = -2 +weight = -3 material = generic_pla variant = AA 0.4 is_experimental = True [values] -infill_sparse_density = 15 acceleration_print = 2000 +acceleration_topbottom = 1000 acceleration_wall = 1500 acceleration_wall_0 = 1000 -acceleration_topbottom = 1000 -speed_print = 50 -speed_wall = 50 - cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed - -material_print_temperature = =default_material_print_temperature + 10 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +infill_sparse_density = 15 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 - +material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = False +raft_airgap = 0.25 retraction_prime_speed = =retraction_speed skin_overlap = 20 +speed_print = 50 +speed_wall = 50 top_bottom_thickness = 0.9 - -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' - -raft_airgap = 0.25 -wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) \ No newline at end of file +wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) 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 082e20d372..ebb514af89 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 @@ -17,7 +17,6 @@ cool_fan_speed_max = 100 cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 7 cool_min_speed = 2.5 - infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0.1 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 d98cbc9037..0abc43467b 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 @@ -17,7 +17,6 @@ cool_fan_speed_max = 100 cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 7 cool_min_speed = 2.5 - infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0.1 @@ -41,7 +40,6 @@ retraction_min_travel = 0.8 speed_layer_0 = =math.ceil(speed_print * 15 / 25) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 25 / 25) - speed_travel_layer_0 = 50 speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 25) 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 ebc2639424..bd8ab98e55 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 @@ -17,7 +17,6 @@ cool_fan_speed_max = 100 cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 7 cool_min_speed = 2.5 - infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0.1 @@ -41,7 +40,6 @@ retraction_min_travel = 0.8 speed_layer_0 = =math.ceil(speed_print * 15 / 25) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 25 / 25) - speed_travel_layer_0 = 50 speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 25) 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 079a95b46c..b80243211d 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 @@ -18,7 +18,7 @@ cool_min_speed = 7 layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -material_print_temperature = =default_material_print_temperature -10 +material_print_temperature = =default_material_print_temperature - 10 prime_tower_enable = False retraction_prime_speed = =retraction_speed skin_overlap = 20 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print.inst.cfg index 0f731a673d..57a4f3349e 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print.inst.cfg @@ -17,7 +17,7 @@ cool_fan_speed_max = =cool_fan_speed layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -material_print_temperature = =default_material_print_temperature -10 +material_print_temperature = =default_material_print_temperature - 10 prime_tower_enable = False retraction_prime_speed = =retraction_speed speed_layer_0 = =math.ceil(speed_print * 20 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg index 3bb7ba5d2f..bf8686d358 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg @@ -15,16 +15,16 @@ variant = AA 0.4 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed cool_min_speed = 10 +layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature - 15 prime_tower_enable = False retraction_prime_speed = =retraction_speed skin_overlap = 10 -speed_print = 45 speed_layer_0 = =math.ceil(speed_print * 20 / 45) +speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) top_bottom_thickness = 1.2 -layer_height_0 = 0.2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg index 5150537256..ef60c4fcd3 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg @@ -1,38 +1,34 @@ [general] version = 4 -name = Extra Fast +name = Extra Fast - Experimental definition = ultimaker_s5 [metadata] setting_version = 20 type = quality quality_type = verydraft -weight = -2 +weight = -3 material = generic_tough_pla variant = AA 0.4 is_experimental = True [values] -infill_sparse_density = 15 acceleration_print = 2000 +acceleration_topbottom = 1000 acceleration_wall = 1500 acceleration_wall_0 = 1000 -acceleration_topbottom = 1000 -speed_print = 50 -speed_wall = 50 - cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed - -material_print_temperature = =default_material_print_temperature - 5 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +infill_sparse_density = 15 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 +material_print_temperature = =default_material_print_temperature - 5 prime_tower_enable = False +raft_airgap = 0.25 retraction_prime_speed = =retraction_speed skin_overlap = 20 +speed_print = 50 +speed_wall = 50 top_bottom_thickness = 1.2 - -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' - -raft_airgap = 0.25 -wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) \ No newline at end of file +wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) 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 dc8fb80084..19324e1777 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 @@ -17,7 +17,6 @@ cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 4 gradual_infill_step_height = =5 * layer_height - infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 10 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 ed9a9e7756..86c8817c5d 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 @@ -17,7 +17,6 @@ cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 4 gradual_infill_step_height = =5 * layer_height - infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 10 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 61602c2e7b..42ad6c4cd2 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 @@ -17,7 +17,6 @@ cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 4 gradual_infill_step_height = =5 * layer_height - infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 10 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Draft_Print.inst.cfg index ee5dff1264..72f29e606b 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Draft_Print.inst.cfg @@ -12,7 +12,6 @@ material = generic_abs variant = AA 0.8 [values] - material_print_temperature = =default_material_print_temperature + 20 speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Superdraft_Print.inst.cfg index 8de9e328d9..6b352edb2d 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Superdraft_Print.inst.cfg @@ -12,10 +12,9 @@ material = generic_abs variant = AA 0.8 [values] - material_print_temperature = =default_material_print_temperature + 25 +speed_infill = =math.ceil(speed_print * 37 / 50) speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 37 / 50) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -speed_infill = =math.ceil(speed_print * 37 / 50) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Verydraft_Print.inst.cfg index 3255684648..b90f30046d 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Verydraft_Print.inst.cfg @@ -12,7 +12,6 @@ material = generic_abs variant = AA 0.8 [values] - material_print_temperature = =default_material_print_temperature + 22 speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Fast_Print.inst.cfg index 3c1491befd..eef401ff61 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Fast_Print.inst.cfg @@ -1,13 +1,13 @@ [general] version = 4 -name = Fast - Experimental +name = Normal - Experimental definition = ultimaker_s5 [metadata] setting_version = 20 type = quality -quality_type = draft -weight = -2 +quality_type = fast +weight = -1 material = generic_cpe_plus variant = AA 0.8 is_experimental = True @@ -15,7 +15,6 @@ is_experimental = True [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 14 * layer_height - machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 10 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg index 30b1940b9c..de96694d69 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg @@ -15,8 +15,6 @@ is_experimental = True [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 7 * layer_height - - machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 5 @@ -26,12 +24,12 @@ retraction_combing_max_distance = 50 retraction_hop = 0.1 retraction_hop_enabled = False skin_overlap = 0 +speed_infill = =math.ceil(speed_print * 40 / 50) speed_layer_0 = =math.ceil(speed_print * 15 / 50) speed_print = 50 speed_slowdown_layers = 8 speed_topbottom = =math.ceil(speed_print * 35 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 35 / 40) -speed_infill = =math.ceil(speed_print * 40 / 50) support_z_distance = =layer_height top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Verydraft_Print.inst.cfg index 01cdfb6142..529c39889b 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Verydraft_Print.inst.cfg @@ -15,8 +15,6 @@ is_experimental = True [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 9 * layer_height - - machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 7 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg index ed90985548..19f7e7be37 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg @@ -13,7 +13,6 @@ variant = AA 0.8 [values] brim_width = 15 - material_print_temperature = =default_material_print_temperature + 15 prime_tower_enable = True retraction_combing_max_distance = 50 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg index 87d8bb69e1..d15f1a7c84 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg @@ -13,12 +13,11 @@ variant = AA 0.8 [values] brim_width = 15 - material_print_temperature = =default_material_print_temperature + 20 prime_tower_enable = True retraction_combing_max_distance = 50 +speed_infill = =math.ceil(speed_print * 33 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 30 / 45) speed_wall = =math.ceil(speed_print * 33 / 45) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -speed_infill = =math.ceil(speed_print * 33 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg index 970964203f..721d0a8752 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg @@ -13,7 +13,6 @@ variant = AA 0.8 [values] brim_width = 15 - material_print_temperature = =default_material_print_temperature + 17 prime_tower_enable = True retraction_combing_max_distance = 50 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg index fc9d586503..8e73a5a755 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg @@ -15,8 +15,6 @@ variant = AA 0.8 brim_width = 5.6 cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 - - machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 ooze_shield_angle = 40 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg index 30877bf726..a6250760c6 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg @@ -1,13 +1,13 @@ [general] version = 4 -name = Fast - Experimental +name = Normal - Experimental definition = ultimaker_s5 [metadata] setting_version = 20 type = quality -quality_type = draft -weight = -2 +quality_type = fast +weight = -1 material = generic_pc variant = AA 0.8 is_experimental = True @@ -15,8 +15,6 @@ is_experimental = True [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 14 * layer_height - - material_print_temperature = =default_material_print_temperature - 5 material_print_temperature_layer_0 = =material_print_temperature raft_airgap = 0.5 @@ -27,4 +25,3 @@ speed_slowdown_layers = 15 speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) - diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Superdraft_Print.inst.cfg index fd3ae94a9e..8045ab8f90 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Superdraft_Print.inst.cfg @@ -15,15 +15,13 @@ is_experimental = True [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 7 * layer_height - - material_print_temperature_layer_0 = =material_print_temperature raft_airgap = 0.5 skin_overlap = 0 +speed_infill = =math.ceil(speed_print * 37 / 50) speed_layer_0 = =math.ceil(speed_print * 15 / 50) speed_print = 50 speed_slowdown_layers = 8 speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 37 / 50) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -speed_infill = =math.ceil(speed_print * 37 / 50) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Draft_Print.inst.cfg index 926a1394bd..47a26097f5 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Draft_Print.inst.cfg @@ -13,12 +13,11 @@ variant = AA 0.8 [values] brim_width = 7 - +cool_fan_speed = 20 +initial_layer_line_width_factor = 100 material_print_temperature = =default_material_print_temperature - 5 prime_tower_enable = True retraction_combing_max_distance = 8 speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) -cool_fan_speed = 20 -initial_layer_line_width_factor = 100 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg index 1d2b4bf257..f13991359d 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg @@ -13,14 +13,13 @@ variant = AA 0.8 [values] brim_width = 7 - +cool_fan_speed = 20 +initial_layer_line_width_factor = 100 material_print_temperature = =default_material_print_temperature - 5 prime_tower_enable = True retraction_combing_max_distance = 8 +speed_infill = =math.ceil(speed_print * 33 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 30 / 45) speed_wall = =math.ceil(speed_print * 33 / 45) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -speed_infill = =math.ceil(speed_print * 33 / 45) -cool_fan_speed = 20 -initial_layer_line_width_factor = 100 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Verydraft_Print.inst.cfg index d9a6c58217..41e42809cf 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Verydraft_Print.inst.cfg @@ -13,13 +13,11 @@ variant = AA 0.8 [values] brim_width = 7 - +cool_fan_speed = 20 +initial_layer_line_width_factor = 100 material_print_temperature = =default_material_print_temperature - 5 prime_tower_enable = True retraction_combing_max_distance = 8 speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) -cool_fan_speed = 20 -initial_layer_line_width_factor = 100 - diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg index 5a75d250ae..3883c1dc8a 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg @@ -16,17 +16,17 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height +layer_height_0 = 0.4 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -material_final_print_temperature = =max(-273.15, material_print_temperature - 15) -material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) +material_final_print_temperature = =material_print_temperature - 15 +material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = True -support_angle = 70 -top_bottom_thickness = =layer_height * 4 speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) -speed_wall_x = =speed_wall speed_wall_0 = =math.ceil(speed_wall * 35 / 40) -layer_height_0 = 0.4 +speed_wall_x = =speed_wall +support_angle = 70 +top_bottom_thickness = =layer_height * 4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg index 7f1cf80f12..7033e11eed 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg @@ -16,18 +16,18 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height +layer_height_0 = 0.4 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -material_final_print_temperature = =max(-273.15, material_print_temperature - 15) -material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) +material_final_print_temperature = =material_print_temperature - 15 +material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature + 15 prime_tower_enable = True -support_angle = 70 -top_bottom_thickness = =layer_height * 4 +speed_infill = =math.ceil(speed_print * 35 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 35 / 45) -speed_wall_x = =speed_wall speed_wall_0 = =math.ceil(speed_wall * 35 / 40) -speed_infill = =math.ceil(speed_print * 35 / 45) -layer_height_0 = 0.4 +speed_wall_x = =speed_wall +support_angle = 70 +top_bottom_thickness = =layer_height * 4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg index 9da869a34e..35f435f693 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg @@ -16,17 +16,17 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height +layer_height_0 = 0.4 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -material_final_print_temperature = =max(-273.15, material_print_temperature - 15) -material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) +material_final_print_temperature = =material_print_temperature - 15 +material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = True -support_angle = 70 -top_bottom_thickness = =layer_height * 4 speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) -speed_wall_x = =speed_wall speed_wall_0 = =math.ceil(speed_wall * 35 / 40) -layer_height_0 = 0.4 +speed_wall_x = =speed_wall +support_angle = 70 +top_bottom_thickness = =layer_height * 4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg index f3deb0b0f9..4c262310e8 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg @@ -15,7 +15,6 @@ variant = AA 0.8 brim_width = 25 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 17 -top_skin_expand_distance = =line_width * 2 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' material_bed_temperature_layer_0 = =material_bed_temperature material_print_temperature = =default_material_print_temperature - 2 @@ -34,4 +33,5 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.6 +top_skin_expand_distance = =line_width * 2 wall_0_wipe_dist = =line_width * 2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg index 859f408ffb..539e6335c7 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg @@ -15,7 +15,6 @@ variant = AA 0.8 brim_width = 25 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 17 -top_skin_expand_distance = =line_width * 2 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' material_bed_temperature_layer_0 = =material_bed_temperature material_print_temperature = =default_material_print_temperature + 2 @@ -29,10 +28,11 @@ retraction_extra_prime_amount = 0.5 retraction_hop = 0.5 retraction_min_travel = 1.5 retraction_prime_speed = 15 -speed_wall_x = =math.ceil(speed_wall * 30 / 30) speed_infill = =math.ceil(speed_wall * 30 / 30) +speed_wall_x = =math.ceil(speed_wall * 30 / 30) switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.6 +top_skin_expand_distance = =line_width * 2 wall_0_wipe_dist = =line_width * 2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg index 85ca930444..9c3cb44e07 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg @@ -15,7 +15,6 @@ variant = AA 0.8 brim_width = 25 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 17 -top_skin_expand_distance = =line_width * 2 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' material_bed_temperature_layer_0 = =material_bed_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 2 @@ -33,4 +32,5 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.6 +top_skin_expand_distance = =line_width * 2 wall_0_wipe_dist = =line_width * 2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Draft_Print.inst.cfg index d2d69e4870..1ccf9c78a4 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Draft_Print.inst.cfg @@ -20,8 +20,8 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic' layer_height_0 = 0.4 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -material_final_print_temperature = =max(-273.15, material_print_temperature - 15) -material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) +material_final_print_temperature = =material_print_temperature - 15 +material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature + 0 prime_tower_enable = False speed_print = 45 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg index b298611623..31f82a54e2 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg @@ -20,14 +20,14 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic' layer_height_0 = 0.4 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -material_final_print_temperature = =max(-273.15, material_print_temperature - 15) -material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) +material_final_print_temperature = =material_print_temperature - 15 +material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature + 5 prime_tower_enable = False speed_infill = =math.ceil(speed_print * 30 / 30) speed_print = 30 speed_topbottom = =math.ceil(speed_print * 20 / 30) -speed_wall = =math.ceil(speed_print * 25/ 30) +speed_wall = =math.ceil(speed_print * 25 / 30) speed_wall_0 = =math.ceil(speed_print * 20 / 30) support_angle = 70 top_bottom_thickness = =layer_height * 4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Verydraft_Print.inst.cfg index 1133c1c194..e8648e68d4 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Verydraft_Print.inst.cfg @@ -20,15 +20,15 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic' layer_height_0 = 0.4 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -material_final_print_temperature = =max(-273.15, material_print_temperature - 15) -material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) +material_final_print_temperature = =material_print_temperature - 15 +material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =material_print_temperature prime_tower_enable = False speed_infill = =math.ceil(speed_print * 30 / 35) speed_print = 35 speed_topbottom = =math.ceil(speed_print * 20 / 35) -speed_wall = =math.ceil(speed_print * 25/ 35) +speed_wall = =math.ceil(speed_print * 25 / 35) speed_wall_0 = =math.ceil(speed_print * 20 / 35) support_angle = 70 top_bottom_thickness = =layer_height * 4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg index 32351241f7..57dc15f243 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg @@ -14,7 +14,6 @@ variant = AA 0.8 [values] brim_width = 8.75 cool_min_layer_time_fan_speed_max = 6 -top_skin_expand_distance = =line_width * 2 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' machine_nozzle_cool_down_speed = 0.5 machine_nozzle_heat_up_speed = 2.5 @@ -41,5 +40,6 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.2 +top_skin_expand_distance = =line_width * 2 travel_avoid_distance = 1.5 wall_0_wipe_dist = =line_width * 2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg index 6e3732f812..1d8cf0809c 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg @@ -14,7 +14,6 @@ variant = AA 0.8 [values] brim_width = 8.75 cool_min_layer_time_fan_speed_max = 6 -top_skin_expand_distance = =line_width * 2 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 15 machine_nozzle_cool_down_speed = 0.5 @@ -32,15 +31,16 @@ retraction_extra_prime_amount = 0.5 retraction_hop = 1.5 retraction_hop_only_when_collides = False retraction_min_travel = =line_width * 2 +speed_infill = =speed_print speed_print = 30 speed_topbottom = =math.ceil(speed_print * 20 / 30) speed_wall = =speed_print speed_wall_x = =speed_print -speed_infill = =speed_print support_angle = 50 switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.2 +top_skin_expand_distance = =line_width * 2 travel_avoid_distance = 1.5 wall_0_wipe_dist = =line_width * 2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg index ab43aa6af3..95e5da677d 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg @@ -14,7 +14,6 @@ variant = AA 0.8 [values] brim_width = 8.75 cool_min_layer_time_fan_speed_max = 6 -top_skin_expand_distance = =line_width * 2 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 15 machine_nozzle_cool_down_speed = 0.5 @@ -41,5 +40,6 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.2 +top_skin_expand_distance = =line_width * 2 travel_avoid_distance = 1.5 wall_0_wipe_dist = =line_width * 2 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Draft_Print.inst.cfg index 05069e722c..b6dda574b3 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Draft_Print.inst.cfg @@ -13,12 +13,12 @@ variant = BB 0.4 [values] brim_replaces_support = False +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = False retraction_count_max = 5 skin_overlap = 20 +skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) support_brim_enable = True support_interface_enable = True -skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) -cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) support_use_towers = True diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg index 7539f5fdb1..ebdf69e1aa 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg @@ -12,14 +12,14 @@ material = generic_pva variant = BB 0.4 [values] -support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) material_print_temperature = =default_material_print_temperature + 5 prime_tower_enable = False retraction_count_max = 5 skin_overlap = 15 +skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) support_brim_enable = True +support_infill_sparse_thickness = =2 * layer_height support_interface_enable = True -skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) -cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) support_use_towers = True diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg index c320676f02..71c60fb9f9 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg @@ -12,12 +12,12 @@ material = generic_pva variant = BB 0.4 [values] -support_infill_sparse_thickness = =3*layer_height brim_replaces_support = False +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) prime_tower_enable = False retraction_count_max = 5 +skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) support_brim_enable = True +support_infill_sparse_thickness = =3 * layer_height support_interface_enable = True -skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) -cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) support_use_towers = True diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg index a068c96756..9e840ced4b 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg @@ -12,12 +12,12 @@ material = generic_pva variant = BB 0.4 [values] -support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) prime_tower_enable = False retraction_count_max = 5 +skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) support_brim_enable = True +support_infill_sparse_thickness = =2 * layer_height support_interface_enable = True -skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) -cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) support_use_towers = True diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Verydraft_Print.inst.cfg index c8c7971f09..b3aee29488 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Verydraft_Print.inst.cfg @@ -1,6 +1,6 @@ [general] version = 4 -name = Extra Fast +name = Extra Fast - Experimental definition = ultimaker_s5 [metadata] @@ -14,11 +14,11 @@ is_experimental = True [values] brim_replaces_support = False +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) prime_tower_enable = False retraction_count_max = 5 +skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) support_brim_enable = True support_infill_sparse_thickness = 0.3 support_interface_enable = True -skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) -cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) support_use_towers = True diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Draft_Print.inst.cfg index e526fc6426..947f62cd98 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Draft_Print.inst.cfg @@ -13,10 +13,10 @@ variant = BB 0.8 [values] brim_replaces_support = False +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) material_print_temperature = =default_material_print_temperature + 5 retraction_count_max = 5 +skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) support_brim_enable = True support_interface_enable = True -skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) -cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) support_use_towers = True diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Superdraft_Print.inst.cfg index ae5b0aacfe..9a530565fc 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Superdraft_Print.inst.cfg @@ -13,9 +13,9 @@ variant = BB 0.8 [values] brim_replaces_support = False +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) retraction_count_max = 5 +skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) support_brim_enable = True support_interface_enable = True -skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) -cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) support_use_towers = True diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Verydraft_Print.inst.cfg index b37122ab7e..fe46635fa6 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Verydraft_Print.inst.cfg @@ -13,10 +13,10 @@ variant = BB 0.8 [values] brim_replaces_support = False +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) retraction_count_max = 5 +skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) support_brim_enable = True support_infill_sparse_thickness = 0.3 support_interface_enable = True -skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) -cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) support_use_towers = True diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFCPE_Draft_Print.inst.cfg index 0e738f1e3d..c0e20f1584 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFCPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFCPE_Draft_Print.inst.cfg @@ -24,4 +24,3 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 - diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFCPE_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFCPE_Fast_Print.inst.cfg index e0d01ba82f..8b3030ce09 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFCPE_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFCPE_Fast_Print.inst.cfg @@ -7,7 +7,7 @@ definition = ultimaker_s5 setting_version = 20 type = quality quality_type = fast -weight = -2 +weight = -1 material = generic_cffcpe variant = CC 0.4 @@ -24,4 +24,3 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 - diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFPA_Draft_Print.inst.cfg index 52d0a07ea5..0307bbff4a 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFPA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFPA_Draft_Print.inst.cfg @@ -24,4 +24,3 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 - diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFPA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFPA_Fast_Print.inst.cfg index 86dad3779b..ac6883ca44 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFPA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFPA_Fast_Print.inst.cfg @@ -7,7 +7,7 @@ definition = ultimaker_s5 setting_version = 20 type = quality quality_type = fast -weight = -2 +weight = -1 material = generic_cffpa variant = CC 0.4 @@ -24,4 +24,3 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 - diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFCPE_Draft_Print.inst.cfg index da79e206cf..c44b25bd94 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFCPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFCPE_Draft_Print.inst.cfg @@ -24,4 +24,3 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 - diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFCPE_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFCPE_Fast_Print.inst.cfg index 644b964c28..a79662a65d 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFCPE_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFCPE_Fast_Print.inst.cfg @@ -7,7 +7,7 @@ definition = ultimaker_s5 setting_version = 20 type = quality quality_type = fast -weight = -2 +weight = -1 material = generic_gffcpe variant = CC 0.4 @@ -24,4 +24,3 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 - diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFPA_Draft_Print.inst.cfg index 2977a497eb..ee1ac1ef7a 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFPA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFPA_Draft_Print.inst.cfg @@ -24,4 +24,3 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 - diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFPA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFPA_Fast_Print.inst.cfg index a339098b6a..c0a4cb9a4a 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFPA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFPA_Fast_Print.inst.cfg @@ -7,7 +7,7 @@ definition = ultimaker_s5 setting_version = 20 type = quality quality_type = fast -weight = -2 +weight = -1 material = generic_gffpa variant = CC 0.4 @@ -24,4 +24,3 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 - diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Draft_Print.inst.cfg index 16d916f56a..a3a407f35c 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Draft_Print.inst.cfg @@ -1,13 +1,13 @@ [general] version = 4 -name = Fast +name = Fast - Experimental definition = ultimaker_s5 [metadata] setting_version = 20 type = quality quality_type = draft -weight = -3 +weight = -2 material = generic_pla variant = CC 0.4 is_experimental = True @@ -20,14 +20,14 @@ gradual_infill_step_height = =3 * layer_height infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -material_final_print_temperature = =max(-273.15, material_print_temperature - 15) -material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) +material_final_print_temperature = =material_print_temperature - 15 +material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) -speed_wall_x = =speed_wall speed_wall_0 = =math.ceil(speed_wall * 35 / 40) +speed_wall_x = =speed_wall support_angle = 70 top_bottom_thickness = =layer_height * 4 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Fast_Print.inst.cfg index 80e101c1a6..367024b978 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Fast_Print.inst.cfg @@ -1,13 +1,13 @@ [general] version = 4 -name = Normal +name = Normal - Experimental definition = ultimaker_s5 [metadata] setting_version = 20 type = quality quality_type = fast -weight = -2 +weight = -1 material = generic_pla variant = CC 0.4 is_experimental = True @@ -20,14 +20,14 @@ gradual_infill_step_height = =3 * layer_height infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -material_final_print_temperature = =max(-273.15, material_print_temperature - 15) -material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) +material_final_print_temperature = =material_print_temperature - 15 +material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) -speed_wall_x = =speed_wall speed_wall_0 = =math.ceil(speed_wall * 35 / 40) +speed_wall_x = =speed_wall support_angle = 70 top_bottom_thickness = =layer_height * 4 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFCPE_Draft_Print.inst.cfg index dd2f4231c7..02430694b3 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFCPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFCPE_Draft_Print.inst.cfg @@ -24,4 +24,3 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 - diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFPA_Draft_Print.inst.cfg index eb2cc63b78..ab1c73641e 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFPA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFPA_Draft_Print.inst.cfg @@ -24,4 +24,3 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 - diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFCPE_Draft_Print.inst.cfg index e5bc3d2e5b..e4019fea55 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFCPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFCPE_Draft_Print.inst.cfg @@ -24,4 +24,3 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 - diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFPA_Draft_Print.inst.cfg index 72e1c0f4fe..2d45c63fcf 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFPA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFPA_Draft_Print.inst.cfg @@ -24,4 +24,3 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 - diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg index af5bb5b9b2..8d2cbfc60f 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg @@ -1,13 +1,13 @@ [general] version = 4 -name = Fast +name = Fast - Experimental definition = ultimaker_s5 [metadata] setting_version = 20 type = quality quality_type = draft -weight = -3 +weight = -2 material = generic_pla variant = CC 0.6 is_experimental = True @@ -20,14 +20,14 @@ gradual_infill_step_height = =3 * layer_height infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -material_final_print_temperature = =max(-273.15, material_print_temperature - 15) -material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) +material_final_print_temperature = =material_print_temperature - 15 +material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) -speed_wall_x = =speed_wall speed_wall_0 = =math.ceil(speed_wall * 35 / 40) +speed_wall_x = =speed_wall support_angle = 70 top_bottom_thickness = =layer_height * 4 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg index e2dbe4a511..7395613486 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg @@ -1,13 +1,13 @@ [general] version = 4 -name = Normal +name = Normal - Experimental definition = ultimaker_s5 [metadata] setting_version = 20 type = quality quality_type = fast -weight = -2 +weight = -1 material = generic_pla variant = CC 0.6 is_experimental = True @@ -20,14 +20,14 @@ gradual_infill_step_height = =3 * layer_height infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -material_final_print_temperature = =max(-273.15, material_print_temperature - 15) -material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) +material_final_print_temperature = =material_print_temperature - 15 +material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) -speed_wall_x = =speed_wall speed_wall_0 = =math.ceil(speed_wall * 35 / 40) +speed_wall_x = =speed_wall support_angle = 70 top_bottom_thickness = =layer_height * 4 From 296175d83bae2a88c5a203c9134c3bbea8d3be76 Mon Sep 17 00:00:00 2001 From: Vandresc Date: Thu, 22 Sep 2022 13:40:08 +0200 Subject: [PATCH 012/103] Update_expert_settings_visibility_Cura-9433 Added the new three children settings of Initial Layer Flow to Expert mode to match the parent. --- resources/setting_visibility/expert.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/setting_visibility/expert.cfg b/resources/setting_visibility/expert.cfg index ea6536a44c..66a26d5466 100644 --- a/resources/setting_visibility/expert.cfg +++ b/resources/setting_visibility/expert.cfg @@ -135,6 +135,9 @@ support_roof_material_flow support_bottom_material_flow prime_tower_flow material_flow_layer_0 +wall_x_material_flow_layer_0 +wall_0_material_flow_layer_0 +skin_material_flow_layer_0 material_standby_temperature material_alternate_walls From c729b87f3ccd9cfddd6269a234bc23516038db93 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Fri, 23 Sep 2022 10:32:03 +0200 Subject: [PATCH 013/103] Duplicate print jobs were being sent when printing via cloud from abstract printers. This was due to the connect function not being called on the CloudOutputDevice used to print on the cloud. This function is only called when it becomes an active printer (AbstractCloudOutputDevice is the active printer instead now). The fix is to always listen for signals to reset the print job even when not the active printer. I've chosen different signals now so there is not too much spam on the reset function. The BackendStateDone signal catches new slices. The SceneChanged signal catches ufp files being loaded (These do not trigger BackendState changes) CURA-9678 --- .../src/Cloud/CloudOutputDevice.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py index 4c58c82350..692a2af160 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py +++ b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py @@ -10,7 +10,6 @@ from PyQt6.QtGui import QDesktopServices from PyQt6.QtNetwork import QNetworkReply, QNetworkRequest # Parse errors specific to print job uploading. from UM import i18nCatalog -from UM.Backend.Backend import BackendState from UM.FileHandler.FileHandler import FileHandler from UM.Logger import Logger from UM.Scene.SceneNode import SceneNode @@ -18,6 +17,8 @@ from UM.Version import Version from cura.CuraApplication import CuraApplication from cura.PrinterOutput.NetworkedPrinterOutputDevice import AuthState from cura.PrinterOutput.PrinterOutputDevice import ConnectionType +from cura.Scene.GCodeListDecorator import GCodeListDecorator +from cura.Scene.SliceableObjectDecorator import SliceableObjectDecorator from .CloudApiClient import CloudApiClient from ..ExportFileJob import ExportFileJob @@ -110,6 +111,9 @@ class CloudOutputDevice(UltimakerNetworkedPrinterOutputDevice): self._pre_upload_print_job = None # type: Optional[CloudPrintJobResponse] self._uploaded_print_job = None # type: Optional[CloudPrintJobResponse] + CuraApplication.getInstance().getBackend().backendDone.connect(self._resetPrintJob) + CuraApplication.getInstance().getController().getScene().sceneChanged.connect(self._onSceneChanged) + def connect(self) -> None: """Connects this device.""" @@ -117,8 +121,6 @@ class CloudOutputDevice(UltimakerNetworkedPrinterOutputDevice): return Logger.log("i", "Attempting to connect to cluster %s", self.key) super().connect() - - CuraApplication.getInstance().getBackend().backendStateChange.connect(self._onBackendStateChange) self._update() def disconnect(self) -> None: @@ -128,11 +130,14 @@ class CloudOutputDevice(UltimakerNetworkedPrinterOutputDevice): return super().disconnect() Logger.log("i", "Disconnected from cluster %s", self.key) - CuraApplication.getInstance().getBackend().backendStateChange.disconnect(self._onBackendStateChange) - def _onBackendStateChange(self, _: BackendState) -> None: - """Resets the print job that was uploaded to force a new upload, runs whenever the user re-slices.""" + def _onSceneChanged(self, node: SceneNode): + # This will reset the print job if a ufp file is loaded. This forces a new upload when printing via cloud from ufp. + if node.getDecorator(GCodeListDecorator) or node.getDecorator(SliceableObjectDecorator): + self._resetPrintJob() + def _resetPrintJob(self) -> None: + """Resets the print job that was uploaded to force a new upload, runs whenever slice finishes.""" self._tool_path = None self._pre_upload_print_job = None self._uploaded_print_job = None From 39e3a18bf6431c9631436b1e4bd6ac429f6b1a5b Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Fri, 23 Sep 2022 10:50:26 +0200 Subject: [PATCH 014/103] Disconnect signal on deletion of CloudOutputDevice CURA-9678 --- plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py index 692a2af160..9daf563460 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py +++ b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py @@ -411,3 +411,7 @@ class CloudOutputDevice(UltimakerNetworkedPrinterOutputDevice): root_url_prefix = "-staging" if self._account.is_staging else "" return f"https://digitalfactory{root_url_prefix}.ultimaker.com/app/jobs/{self.clusterData.cluster_id}" + + def __del__(self): + CuraApplication.getInstance().getBackend().backendDone.disconnect(self._resetPrintJob) + CuraApplication.getInstance().getController().getScene().sceneChanged.disconnect(self._onSceneChanged) From df16108938c63900cab2d9acf4c106648016c3eb Mon Sep 17 00:00:00 2001 From: Julian Date: Fri, 23 Sep 2022 11:49:30 +0200 Subject: [PATCH 015/103] Fixes for better decorators using pyqtProperty --- cura/MachineAction.py | 21 ++++++++++++++------- resources/qml/Preferences/MachinesPage.qml | 4 ++-- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/cura/MachineAction.py b/cura/MachineAction.py index 8ca9b63679..fa1fb01e02 100644 --- a/cura/MachineAction.py +++ b/cura/MachineAction.py @@ -34,8 +34,10 @@ class MachineAction(QObject, PluginObject): self._view = None self._finished = False self._open_as_dialog = True + self._visible = True labelChanged = pyqtSignal() + visibilityChanged = pyqtSignal() onFinished = pyqtSignal() def getKey(self) -> str: @@ -125,8 +127,8 @@ class MachineAction(QObject, PluginObject): def getDisplayItem(self) -> Optional["QObject"]: return self._createViewFromQML() - @pyqtSlot(result = bool) - def openAsDialog(self) -> bool: + @pyqtProperty(bool, constant=True) + def shouldOpenAsDialog(self) -> bool: """Whether this action will show a dialog. If not, the action will directly run the function inside execute(). @@ -135,9 +137,15 @@ class MachineAction(QObject, PluginObject): """ return self._open_as_dialog - - @pyqtSlot(result = bool) - def isVisible(self) -> bool: + + @pyqtSlot() + def setVisible(self, visible: bool) -> None: + if self._visible != visible: + self._visible = visible + self.visibilityChanged.emit() + + @pyqtProperty(bool, notify = visibilityChanged) + def visible(self) -> bool: """Whether this action button will be visible. Example: Show only when isLoggedIn @@ -145,5 +153,4 @@ class MachineAction(QObject, PluginObject): :return: Defaults to true to be in line with the old behaviour. """ - return True - \ No newline at end of file + self._visible \ No newline at end of file diff --git a/resources/qml/Preferences/MachinesPage.qml b/resources/qml/Preferences/MachinesPage.qml index 4ecc70b404..960dc75904 100644 --- a/resources/qml/Preferences/MachinesPage.qml +++ b/resources/qml/Preferences/MachinesPage.qml @@ -67,14 +67,14 @@ UM.ManagementPage { width: Math.round(childrenRect.width + 2 * screenScaleFactor) height: childrenRect.height - visible: machineActionRepeater.model[index].isVisible() + visible: machineActionRepeater.model[index].visible Cura.SecondaryButton { text: machineActionRepeater.model[index].label onClicked: { var currentItem = machineActionRepeater.model[index] - if (currentItem.openAsDialog()) { + if (currentItem.shouldOpenAsDialog) { actionDialog.loader.manager = currentItem actionDialog.loader.source = currentItem.qmlPath actionDialog.title = currentItem.label From 6213c95bbca8a97b9bf0bdec27067f76a4b6b284 Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 23 Sep 2022 13:11:23 +0200 Subject: [PATCH 016/103] build: harden unit-test.yml permissions Signed-off-by: Alex --- .github/workflows/unit-test.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index eb2edc09d8..035a2b8ef1 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -60,6 +60,9 @@ env: CONAN_LOGGING_LEVEL: info CONAN_NON_INTERACTIVE: 1 +permissions: + contents: read + jobs: conan-recipe-version: uses: ultimaker/cura/.github/workflows/conan-recipe-version.yml@main @@ -144,6 +147,11 @@ jobs: path: "tests/**/*.xml" publish-test-results: + permissions: + contents: read # to fetch code (actions/checkout) + checks: write + pull-requests: write # to comment on pull request + runs-on: ubuntu-20.04 needs: [ testing ] if: success() || failure() From 7e218bef8b7b277375c77b16d30b7ec61ae4e5f6 Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 23 Sep 2022 13:22:49 +0200 Subject: [PATCH 017/103] build: harden conan-package.yml permissions Signed-off-by: Alex --- .github/workflows/conan-package.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index d7f4557b81..ce9d9998eb 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -47,13 +47,20 @@ on: - '[1-9].[0-9].[0-9]+' - '[1-9].[0-9][0-9].[0-9]+' +permissions: {} jobs: conan-recipe-version: + permissions: + contents: read + uses: ultimaker/cura/.github/workflows/conan-recipe-version.yml@main with: project_name: cura conan-package-export: + permissions: + contents: read + needs: [ conan-recipe-version ] uses: ultimaker/cura/.github/workflows/conan-recipe-export.yml@main with: @@ -65,6 +72,9 @@ jobs: secrets: inherit conan-package-create-linux: + permissions: + contents: read + if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'master' || needs.conan-recipe-version.outputs.is_release_branch == 'true')) || (github.event_name == 'workflow_dispatch' && inputs.create_binaries_linux) }} needs: [ conan-recipe-version, conan-package-export ] From 827ef072bd1a40b6d59a6e3f576950c6f9bfebee Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Fri, 23 Sep 2022 13:28:13 +0200 Subject: [PATCH 018/103] Should be able to run a build for VnV (testing). --- conandata.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conandata.yml b/conandata.yml index 83f45a2056..108b83f368 100644 --- a/conandata.yml +++ b/conandata.yml @@ -13,10 +13,10 @@ "5.2.0-alpha": requirements: - "pyarcus/(latest)@ultimaker/testing" - - "curaengine/(latest)@ultimaker/testing" + - "curaengine/5.2@ultimaker/testing" - "pysavitar/(latest)@ultimaker/testing" - "pynest2d/(latest)@ultimaker/testing" - - "uranium/(latest)@ultimaker/testing" + - "uranium/5.2@ultimaker/testing" - "fdm_materials/(latest)@ultimaker/testing" - "cura_binary_data/(latest)@ultimaker/testing" - "cpython/3.10.4" From 31e1577347947766fcec54ff5d9a155a00c8a20c Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Fri, 23 Sep 2022 14:01:55 +0200 Subject: [PATCH 019/103] Revert "Should be able to run a build for VnV (testing)." This reverts commit 827ef072bd1a40b6d59a6e3f576950c6f9bfebee. --- conandata.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conandata.yml b/conandata.yml index 108b83f368..83f45a2056 100644 --- a/conandata.yml +++ b/conandata.yml @@ -13,10 +13,10 @@ "5.2.0-alpha": requirements: - "pyarcus/(latest)@ultimaker/testing" - - "curaengine/5.2@ultimaker/testing" + - "curaengine/(latest)@ultimaker/testing" - "pysavitar/(latest)@ultimaker/testing" - "pynest2d/(latest)@ultimaker/testing" - - "uranium/5.2@ultimaker/testing" + - "uranium/(latest)@ultimaker/testing" - "fdm_materials/(latest)@ultimaker/testing" - "cura_binary_data/(latest)@ultimaker/testing" - "cpython/3.10.4" From a94bd91085afa99707ef5c6f5e2ff9fe709bf764 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Fri, 23 Sep 2022 17:49:50 +0200 Subject: [PATCH 020/103] Able to force 'prerelease'-version information. --- conanfile.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/conanfile.py b/conanfile.py index 17cd0260a6..327a571e54 100644 --- a/conanfile.py +++ b/conanfile.py @@ -35,6 +35,7 @@ class CuraConan(ConanFile): "devtools": [True, False], # FIXME: Split this up in testing and (development / build (pyinstaller) / system installer) tools "cloud_api_version": "ANY", "display_name": "ANY", # TODO: should this be an option?? + "extra_build_version": "ANY", #FIXME?: can't retrieve this from github workflow, so have an option to do it 'manually' "cura_debug_mode": [True, False], # FIXME: Use profiles "internal": [True, False] } @@ -44,6 +45,7 @@ class CuraConan(ConanFile): "devtools": False, "cloud_api_version": "1", "display_name": "Ultimaker Cura", + "extra_build_version": "", "cura_debug_mode": False, # Not yet implemented "internal": False, } @@ -150,9 +152,12 @@ class CuraConan(ConanFile): cura_version_py = Template(f.read()) cura_version = self.conf_info.get("user.cura:version", default = self.version, check_type = str) + version = Version(cura_version) + if self.options.extra_build_version != "": + version.prerelease = self.options.extra_build_version if self.options.internal: - version = Version(cura_version) - cura_version = f"{version.major}.{version.minor}.{version.patch}-{version.prerelease.replace('+', '+internal_')}" + version.prerelease = version.prerelease.replace('+', '+internal_') + cura_version = f"{version.major}.{version.minor}.{version.patch}-{version.prerelease}" with open(Path(location, "CuraVersion.py"), "w") as f: f.write(cura_version_py.render( From f52a9ad0fe01079fe4598af6f0e8750b3c0da6d0 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 26 Sep 2022 10:25:42 +0200 Subject: [PATCH 021/103] Add missing return CURA-9663 --- cura/MachineAction.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cura/MachineAction.py b/cura/MachineAction.py index fa1fb01e02..eaddebec42 100644 --- a/cura/MachineAction.py +++ b/cura/MachineAction.py @@ -135,7 +135,6 @@ class MachineAction(QObject, PluginObject): :return: Defaults to true to be in line with the old behaviour. """ - return self._open_as_dialog @pyqtSlot() @@ -153,4 +152,4 @@ class MachineAction(QObject, PluginObject): :return: Defaults to true to be in line with the old behaviour. """ - self._visible \ No newline at end of file + return self._visible \ No newline at end of file From 61065ce46df5373a69b2a2f20b287c133fd103e2 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Mon, 26 Sep 2022 11:23:17 +0200 Subject: [PATCH 022/103] Add a circle to the background of the refresh button Be more consistent with rest of UI. CURA-9677 --- resources/qml/Dialogs/ChoosePrinterDialog.qml | 32 ++++++++++++++----- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/resources/qml/Dialogs/ChoosePrinterDialog.qml b/resources/qml/Dialogs/ChoosePrinterDialog.qml index 69d9fc44cc..b8ea98f7df 100644 --- a/resources/qml/Dialogs/ChoosePrinterDialog.qml +++ b/resources/qml/Dialogs/ChoosePrinterDialog.qml @@ -53,23 +53,39 @@ UM.Dialog anchors.left: parent.left text: catalog.i18nc("@title:label", "Compatible Printers") font: UM.Theme.getFont("large") + anchors.horizontalCenter: parent.horizontalCenter } - - UM.SimpleButton + TabButton { + id: refreshButton anchors.right: parent.right - - width: UM.Theme.getSize("small_button").width - height: UM.Theme.getSize("small_button").height - iconSource: UM.Theme.getIcon("ArrowDoubleCircleRight") - color: UM.Theme.getColor("text_link") - hoverColor: UM.Theme.getColor("text_scene_hover") + width: UM.Theme.getSize("button_icon").width + height: UM.Theme.getSize("button_icon").height + hoverEnabled: true onClicked: { manager.refresh() base.compatible_machine_model.forceUpdate() } + + background: Rectangle + { + width: UM.Theme.getSize("button_icon").width + height: UM.Theme.getSize("button_icon").height + color: refreshButton.hovered ? UM.Theme.getColor("toolbar_button_hover") : UM.Theme.getColor("toolbar_background") + radius: Math.round(refreshButton.width * 0.5) + } + + UM.ColorImage + { + width: UM.Theme.getSize("section_icon").width + height: UM.Theme.getSize("section_icon").height + color: UM.Theme.getColor("text_link") + source: UM.Theme.getIcon("ArrowDoubleCircleRight") + anchors.horizontalCenter: parent.horizontalCenter + anchors.verticalCenter: parent.verticalCenter + } } } From 73f05a392958ffff48adf550324729037d603576 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 27 Sep 2022 16:48:57 +0200 Subject: [PATCH 023/103] Changelog for 5.2-beta (draft v2). --- resources/texts/change_log.txt | 66 ++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/resources/texts/change_log.txt b/resources/texts/change_log.txt index c402291178..16b5952a8f 100644 --- a/resources/texts/change_log.txt +++ b/resources/texts/change_log.txt @@ -1,3 +1,69 @@ +[5.2-BETA] + +* Abstract Cloud Printer Type +For currently online cloud printers, they are collated by type, and you can slice on the ('abstract') printer-type, then choose the specific printer that matches the profiles afterwards. + +* Support For 'Student'-Type Accounts (In Digital Factory) +Accounts can have a 'Student'/'Teacher' relationship, where permission is needed for printing, when a print is sent via cloud. + +* More Control Over Initial Layer Flow +Three new settings: 'Initial Layer Outer Wall Flow', 'Initial Layer Inner Wall Flow', 'Initial Layer Bottom Flow', to better counteract the 'elephants foot' phenomenon. + +* Other new features and improvements: +- Auto-remove holes from not completely solid models in vase-mode. +- Add setting for 'tree support max diameter'. +- Add option to drop-down models to the build-plate individually. contributed to @Piezoid +- Added a preference to make the tray icon optional. contributed by @fieldOfView + +* Bug fixes: +- Don't ignore bottom pattern when spiralizing. +- Don't 'Union All' for 'Merged Meshes Overlap'. +- Seam placement was not in the correct corner in some cases. +- Cutting meshes with 'surface' set to 'both' cut through the mesh. +- Brim lines where ordered the wrong way in some cases. +- Random seam is now more random. +- Correctly apply combing when spiralizing. contributed by @smartavionics +- Don't spam the user with spurious 'Cura Notification's. +- Don't spam the logs with duplicated deprecated warnings. contributed by @Patschke +- Properly update the infill percentage in the top bar after an intent profile switch. +- An uninstall could only be done by the original user that installed. +- In certain rare situations, layers would be printed multiple times when monotonic fill was on. +- Put tree support infill density at 0% by default. +- Machine settings: Also save values when closing the window, not just when focus' changed. +- Reduce clickable area of settings checkboxes, to prevent mis-clicks. +- Fixed a crash when an unnamed tool would be accessed (possibly related to plugin use). +- Fix an issue where a plugin would crash because of a missing dependency. +- Code refactors contributed by @digitalfrost +- Fix for to-mouse zoom on screens with scaling factor. contributed by @seaniepie +- Models could not be multiplied in one-at-a-time mode. + +* Printer definitions, profiles and materials: +- Added Creality Ender 3 S1 profile. contributed by @Sebazzz +- Added Anycubic Kobra (Max). contributed by @ANYCUBIC-3D +- Added HCTECH printers. contributed by @3d-hctech +- Added da Vinci Pro EVO. contributed by @heed818 +- Fix FLSUN QQ-S platform orientation. contributed by @RVillani +- Fix Kingroon printers from going outside the build-volume in the end-gcode. contributed by @odaki +- Added Geetech Mizar_S. contributed by @Geeetech3D +- Added Tank-M printer. contributed by KOONOVO3DPrinter +- Update Renkforce RF100XL definition. contributed by @imakecodes +- Added VzBot profiles. contributed by @ckvsoft +- Added (additional) mingda printers. contributed by @jianshu-du +- Added Naxe machines. contributed by @Naxecorp +- Added T-Rex 2+, T-Rex 3. contributed by @jim-edwards +- Update FLsun SR. @xPakrikx +- Update Anycubic mega zero. contributed by @NOVAXIM +- Added some Renkforce machines. contributed by @goofoo3d + +* Community translations (pending): +- Updated the Brazilian Portuguese translation, contributed by Patola. +- Updated the Czech translation, contributed by sustmi. + +* Known critical issues: +- While some small fixes have been made already, the placement of the seam is still more scattered than before 5.0. (Will try to fix in stable.) +- Support is sometimes missing in detailed parts, where previous releases supported them properly (still). (Will probably not be fixed in stable. This is currently slated for 5.3) +- Multiple external monitors on Windows (especially if from the same brand) might be a problem under some circumstances. (Will probably not be fixed in stable.) + [5.1.1] * New features: - Added support for the Ultimaker S3 and Ultimaker S5 updated mainbord From da8042fe20879420ece3ad58f2a21e84e52bc466 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 27 Sep 2022 17:05:00 +0200 Subject: [PATCH 024/103] Update change-log to better reflect guest-type accounts. --- resources/texts/change_log.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/texts/change_log.txt b/resources/texts/change_log.txt index 16b5952a8f..6f505ac21c 100644 --- a/resources/texts/change_log.txt +++ b/resources/texts/change_log.txt @@ -3,8 +3,8 @@ * Abstract Cloud Printer Type For currently online cloud printers, they are collated by type, and you can slice on the ('abstract') printer-type, then choose the specific printer that matches the profiles afterwards. -* Support For 'Student'-Type Accounts (In Digital Factory) -Accounts can have a 'Student'/'Teacher' relationship, where permission is needed for printing, when a print is sent via cloud. +* Support For 'Guest'-Type Accounts (In Digital Factory) +Colleagues or students in a ‘Guest’ role can prepare print jobs in Ultimaker Cura and send them to the printers via Digital Factory. Print jobs prepared like this will not start immediately but wait for approval from a user with an 'Member' or 'Admin' role. * More Control Over Initial Layer Flow Three new settings: 'Initial Layer Outer Wall Flow', 'Initial Layer Inner Wall Flow', 'Initial Layer Bottom Flow', to better counteract the 'elephants foot' phenomenon. From 5a15d973deecf476482bc0eb46454bb4fd18036f Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 27 Sep 2022 17:08:44 +0200 Subject: [PATCH 025/103] Update change-log: Remove at-signs before contributors. --- resources/texts/change_log.txt | 42 +++++++++++++++++----------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/resources/texts/change_log.txt b/resources/texts/change_log.txt index 6f505ac21c..d542d4fdf7 100644 --- a/resources/texts/change_log.txt +++ b/resources/texts/change_log.txt @@ -12,8 +12,8 @@ Three new settings: 'Initial Layer Outer Wall Flow', 'Initial Layer Inner Wall F * Other new features and improvements: - Auto-remove holes from not completely solid models in vase-mode. - Add setting for 'tree support max diameter'. -- Add option to drop-down models to the build-plate individually. contributed to @Piezoid -- Added a preference to make the tray icon optional. contributed by @fieldOfView +- Add option to drop-down models to the build-plate individually. contributed to Piezoid +- Added a preference to make the tray icon optional. contributed by fieldOfView * Bug fixes: - Don't ignore bottom pattern when spiralizing. @@ -22,9 +22,9 @@ Three new settings: 'Initial Layer Outer Wall Flow', 'Initial Layer Inner Wall F - Cutting meshes with 'surface' set to 'both' cut through the mesh. - Brim lines where ordered the wrong way in some cases. - Random seam is now more random. -- Correctly apply combing when spiralizing. contributed by @smartavionics +- Correctly apply combing when spiralizing. contributed by smartavionics - Don't spam the user with spurious 'Cura Notification's. -- Don't spam the logs with duplicated deprecated warnings. contributed by @Patschke +- Don't spam the logs with duplicated deprecated warnings. contributed by Patschke - Properly update the infill percentage in the top bar after an intent profile switch. - An uninstall could only be done by the original user that installed. - In certain rare situations, layers would be printed multiple times when monotonic fill was on. @@ -33,27 +33,27 @@ Three new settings: 'Initial Layer Outer Wall Flow', 'Initial Layer Inner Wall F - Reduce clickable area of settings checkboxes, to prevent mis-clicks. - Fixed a crash when an unnamed tool would be accessed (possibly related to plugin use). - Fix an issue where a plugin would crash because of a missing dependency. -- Code refactors contributed by @digitalfrost -- Fix for to-mouse zoom on screens with scaling factor. contributed by @seaniepie +- Code refactors contributed by digitalfrost +- Fix for to-mouse zoom on screens with scaling factor. contributed by seaniepie - Models could not be multiplied in one-at-a-time mode. * Printer definitions, profiles and materials: -- Added Creality Ender 3 S1 profile. contributed by @Sebazzz -- Added Anycubic Kobra (Max). contributed by @ANYCUBIC-3D -- Added HCTECH printers. contributed by @3d-hctech -- Added da Vinci Pro EVO. contributed by @heed818 -- Fix FLSUN QQ-S platform orientation. contributed by @RVillani -- Fix Kingroon printers from going outside the build-volume in the end-gcode. contributed by @odaki -- Added Geetech Mizar_S. contributed by @Geeetech3D +- Added Creality Ender 3 S1 profile. contributed by Sebazzz +- Added Anycubic Kobra (Max). contributed by ANYCUBIC-3D +- Added HCTECH printers. contributed by 3d-hctech +- Added da Vinci Pro EVO. contributed by heed818 +- Fix FLSUN QQ-S platform orientation. contributed by RVillani +- Fix Kingroon printers from going outside the build-volume in the end-gcode. contributed by odaki +- Added Geetech Mizar_S. contributed by Geeetech3D - Added Tank-M printer. contributed by KOONOVO3DPrinter -- Update Renkforce RF100XL definition. contributed by @imakecodes -- Added VzBot profiles. contributed by @ckvsoft -- Added (additional) mingda printers. contributed by @jianshu-du -- Added Naxe machines. contributed by @Naxecorp -- Added T-Rex 2+, T-Rex 3. contributed by @jim-edwards -- Update FLsun SR. @xPakrikx -- Update Anycubic mega zero. contributed by @NOVAXIM -- Added some Renkforce machines. contributed by @goofoo3d +- Update Renkforce RF100XL definition. contributed by imakecodes +- Added VzBot profiles. contributed by ckvsoft +- Added (additional) mingda printers. contributed by jianshu-du +- Added Naxe machines. contributed by Naxecorp +- Added T-Rex 2+, T-Rex 3. contributed by jim-edwards +- Update FLsun SR. xPakrikx +- Update Anycubic mega zero. contributed by NOVAXIM +- Added some Renkforce machines. contributed by goofoo3d * Community translations (pending): - Updated the Brazilian Portuguese translation, contributed by Patola. From fb48c80ff904f33e0766fa5edbb460a1a1b2ce3a Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 27 Sep 2022 17:25:58 +0200 Subject: [PATCH 026/103] Update changelog: Style and small fixes. --- resources/texts/change_log.txt | 84 +++++++++++++++++----------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/resources/texts/change_log.txt b/resources/texts/change_log.txt index d542d4fdf7..d62c0c0a34 100644 --- a/resources/texts/change_log.txt +++ b/resources/texts/change_log.txt @@ -10,54 +10,54 @@ Colleagues or students in a ‘Guest’ role can prepare print jobs in Ultimaker Three new settings: 'Initial Layer Outer Wall Flow', 'Initial Layer Inner Wall Flow', 'Initial Layer Bottom Flow', to better counteract the 'elephants foot' phenomenon. * Other new features and improvements: -- Auto-remove holes from not completely solid models in vase-mode. -- Add setting for 'tree support max diameter'. -- Add option to drop-down models to the build-plate individually. contributed to Piezoid -- Added a preference to make the tray icon optional. contributed by fieldOfView +- Auto-remove holes from not completely solid models in vase-mode +- Add setting for 'tree support max diameter' +- Add option to drop-down models to the build-plate individually, contributed to Piezoid +- Added a preference to make the tray icon optional, contributed by fieldOfView * Bug fixes: -- Don't ignore bottom pattern when spiralizing. -- Don't 'Union All' for 'Merged Meshes Overlap'. -- Seam placement was not in the correct corner in some cases. -- Cutting meshes with 'surface' set to 'both' cut through the mesh. -- Brim lines where ordered the wrong way in some cases. -- Random seam is now more random. -- Correctly apply combing when spiralizing. contributed by smartavionics -- Don't spam the user with spurious 'Cura Notification's. -- Don't spam the logs with duplicated deprecated warnings. contributed by Patschke -- Properly update the infill percentage in the top bar after an intent profile switch. -- An uninstall could only be done by the original user that installed. -- In certain rare situations, layers would be printed multiple times when monotonic fill was on. -- Put tree support infill density at 0% by default. -- Machine settings: Also save values when closing the window, not just when focus' changed. -- Reduce clickable area of settings checkboxes, to prevent mis-clicks. -- Fixed a crash when an unnamed tool would be accessed (possibly related to plugin use). -- Fix an issue where a plugin would crash because of a missing dependency. -- Code refactors contributed by digitalfrost -- Fix for to-mouse zoom on screens with scaling factor. contributed by seaniepie -- Models could not be multiplied in one-at-a-time mode. +- Don't ignore bottom pattern when spiralizing +- Don't 'Union All' for 'Merged Meshes Overlap' +- Seam placement was not in the correct corner in some cases +- Cutting meshes with 'surface' set to 'both' cut through the mesh +- Brim lines where ordered the wrong way in some cases +- Random seam is now more random +- Correctly apply combing when spiralizing, contributed by smartavionics +- Don't spam the user with spurious 'Cura Notification's (Windows only) +- Don't spam the logs with duplicated deprecated warnings, contributed by Patschke +- Properly update the infill percentage in the top bar after an intent profile switch +- An uninstall could only be done by the original user that installed +- In certain rare situations, layers would be printed multiple times when monotonic fill was on +- Put tree support infill density at 0% by default +- Machine settings: Also save values when closing the window, not just when focus' changed +- Reduce clickable area of settings checkboxes, to prevent mis-clicks +- Fixed a crash when an unnamed tool would be accessed (possibly related to plugin use) +- Fix an issue where a plugin would crash because of a missing dependency +- Many helpful code refactors, contributed by digitalfrost +- Fix for to-mouse zoom on screens with scaling factor, contributed by seaniepie +- Models could not be multiplied in one-at-a-time mode * Printer definitions, profiles and materials: -- Added Creality Ender 3 S1 profile. contributed by Sebazzz -- Added Anycubic Kobra (Max). contributed by ANYCUBIC-3D -- Added HCTECH printers. contributed by 3d-hctech -- Added da Vinci Pro EVO. contributed by heed818 -- Fix FLSUN QQ-S platform orientation. contributed by RVillani -- Fix Kingroon printers from going outside the build-volume in the end-gcode. contributed by odaki -- Added Geetech Mizar_S. contributed by Geeetech3D -- Added Tank-M printer. contributed by KOONOVO3DPrinter -- Update Renkforce RF100XL definition. contributed by imakecodes -- Added VzBot profiles. contributed by ckvsoft -- Added (additional) mingda printers. contributed by jianshu-du -- Added Naxe machines. contributed by Naxecorp -- Added T-Rex 2+, T-Rex 3. contributed by jim-edwards -- Update FLsun SR. xPakrikx -- Update Anycubic mega zero. contributed by NOVAXIM -- Added some Renkforce machines. contributed by goofoo3d +- Added Creality Ender 3 S1 profile, contributed by Sebazzz +- Added Anycubic Kobra (Max), contributed by ANYCUBIC-3D +- Added HCTECH printers, contributed by 3d-hctech +- Added da Vinci Pro EVO, contributed by heed818 +- Fix FLSUN QQ-S platform orientation, contributed by RVillani +- Fix Kingroon printers from going outside the build-volume in the end-gcode, contributed by odaki +- Added Geetech Mizar_S, contributed by Geeetech3D +- Added Tank-M printer, contributed by KOONOVO3DPrinter +- Update Renkforce RF100XL definition, contributed by imakecodes +- Added VzBot profiles, contributed by ckvsoft +- Added (additional) mingda printers, contributed by jianshu-du +- Added Naxe machines, contributed by Naxecorp +- Added T-Rex 2+, T-Rex 3, contributed by jim-edwards +- Update FLsun SR, contributed xPakrikx +- Update Anycubic mega zero, contributed by NOVAXIM +- Added some Renkforce machines, contributed by goofoo3d * Community translations (pending): -- Updated the Brazilian Portuguese translation, contributed by Patola. -- Updated the Czech translation, contributed by sustmi. +- Updated the Brazilian Portuguese translation, contributed by Patola +- Updated the Czech translation, contributed by sustmi * Known critical issues: - While some small fixes have been made already, the placement of the seam is still more scattered than before 5.0. (Will try to fix in stable.) From 9a4500f8472a71febfe5f79ef1a5eefc247e906b Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 28 Sep 2022 10:37:08 +0200 Subject: [PATCH 027/103] Update SDK to 8.2.0 for release 5.2 --- cura/ApplicationMetadata.py | 2 +- resources/bundled_packages/cura.json | 214 +++++++++++++-------------- 2 files changed, 108 insertions(+), 108 deletions(-) diff --git a/cura/ApplicationMetadata.py b/cura/ApplicationMetadata.py index 4938d569e7..92d5eb6b64 100644 --- a/cura/ApplicationMetadata.py +++ b/cura/ApplicationMetadata.py @@ -14,7 +14,7 @@ DEFAULT_CURA_LATEST_URL = "https://software.ultimaker.com/latest.json" # Each release has a fixed SDK version coupled with it. It doesn't make sense to make it configurable because, for # example Cura 3.2 with SDK version 6.1 will not work. So the SDK version is hard-coded here and left out of the # CuraVersion.py.in template. -CuraSDKVersion = "8.1.0" +CuraSDKVersion = "8.2.0" try: from cura.CuraVersion import CuraLatestURL diff --git a/resources/bundled_packages/cura.json b/resources/bundled_packages/cura.json index df89a0e2d1..6e28222597 100644 --- a/resources/bundled_packages/cura.json +++ b/resources/bundled_packages/cura.json @@ -6,7 +6,7 @@ "display_name": "3MF Reader", "description": "Provides support for reading 3MF files.", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -23,7 +23,7 @@ "display_name": "3MF Writer", "description": "Provides support for writing 3MF files.", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -40,7 +40,7 @@ "display_name": "AMF Reader", "description": "Provides support for reading AMF files.", "package_version": "1.0.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "fieldOfView", @@ -57,7 +57,7 @@ "display_name": "Cura Backups", "description": "Backup and restore your configuration.", "package_version": "1.2.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -74,7 +74,7 @@ "display_name": "CuraEngine Backend", "description": "Provides the link to the CuraEngine slicing backend.", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -91,7 +91,7 @@ "display_name": "Cura Profile Reader", "description": "Provides support for importing Cura profiles.", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -108,7 +108,7 @@ "display_name": "Cura Profile Writer", "description": "Provides support for exporting Cura profiles.", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -125,7 +125,7 @@ "display_name": "Ultimaker Digital Library", "description": "Connects to the Digital Library, allowing Cura to open files from and save files to the Digital Library.", "package_version": "1.1.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -142,7 +142,7 @@ "display_name": "Firmware Update Checker", "description": "Checks for firmware updates.", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -159,7 +159,7 @@ "display_name": "Firmware Updater", "description": "Provides a machine actions for updating firmware.", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -176,7 +176,7 @@ "display_name": "Compressed G-code Reader", "description": "Reads g-code from a compressed archive.", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -193,7 +193,7 @@ "display_name": "Compressed G-code Writer", "description": "Writes g-code to a compressed archive.", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -210,7 +210,7 @@ "display_name": "G-Code Profile Reader", "description": "Provides support for importing profiles from g-code files.", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -227,7 +227,7 @@ "display_name": "G-Code Reader", "description": "Allows loading and displaying G-code files.", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "VictorLarchenko", @@ -244,7 +244,7 @@ "display_name": "G-Code Writer", "description": "Writes g-code to a file.", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -261,7 +261,7 @@ "display_name": "Image Reader", "description": "Enables ability to generate printable geometry from 2D image files.", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -278,7 +278,7 @@ "display_name": "Legacy Cura Profile Reader", "description": "Provides support for importing profiles from legacy Cura versions.", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -295,7 +295,7 @@ "display_name": "Machine Settings Action", "description": "Provides a way to change machine settings (such as build volume, nozzle size, etc.).", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "fieldOfView", @@ -312,7 +312,7 @@ "display_name": "Model Checker", "description": "Checks models and print configuration for possible printing issues and give suggestions.", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -329,7 +329,7 @@ "display_name": "Monitor Stage", "description": "Provides a monitor stage in Cura.", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -346,7 +346,7 @@ "display_name": "Per-Object Settings Tool", "description": "Provides the per-model settings.", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -363,7 +363,7 @@ "display_name": "Post Processing", "description": "Extension that allows for user created scripts for post processing.", "package_version": "2.2.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -380,7 +380,7 @@ "display_name": "Prepare Stage", "description": "Provides a prepare stage in Cura.", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -397,7 +397,7 @@ "display_name": "Preview Stage", "description": "Provides a preview stage in Cura.", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -414,7 +414,7 @@ "display_name": "Removable Drive Output Device", "description": "Provides removable drive hotplugging and writing support.", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -431,7 +431,7 @@ "display_name": "Sentry Logger", "description": "Logs certain events so that they can be used by the crash reporter", "package_version": "1.0.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -448,7 +448,7 @@ "display_name": "Simulation View", "description": "Provides the Simulation view.", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -465,7 +465,7 @@ "display_name": "Slice Info", "description": "Submits anonymous slice info. Can be disabled through preferences.", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -482,7 +482,7 @@ "display_name": "Solid View", "description": "Provides a normal solid mesh view.", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -499,7 +499,7 @@ "display_name": "Support Eraser Tool", "description": "Creates an eraser mesh to block the printing of support in certain places.", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -516,7 +516,7 @@ "display_name": "Trimesh Reader", "description": "Provides support for reading model files.", "package_version": "1.0.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -533,7 +533,7 @@ "display_name": "Marketplace", "description": "Find, manage and install new Cura packages.", "package_version": "1.0.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -550,7 +550,7 @@ "display_name": "UFP Reader", "description": "Provides support for reading Ultimaker Format Packages.", "package_version": "1.0.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -567,7 +567,7 @@ "display_name": "UFP Writer", "description": "Provides support for writing Ultimaker Format Packages.", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -584,7 +584,7 @@ "display_name": "Ultimaker Machine Actions", "description": "Provides machine actions for Ultimaker machines (such as bed leveling wizard, selecting upgrades, etc.).", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -601,7 +601,7 @@ "display_name": "UM3 Network Printing", "description": "Manages network connections to Ultimaker 3 printers.", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -618,7 +618,7 @@ "display_name": "USB Printing", "description": "Accepts G-Code and sends them to a printer. Plugin can also update firmware.", "package_version": "1.0.2", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -635,7 +635,7 @@ "display_name": "Version Upgrade 2.1 to 2.2", "description": "Upgrades configurations from Cura 2.1 to Cura 2.2.", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -652,7 +652,7 @@ "display_name": "Version Upgrade 2.2 to 2.4", "description": "Upgrades configurations from Cura 2.2 to Cura 2.4.", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -669,7 +669,7 @@ "display_name": "Version Upgrade 2.5 to 2.6", "description": "Upgrades configurations from Cura 2.5 to Cura 2.6.", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -686,7 +686,7 @@ "display_name": "Version Upgrade 2.6 to 2.7", "description": "Upgrades configurations from Cura 2.6 to Cura 2.7.", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -703,7 +703,7 @@ "display_name": "Version Upgrade 2.7 to 3.0", "description": "Upgrades configurations from Cura 2.7 to Cura 3.0.", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -720,7 +720,7 @@ "display_name": "Version Upgrade 3.0 to 3.1", "description": "Upgrades configurations from Cura 3.0 to Cura 3.1.", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -737,7 +737,7 @@ "display_name": "Version Upgrade 3.2 to 3.3", "description": "Upgrades configurations from Cura 3.2 to Cura 3.3.", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -754,7 +754,7 @@ "display_name": "Version Upgrade 3.3 to 3.4", "description": "Upgrades configurations from Cura 3.3 to Cura 3.4.", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -771,7 +771,7 @@ "display_name": "Version Upgrade 3.4 to 3.5", "description": "Upgrades configurations from Cura 3.4 to Cura 3.5.", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -788,7 +788,7 @@ "display_name": "Version Upgrade 3.5 to 4.0", "description": "Upgrades configurations from Cura 3.5 to Cura 4.0.", "package_version": "1.0.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -805,7 +805,7 @@ "display_name": "Version Upgrade 4.0 to 4.1", "description": "Upgrades configurations from Cura 4.0 to Cura 4.1.", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -822,7 +822,7 @@ "display_name": "Version Upgrade 4.1 to 4.2", "description": "Upgrades configurations from Cura 4.1 to Cura 4.2.", "package_version": "1.0.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -839,7 +839,7 @@ "display_name": "Version Upgrade 4.2 to 4.3", "description": "Upgrades configurations from Cura 4.2 to Cura 4.3.", "package_version": "1.0.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -856,7 +856,7 @@ "display_name": "Version Upgrade 4.3 to 4.4", "description": "Upgrades configurations from Cura 4.3 to Cura 4.4.", "package_version": "1.0.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -873,7 +873,7 @@ "display_name": "Version Upgrade 4.4 to 4.5", "description": "Upgrades configurations from Cura 4.4 to Cura 4.5.", "package_version": "1.0.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -890,7 +890,7 @@ "display_name": "Version Upgrade 4.5 to 4.6", "description": "Upgrades configurations from Cura 4.5 to Cura 4.6.", "package_version": "1.0.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -907,7 +907,7 @@ "display_name": "Version Upgrade 4.6.0 to 4.6.2", "description": "Upgrades configurations from Cura 4.6.0 to Cura 4.6.2.", "package_version": "1.0.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -924,7 +924,7 @@ "display_name": "Version Upgrade 4.6.2 to 4.7", "description": "Upgrades configurations from Cura 4.6.2 to Cura 4.7.", "package_version": "1.0.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -941,7 +941,7 @@ "display_name": "Version Upgrade 4.7.0 to 4.8.0", "description": "Upgrades configurations from Cura 4.7.0 to Cura 4.8.0", "package_version": "1.0.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -958,7 +958,7 @@ "display_name": "Version Upgrade 4.8.0 to 4.9.0", "description": "Upgrades configurations from Cura 4.8.0 to Cura 4.9.0", "package_version": "1.0.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -975,7 +975,7 @@ "display_name": "Version Upgrade 4.9 to 4.10", "description": "Upgrades configurations from Cura 4.9 to Cura 4.10", "package_version": "1.0.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -1010,7 +1010,7 @@ "display_name": "X3D Reader", "description": "Provides support for reading X3D files.", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "SevaAlekseyev", @@ -1027,7 +1027,7 @@ "display_name": "XML Material Profiles", "description": "Provides capabilities to read and write XML-based material profiles.", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -1044,7 +1044,7 @@ "display_name": "X-Ray View", "description": "Provides the X-Ray view.", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -1061,7 +1061,7 @@ "display_name": "Generic ABS", "description": "The generic ABS profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1079,7 +1079,7 @@ "display_name": "Generic BAM", "description": "The generic BAM profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1097,7 +1097,7 @@ "display_name": "Generic CFF CPE", "description": "The generic CFF CPE profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1115,7 +1115,7 @@ "display_name": "Generic CFF PA", "description": "The generic CFF PA profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1133,7 +1133,7 @@ "display_name": "Generic CPE", "description": "The generic CPE profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1151,7 +1151,7 @@ "display_name": "Generic CPE+", "description": "The generic CPE+ profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1169,7 +1169,7 @@ "display_name": "Generic GFF CPE", "description": "The generic GFF CPE profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1187,7 +1187,7 @@ "display_name": "Generic GFF PA", "description": "The generic GFF PA profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1205,7 +1205,7 @@ "display_name": "Generic HIPS", "description": "The generic HIPS profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1223,7 +1223,7 @@ "display_name": "Generic Nylon", "description": "The generic Nylon profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1241,7 +1241,7 @@ "display_name": "Generic PC", "description": "The generic PC profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1259,7 +1259,7 @@ "display_name": "Generic PETG", "description": "The generic PETG profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1277,7 +1277,7 @@ "display_name": "Generic PLA", "description": "The generic PLA profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1295,7 +1295,7 @@ "display_name": "Generic PP", "description": "The generic PP profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1313,7 +1313,7 @@ "display_name": "Generic PVA", "description": "The generic PVA profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1331,7 +1331,7 @@ "display_name": "Generic Tough PLA", "description": "The generic Tough PLA profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1349,7 +1349,7 @@ "display_name": "Generic TPU", "description": "The generic TPU profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1367,7 +1367,7 @@ "display_name": "Dagoma Chromatik PLA", "description": "Filament testé et approuvé pour les imprimantes 3D Dagoma. Chromatik est l'idéal pour débuter et suivre les tutoriels premiers pas. Il vous offre qualité et résistance pour chacune de vos impressions.", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://dagoma.fr/boutique/filaments.html", "author": { "author_id": "Dagoma", @@ -1384,7 +1384,7 @@ "display_name": "FABtotum ABS", "description": "This material is easy to be extruded but it is not the simplest to use. It is one of the most used in 3D printing to get very well finished objects. It is not sustainable and its smoke can be dangerous if inhaled. The reason to prefer this filament to PLA is mainly because of its precision and mechanical specs. ABS (for plastic) stands for Acrylonitrile Butadiene Styrene and it is a thermoplastic which is widely used in everyday objects. It can be printed with any FFF 3D printer which can get to high temperatures as it must be extruded in a range between 220° and 245°, so it’s compatible with all versions of the FABtotum Personal fabricator.", "package_version": "1.4.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://store.fabtotum.com/eu/products/filaments.html?filament_type=40", "author": { "author_id": "FABtotum", @@ -1401,7 +1401,7 @@ "display_name": "FABtotum Nylon", "description": "When 3D printing started this material was not listed among the extrudable filaments. It is flexible as well as resistant to tractions. It is well known for its uses in textile but also in industries which require a strong and flexible material. There are different kinds of Nylon: 3D printing mostly uses Nylon 6 and Nylon 6.6, which are the most common. It requires higher temperatures to be printed, so a 3D printer must be able to reach them (around 240°C): the FABtotum, of course, can.", "package_version": "1.4.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://store.fabtotum.com/eu/products/filaments.html?filament_type=53", "author": { "author_id": "FABtotum", @@ -1418,7 +1418,7 @@ "display_name": "FABtotum PLA", "description": "It is the most common filament used for 3D printing. It is studied to be bio-degradable as it comes from corn starch’s sugar mainly. It is completely made of renewable sources and has no footprint on polluting. PLA stands for PolyLactic Acid and it is a thermoplastic that today is still considered the easiest material to be 3D printed. It can be extruded at lower temperatures: the standard range of FABtotum’s one is between 185° and 195°.", "package_version": "1.4.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://store.fabtotum.com/eu/products/filaments.html?filament_type=39", "author": { "author_id": "FABtotum", @@ -1435,7 +1435,7 @@ "display_name": "FABtotum TPU Shore 98A", "description": "", "package_version": "1.4.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://store.fabtotum.com/eu/products/filaments.html?filament_type=66", "author": { "author_id": "FABtotum", @@ -1452,7 +1452,7 @@ "display_name": "Fiberlogy HD PLA", "description": "With our HD PLA you have many more options. You can use this material in two ways. Choose the one you like best. You can use it as a normal PLA and get prints characterized by a very good adhesion between the layers and high precision. You can also make your prints acquire similar properties to that of ABS – better impact resistance and high temperature resistance. All you need is an oven. Yes, an oven! By annealing our HD PLA in an oven, in accordance with the manual, you will avoid all the inconveniences of printing with ABS, such as unpleasant odour or hazardous fumes.", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "http://fiberlogy.com/en/fiberlogy-filaments/filament-hd-pla/", "author": { "author_id": "Fiberlogy", @@ -1469,7 +1469,7 @@ "display_name": "Filo3D PLA", "description": "Fast, safe and reliable printing. PLA is ideal for the fast and reliable printing of parts and prototypes with a great surface quality.", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://dagoma.fr", "author": { "author_id": "Dagoma", @@ -1486,7 +1486,7 @@ "display_name": "IMADE3D JellyBOX PETG", "description": "", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "http://shop.imade3d.com/filament.html", "author": { "author_id": "IMADE3D", @@ -1503,7 +1503,7 @@ "display_name": "IMADE3D JellyBOX PLA", "description": "", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "http://shop.imade3d.com/filament.html", "author": { "author_id": "IMADE3D", @@ -1520,7 +1520,7 @@ "display_name": "Octofiber PLA", "description": "PLA material from Octofiber.", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://nl.octofiber.com/3d-printing-filament/pla.html", "author": { "author_id": "Octofiber", @@ -1537,7 +1537,7 @@ "display_name": "PolyFlex™ PLA", "description": "PolyFlex™ is a highly flexible yet easy to print 3D printing material. Featuring good elasticity and a large strain-to- failure, PolyFlex™ opens up a completely new realm of applications.", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "http://www.polymaker.com/shop/polyflex/", "author": { "author_id": "Polymaker", @@ -1554,7 +1554,7 @@ "display_name": "PolyMax™ PLA", "description": "PolyMax™ PLA is a 3D printing material with excellent mechanical properties and printing quality. PolyMax™ PLA has an impact resistance of up to nine times that of regular PLA, and better overall mechanical properties than ABS.", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "http://www.polymaker.com/shop/polymax/", "author": { "author_id": "Polymaker", @@ -1571,7 +1571,7 @@ "display_name": "PolyPlus™ PLA True Colour", "description": "PolyPlus™ PLA is a premium PLA designed for all desktop FDM/FFF 3D printers. It is produced with our patented Jam-Free™ technology that ensures consistent extrusion and prevents jams.", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "http://www.polymaker.com/shop/polyplus-true-colour/", "author": { "author_id": "Polymaker", @@ -1588,7 +1588,7 @@ "display_name": "PolyWood™ PLA", "description": "PolyWood™ is a wood mimic printing material that contains no actual wood ensuring a clean Jam-Free™ printing experience.", "package_version": "1.0.1", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "http://www.polymaker.com/shop/polywood/", "author": { "author_id": "Polymaker", @@ -1605,7 +1605,7 @@ "display_name": "Ultimaker ABS", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "1.4.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com/products/materials/abs", "author": { "author_id": "UltimakerPackages", @@ -1624,7 +1624,7 @@ "display_name": "Ultimaker Breakaway", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "1.4.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com/products/materials/breakaway", "author": { "author_id": "UltimakerPackages", @@ -1643,7 +1643,7 @@ "display_name": "Ultimaker CPE", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "1.4.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com/products/materials/abs", "author": { "author_id": "UltimakerPackages", @@ -1662,7 +1662,7 @@ "display_name": "Ultimaker CPE+", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "1.4.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com/products/materials/cpe", "author": { "author_id": "UltimakerPackages", @@ -1681,7 +1681,7 @@ "display_name": "Ultimaker Nylon", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "1.4.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com/products/materials/abs", "author": { "author_id": "UltimakerPackages", @@ -1700,7 +1700,7 @@ "display_name": "Ultimaker PC", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "1.4.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com/products/materials/pc", "author": { "author_id": "UltimakerPackages", @@ -1719,7 +1719,7 @@ "display_name": "Ultimaker PLA", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "1.4.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com/products/materials/abs", "author": { "author_id": "UltimakerPackages", @@ -1738,7 +1738,7 @@ "display_name": "Ultimaker PP", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "1.4.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com/products/materials/pp", "author": { "author_id": "UltimakerPackages", @@ -1757,7 +1757,7 @@ "display_name": "Ultimaker PVA", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "1.4.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com/products/materials/abs", "author": { "author_id": "UltimakerPackages", @@ -1776,7 +1776,7 @@ "display_name": "Ultimaker TPU 95A", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "1.4.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com/products/materials/tpu-95a", "author": { "author_id": "UltimakerPackages", @@ -1795,7 +1795,7 @@ "display_name": "Ultimaker Tough PLA", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "1.4.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://ultimaker.com/products/materials/tough-pla", "author": { "author_id": "UltimakerPackages", @@ -1814,7 +1814,7 @@ "display_name": "Vertex Delta ABS", "description": "ABS material and quality files for the Delta Vertex K8800.", "package_version": "1.4.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://vertex3dprinter.eu", "author": { "author_id": "Velleman", @@ -1831,7 +1831,7 @@ "display_name": "Vertex Delta PET", "description": "ABS material and quality files for the Delta Vertex K8800.", "package_version": "1.4.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://vertex3dprinter.eu", "author": { "author_id": "Velleman", @@ -1848,7 +1848,7 @@ "display_name": "Vertex Delta PLA", "description": "ABS material and quality files for the Delta Vertex K8800.", "package_version": "1.4.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://vertex3dprinter.eu", "author": { "author_id": "Velleman", @@ -1865,7 +1865,7 @@ "display_name": "Vertex Delta TPU", "description": "ABS material and quality files for the Delta Vertex K8800.", "package_version": "1.4.0", - "sdk_version": "8.1.0", + "sdk_version": "8.2.0", "website": "https://vertex3dprinter.eu", "author": { "author_id": "Velleman", From aab4723fe0a33894009444cae2eedf2b009c5145 Mon Sep 17 00:00:00 2001 From: Remco Burema <41987080+rburema@users.noreply.github.com> Date: Wed, 28 Sep 2022 12:22:15 +0200 Subject: [PATCH 028/103] Changelog updates: suggestions from 'code' review. Co-authored-by: Joey de l'Arago --- resources/texts/change_log.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/texts/change_log.txt b/resources/texts/change_log.txt index d62c0c0a34..edbd7f1b91 100644 --- a/resources/texts/change_log.txt +++ b/resources/texts/change_log.txt @@ -1,10 +1,10 @@ [5.2-BETA] * Abstract Cloud Printer Type -For currently online cloud printers, they are collated by type, and you can slice on the ('abstract') printer-type, then choose the specific printer that matches the profiles afterwards. +Online cloud printers are now grouped by type. You can slice with the ('abstract') printer type, and afterwards choose a specific printer to print with. * Support For 'Guest'-Type Accounts (In Digital Factory) -Colleagues or students in a ‘Guest’ role can prepare print jobs in Ultimaker Cura and send them to the printers via Digital Factory. Print jobs prepared like this will not start immediately but wait for approval from a user with an 'Member' or 'Admin' role. +Users with the ‘Guest’ role can prepare print jobs in Ultimaker Cura and send them to the printers via Digital Factory. These print jobs will not start until they are approved by a user with an 'Member' or 'Admin' role. * More Control Over Initial Layer Flow Three new settings: 'Initial Layer Outer Wall Flow', 'Initial Layer Inner Wall Flow', 'Initial Layer Bottom Flow', to better counteract the 'elephants foot' phenomenon. From 17462d274bf1cd1ea904625513db481e11c0d9b3 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 28 Sep 2022 16:15:32 +0200 Subject: [PATCH 029/103] Upgrade SciPy to 1.9.1 This _should_ fix a bug where Cura crashes due to a username with non-latin characters in Windows. This is due to the creation and removal of temporary files by SciPy, which on Windows, happens in the users' folder. CURA-8416 --- requirements.txt | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/requirements.txt b/requirements.txt index 60dcb77bea..70a91f9a0e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -66,16 +66,30 @@ pyclipper==1.3.0.post2; \ --hash=sha256:5175ee50772a7dcc0feaab19ccf5b979b6066f4753edb330700231cf70d0c918 \ --hash=sha256:19a6809d9cbd535d0fe922e9315babb8d70b5c7dcd43e0f89740d09c406b40f8 \ --hash=sha256:5c5d50498e335d7f969ca5ad5886e77c40088521dcabab4feb2f93727140251e -scipy==1.8.1; \ - --hash=sha256:9e3fb1b0e896f14a85aa9a28d5f755daaeeb54c897b746df7a55ccb02b340f33 \ - --hash=sha256:4e53a55f6a4f22de01ffe1d2f016e30adedb67a699a310cdcac312806807ca81 \ - --hash=sha256:a0aa8220b89b2e3748a2836fbfa116194378910f1a6e78e4675a095bcd2c762d \ - --hash=sha256:02b567e722d62bddd4ac253dafb01ce7ed8742cf8031aea030a41414b86c1125 \ - --hash=sha256:65b77f20202599c51eb2771d11a6b899b97989159b7975e9b5259594f1d35ef4 \ - --hash=sha256:9dd4012ac599a1e7eb63c114d1eee1bcfc6dc75a29b589ff0ad0bb3d9412034f \ - --hash=sha256:70de2f11bf64ca9921fda018864c78af7147025e467ce9f4a11bc877266900a6 \ - --hash=sha256:83606129247e7610b58d0e1e93d2c5133959e9cf93555d3c27e536892f1ba1f2 \ - --hash=sha256:f3e7a8867f307e3359cc0ed2c63b61a1e33a19080f92fe377bc7d49f646f2ec1 +scipy==1.9.1 \ + --hash=sha256:c61b4a91a702e8e04aeb0bfc40460e1f17a640977c04dda8757efb0199c75332 \ + --hash=sha256:d79da472015d0120ba9b357b28a99146cd6c17b9609403164b1a8ed149b4dfc8 \ + --hash=sha256:825951b88f56765aeb6e5e38ac9d7d47407cfaaeb008d40aa1b45a2d7ea2731e \ + --hash=sha256:f950a04b33e17b38ff561d5a0951caf3f5b47caa841edd772ffb7959f20a6af0 \ + --hash=sha256:8cc81ac25659fec73599ccc52c989670e5ccd8974cf34bacd7b54a8d809aff1a \ + --hash=sha256:8d3faa40ac16c6357aaf7ea50394ea6f1e8e99d75e927a51102b1943b311b4d9 \ + --hash=sha256:7a412c476a91b080e456229e413792bbb5d6202865dae963d1e6e28c2bb58691 \ + --hash=sha256:eb954f5aca4d26f468bbebcdc5448348eb287f7bea536c6306f62ea062f63d9a \ + --hash=sha256:3c6f5d1d4b9a5e4fe5e14f26ffc9444fc59473bbf8d45dc4a9a15283b7063a72 \ + --hash=sha256:bc4e2c77d4cd015d739e75e74ebbafed59ba8497a7ed0fd400231ed7683497c4 \ + --hash=sha256:0419485dbcd0ed78c0d5bf234c5dd63e86065b39b4d669e45810d42199d49521 \ + --hash=sha256:34441dfbee5b002f9e15285014fd56e5e3372493c3e64ae297bae2c4b9659f5a \ + --hash=sha256:b97b479f39c7e4aaf807efd0424dec74bbb379108f7d22cf09323086afcd312c \ + --hash=sha256:e8fe305d9d67a81255e06203454729405706907dccbdfcc330b7b3482a6c371d \ + --hash=sha256:39ab9240cd215a9349c85ab908dda6d732f7d3b4b192fa05780812495536acc4 \ + --hash=sha256:71487c503e036740635f18324f62a11f283a632ace9d35933b2b0a04fd898c98 \ + --hash=sha256:3bc1ab68b9a096f368ba06c3a5e1d1d50957a86665fc929c4332d21355e7e8f4 \ + --hash=sha256:f7c39f7dbb57cce00c108d06d731f3b0e2a4d3a95c66d96bce697684876ce4d4 \ + --hash=sha256:47d1a95bd9d37302afcfe1b84c8011377c4f81e33649c5a5785db9ab827a6ade \ + --hash=sha256:96d7cf7b25c9f23c59a766385f6370dab0659741699ecc7a451f9b94604938ce \ + --hash=sha256:09412eb7fb60b8f00b328037fd814d25d261066ebc43a1e339cdce4f7502877e \ + --hash=sha256:90c805f30c46cf60f1e76e947574f02954d25e3bb1e97aa8a07bc53aa31cf7d1 \ + --hash=sha256:26d28c468900e6d5fdb37d2812ab46db0ccd22c63baa095057871faa3a498bc9 trimesh==3.9.36 \ --hash=sha256:f01e8edab14d1999700c980c21a1546f37417216ad915a53be649d263130181e \ --hash=sha256:8ac8bea693b3ee119f11b022fc9b9481c9f1af06cb38bc859bf5d16bbbe49b23 From 224f51bdab7c7df7c87a71d2e9088c90ff2824f7 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 28 Sep 2022 16:59:48 +0200 Subject: [PATCH 030/103] Put links in change-log for critical issues. --- resources/texts/change_log.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/resources/texts/change_log.txt b/resources/texts/change_log.txt index edbd7f1b91..ac55eb1ecd 100644 --- a/resources/texts/change_log.txt +++ b/resources/texts/change_log.txt @@ -61,8 +61,10 @@ Three new settings: 'Initial Layer Outer Wall Flow', 'Initial Layer Inner Wall F * Known critical issues: - While some small fixes have been made already, the placement of the seam is still more scattered than before 5.0. (Will try to fix in stable.) -- Support is sometimes missing in detailed parts, where previous releases supported them properly (still). (Will probably not be fixed in stable. This is currently slated for 5.3) -- Multiple external monitors on Windows (especially if from the same brand) might be a problem under some circumstances. (Will probably not be fixed in stable.) +- Support is sometimes missing in detailed parts, where previous releases supported them properly (still). (Will probably not be fixed in stable. This is currently slated for 5.3) +- Multiple external monitors on Windows (especially if from the same brand) might be a problem under some circumstances. (Will probably not be fixed in stable.) + +* Does Cura (not) work on your OS (version)? See this article for clarification. [5.1.1] * New features: From 237b671e0c24d4ea5323dc66c80046a3931698a4 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 28 Sep 2022 17:21:31 +0200 Subject: [PATCH 031/103] Prevent building with prerelease-string if none present. --- conanfile.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 327a571e54..29cb38502a 100644 --- a/conanfile.py +++ b/conanfile.py @@ -157,7 +157,10 @@ class CuraConan(ConanFile): version.prerelease = self.options.extra_build_version if self.options.internal: version.prerelease = version.prerelease.replace('+', '+internal_') - cura_version = f"{version.major}.{version.minor}.{version.patch}-{version.prerelease}" + if version.prerelease and version.prerelease != "": + cura_version = f"{version.major}.{version.minor}.{version.patch}-{version.prerelease}" + else: + cura_version = f"{version.major}.{version.minor}.{version.patch}" with open(Path(location, "CuraVersion.py"), "w") as f: f.write(cura_version_py.render( From f1250514ef6ddb74014313567641e847423dd79e Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 28 Sep 2022 17:21:31 +0200 Subject: [PATCH 032/103] Prevent building with prerelease-string if none present. --- conanfile.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 327a571e54..29cb38502a 100644 --- a/conanfile.py +++ b/conanfile.py @@ -157,7 +157,10 @@ class CuraConan(ConanFile): version.prerelease = self.options.extra_build_version if self.options.internal: version.prerelease = version.prerelease.replace('+', '+internal_') - cura_version = f"{version.major}.{version.minor}.{version.patch}-{version.prerelease}" + if version.prerelease and version.prerelease != "": + cura_version = f"{version.major}.{version.minor}.{version.patch}-{version.prerelease}" + else: + cura_version = f"{version.major}.{version.minor}.{version.patch}" with open(Path(location, "CuraVersion.py"), "w") as f: f.write(cura_version_py.render( From 91c6f17bb31175d8654f94ee46f125d2642b6d8c Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 28 Sep 2022 17:40:47 +0200 Subject: [PATCH 033/103] Not building with prerelease-string if none present. --- conanfile.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/conanfile.py b/conanfile.py index 29cb38502a..c032d6d83f 100644 --- a/conanfile.py +++ b/conanfile.py @@ -153,12 +153,13 @@ class CuraConan(ConanFile): cura_version = self.conf_info.get("user.cura:version", default = self.version, check_type = str) version = Version(cura_version) + prerelease = "" if self.options.extra_build_version != "": - version.prerelease = self.options.extra_build_version + prerelease = self.options.extra_build_version if self.options.internal: - version.prerelease = version.prerelease.replace('+', '+internal_') - if version.prerelease and version.prerelease != "": - cura_version = f"{version.major}.{version.minor}.{version.patch}-{version.prerelease}" + prerelease = version.prerelease.replace('+', '+internal_') + if prerelease != "": + cura_version = f"{version.major}.{version.minor}.{version.patch}-{prerelease}" else: cura_version = f"{version.major}.{version.minor}.{version.patch}" From 6953ff9019f8d692a916e2e87eb3430fe160d983 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 28 Sep 2022 17:40:47 +0200 Subject: [PATCH 034/103] Not building with prerelease-string if none present. --- conanfile.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/conanfile.py b/conanfile.py index 29cb38502a..c032d6d83f 100644 --- a/conanfile.py +++ b/conanfile.py @@ -153,12 +153,13 @@ class CuraConan(ConanFile): cura_version = self.conf_info.get("user.cura:version", default = self.version, check_type = str) version = Version(cura_version) + prerelease = "" if self.options.extra_build_version != "": - version.prerelease = self.options.extra_build_version + prerelease = self.options.extra_build_version if self.options.internal: - version.prerelease = version.prerelease.replace('+', '+internal_') - if version.prerelease and version.prerelease != "": - cura_version = f"{version.major}.{version.minor}.{version.patch}-{version.prerelease}" + prerelease = version.prerelease.replace('+', '+internal_') + if prerelease != "": + cura_version = f"{version.major}.{version.minor}.{version.patch}-{prerelease}" else: cura_version = f"{version.major}.{version.minor}.{version.patch}" From cbadf50f4dc7358df32b8d64b94b56c13fec212c Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Thu, 29 Sep 2022 12:57:10 +0200 Subject: [PATCH 035/103] Add beta version --- conandata.yml | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/conandata.yml b/conandata.yml index 83f45a2056..cac360ac3f 100644 --- a/conandata.yml +++ b/conandata.yml @@ -10,6 +10,113 @@ # requirements (use the /(latest)@ultimaker/testing) # # Subject to change in the future! + +"5.2.0-beta": + requirements: + - "pyarcus/(latest)@ultimaker/stable" + - "curaengine/(latest)@ultimaker/stable" + - "pysavitar/(latest)@ultimaker/stable" + - "pynest2d/(latest)@ultimaker/stable" + - "uranium/(latest)@ultimaker/stable" + - "fdm_materials/(latest)@ultimaker/stable" + - "cura_binary_data/(latest)@ultimaker/stable" + - "cpython/3.10.4" + internal_requirements: + - "fdm_materials_private/(latest)@ultimaker/testing" + - "cura_private_data/(latest)@ultimaker/testing" + runinfo: + entrypoint: "cura_app.py" + pyinstaller: + datas: + cura_plugins: + package: "cura" + src: "plugins" + dst: "share/cura/plugins" + cura_resources: + package: "cura" + src: "resources" + dst: "share/cura/resources" + cura_private_data: + package: "cura_private_data" + src: "resources" + dst: "share/cura/resources" + internal: true + uranium_plugins: + package: "uranium" + src: "plugins" + dst: "share/uranium/plugins" + uranium_resources: + package: "uranium" + src: "resources" + dst: "share/uranium/resources" + uranium_um_qt_qml_um: + package: "uranium" + src: "site-packages/UM/Qt/qml/UM" + dst: "PyQt6/Qt6/qml/UM" + cura_binary_data: + package: "cura_binary_data" + src: "resources/cura/resources" + dst: "share/cura/resources" + uranium_binary_data: + package: "cura_binary_data" + src: "resources/uranium/resources" + dst: "share/uranium/resources" + windows_binary_data: + package: "cura_binary_data" + src: "windows" + dst: "share/windows" + fdm_materials: + package: "fdm_materials" + src: "materials" + dst: "share/cura/resources/materials" + fdm_materials_private: + package: "fdm_materials_private" + src: "resources/materials" + dst: "share/cura/resources/materials" + internal: true + tcl: + package: "tcl" + src: "lib/tcl8.6" + dst: "tcl" + tk: + package: "tk" + src: "lib/tk8.6" + dst: "tk" + binaries: + curaengine: + package: "curaengine" + src: "bin" + dst: "." + binary: "CuraEngine" + hiddenimports: + - "pySavitar" + - "pyArcus" + - "pynest2d" + - "PyQt6" + - "PyQt6.QtNetwork" + - "PyQt6.sip" + - "logging.handlers" + - "zeroconf" + - "fcntl" + - "stl" + - "serial" + collect_all: + - "cura" + - "UM" + - "serial" + - "Charon" + - "sqlite3" + - "trimesh" + - "win32ctypes" + - "PyQt6" + - "PyQt6.QtNetwork" + - "PyQt6.sip" + - "stl" + icon: + Windows: "./icons/Cura.ico" + Macos: "./icons/cura.icns" + Linux: "./icons/cura-128.png" + "5.2.0-alpha": requirements: - "pyarcus/(latest)@ultimaker/testing" From a2c85dced99c374772747e4a3a48e42477c68d12 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Thu, 29 Sep 2022 16:09:00 +0200 Subject: [PATCH 036/103] Revert "Enable zigzag instead of the lines paatern on the skin layers. This improves print speed and quality. I used to decrease bridging quality, but due to enabling experimental bridging in the print profiles this can now be used." This reverts commit 863e1ecbae19644384e484cf88a3b4e0ae4a86aa. --- 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 c63169fc3a..2e5a2d4f5d 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -292,9 +292,6 @@ }, "support_z_distance": { "value": "0" - }, - "top_bottom_pattern": { - "value": "'zigzag'" } } } From f769216340e775e4b167d925c9cc56a1a6a1f39e Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Fri, 30 Sep 2022 09:23:51 +0200 Subject: [PATCH 037/103] Update conandata.yml --- conandata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index cac360ac3f..f4ce31f655 100644 --- a/conandata.yml +++ b/conandata.yml @@ -11,7 +11,7 @@ # # Subject to change in the future! -"5.2.0-beta": +"5.2.0": requirements: - "pyarcus/(latest)@ultimaker/stable" - "curaengine/(latest)@ultimaker/stable" From 5eccf57c514c8cb5c6a6295b40c6097e49ba3a01 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Fri, 30 Sep 2022 10:05:15 +0200 Subject: [PATCH 038/103] Update conandata.yml --- conandata.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/conandata.yml b/conandata.yml index f4ce31f655..4c35a1957f 100644 --- a/conandata.yml +++ b/conandata.yml @@ -13,13 +13,13 @@ "5.2.0": requirements: - - "pyarcus/(latest)@ultimaker/stable" - - "curaengine/(latest)@ultimaker/stable" - - "pysavitar/(latest)@ultimaker/stable" - - "pynest2d/(latest)@ultimaker/stable" - - "uranium/(latest)@ultimaker/stable" - - "fdm_materials/(latest)@ultimaker/stable" - - "cura_binary_data/(latest)@ultimaker/stable" + - "pyarcus/(latest)@_/_" + - "curaengine/(latest)@_/_" + - "pysavitar/(latest)@_/_" + - "pynest2d/(latest)@_/_" + - "uranium/(latest)@_/_" + - "fdm_materials/(latest)@_/_" + - "cura_binary_data/(latest)@_/_" - "cpython/3.10.4" internal_requirements: - "fdm_materials_private/(latest)@ultimaker/testing" From 3da50c0ee00fb2e8e42fe1cab72766440b0f3e3c Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Fri, 30 Sep 2022 10:25:44 +0200 Subject: [PATCH 039/103] Update conandata.yml --- conandata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index 83f45a2056..0a414ddf8c 100644 --- a/conandata.yml +++ b/conandata.yml @@ -12,7 +12,7 @@ # Subject to change in the future! "5.2.0-alpha": requirements: - - "pyarcus/(latest)@ultimaker/testing" + - "pyarcus/5.2@ultimaker/testing" - "curaengine/(latest)@ultimaker/testing" - "pysavitar/(latest)@ultimaker/testing" - "pynest2d/(latest)@ultimaker/testing" From c482cbddf34c58739f499fdfb9770271a1ef25fc Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Fri, 30 Sep 2022 10:25:44 +0200 Subject: [PATCH 040/103] Update conandata.yml --- conandata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index 4c35a1957f..a3b1e05e1b 100644 --- a/conandata.yml +++ b/conandata.yml @@ -119,7 +119,7 @@ "5.2.0-alpha": requirements: - - "pyarcus/(latest)@ultimaker/testing" + - "pyarcus/5.2@ultimaker/testing" - "curaengine/(latest)@ultimaker/testing" - "pysavitar/(latest)@ultimaker/testing" - "pynest2d/(latest)@ultimaker/testing" From b81b7c8c63654ac3baedaa724c65df8c0f9633bb Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Fri, 30 Sep 2022 10:34:22 +0200 Subject: [PATCH 041/103] Revert "Update conandata.yml" This reverts commit 3da50c0ee00fb2e8e42fe1cab72766440b0f3e3c. --- conandata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index 0a414ddf8c..83f45a2056 100644 --- a/conandata.yml +++ b/conandata.yml @@ -12,7 +12,7 @@ # Subject to change in the future! "5.2.0-alpha": requirements: - - "pyarcus/5.2@ultimaker/testing" + - "pyarcus/(latest)@ultimaker/testing" - "curaengine/(latest)@ultimaker/testing" - "pysavitar/(latest)@ultimaker/testing" - "pynest2d/(latest)@ultimaker/testing" From 94d80ef71255ae514dcb8ff3fd00f6a524b1a1b5 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Fri, 30 Sep 2022 10:35:50 +0200 Subject: [PATCH 042/103] Update conandata.yml --- conandata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index a3b1e05e1b..8b113aaa8e 100644 --- a/conandata.yml +++ b/conandata.yml @@ -13,7 +13,7 @@ "5.2.0": requirements: - - "pyarcus/(latest)@_/_" + - "pyarcus/5.1.1-alpha+32@ultimaker/stable" - "curaengine/(latest)@_/_" - "pysavitar/(latest)@_/_" - "pynest2d/(latest)@_/_" From ff9fb445e0f50008c6bc7b654e749356c30985fe Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Fri, 30 Sep 2022 10:54:52 +0200 Subject: [PATCH 043/103] Update conandata.yml --- conandata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index 8b113aaa8e..3194079f7b 100644 --- a/conandata.yml +++ b/conandata.yml @@ -14,7 +14,7 @@ "5.2.0": requirements: - "pyarcus/5.1.1-alpha+32@ultimaker/stable" - - "curaengine/(latest)@_/_" + - "curaengine/5.2" - "pysavitar/(latest)@_/_" - "pynest2d/(latest)@_/_" - "uranium/(latest)@_/_" From 959e4bfadd606754c67cf574ddc5dda879acdf23 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Fri, 30 Sep 2022 11:07:10 +0200 Subject: [PATCH 044/103] Update conandata.yml --- conandata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index 3194079f7b..1feb4c9021 100644 --- a/conandata.yml +++ b/conandata.yml @@ -14,7 +14,7 @@ "5.2.0": requirements: - "pyarcus/5.1.1-alpha+32@ultimaker/stable" - - "curaengine/5.2" + - "curaengine/(latest)" - "pysavitar/(latest)@_/_" - "pynest2d/(latest)@_/_" - "uranium/(latest)@_/_" From b7ef3133757b00ff1063a60f18691f57ea3708f7 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Fri, 30 Sep 2022 13:19:47 +0200 Subject: [PATCH 045/103] Update conandata.yml --- conandata.yml | 107 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 106 insertions(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index 1feb4c9021..95b2d526b8 100644 --- a/conandata.yml +++ b/conandata.yml @@ -10,7 +10,112 @@ # requirements (use the /(latest)@ultimaker/testing) # # Subject to change in the future! - +"5.2.0-beta": + requirements: + - "pyarcus/5.1.1-alpha+32@ultimaker/stable" + - "curaengine/(latest)" + - "pysavitar/(latest)@_/_" + - "pynest2d/(latest)@_/_" + - "uranium/(latest)@_/_" + - "fdm_materials/(latest)@_/_" + - "cura_binary_data/(latest)@_/_" + - "cpython/3.10.4" + internal_requirements: + - "fdm_materials_private/(latest)@ultimaker/testing" + - "cura_private_data/(latest)@ultimaker/testing" + runinfo: + entrypoint: "cura_app.py" + pyinstaller: + datas: + cura_plugins: + package: "cura" + src: "plugins" + dst: "share/cura/plugins" + cura_resources: + package: "cura" + src: "resources" + dst: "share/cura/resources" + cura_private_data: + package: "cura_private_data" + src: "resources" + dst: "share/cura/resources" + internal: true + uranium_plugins: + package: "uranium" + src: "plugins" + dst: "share/uranium/plugins" + uranium_resources: + package: "uranium" + src: "resources" + dst: "share/uranium/resources" + uranium_um_qt_qml_um: + package: "uranium" + src: "site-packages/UM/Qt/qml/UM" + dst: "PyQt6/Qt6/qml/UM" + cura_binary_data: + package: "cura_binary_data" + src: "resources/cura/resources" + dst: "share/cura/resources" + uranium_binary_data: + package: "cura_binary_data" + src: "resources/uranium/resources" + dst: "share/uranium/resources" + windows_binary_data: + package: "cura_binary_data" + src: "windows" + dst: "share/windows" + fdm_materials: + package: "fdm_materials" + src: "materials" + dst: "share/cura/resources/materials" + fdm_materials_private: + package: "fdm_materials_private" + src: "resources/materials" + dst: "share/cura/resources/materials" + internal: true + tcl: + package: "tcl" + src: "lib/tcl8.6" + dst: "tcl" + tk: + package: "tk" + src: "lib/tk8.6" + dst: "tk" + binaries: + curaengine: + package: "curaengine" + src: "bin" + dst: "." + binary: "CuraEngine" + hiddenimports: + - "pySavitar" + - "pyArcus" + - "pynest2d" + - "PyQt6" + - "PyQt6.QtNetwork" + - "PyQt6.sip" + - "logging.handlers" + - "zeroconf" + - "fcntl" + - "stl" + - "serial" + collect_all: + - "cura" + - "UM" + - "serial" + - "Charon" + - "sqlite3" + - "trimesh" + - "win32ctypes" + - "PyQt6" + - "PyQt6.QtNetwork" + - "PyQt6.sip" + - "stl" + icon: + Windows: "./icons/Cura.ico" + Macos: "./icons/cura.icns" + Linux: "./icons/cura-128.png" + "5.2.0": requirements: - "pyarcus/5.1.1-alpha+32@ultimaker/stable" From c4f4900ccdab7ca2069cd6888ec17676ef38a239 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Fri, 30 Sep 2022 13:39:07 +0200 Subject: [PATCH 046/103] Revert Later This is a hack for beta release --- .github/workflows/conan-recipe-version.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml index 3ee67835f0..7d118d49f3 100644 --- a/.github/workflows/conan-recipe-version.yml +++ b/.github/workflows/conan-recipe-version.yml @@ -173,6 +173,14 @@ jobs: # FIXME: for external PR's actual_version = f"5.2.0-alpha+{buildmetadata}pr_{issue_number}" + if is_tag: + print("THE TAG IS: ", ${{ github.ref_name }}) + if is_tag and ${{ github.ref_name }} == "5.2.0-beta: + actual_version = "5.2.0-beta" + is_release_branch = True + user = "_" + channel = "_" + # %% print to output cmd_name = ["echo", f"::set-output name=name::{project_name}"] subprocess.call(cmd_name) @@ -194,7 +202,7 @@ jobs: print(f"version = {actual_version}") print(f"user = {user}") print(f"channel = {channel}") - print(f"recipe_id_full = {project_name}/{actual_version}@{user}/{channel}") + print(f"= {project_name}/{actual_version}@{user}/{channel}") print(f"recipe_id_latest = {project_name}/latest@{user}/{channel}") print(f"semver_full = {actual_version}") print(f"is_release_branch = {str(is_release_branch).lower()}") From 51b3c338da7c4bdf4360b6fb21f82847925e2b14 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Fri, 30 Sep 2022 13:44:36 +0200 Subject: [PATCH 047/103] Update conan-recipe-version.yml --- .github/workflows/conan-recipe-version.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml index 3ee67835f0..2272e0aa6e 100644 --- a/.github/workflows/conan-recipe-version.yml +++ b/.github/workflows/conan-recipe-version.yml @@ -172,6 +172,14 @@ jobs: else: # FIXME: for external PR's actual_version = f"5.2.0-alpha+{buildmetadata}pr_{issue_number}" + + if is_tag: + print("THE TAG IS: ", ${{ github.ref_name }}) + if is_tag and ${{ github.ref_name }} == "5.2.0-beta: + actual_version = "5.2.0-beta" + is_release_branch = True + user = "_" + channel = "_" # %% print to output cmd_name = ["echo", f"::set-output name=name::{project_name}"] From d7db09d96d7f124c99feadde034f4f53b1ed28fd Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Fri, 30 Sep 2022 13:46:02 +0200 Subject: [PATCH 048/103] Update conan-recipe-version.yml --- .github/workflows/conan-recipe-version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml index 2272e0aa6e..6a65cefdb3 100644 --- a/.github/workflows/conan-recipe-version.yml +++ b/.github/workflows/conan-recipe-version.yml @@ -175,7 +175,7 @@ jobs: if is_tag: print("THE TAG IS: ", ${{ github.ref_name }}) - if is_tag and ${{ github.ref_name }} == "5.2.0-beta: + if is_tag and ${{ github.ref_name }} == "5.2.0-beta": actual_version = "5.2.0-beta" is_release_branch = True user = "_" From 75ca7babaf3cbb3c737576bfcf1aa848fcb2d05b Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Mon, 26 Sep 2022 11:23:17 +0200 Subject: [PATCH 049/103] Add a circle to the background of the refresh button Be more consistent with rest of UI. CURA-9677 --- resources/qml/Dialogs/ChoosePrinterDialog.qml | 32 ++++++++++++++----- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/resources/qml/Dialogs/ChoosePrinterDialog.qml b/resources/qml/Dialogs/ChoosePrinterDialog.qml index 69d9fc44cc..b8ea98f7df 100644 --- a/resources/qml/Dialogs/ChoosePrinterDialog.qml +++ b/resources/qml/Dialogs/ChoosePrinterDialog.qml @@ -53,23 +53,39 @@ UM.Dialog anchors.left: parent.left text: catalog.i18nc("@title:label", "Compatible Printers") font: UM.Theme.getFont("large") + anchors.horizontalCenter: parent.horizontalCenter } - - UM.SimpleButton + TabButton { + id: refreshButton anchors.right: parent.right - - width: UM.Theme.getSize("small_button").width - height: UM.Theme.getSize("small_button").height - iconSource: UM.Theme.getIcon("ArrowDoubleCircleRight") - color: UM.Theme.getColor("text_link") - hoverColor: UM.Theme.getColor("text_scene_hover") + width: UM.Theme.getSize("button_icon").width + height: UM.Theme.getSize("button_icon").height + hoverEnabled: true onClicked: { manager.refresh() base.compatible_machine_model.forceUpdate() } + + background: Rectangle + { + width: UM.Theme.getSize("button_icon").width + height: UM.Theme.getSize("button_icon").height + color: refreshButton.hovered ? UM.Theme.getColor("toolbar_button_hover") : UM.Theme.getColor("toolbar_background") + radius: Math.round(refreshButton.width * 0.5) + } + + UM.ColorImage + { + width: UM.Theme.getSize("section_icon").width + height: UM.Theme.getSize("section_icon").height + color: UM.Theme.getColor("text_link") + source: UM.Theme.getIcon("ArrowDoubleCircleRight") + anchors.horizontalCenter: parent.horizontalCenter + anchors.verticalCenter: parent.verticalCenter + } } } From 3d2f6bbfe4530bcaa9561c601fb80542bcd390d7 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Fri, 30 Sep 2022 13:47:50 +0200 Subject: [PATCH 050/103] Update conan-recipe-version.yml --- .github/workflows/conan-recipe-version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml index 6a65cefdb3..efb69f0712 100644 --- a/.github/workflows/conan-recipe-version.yml +++ b/.github/workflows/conan-recipe-version.yml @@ -174,7 +174,7 @@ jobs: actual_version = f"5.2.0-alpha+{buildmetadata}pr_{issue_number}" if is_tag: - print("THE TAG IS: ", ${{ github.ref_name }}) + print("THE TAG IS: ", "${{ github.ref_name }}") if is_tag and ${{ github.ref_name }} == "5.2.0-beta": actual_version = "5.2.0-beta" is_release_branch = True From d505e6980c67980a2744cc4b54fb153879cf061d Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Fri, 30 Sep 2022 13:49:45 +0200 Subject: [PATCH 051/103] Update conan-recipe-version.yml --- .github/workflows/conan-recipe-version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml index efb69f0712..2b4f9918cc 100644 --- a/.github/workflows/conan-recipe-version.yml +++ b/.github/workflows/conan-recipe-version.yml @@ -175,7 +175,7 @@ jobs: if is_tag: print("THE TAG IS: ", "${{ github.ref_name }}") - if is_tag and ${{ github.ref_name }} == "5.2.0-beta": + if is_tag and "${{ github.ref_name }}" == "5.2.0-beta": actual_version = "5.2.0-beta" is_release_branch = True user = "_" From 6da52b1d5967d6673f5c7b8e0d918eff57291af6 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Fri, 30 Sep 2022 15:50:35 +0200 Subject: [PATCH 052/103] Update conandata.yml --- conandata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index 95b2d526b8..daceec0349 100644 --- a/conandata.yml +++ b/conandata.yml @@ -12,7 +12,7 @@ # Subject to change in the future! "5.2.0-beta": requirements: - - "pyarcus/5.1.1-alpha+32@ultimaker/stable" + - "pyarcus/(latest)@_/_" - "curaengine/(latest)" - "pysavitar/(latest)@_/_" - "pynest2d/(latest)@_/_" From ed48fd2e82e31a403032ef44ae2d631dd63d3b12 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Mon, 3 Oct 2022 10:58:50 +0200 Subject: [PATCH 053/103] Update conanfile.py --- conanfile.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/conanfile.py b/conanfile.py index 17cd0260a6..c868c8cb52 100644 --- a/conanfile.py +++ b/conanfile.py @@ -152,6 +152,11 @@ class CuraConan(ConanFile): cura_version = self.conf_info.get("user.cura:version", default = self.version, check_type = str) if self.options.internal: version = Version(cura_version) + self.output.error("="*100) + self.output.error(f"version: {version}") + self.output.error(f"cura_version: {cura_version}") + self.output.error(f"version.prerelease: {version.prerelease}") + self.output.error("="*100) cura_version = f"{version.major}.{version.minor}.{version.patch}-{version.prerelease.replace('+', '+internal_')}" with open(Path(location, "CuraVersion.py"), "w") as f: From b33cff33f5f18f7be23e6c0a86a302ea887a517c Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Mon, 3 Oct 2022 11:28:22 +0200 Subject: [PATCH 054/103] Disable "Remove Raft Inside Corners" setting by default --- resources/definitions/fdmprinter.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index cc49213a6c..b8fd5fa79b 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -8072,7 +8072,7 @@ "label": "Remove Raft Inside Corners", "description": "Remove inside corners from the raft, causing the raft to become convex.", "type": "bool", - "default_value": true, + "default_value": false, "resolve": "any(extruderValues('raft_remove_inside_corners'))", "enabled": "resolveOrValue('adhesion_type') == 'raft'", "settable_per_mesh": false, From e854ee6a3ceb3e1e30a5d2e8d869fb235af84eaf Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Mon, 3 Oct 2022 11:35:46 +0200 Subject: [PATCH 055/103] Fix reference to version properties that don't exist. version.prerelease does not exist, swapped this out for version.pre. There is no "+" inside prerelease (ie "-alpha"), this was probably being confused with the build version ( ie. +testing_120). Both "+" and "-" are removed from these values so I have prepended "_internal" to the build number instead. --- conanfile.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/conanfile.py b/conanfile.py index c868c8cb52..66c7e39015 100644 --- a/conanfile.py +++ b/conanfile.py @@ -152,12 +152,10 @@ class CuraConan(ConanFile): cura_version = self.conf_info.get("user.cura:version", default = self.version, check_type = str) if self.options.internal: version = Version(cura_version) - self.output.error("="*100) - self.output.error(f"version: {version}") - self.output.error(f"cura_version: {cura_version}") - self.output.error(f"version.prerelease: {version.prerelease}") - self.output.error("="*100) - cura_version = f"{version.major}.{version.minor}.{version.patch}-{version.prerelease.replace('+', '+internal_')}" + if version.pre: + cura_version = f"{version.major}.{version.minor}.{version.patch}-{version.pre}+internal_{version.build}" + else: + cura_version = f"{version.major}.{version.minor}.{version.patch}+internal_{version.build}" with open(Path(location, "CuraVersion.py"), "w") as f: f.write(cura_version_py.render( From d0ddb5fafeef4592f838837dbd1da4ef2b1563f0 Mon Sep 17 00:00:00 2001 From: MariskaMaas <40423138+MariMakes@users.noreply.github.com> Date: Mon, 3 Oct 2022 14:26:19 +0200 Subject: [PATCH 056/103] [CURA-9688] Fix View Printers in Digital Factory Send the user to the welcome page instead of the printjobs page to get a more comprehensive overview coming from the monitor page. --- plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml index e508f70cbb..33e8adf256 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml @@ -127,7 +127,7 @@ Component id: sendToFactoryButton anchors.horizontalCenter: parent.horizontalCenter text: catalog.i18nc("@button", "View printers in Digital Factory") - onClicked: Qt.openUrlExternally("https://digitalfactory.ultimaker.com/app/print-jobs?utm_source=cura&utm_medium=software&utm_campaign=monitor-view-cloud-printer-type") + onClicked: Qt.openUrlExternally("https://digitalfactory.ultimaker.com/app/welcome?utm_source=cura&utm_medium=software&utm_campaign=monitor-view-cloud-printer-type") } } } From a1a2784ef9c998b0f88598e076cced3c575bc303 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Tue, 4 Oct 2022 11:47:53 +0200 Subject: [PATCH 057/103] Add intent and quality fields to slice metadata CURA-9719 --- plugins/UFPWriter/UFPWriter.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/UFPWriter/UFPWriter.py b/plugins/UFPWriter/UFPWriter.py index 49751e1a2a..53ee5ae1ff 100644 --- a/plugins/UFPWriter/UFPWriter.py +++ b/plugins/UFPWriter/UFPWriter.py @@ -213,6 +213,7 @@ class UFPWriter(MeshWriter): def _getSliceMetadata(self) -> Dict[str, Dict[str, Dict[str, str]]]: """Get all changed settings and all settings. For each extruder and the global stack""" print_information = CuraApplication.getInstance().getPrintInformation() + machine_manager = CuraApplication.getInstance().getMachineManager() settings = { "material": { "length": print_information.materialLengths, @@ -222,7 +223,9 @@ class UFPWriter(MeshWriter): "global": { "changes": {}, "all_settings": {}, - } + }, + "intent": machine_manager.activeIntentCategory, + "quality": machine_manager.activeQualityOrQualityChangesName, } global_stack = cast(GlobalStack, Application.getInstance().getGlobalContainerStack()) From 3dd2d146e79b60e6a017a31be20f143ec6825380 Mon Sep 17 00:00:00 2001 From: jelle Spijker Date: Tue, 4 Oct 2022 12:00:09 +0200 Subject: [PATCH 058/103] Make sure a tag is a release version --- .github/workflows/conan-recipe-version.yml | 107 ++++++++++----------- 1 file changed, 50 insertions(+), 57 deletions(-) diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml index 2b4f9918cc..c58ee0f901 100644 --- a/.github/workflows/conan-recipe-version.yml +++ b/.github/workflows/conan-recipe-version.yml @@ -102,6 +102,7 @@ jobs: is_release_branch = True channel = "_" user = "_" + actual_version = f"{branch_version}" else: try: branch_version = tools.Version(repo.active_branch.name) @@ -118,68 +119,60 @@ jobs: if "pull_request" in event_name: channel = f"pr_{issue_number}" - # %% Get the actual version - latest_branch_version = tools.Version("0.0.0") - latest_branch_tag = None - for tag in repo.git.tag(merged = True).splitlines(): - if str(tag).startswith("firmware") or str(tag).startswith("master"): - continue # Quick-fix for the versioning scheme name of the embedded team in fdm_materials(_private) repo - try: - version = tools.Version(tag) - except ConanException: - continue - if version > latest_branch_version: - latest_branch_version = version - latest_branch_tag = repo.tag(tag) - - if latest_branch_tag: # %% Get the actual version - no_commits = 0 - for commit in repo.iter_commits("HEAD"): - if commit == latest_branch_tag.commit: - break - no_commits += 1 + latest_branch_version = tools.Version("0.0.0") + latest_branch_tag = None + for tag in repo.git.tag(merged = True).splitlines(): + if str(tag).startswith("firmware") or str(tag).startswith("master"): + continue # Quick-fix for the versioning scheme name of the embedded team in fdm_materials(_private) repo + try: + version = tools.Version(tag) + except ConanException: + continue + if version > latest_branch_version: + latest_branch_version = version + latest_branch_tag = repo.tag(tag) - if no_commits == 0: - # This is a release - actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{latest_branch_version.patch}" - if channel == "stable": - user = "_" - channel = "_" - else: - latest_branch_version_prerelease = latest_branch_version.prerelease - if latest_branch_version.prerelease and not "." in latest_branch_version.prerelease: - # The prerealese did not contain a version number, default it to 1 - latest_branch_version_prerelease = f"{latest_branch_version.prerelease}.1" - if event_name == "pull_request": - actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{latest_branch_version.patch}-{latest_branch_version_prerelease.lower()}+{buildmetadata}pr_{issue_number}_{no_commits}" - channel_metadata = f"{channel}_{no_commits}" + if latest_branch_tag: + # %% Get the actual version + no_commits = 0 + for commit in repo.iter_commits("HEAD"): + if commit == latest_branch_tag.commit: + break + no_commits += 1 + + if no_commits == 0: + # This is a release + actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{latest_branch_version.patch}" + if channel == "stable": + user = "_" + channel = "_" else: - if channel in ("stable", "_", ""): - channel_metadata = f"{no_commits}" - else: + latest_branch_version_prerelease = latest_branch_version.prerelease + if latest_branch_version.prerelease and not "." in latest_branch_version.prerelease: + # The prerealese did not contain a version number, default it to 1 + latest_branch_version_prerelease = f"{latest_branch_version.prerelease}.1" + if event_name == "pull_request": + actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{latest_branch_version.patch}-{latest_branch_version_prerelease.lower()}+{buildmetadata}pr_{issue_number}_{no_commits}" channel_metadata = f"{channel}_{no_commits}" - if latest_branch_version.prerelease == "": - if is_release_branch: - bump_up_patch = int(latest_branch_version.patch) + 1 - actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{bump_up_patch}-alpha+{buildmetadata}{channel_metadata}" else: - bump_up_minor = int(latest_branch_version.minor) + 1 - reset_patch = 0 - actual_version = f"{latest_branch_version.major}.{bump_up_minor}.{reset_patch}-alpha+{buildmetadata}{channel_metadata}" - else: - actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{latest_branch_version.patch}-{latest_branch_version.prerelease.lower()}+{buildmetadata}{channel_metadata}" - else: - # FIXME: for external PR's - actual_version = f"5.2.0-alpha+{buildmetadata}pr_{issue_number}" - - if is_tag: - print("THE TAG IS: ", "${{ github.ref_name }}") - if is_tag and "${{ github.ref_name }}" == "5.2.0-beta": - actual_version = "5.2.0-beta" - is_release_branch = True - user = "_" - channel = "_" + if channel in ("stable", "_", ""): + channel_metadata = f"{no_commits}" + else: + channel_metadata = f"{channel}_{no_commits}" + if latest_branch_version.prerelease == "": + if is_release_branch: + bump_up_patch = int(latest_branch_version.patch) + 1 + actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{bump_up_patch}-alpha+{buildmetadata}{channel_metadata}" + else: + bump_up_minor = int(latest_branch_version.minor) + 1 + reset_patch = 0 + actual_version = f"{latest_branch_version.major}.{bump_up_minor}.{reset_patch}-alpha+{buildmetadata}{channel_metadata}" + else: + actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{latest_branch_version.patch}-{latest_branch_version.prerelease.lower()}+{buildmetadata}{channel_metadata}" + else: + # FIXME: for external PR's + actual_version = f"5.2.0-alpha+{buildmetadata}pr_{issue_number}" # %% print to output cmd_name = ["echo", f"::set-output name=name::{project_name}"] From 01357dd7fe0474ef5064acaffad53a686ccce6c4 Mon Sep 17 00:00:00 2001 From: jelle Spijker Date: Tue, 4 Oct 2022 12:01:08 +0200 Subject: [PATCH 059/103] PR's a tagged with 5.3.0-alpha --- .github/workflows/conan-recipe-version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml index c58ee0f901..13488ed603 100644 --- a/.github/workflows/conan-recipe-version.yml +++ b/.github/workflows/conan-recipe-version.yml @@ -172,7 +172,7 @@ jobs: actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{latest_branch_version.patch}-{latest_branch_version.prerelease.lower()}+{buildmetadata}{channel_metadata}" else: # FIXME: for external PR's - actual_version = f"5.2.0-alpha+{buildmetadata}pr_{issue_number}" + actual_version = f"5.3.0-alpha+{buildmetadata}pr_{issue_number}" # %% print to output cmd_name = ["echo", f"::set-output name=name::{project_name}"] From 328cff594a35b266d530ed1357093755f0667012 Mon Sep 17 00:00:00 2001 From: jelle Spijker Date: Tue, 4 Oct 2022 12:36:10 +0200 Subject: [PATCH 060/103] Also bump up version after beta release --- .github/workflows/conan-recipe-version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml index 13488ed603..cf0febb961 100644 --- a/.github/workflows/conan-recipe-version.yml +++ b/.github/workflows/conan-recipe-version.yml @@ -160,7 +160,7 @@ jobs: channel_metadata = f"{no_commits}" else: channel_metadata = f"{channel}_{no_commits}" - if latest_branch_version.prerelease == "": + if latest_branch_version.prerelease == "" or "beta" in latest_branch_version.prerelease: if is_release_branch: bump_up_patch = int(latest_branch_version.patch) + 1 actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{bump_up_patch}-alpha+{buildmetadata}{channel_metadata}" From 95faab7eb92c356fba87bd2c0e822b70feeb19ef Mon Sep 17 00:00:00 2001 From: jelle Spijker Date: Tue, 4 Oct 2022 12:58:45 +0200 Subject: [PATCH 061/103] Fix release is pushed to branch and not tagged --- .github/workflows/conan-recipe-version.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml index cf0febb961..3952a4095b 100644 --- a/.github/workflows/conan-recipe-version.yml +++ b/.github/workflows/conan-recipe-version.yml @@ -142,11 +142,8 @@ jobs: no_commits += 1 if no_commits == 0: - # This is a release - actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{latest_branch_version.patch}" - if channel == "stable": - user = "_" - channel = "_" + # This is a release on a branch + actual_version = f"{latest_branch_version}" else: latest_branch_version_prerelease = latest_branch_version.prerelease if latest_branch_version.prerelease and not "." in latest_branch_version.prerelease: From c98614e2e1547f8827f1ed8a01a63f9e1432f6c9 Mon Sep 17 00:00:00 2001 From: jelle Spijker Date: Tue, 4 Oct 2022 13:11:07 +0200 Subject: [PATCH 062/103] Fix release is pushed to branch and not tagged --- .github/workflows/conan-recipe-version.yml | 43 ++++++++++------------ 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml index 3952a4095b..b0fbaaf981 100644 --- a/.github/workflows/conan-recipe-version.yml +++ b/.github/workflows/conan-recipe-version.yml @@ -140,33 +140,28 @@ jobs: if commit == latest_branch_tag.commit: break no_commits += 1 - - if no_commits == 0: - # This is a release on a branch - actual_version = f"{latest_branch_version}" + latest_branch_version_prerelease = latest_branch_version.prerelease + if latest_branch_version.prerelease and not "." in latest_branch_version.prerelease: + # The prerealese did not contain a version number, default it to 1 + latest_branch_version_prerelease = f"{latest_branch_version.prerelease}.1" + if event_name == "pull_request": + actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{latest_branch_version.patch}-{latest_branch_version_prerelease.lower()}+{buildmetadata}pr_{issue_number}_{no_commits}" + channel_metadata = f"{channel}_{no_commits}" else: - latest_branch_version_prerelease = latest_branch_version.prerelease - if latest_branch_version.prerelease and not "." in latest_branch_version.prerelease: - # The prerealese did not contain a version number, default it to 1 - latest_branch_version_prerelease = f"{latest_branch_version.prerelease}.1" - if event_name == "pull_request": - actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{latest_branch_version.patch}-{latest_branch_version_prerelease.lower()}+{buildmetadata}pr_{issue_number}_{no_commits}" + if channel in ("stable", "_", ""): + channel_metadata = f"{no_commits}" + else: channel_metadata = f"{channel}_{no_commits}" + if latest_branch_version.prerelease == "" or "beta" in latest_branch_version.prerelease: + if is_release_branch: + bump_up_patch = int(latest_branch_version.patch) + 1 + actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{bump_up_patch}-alpha+{buildmetadata}{channel_metadata}" else: - if channel in ("stable", "_", ""): - channel_metadata = f"{no_commits}" - else: - channel_metadata = f"{channel}_{no_commits}" - if latest_branch_version.prerelease == "" or "beta" in latest_branch_version.prerelease: - if is_release_branch: - bump_up_patch = int(latest_branch_version.patch) + 1 - actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{bump_up_patch}-alpha+{buildmetadata}{channel_metadata}" - else: - bump_up_minor = int(latest_branch_version.minor) + 1 - reset_patch = 0 - actual_version = f"{latest_branch_version.major}.{bump_up_minor}.{reset_patch}-alpha+{buildmetadata}{channel_metadata}" - else: - actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{latest_branch_version.patch}-{latest_branch_version.prerelease.lower()}+{buildmetadata}{channel_metadata}" + bump_up_minor = int(latest_branch_version.minor) + 1 + reset_patch = 0 + actual_version = f"{latest_branch_version.major}.{bump_up_minor}.{reset_patch}-alpha+{buildmetadata}{channel_metadata}" + else: + actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{latest_branch_version.patch}-{latest_branch_version.prerelease.lower()}+{buildmetadata}{channel_metadata}" else: # FIXME: for external PR's actual_version = f"5.3.0-alpha+{buildmetadata}pr_{issue_number}" From 9ef927d7479f59cc84ba1710f3b1ea8cc4385347 Mon Sep 17 00:00:00 2001 From: jelle Spijker Date: Tue, 4 Oct 2022 13:38:19 +0200 Subject: [PATCH 063/103] Fix bump up version --- .github/workflows/conan-recipe-version.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml index b0fbaaf981..19af28c6e2 100644 --- a/.github/workflows/conan-recipe-version.yml +++ b/.github/workflows/conan-recipe-version.yml @@ -152,16 +152,19 @@ jobs: channel_metadata = f"{no_commits}" else: channel_metadata = f"{channel}_{no_commits}" - if latest_branch_version.prerelease == "" or "beta" in latest_branch_version.prerelease: - if is_release_branch: + if is_release_branch: + if latest_branch_version.prerelease == "": + # An actual full release has been created, we are working on patch bump_up_patch = int(latest_branch_version.patch) + 1 - actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{bump_up_patch}-alpha+{buildmetadata}{channel_metadata}" + actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{bump_up_patch}-beta.1+{buildmetadata}{channel_metadata}" else: - bump_up_minor = int(latest_branch_version.minor) + 1 - reset_patch = 0 - actual_version = f"{latest_branch_version.major}.{bump_up_minor}.{reset_patch}-alpha+{buildmetadata}{channel_metadata}" + # An beta release has been created we are working toward a next beta or full release + bump_up_release_tag = int(latest_branch_version.prerelease.split('.')[1]) + 1 + actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{latest_branch_version.patch}-{latest_branch_version.prerelease.split('.')[0]}.{bump_up_release_tag}+{buildmetadata}{channel_metadata}" else: - actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{latest_branch_version.patch}-{latest_branch_version.prerelease.lower()}+{buildmetadata}{channel_metadata}" + bump_up_minor = int(latest_branch_version.minor) + 1 + reset_patch = 0 + actual_version = f"{latest_branch_version.major}.{bump_up_minor}.{reset_patch}-alpha+{buildmetadata}{channel_metadata}" else: # FIXME: for external PR's actual_version = f"5.3.0-alpha+{buildmetadata}pr_{issue_number}" From ccea542280a341f6e78941cea5846f725a5d51fd Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Tue, 4 Oct 2022 14:40:13 +0200 Subject: [PATCH 064/103] Add spdlog to binaries list. Add warning for missing binary Update pattern matching for binaries glob in bin paths. It will now match .so.X files that it would not before. CURA-9711 --- conandata.yml | 5 +++++ conanfile.py | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index daceec0349..aca3d52105 100644 --- a/conandata.yml +++ b/conandata.yml @@ -87,6 +87,11 @@ src: "bin" dst: "." binary: "CuraEngine" + spdlog: + package: "spdlog" + src: "lib" + dst: "." + binary: "libspdlog" hiddenimports: - "pySavitar" - "pyArcus" diff --git a/conanfile.py b/conanfile.py index c032d6d83f..4334db0a9e 100644 --- a/conanfile.py +++ b/conanfile.py @@ -208,8 +208,10 @@ class CuraConan(ConanFile): else: continue if not src_path.exists(): + self.output.warning(f"Source path for binary {binary['binary']} does not exist") continue - for bin in src_path.glob(binary["binary"] + ".*[exe|dll|so|dylib]"): + + for bin in src_path.glob(binary["binary"] + "*[.exe|.dll|.so|.dylib|.so.]*"): binaries.append((str(bin), binary["dst"])) for bin in src_path.glob(binary["binary"]): binaries.append((str(bin), binary["dst"])) From 566cbba111eaff28fc79b785954a7a6e2fdb04e5 Mon Sep 17 00:00:00 2001 From: Casper Lamboo Date: Tue, 4 Oct 2022 15:23:58 +0200 Subject: [PATCH 065/103] Update conandata.yml --- conandata.yml | 241 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 226 insertions(+), 15 deletions(-) diff --git a/conandata.yml b/conandata.yml index daceec0349..199ea7a582 100644 --- a/conandata.yml +++ b/conandata.yml @@ -10,15 +10,226 @@ # requirements (use the /(latest)@ultimaker/testing) # # Subject to change in the future! -"5.2.0-beta": +"5.2.0-alpha": requirements: - - "pyarcus/(latest)@_/_" - - "curaengine/(latest)" - - "pysavitar/(latest)@_/_" - - "pynest2d/(latest)@_/_" - - "uranium/(latest)@_/_" - - "fdm_materials/(latest)@_/_" - - "cura_binary_data/(latest)@_/_" + - "pyarcus/(latest)@ultimaker/testing" + - "curaengine/(latest)@ultimaker/testing" + - "pysavitar/(latest)@ultimaker/testing" + - "pynest2d/(latest)@ultimaker/testing" + - "uranium/(latest)@ultimaker/testing" + - "fdm_materials/(latest)@ultimaker/testing" + - "cura_binary_data/(latest)@ultimaker/testing" + - "cpython/3.10.4" + internal_requirements: + - "fdm_materials_private/(latest)@ultimaker/testing" + - "cura_private_data/(latest)@ultimaker/testing" + runinfo: + entrypoint: "cura_app.py" + pyinstaller: + datas: + cura_plugins: + package: "cura" + src: "plugins" + dst: "share/cura/plugins" + cura_resources: + package: "cura" + src: "resources" + dst: "share/cura/resources" + cura_private_data: + package: "cura_private_data" + src: "resources" + dst: "share/cura/resources" + internal: true + uranium_plugins: + package: "uranium" + src: "plugins" + dst: "share/uranium/plugins" + uranium_resources: + package: "uranium" + src: "resources" + dst: "share/uranium/resources" + uranium_um_qt_qml_um: + package: "uranium" + src: "site-packages/UM/Qt/qml/UM" + dst: "PyQt6/Qt6/qml/UM" + cura_binary_data: + package: "cura_binary_data" + src: "resources/cura/resources" + dst: "share/cura/resources" + uranium_binary_data: + package: "cura_binary_data" + src: "resources/uranium/resources" + dst: "share/uranium/resources" + windows_binary_data: + package: "cura_binary_data" + src: "windows" + dst: "share/windows" + fdm_materials: + package: "fdm_materials" + src: "materials" + dst: "share/cura/resources/materials" + fdm_materials_private: + package: "fdm_materials_private" + src: "resources/materials" + dst: "share/cura/resources/materials" + internal: true + tcl: + package: "tcl" + src: "lib/tcl8.6" + dst: "tcl" + tk: + package: "tk" + src: "lib/tk8.6" + dst: "tk" + binaries: + curaengine: + package: "curaengine" + src: "bin" + dst: "." + binary: "CuraEngine" + hiddenimports: + - "pySavitar" + - "pyArcus" + - "pynest2d" + - "PyQt6" + - "PyQt6.QtNetwork" + - "PyQt6.sip" + - "logging.handlers" + - "zeroconf" + - "fcntl" + - "stl" + - "serial" + collect_all: + - "cura" + - "UM" + - "serial" + - "Charon" + - "sqlite3" + - "trimesh" + - "win32ctypes" + - "PyQt6" + - "PyQt6.QtNetwork" + - "PyQt6.sip" + - "stl" + icon: + Windows: "./icons/Cura.ico" + Macos: "./icons/cura.icns" + Linux: "./icons/cura-128.png" +"5.2.0-beta.2": + requirements: + - "pyarcus/(latest)@ultimaker/stable" + - "curaengine/(latest)@ultimaker/stable" + - "pysavitar/(latest)@ultimaker/stable" + - "pynest2d/(latest)@ultimaker/stable" + - "uranium/(latest)@ultimaker/stable" + - "fdm_materials/(latest)@ultimaker/stable" + - "cura_binary_data/(latest)@ultimaker/stable" + - "cpython/3.10.4" + internal_requirements: + - "fdm_materials_private/(latest)@ultimaker/testing" + - "cura_private_data/(latest)@ultimaker/testing" + runinfo: + entrypoint: "cura_app.py" + pyinstaller: + datas: + cura_plugins: + package: "cura" + src: "plugins" + dst: "share/cura/plugins" + cura_resources: + package: "cura" + src: "resources" + dst: "share/cura/resources" + cura_private_data: + package: "cura_private_data" + src: "resources" + dst: "share/cura/resources" + internal: true + uranium_plugins: + package: "uranium" + src: "plugins" + dst: "share/uranium/plugins" + uranium_resources: + package: "uranium" + src: "resources" + dst: "share/uranium/resources" + uranium_um_qt_qml_um: + package: "uranium" + src: "site-packages/UM/Qt/qml/UM" + dst: "PyQt6/Qt6/qml/UM" + cura_binary_data: + package: "cura_binary_data" + src: "resources/cura/resources" + dst: "share/cura/resources" + uranium_binary_data: + package: "cura_binary_data" + src: "resources/uranium/resources" + dst: "share/uranium/resources" + windows_binary_data: + package: "cura_binary_data" + src: "windows" + dst: "share/windows" + fdm_materials: + package: "fdm_materials" + src: "materials" + dst: "share/cura/resources/materials" + fdm_materials_private: + package: "fdm_materials_private" + src: "resources/materials" + dst: "share/cura/resources/materials" + internal: true + tcl: + package: "tcl" + src: "lib/tcl8.6" + dst: "tcl" + tk: + package: "tk" + src: "lib/tk8.6" + dst: "tk" + binaries: + curaengine: + package: "curaengine" + src: "bin" + dst: "." + binary: "CuraEngine" + hiddenimports: + - "pySavitar" + - "pyArcus" + - "pynest2d" + - "PyQt6" + - "PyQt6.QtNetwork" + - "PyQt6.sip" + - "logging.handlers" + - "zeroconf" + - "fcntl" + - "stl" + - "serial" + collect_all: + - "cura" + - "UM" + - "serial" + - "Charon" + - "sqlite3" + - "trimesh" + - "win32ctypes" + - "PyQt6" + - "PyQt6.QtNetwork" + - "PyQt6.sip" + - "stl" + icon: + Windows: "./icons/Cura.ico" + Macos: "./icons/cura.icns" + Linux: "./icons/cura-128.png" + +"5.2.0-beta.1": + requirements: + - "pyarcus/5.2.0-beta.1" + - "curaengine/5.2.0-beta.1" + - "pysavitar/5.2.0-beta.1" + - "pynest2d/5.2.0-beta.1" + - "uranium/5.2.0-beta.1" + - "fdm_materials/5.2.0-beta.1" + - "cura_binary_data/5.2.0-beta.1" - "cpython/3.10.4" internal_requirements: - "fdm_materials_private/(latest)@ultimaker/testing" @@ -118,13 +329,13 @@ "5.2.0": requirements: - - "pyarcus/5.1.1-alpha+32@ultimaker/stable" - - "curaengine/(latest)" - - "pysavitar/(latest)@_/_" - - "pynest2d/(latest)@_/_" - - "uranium/(latest)@_/_" - - "fdm_materials/(latest)@_/_" - - "cura_binary_data/(latest)@_/_" + - "pyarcus/5.2.0" + - "curaengine/5.2.0" + - "pysavitar/5.2.0" + - "pynest2d/5.2.0" + - "uranium/5.2.0" + - "fdm_materials/5.2.0" + - "cura_binary_data/5.2.0" - "cpython/3.10.4" internal_requirements: - "fdm_materials_private/(latest)@ultimaker/testing" From bef3eb8703e4f51da5a2e0cb3d173423cb3dfc9f Mon Sep 17 00:00:00 2001 From: Casper Lamboo Date: Tue, 4 Oct 2022 15:27:41 +0200 Subject: [PATCH 066/103] Update conandata.yml --- conandata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index 199ea7a582..517efd9596 100644 --- a/conandata.yml +++ b/conandata.yml @@ -10,7 +10,7 @@ # requirements (use the /(latest)@ultimaker/testing) # # Subject to change in the future! -"5.2.0-alpha": +"5.3.0-alpha": requirements: - "pyarcus/(latest)@ultimaker/testing" - "curaengine/(latest)@ultimaker/testing" From 1287dffe22ddf27ba0304c8f1a1f5fedb320395b Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Tue, 4 Oct 2022 15:45:37 +0200 Subject: [PATCH 067/103] Add fmt binaries to list. CURA-9711 --- conandata.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/conandata.yml b/conandata.yml index aca3d52105..e3dc2eb1c8 100644 --- a/conandata.yml +++ b/conandata.yml @@ -92,6 +92,11 @@ src: "lib" dst: "." binary: "libspdlog" + fmt: + package: "fmt" + src: "lib" + dst: "." + binary: "libfmt" hiddenimports: - "pySavitar" - "pyArcus" From c00135bfac31738608df9b11a3649076126c3add Mon Sep 17 00:00:00 2001 From: jspijker Date: Tue, 4 Oct 2022 16:36:13 +0200 Subject: [PATCH 068/103] make sure prerelease tag triggers conan-package --- .github/workflows/conan-package.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index d7f4557b81..f8fc6e900b 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -44,8 +44,9 @@ on: - '[1-9].[0-9]' - '[1-9].[0-9][0-9]' tags: - - '[1-9].[0-9].[0-9]+' - - '[1-9].[0-9][0-9].[0-9]+' + - '[1-9].[0-9].[0-9]*' + - '[1-9].[0-9].[0-9]' + - '[1-9].[0-9][0-9].[0-9]*' jobs: conan-recipe-version: From 4cdf4e607db8385f00ff5cae4b90b65b09911280 Mon Sep 17 00:00:00 2001 From: jspijker Date: Tue, 4 Oct 2022 16:38:01 +0200 Subject: [PATCH 069/103] update conandata.yml --- conandata.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/conandata.yml b/conandata.yml index 517efd9596..a531564622 100644 --- a/conandata.yml +++ b/conandata.yml @@ -326,7 +326,6 @@ Windows: "./icons/Cura.ico" Macos: "./icons/cura.icns" Linux: "./icons/cura-128.png" - "5.2.0": requirements: - "pyarcus/5.2.0" @@ -432,7 +431,6 @@ Windows: "./icons/Cura.ico" Macos: "./icons/cura.icns" Linux: "./icons/cura-128.png" - "5.2.0-alpha": requirements: - "pyarcus/5.2@ultimaker/testing" From 058824d2f4647aea6dbd7ad9bdb50aaca7d8859e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Kerbiriou?= Date: Mon, 19 Sep 2022 21:57:05 +0200 Subject: [PATCH 070/103] UFPWriter: fix settings serialization --- plugins/UFPWriter/UFPWriter.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/UFPWriter/UFPWriter.py b/plugins/UFPWriter/UFPWriter.py index 49751e1a2a..aa63eb6d2e 100644 --- a/plugins/UFPWriter/UFPWriter.py +++ b/plugins/UFPWriter/UFPWriter.py @@ -230,11 +230,11 @@ class UFPWriter(MeshWriter): # Add global user or quality changes global_flattened_changes = InstanceContainer.createMergedInstanceContainer(global_stack.userChanges, global_stack.qualityChanges) for setting in global_flattened_changes.getAllKeys(): - settings["global"]["changes"][setting] = global_flattened_changes.getProperty(setting, "value") + settings["global"]["changes"][setting] = str(global_flattened_changes.getProperty(setting, "value")) # Get global all settings values without user or quality changes for setting in global_stack.getAllKeys(): - settings["global"]["all_settings"][setting] = global_stack.getProperty(setting, "value") + settings["global"]["all_settings"][setting] = str(global_stack.getProperty(setting, "value")) for i, extruder in enumerate(global_stack.extruderList): # Add extruder fields to settings dictionary @@ -246,10 +246,10 @@ class UFPWriter(MeshWriter): # Add extruder user or quality changes extruder_flattened_changes = InstanceContainer.createMergedInstanceContainer(extruder.userChanges, extruder.qualityChanges) for setting in extruder_flattened_changes.getAllKeys(): - settings[f"extruder_{i}"]["changes"][setting] = extruder_flattened_changes.getProperty(setting, "value") + settings[f"extruder_{i}"]["changes"][setting] = str(extruder_flattened_changes.getProperty(setting, "value")) # Get extruder all settings values without user or quality changes for setting in extruder.getAllKeys(): - settings[f"extruder_{i}"]["all_settings"][setting] = extruder.getProperty(setting, "value") + settings[f"extruder_{i}"]["all_settings"][setting] = str(extruder.getProperty(setting, "value")) return settings From 6a03ae9e9c6cd22f33997acd1930c0479a07a408 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Wed, 5 Oct 2022 07:43:25 +0200 Subject: [PATCH 071/103] Use run-name to show version and actor New functionality which should help clarify which run is which. https://github.blog/changelog/2022-09-26-github-actions-dynamic-names-for-workflow-runs/ --- .github/workflows/cura-installer.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/cura-installer.yml b/.github/workflows/cura-installer.yml index 10e7888029..da439eeff0 100644 --- a/.github/workflows/cura-installer.yml +++ b/.github/workflows/cura-installer.yml @@ -1,4 +1,5 @@ name: Cura Installer +run-name: Cura binaries ${{ inputs.cura_conan_version }} by @${{ github.actor }} on: workflow_dispatch: From 9bb1383da25cbd20d1d9118f06e8d271d277024e Mon Sep 17 00:00:00 2001 From: jspijker Date: Wed, 5 Oct 2022 09:34:11 +0200 Subject: [PATCH 072/103] revert changes to tag script --- scripts/rename_cura_1_tags.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 scripts/rename_cura_1_tags.sh diff --git a/scripts/rename_cura_1_tags.sh b/scripts/rename_cura_1_tags.sh old mode 100644 new mode 100755 index 8391ed08c2..624bd28d82 --- a/scripts/rename_cura_1_tags.sh +++ b/scripts/rename_cura_1_tags.sh @@ -11,4 +11,4 @@ do git tag -d $i; #Delete old tag. git push origin 1.$i :$i #Rename the tag remotely too. fi -done \ No newline at end of file +done From ca90ac7787587db9e90a15584854ea54bcbc45d8 Mon Sep 17 00:00:00 2001 From: jelle Spijker Date: Wed, 5 Oct 2022 10:47:34 +0200 Subject: [PATCH 073/103] Fix adding all shared libs managed by Conan to pyinstaller Closes #13422 Contributes to CURA-9711 --- conandata.yml | 11 ----------- conanfile.py | 15 +++++++++------ 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/conandata.yml b/conandata.yml index 377224053c..0da3e8bc1d 100644 --- a/conandata.yml +++ b/conandata.yml @@ -220,7 +220,6 @@ Windows: "./icons/Cura.ico" Macos: "./icons/cura.icns" Linux: "./icons/cura-128.png" - "5.2.0-beta.1": requirements: - "pyarcus/5.2.0-beta.1" @@ -298,16 +297,6 @@ src: "bin" dst: "." binary: "CuraEngine" - spdlog: - package: "spdlog" - src: "lib" - dst: "." - binary: "libspdlog" - fmt: - package: "fmt" - src: "lib" - dst: "." - binary: "libfmt" hiddenimports: - "pySavitar" - "pyArcus" diff --git a/conanfile.py b/conanfile.py index 4334db0a9e..f5c9fcd65f 100644 --- a/conanfile.py +++ b/conanfile.py @@ -216,14 +216,17 @@ class CuraConan(ConanFile): for bin in src_path.glob(binary["binary"]): binaries.append((str(bin), binary["dst"])) - for _, dependency in self.dependencies.items(): - for bin_paths in dependency.cpp_info.bindirs: - binaries.extend([(f"{p}", ".") for p in Path(bin_paths).glob("**/*.dll")]) - binaries.extend([(f"{p}", ".") for p in Path(bin_paths).glob("**/*.dylib")]) - binaries.extend([(f"{p}", ".") for p in Path(bin_paths).glob("**/*.so")]) + # Make sure all Conan dependencies which are shared are added to the binary list for pyinstaller + for _, dependency in self.dependencies.host.items(): + if hasattr(dependency.options, "shared") and dependency.options.shared: + for bin_paths in dependency.cpp_info.bindirs: + binaries.extend([(f"{p}", ".") for p in Path(bin_paths).glob("**/*")]) + for lib_paths in dependency.cpp_info.libdirs: + binaries.extend([(f"{p}", ".") for p in Path(lib_paths).glob("**/*")]) # Copy dynamic libs from lib path - binaries.extend([(f"{p}", ".") for p in Path(self._base_dir.joinpath("lib")).glob("**/*.dylib")]) + binaries.extend([(f"{p}", ".") for p in Path(self._base_dir.joinpath("lib")).glob("**/*.dylib*")]) + binaries.extend([(f"{p}", ".") for p in Path(self._base_dir.joinpath("lib")).glob("**/*.so*")]) # Collect all dll's from PyQt6 and place them in the root binaries.extend([(f"{p}", ".") for p in Path(self._site_packages, "PyQt6", "Qt6").glob("**/*.dll")]) From ad65ffa76c1197ef81bc9d8df9332400b0639868 Mon Sep 17 00:00:00 2001 From: jelle Spijker Date: Wed, 5 Oct 2022 10:56:53 +0200 Subject: [PATCH 074/103] Fix check if option exist Contributes to CURA-9711 --- conanfile.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/conanfile.py b/conanfile.py index f5c9fcd65f..47ca0354e3 100644 --- a/conanfile.py +++ b/conanfile.py @@ -7,7 +7,7 @@ from conan import ConanFile from conan.tools.files import copy, rmdir, save from conan.tools.env import VirtualRunEnv, Environment from conan.tools.scm import Version -from conan.errors import ConanInvalidConfiguration +from conan.errors import ConanInvalidConfiguration, ConanException required_conan_version = ">=1.50.0" @@ -218,7 +218,11 @@ class CuraConan(ConanFile): # Make sure all Conan dependencies which are shared are added to the binary list for pyinstaller for _, dependency in self.dependencies.host.items(): - if hasattr(dependency.options, "shared") and dependency.options.shared: + try: + is_shared = dependency.options.shared + except ConanException: + is_shared = False + if is_shared: for bin_paths in dependency.cpp_info.bindirs: binaries.extend([(f"{p}", ".") for p in Path(bin_paths).glob("**/*")]) for lib_paths in dependency.cpp_info.libdirs: From e2cf889f7feaa4e93ce04171e917ee0ec28047e7 Mon Sep 17 00:00:00 2001 From: jelle Spijker Date: Wed, 5 Oct 2022 11:08:53 +0200 Subject: [PATCH 075/103] Don't check for shared Contributes to CURA-9711 --- conanfile.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/conanfile.py b/conanfile.py index 47ca0354e3..a932f0a232 100644 --- a/conanfile.py +++ b/conanfile.py @@ -218,15 +218,10 @@ class CuraConan(ConanFile): # Make sure all Conan dependencies which are shared are added to the binary list for pyinstaller for _, dependency in self.dependencies.host.items(): - try: - is_shared = dependency.options.shared - except ConanException: - is_shared = False - if is_shared: - for bin_paths in dependency.cpp_info.bindirs: - binaries.extend([(f"{p}", ".") for p in Path(bin_paths).glob("**/*")]) - for lib_paths in dependency.cpp_info.libdirs: - binaries.extend([(f"{p}", ".") for p in Path(lib_paths).glob("**/*")]) + for bin_paths in dependency.cpp_info.bindirs: + binaries.extend([(f"{p}", ".") for p in Path(bin_paths).glob("**/*")]) + for lib_paths in dependency.cpp_info.libdirs: + binaries.extend([(f"{p}", ".") for p in Path(lib_paths).glob("**/*")]) # Copy dynamic libs from lib path binaries.extend([(f"{p}", ".") for p in Path(self._base_dir.joinpath("lib")).glob("**/*.dylib*")]) From 2079bd5a6e70c8b9882e41bf3983099623bb044b Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Wed, 5 Oct 2022 13:26:12 +0200 Subject: [PATCH 076/103] Sort "other printers" list CURA-9687 --- cura/Machines/Models/MachineListModel.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cura/Machines/Models/MachineListModel.py b/cura/Machines/Models/MachineListModel.py index 4db1082863..df9ca7483f 100644 --- a/cura/Machines/Models/MachineListModel.py +++ b/cura/Machines/Models/MachineListModel.py @@ -86,6 +86,7 @@ class MachineListModel(ListModel): machines_manager = CuraApplication.getInstance().getMachineManager() other_machine_stacks = CuraContainerRegistry.getInstance().findContainerStacks(type="machine") + other_machine_stacks.sort(key = lambda machine: machine.getName().upper()) abstract_machine_stacks = CuraContainerRegistry.getInstance().findContainerStacks(is_abstract_machine = "True") abstract_machine_stacks.sort(key = lambda machine: machine.getName(), reverse = True) From 8cf475694fd6114a0ab5864db1fd51a090027e0a Mon Sep 17 00:00:00 2001 From: jelle spijker Date: Wed, 5 Oct 2022 13:47:09 +0200 Subject: [PATCH 077/103] Filter on specific extensions Contributes to CURA-9711 --- conanfile.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/conanfile.py b/conanfile.py index a932f0a232..23c3f364ba 100644 --- a/conanfile.py +++ b/conanfile.py @@ -219,9 +219,10 @@ class CuraConan(ConanFile): # Make sure all Conan dependencies which are shared are added to the binary list for pyinstaller for _, dependency in self.dependencies.host.items(): for bin_paths in dependency.cpp_info.bindirs: - binaries.extend([(f"{p}", ".") for p in Path(bin_paths).glob("**/*")]) + binaries.extend([(f"{p}", ".") for p in Path(bin_paths).glob("**/*.dll")]) for lib_paths in dependency.cpp_info.libdirs: - binaries.extend([(f"{p}", ".") for p in Path(lib_paths).glob("**/*")]) + binaries.extend([(f"{p}", ".") for p in Path(lib_paths).glob("**/*.so*")]) + binaries.extend([(f"{p}", ".") for p in Path(lib_paths).glob("**/*.dylib*")]) # Copy dynamic libs from lib path binaries.extend([(f"{p}", ".") for p in Path(self._base_dir.joinpath("lib")).glob("**/*.dylib*")]) From 728daec6afdf143b823e1afbdf7ece49318e235a Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Wed, 5 Oct 2022 14:19:38 +0200 Subject: [PATCH 078/103] Wrap material name in Compatible Printer List CURA-9690 --- resources/qml/PrinterSelector/PrintSelectorCard.qml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/qml/PrinterSelector/PrintSelectorCard.qml b/resources/qml/PrinterSelector/PrintSelectorCard.qml index 943ad8077c..a4cf423466 100644 --- a/resources/qml/PrinterSelector/PrintSelectorCard.qml +++ b/resources/qml/PrinterSelector/PrintSelectorCard.qml @@ -59,6 +59,7 @@ Rectangle Item { + Layout.preferredWidth: extruderInformation.width height: childrenRect.height Cura.ExtruderIcon @@ -84,6 +85,7 @@ Rectangle { id: singleMaterialText anchors.left: extruderCore.right + anchors.right: parent.right anchors.verticalCenter: extruderCore.verticalCenter anchors.leftMargin: UM.Theme.getSize("default_margin").width text: modelData.materials.length == 1 ? `${modelData.materials[0].brand} ${modelData.materials[0].name}` : "" From 67e99cd4ce04f82ae817876848cc3347bba0d290 Mon Sep 17 00:00:00 2001 From: jelle spijker Date: Wed, 5 Oct 2022 14:32:54 +0200 Subject: [PATCH 079/103] Set version number for CuraVersion.py If you want custom version use the Conan Configuration: `user.cura:version` Contributes to CURA-9711 --- conanfile.py | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/conanfile.py b/conanfile.py index 23c3f364ba..70ddaf0731 100644 --- a/conanfile.py +++ b/conanfile.py @@ -151,17 +151,12 @@ class CuraConan(ConanFile): with open(Path(__file__).parent.joinpath("CuraVersion.py.jinja"), "r") as f: cura_version_py = Template(f.read()) - cura_version = self.conf_info.get("user.cura:version", default = self.version, check_type = str) - version = Version(cura_version) - prerelease = "" - if self.options.extra_build_version != "": - prerelease = self.options.extra_build_version - if self.options.internal: - prerelease = version.prerelease.replace('+', '+internal_') - if prerelease != "": - cura_version = f"{version.major}.{version.minor}.{version.patch}-{prerelease}" - else: - cura_version = f"{version.major}.{version.minor}.{version.patch}" + # If you want a specific Cura version to show up on the splash screen add the user configuration `user.cura:version=VERSION` + # the global.conf, profile, package_info (of dependency) or via the cmd line `-c user.cura:version=VERSION` + cura_version = Version(self.conf.get("user.cura:version", default = self.version, check_type = str)) + pre_tag = f"-{cura_version.pre}" if cura_version.pre else "" + build_tag = f"+internal_{cura_version.build}" if self.options.internal and cura_version.build else "" + cura_version = f"{cura_version.major}.{cura_version.minor}.{cura_version.patch}{pre_tag}{build_tag}" with open(Path(location, "CuraVersion.py"), "w") as f: f.write(cura_version_py.render( From 6ae88f1181332df9e8add81742b2479e251a768c Mon Sep 17 00:00:00 2001 From: jelle spijker Date: Wed, 5 Oct 2022 14:43:31 +0200 Subject: [PATCH 080/103] Also set build tag if not internal Contributes to CURA-9711 --- conanfile.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/conanfile.py b/conanfile.py index 70ddaf0731..a17f50f666 100644 --- a/conanfile.py +++ b/conanfile.py @@ -155,8 +155,9 @@ class CuraConan(ConanFile): # the global.conf, profile, package_info (of dependency) or via the cmd line `-c user.cura:version=VERSION` cura_version = Version(self.conf.get("user.cura:version", default = self.version, check_type = str)) pre_tag = f"-{cura_version.pre}" if cura_version.pre else "" - build_tag = f"+internal_{cura_version.build}" if self.options.internal and cura_version.build else "" - cura_version = f"{cura_version.major}.{cura_version.minor}.{cura_version.patch}{pre_tag}{build_tag}" + build_tag = f"+{cura_version.build}" if cura_version.build else "" + internal_tag = f"+internal" if self.options.internal else "" + cura_version = f"{cura_version.major}.{cura_version.minor}.{cura_version.patch}{pre_tag}{build_tag}{internal_tag}" with open(Path(location, "CuraVersion.py"), "w") as f: f.write(cura_version_py.render( From d6d7eef0548726f702d7b5a1b401592e40973bcc Mon Sep 17 00:00:00 2001 From: Rijk van Manen Date: Wed, 5 Oct 2022 14:55:49 +0200 Subject: [PATCH 081/103] Notify PP&M on Print Profile Change To avoid print profile changes for ultimaker printers going unnoticed a github action is set up. PP-260 --- .../notify_on_print_profile_change.yml | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 .github/workflows/notify_on_print_profile_change.yml diff --git a/.github/workflows/notify_on_print_profile_change.yml b/.github/workflows/notify_on_print_profile_change.yml new file mode 100644 index 0000000000..f2c77d366c --- /dev/null +++ b/.github/workflows/notify_on_print_profile_change.yml @@ -0,0 +1,35 @@ +name: notify_on_print_profile_change + +on: + push: + branches: [ "main" ] + paths: + - 'resources/definitions/fdmprinter.def.json' + - 'resources/definitions/ultimaker**' + - 'resources/extruders/ultimaker**' + - 'resources/intent/ultimaker**' + - 'resources/quality/ultimaker**' + - 'resources/variants/ultimaker**' + pull_request: + branches: [ "main" ] + paths: + - 'resources/definitions/fdmprinter.def.json' + - 'resources/definitions/ultimaker**' + - 'resources/extruders/ultimaker**' + - 'resources/intent/ultimaker**' + - 'resources/quality/ultimaker**' + - 'resources/variants/ultimaker**' +jobs: + slackNotification: + name: Slack Notification + runs-on: ubuntu-latest + steps: + - name: Ultimaker Print Profile Changed + uses: rtCamp/action-slack-notify@v2 + env: + SLACK_CHANNEL: profile-changes + SLACK_USERNAME: ${{ github.repository }} + SLACK_COLOR: '#00FF00' + SLACK_TITLE: Print profiles changed + MSG_MINIMAL: commit + SLACK_WEBHOOK: ${{ secrets.SLACK_CURA_PPM_HOOK }} \ No newline at end of file From 8e566319725e4232bb8f7ccbbe10d2c655aa136d Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Wed, 5 Oct 2022 15:27:39 +0200 Subject: [PATCH 082/103] 3mf project files saved with an abstract printer would crash on loading when selecting a non abstract printer to load the project with. This was because the metadata "is_abstract_machine" was being loaded into the non abstract machine. This caused a crash in MachineListModel.py by trying to delete this non abstract machine from a list where it didn't exist. The solution is to ignore the "is_abstract_machine" metadata when loading settings from saved machines in 3mf files. CURA-9711 --- plugins/3MFReader/ThreeMFWorkspaceReader.py | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/3MFReader/ThreeMFWorkspaceReader.py b/plugins/3MFReader/ThreeMFWorkspaceReader.py index 86be2f0380..bec50b5660 100755 --- a/plugins/3MFReader/ThreeMFWorkspaceReader.py +++ b/plugins/3MFReader/ThreeMFWorkspaceReader.py @@ -53,6 +53,7 @@ _ignored_machine_network_metadata = { "connection_type", "capabilities", "octoprint_api_key", + "is_abstract_machine" } # type: Set[str] From 1f7679b33165f65a0c4474f6b29d3e56a23d3fc1 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Thu, 6 Oct 2022 10:01:06 +0200 Subject: [PATCH 083/103] Default to creating the installer --- .github/workflows/cura-installer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cura-installer.yml b/.github/workflows/cura-installer.yml index da439eeff0..19f2211234 100644 --- a/.github/workflows/cura-installer.yml +++ b/.github/workflows/cura-installer.yml @@ -29,7 +29,7 @@ on: installer: description: 'Create the installer' required: true - default: false + default: true type: boolean # Run the nightly at 3:25 UTC on working days From 8e883cf5466f47d1dd708e19646bd7f82aa2482b Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Thu, 6 Oct 2022 11:44:30 +0200 Subject: [PATCH 084/103] This fixes a crash when loading a 3mf with a printer that has no extruders while the current global stack also has no extruders. This was caused by trying to compare "extruders_enabled_count" which was None with an integer. CURA-9714 --- cura/Settings/MachineManager.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 2051ce1b99..27d8fbbc78 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -904,6 +904,7 @@ class MachineManager(QObject): if self._global_container_stack is None \ or self._global_container_stack.getProperty(setting_key, "value") == new_value \ + or self._global_container_stack.definitionChanges.getProperty("extruders_enabled_count", "value") is None \ or self._global_container_stack.definitionChanges.getProperty("extruders_enabled_count", "value") < 2: return From e2e626f53008d64e3d92e4bf9ddc1c9d48128135 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Thu, 6 Oct 2022 12:46:56 +0200 Subject: [PATCH 085/103] Windows: Registry root should be the local machine one. So that uninstall is properly linked in the 'programs and features' again. CURA-9696 --- packaging/NSIS/Ultimaker-Cura.nsi.jinja | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/NSIS/Ultimaker-Cura.nsi.jinja b/packaging/NSIS/Ultimaker-Cura.nsi.jinja index 9a51b81110..9cc6b53bd6 100644 --- a/packaging/NSIS/Ultimaker-Cura.nsi.jinja +++ b/packaging/NSIS/Ultimaker-Cura.nsi.jinja @@ -12,7 +12,7 @@ !define INSTALLER_NAME "{{ destination }}" !define MAIN_APP_EXE "{{ main_app }}" !define INSTALL_TYPE "SetShellVarContext all" -!define REG_ROOT "HKCR" +!define REG_ROOT "HKLM" !define REG_APP_PATH "Software\Microsoft\Windows\CurrentVersion\App Paths\${APP_NAME}" !define UNINSTALL_PATH "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}" From ccf9a47f085ac66bf57ec04e99a04bd984770641 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Thu, 6 Oct 2022 15:49:51 +0200 Subject: [PATCH 086/103] Flatten equation in UFP settings export --- plugins/UFPWriter/UFPWriter.py | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/plugins/UFPWriter/UFPWriter.py b/plugins/UFPWriter/UFPWriter.py index 9c323964ed..6510a52a41 100644 --- a/plugins/UFPWriter/UFPWriter.py +++ b/plugins/UFPWriter/UFPWriter.py @@ -12,6 +12,7 @@ from PyQt6.QtCore import QBuffer from UM.Application import Application from UM.Logger import Logger +from UM.Settings.SettingFunction import SettingFunction from UM.Mesh.MeshWriter import MeshWriter # The writer we need to implement. from UM.MimeTypeDatabase import MimeTypeDatabase, MimeType from UM.PluginRegistry import PluginRegistry # To get the g-code writer. @@ -233,11 +234,17 @@ class UFPWriter(MeshWriter): # Add global user or quality changes global_flattened_changes = InstanceContainer.createMergedInstanceContainer(global_stack.userChanges, global_stack.qualityChanges) for setting in global_flattened_changes.getAllKeys(): - settings["global"]["changes"][setting] = str(global_flattened_changes.getProperty(setting, "value")) + value = global_flattened_changes.getProperty(setting, "value") + if isinstance(property_value, SettingFunction): + property_value = property_value(value) + settings["global"]["changes"][setting] = value # Get global all settings values without user or quality changes for setting in global_stack.getAllKeys(): - settings["global"]["all_settings"][setting] = str(global_stack.getProperty(setting, "value")) + value = global_stack.getProperty(setting, "value") + if isinstance(property_value, SettingFunction): + property_value = property_value(value) + settings["global"]["all_settings"][setting] = value for i, extruder in enumerate(global_stack.extruderList): # Add extruder fields to settings dictionary @@ -249,10 +256,16 @@ class UFPWriter(MeshWriter): # Add extruder user or quality changes extruder_flattened_changes = InstanceContainer.createMergedInstanceContainer(extruder.userChanges, extruder.qualityChanges) for setting in extruder_flattened_changes.getAllKeys(): - settings[f"extruder_{i}"]["changes"][setting] = str(extruder_flattened_changes.getProperty(setting, "value")) + value = extruder_flattened_changes.getProperty(setting, "value") + if isinstance(property_value, SettingFunction): + property_value = property_value(value) + settings[f"extruder_{i}"]["changes"][setting] = value # Get extruder all settings values without user or quality changes for setting in extruder.getAllKeys(): - settings[f"extruder_{i}"]["all_settings"][setting] = str(extruder.getProperty(setting, "value")) + value = extruder.getProperty(setting, "value") + if isinstance(property_value, SettingFunction): + property_value = property_value(value) + settings[f"extruder_{i}"]["all_settings"][setting] = value return settings From 598e093b5e1dc30558db011e3c1f70158c411e2d Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Thu, 6 Oct 2022 16:05:53 +0200 Subject: [PATCH 087/103] Revert "Flatten equation in UFP settings export" This reverts commit ccf9a47f085ac66bf57ec04e99a04bd984770641. --- plugins/UFPWriter/UFPWriter.py | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/plugins/UFPWriter/UFPWriter.py b/plugins/UFPWriter/UFPWriter.py index 6510a52a41..9c323964ed 100644 --- a/plugins/UFPWriter/UFPWriter.py +++ b/plugins/UFPWriter/UFPWriter.py @@ -12,7 +12,6 @@ from PyQt6.QtCore import QBuffer from UM.Application import Application from UM.Logger import Logger -from UM.Settings.SettingFunction import SettingFunction from UM.Mesh.MeshWriter import MeshWriter # The writer we need to implement. from UM.MimeTypeDatabase import MimeTypeDatabase, MimeType from UM.PluginRegistry import PluginRegistry # To get the g-code writer. @@ -234,17 +233,11 @@ class UFPWriter(MeshWriter): # Add global user or quality changes global_flattened_changes = InstanceContainer.createMergedInstanceContainer(global_stack.userChanges, global_stack.qualityChanges) for setting in global_flattened_changes.getAllKeys(): - value = global_flattened_changes.getProperty(setting, "value") - if isinstance(property_value, SettingFunction): - property_value = property_value(value) - settings["global"]["changes"][setting] = value + settings["global"]["changes"][setting] = str(global_flattened_changes.getProperty(setting, "value")) # Get global all settings values without user or quality changes for setting in global_stack.getAllKeys(): - value = global_stack.getProperty(setting, "value") - if isinstance(property_value, SettingFunction): - property_value = property_value(value) - settings["global"]["all_settings"][setting] = value + settings["global"]["all_settings"][setting] = str(global_stack.getProperty(setting, "value")) for i, extruder in enumerate(global_stack.extruderList): # Add extruder fields to settings dictionary @@ -256,16 +249,10 @@ class UFPWriter(MeshWriter): # Add extruder user or quality changes extruder_flattened_changes = InstanceContainer.createMergedInstanceContainer(extruder.userChanges, extruder.qualityChanges) for setting in extruder_flattened_changes.getAllKeys(): - value = extruder_flattened_changes.getProperty(setting, "value") - if isinstance(property_value, SettingFunction): - property_value = property_value(value) - settings[f"extruder_{i}"]["changes"][setting] = value + settings[f"extruder_{i}"]["changes"][setting] = str(extruder_flattened_changes.getProperty(setting, "value")) # Get extruder all settings values without user or quality changes for setting in extruder.getAllKeys(): - value = extruder.getProperty(setting, "value") - if isinstance(property_value, SettingFunction): - property_value = property_value(value) - settings[f"extruder_{i}"]["all_settings"][setting] = value + settings[f"extruder_{i}"]["all_settings"][setting] = str(extruder.getProperty(setting, "value")) return settings From efe3014d5560089c7dce8a6a8d2cd60891a0c736 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Thu, 6 Oct 2022 16:05:59 +0200 Subject: [PATCH 088/103] Merge branch '5.2' of github.com:Ultimaker/Cura into 5.2 # Conflicts: # plugins/UFPWriter/UFPWriter.py --- plugins/UFPWriter/UFPWriter.py | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/plugins/UFPWriter/UFPWriter.py b/plugins/UFPWriter/UFPWriter.py index 9c323964ed..d7671d02c8 100644 --- a/plugins/UFPWriter/UFPWriter.py +++ b/plugins/UFPWriter/UFPWriter.py @@ -12,6 +12,7 @@ from PyQt6.QtCore import QBuffer from UM.Application import Application from UM.Logger import Logger +from UM.Settings.SettingFunction import SettingFunction from UM.Mesh.MeshWriter import MeshWriter # The writer we need to implement. from UM.MimeTypeDatabase import MimeTypeDatabase, MimeType from UM.PluginRegistry import PluginRegistry # To get the g-code writer. @@ -233,11 +234,17 @@ class UFPWriter(MeshWriter): # Add global user or quality changes global_flattened_changes = InstanceContainer.createMergedInstanceContainer(global_stack.userChanges, global_stack.qualityChanges) for setting in global_flattened_changes.getAllKeys(): - settings["global"]["changes"][setting] = str(global_flattened_changes.getProperty(setting, "value")) + value = global_flattened_changes.getProperty(setting, "value") + if isinstance(value, SettingFunction): + value = value(global_flattened_changes) + settings["global"]["changes"][setting] = value # Get global all settings values without user or quality changes for setting in global_stack.getAllKeys(): - settings["global"]["all_settings"][setting] = str(global_stack.getProperty(setting, "value")) + value = global_stack.getProperty(setting, "value") + if isinstance(value, SettingFunction): + value = value(global_stack) + settings["global"]["all_settings"][setting] = value for i, extruder in enumerate(global_stack.extruderList): # Add extruder fields to settings dictionary @@ -249,10 +256,16 @@ class UFPWriter(MeshWriter): # Add extruder user or quality changes extruder_flattened_changes = InstanceContainer.createMergedInstanceContainer(extruder.userChanges, extruder.qualityChanges) for setting in extruder_flattened_changes.getAllKeys(): - settings[f"extruder_{i}"]["changes"][setting] = str(extruder_flattened_changes.getProperty(setting, "value")) + value = extruder_flattened_changes.getProperty(setting, "value") + if isinstance(value, SettingFunction): + value = value(extruder_flattened_changes) + settings[f"extruder_{i}"]["changes"][setting] = value # Get extruder all settings values without user or quality changes for setting in extruder.getAllKeys(): - settings[f"extruder_{i}"]["all_settings"][setting] = str(extruder.getProperty(setting, "value")) + value = extruder.getProperty(setting, "value") + if isinstance(value, SettingFunction): + value = value(extruder) + settings[f"extruder_{i}"]["all_settings"][setting] = value return settings From 1e1ec7c6e55b62c15071a2fd42373dc2fd750058 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Thu, 6 Oct 2022 22:23:24 +0200 Subject: [PATCH 089/103] For tree support default should be support wall count 1. part of CURA-7800 --- resources/definitions/maker_made_300x.def.json | 2 +- resources/definitions/tronxy_x.def.json | 2 +- resources/definitions/two_trees_base.def.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/definitions/maker_made_300x.def.json b/resources/definitions/maker_made_300x.def.json index 0be2112bed..c7b888dfff 100644 --- a/resources/definitions/maker_made_300x.def.json +++ b/resources/definitions/maker_made_300x.def.json @@ -106,7 +106,7 @@ "support_type": {"value": "'everywhere'" }, "support_angle": {"value": "50"}, "support_pattern": {"value": "'grid'"}, - "support_wall_count": {"value": 0}, + "support_wall_count": {"value": "1 if (support_structure == 'tree') else 0" }, "zig_zaggify_support": {"value": false }, "support_infill_rate": {"value": "15 if support_enable else 0"}, "support_brim_enable": {"value": true }, diff --git a/resources/definitions/tronxy_x.def.json b/resources/definitions/tronxy_x.def.json index 69525e5f27..da8f94fffe 100644 --- a/resources/definitions/tronxy_x.def.json +++ b/resources/definitions/tronxy_x.def.json @@ -130,7 +130,7 @@ "support_xy_distance_overhang": { "value": "wall_line_width_0" }, "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height*2" }, "support_xy_overrides_z": { "value": "'xy_overrides_z'" }, - "support_wall_count": { "value": 0 }, + "support_wall_count": {"value": "1 if (support_structure == 'tree') else 0" }, "support_brim_enable": { "value": true }, "support_brim_width": { "value": 4 }, "support_interface_height": { "value": "layer_height * 4" }, diff --git a/resources/definitions/two_trees_base.def.json b/resources/definitions/two_trees_base.def.json index f6918c6121..7e0495b469 100644 --- a/resources/definitions/two_trees_base.def.json +++ b/resources/definitions/two_trees_base.def.json @@ -93,7 +93,7 @@ "support_xy_distance_overhang": { "value": "wall_line_width_0" }, "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height*2" }, "support_xy_overrides_z": { "value": "'xy_overrides_z'" }, - "support_wall_count": { "value": 0 }, + "support_wall_count": {"value": "1 if (support_structure == 'tree') else 0" }, "support_brim_enable": { "value": true }, "support_brim_width": { "value": 5 }, From 2cc923761dc762ec9fd78b8b8911c68d2e2d08e4 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Mon, 10 Oct 2022 14:58:46 +0200 Subject: [PATCH 090/103] Fix missing quote --- .github/workflows/conan-recipe-version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml index a175687a6a..3acb4cd76b 100644 --- a/.github/workflows/conan-recipe-version.yml +++ b/.github/workflows/conan-recipe-version.yml @@ -171,7 +171,7 @@ jobs: if is_tag: print("THE TAG IS: ", ${{ github.ref_name }}) - if is_tag and ${{ github.ref_name }} == "5.2.0-beta: + if is_tag and ${{ github.ref_name }} == "5.2.0-beta": actual_version = "5.2.0-beta" is_release_branch = True user = "_" From fce7df29e01b5638641802401aeaa7d4d9221abe Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Mon, 10 Oct 2022 15:44:46 +0200 Subject: [PATCH 091/103] remove debugging statement --- .github/workflows/conan-recipe-version.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml index 3acb4cd76b..e10ffa8b2d 100644 --- a/.github/workflows/conan-recipe-version.yml +++ b/.github/workflows/conan-recipe-version.yml @@ -169,8 +169,6 @@ jobs: # FIXME: for external PR's actual_version = f"5.3.0-alpha+{buildmetadata}pr_{issue_number}" - if is_tag: - print("THE TAG IS: ", ${{ github.ref_name }}) if is_tag and ${{ github.ref_name }} == "5.2.0-beta": actual_version = "5.2.0-beta" is_release_branch = True From bbda089ae9d9de24b672b32b7fa5bd210231dd6b Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Mon, 10 Oct 2022 15:46:52 +0200 Subject: [PATCH 092/103] Add quotes around ref_name --- .github/workflows/conan-recipe-version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml index e10ffa8b2d..f1dfc67bf3 100644 --- a/.github/workflows/conan-recipe-version.yml +++ b/.github/workflows/conan-recipe-version.yml @@ -169,7 +169,7 @@ jobs: # FIXME: for external PR's actual_version = f"5.3.0-alpha+{buildmetadata}pr_{issue_number}" - if is_tag and ${{ github.ref_name }} == "5.2.0-beta": + if is_tag and "${{ github.ref_name }}" == "5.2.0-beta": actual_version = "5.2.0-beta" is_release_branch = True user = "_" From 6989aabff5d9902e9587a26bd0d2c037c2ee22af Mon Sep 17 00:00:00 2001 From: Tim Date: Tue, 11 Oct 2022 14:43:34 +0200 Subject: [PATCH 093/103] Fix startup on Zorin OS First unset QT_STYLE_OVERRIDE then start Cura --- packaging/AppImage/AppRun | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packaging/AppImage/AppRun b/packaging/AppImage/AppRun index d2beac8745..14ee0e4d8e 100644 --- a/packaging/AppImage/AppRun +++ b/packaging/AppImage/AppRun @@ -13,8 +13,8 @@ export QT_XKB_CONFIG_ROOT=/usr/share/X11/xkb # Use the openssl.cnf packaged in the AppImage export OPENSSL_CONF="$scriptdir/openssl.cnf" -$scriptdir/Ultimaker-Cura "$@" - # If this variable is set on Zorin OS 16 Cura would crash # unset `QT_STYLE_OVERRIDE` as a precaution -unset QT_STYLE_OVERRIDE \ No newline at end of file +unset QT_STYLE_OVERRIDE + +$scriptdir/Ultimaker-Cura "$@" From 7faf2f63da8e8dd5b321fd94a0f25285f3db3261 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Tue, 11 Oct 2022 15:05:46 +0200 Subject: [PATCH 094/103] Remove 5.3.0-alpha from the conandata When the `conan install . ` command is run without a version specifier it would take the dependencies for 5.3.0-alpha on the 5.2 branch. --- conandata.yml | 105 -------------------------------------------------- 1 file changed, 105 deletions(-) diff --git a/conandata.yml b/conandata.yml index 0da3e8bc1d..09f7834960 100644 --- a/conandata.yml +++ b/conandata.yml @@ -10,111 +10,6 @@ # requirements (use the /(latest)@ultimaker/testing) # # Subject to change in the future! -"5.3.0-alpha": - requirements: - - "pyarcus/(latest)@ultimaker/testing" - - "curaengine/(latest)@ultimaker/testing" - - "pysavitar/(latest)@ultimaker/testing" - - "pynest2d/(latest)@ultimaker/testing" - - "uranium/(latest)@ultimaker/testing" - - "fdm_materials/(latest)@ultimaker/testing" - - "cura_binary_data/(latest)@ultimaker/testing" - - "cpython/3.10.4" - internal_requirements: - - "fdm_materials_private/(latest)@ultimaker/testing" - - "cura_private_data/(latest)@ultimaker/testing" - runinfo: - entrypoint: "cura_app.py" - pyinstaller: - datas: - cura_plugins: - package: "cura" - src: "plugins" - dst: "share/cura/plugins" - cura_resources: - package: "cura" - src: "resources" - dst: "share/cura/resources" - cura_private_data: - package: "cura_private_data" - src: "resources" - dst: "share/cura/resources" - internal: true - uranium_plugins: - package: "uranium" - src: "plugins" - dst: "share/uranium/plugins" - uranium_resources: - package: "uranium" - src: "resources" - dst: "share/uranium/resources" - uranium_um_qt_qml_um: - package: "uranium" - src: "site-packages/UM/Qt/qml/UM" - dst: "PyQt6/Qt6/qml/UM" - cura_binary_data: - package: "cura_binary_data" - src: "resources/cura/resources" - dst: "share/cura/resources" - uranium_binary_data: - package: "cura_binary_data" - src: "resources/uranium/resources" - dst: "share/uranium/resources" - windows_binary_data: - package: "cura_binary_data" - src: "windows" - dst: "share/windows" - fdm_materials: - package: "fdm_materials" - src: "materials" - dst: "share/cura/resources/materials" - fdm_materials_private: - package: "fdm_materials_private" - src: "resources/materials" - dst: "share/cura/resources/materials" - internal: true - tcl: - package: "tcl" - src: "lib/tcl8.6" - dst: "tcl" - tk: - package: "tk" - src: "lib/tk8.6" - dst: "tk" - binaries: - curaengine: - package: "curaengine" - src: "bin" - dst: "." - binary: "CuraEngine" - hiddenimports: - - "pySavitar" - - "pyArcus" - - "pynest2d" - - "PyQt6" - - "PyQt6.QtNetwork" - - "PyQt6.sip" - - "logging.handlers" - - "zeroconf" - - "fcntl" - - "stl" - - "serial" - collect_all: - - "cura" - - "UM" - - "serial" - - "Charon" - - "sqlite3" - - "trimesh" - - "win32ctypes" - - "PyQt6" - - "PyQt6.QtNetwork" - - "PyQt6.sip" - - "stl" - icon: - Windows: "./icons/Cura.ico" - Macos: "./icons/cura.icns" - Linux: "./icons/cura-128.png" "5.2.0-beta.2": requirements: - "pyarcus/(latest)@ultimaker/stable" From a51b03b9f4312f9d22361145f1bd57df6fa472b7 Mon Sep 17 00:00:00 2001 From: Tim Date: Tue, 11 Oct 2022 14:43:34 +0200 Subject: [PATCH 095/103] Fix startup on Zorin OS First unset QT_STYLE_OVERRIDE then start Cura (cherry picked from commit 6989aabff5d9902e9587a26bd0d2c037c2ee22af) --- packaging/AppImage/AppRun | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packaging/AppImage/AppRun b/packaging/AppImage/AppRun index d2beac8745..14ee0e4d8e 100644 --- a/packaging/AppImage/AppRun +++ b/packaging/AppImage/AppRun @@ -13,8 +13,8 @@ export QT_XKB_CONFIG_ROOT=/usr/share/X11/xkb # Use the openssl.cnf packaged in the AppImage export OPENSSL_CONF="$scriptdir/openssl.cnf" -$scriptdir/Ultimaker-Cura "$@" - # If this variable is set on Zorin OS 16 Cura would crash # unset `QT_STYLE_OVERRIDE` as a precaution -unset QT_STYLE_OVERRIDE \ No newline at end of file +unset QT_STYLE_OVERRIDE + +$scriptdir/Ultimaker-Cura "$@" From e28e25281c48999077fea5c01f38b8cae2aa3328 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Wed, 12 Oct 2022 10:42:44 +0200 Subject: [PATCH 096/103] Ensure the complete install folder is removed Fixes: CURA-9526 Uninstalling main build doesn't remove all files --- packaging/NSIS/Ultimaker-Cura.nsi.jinja | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/NSIS/Ultimaker-Cura.nsi.jinja b/packaging/NSIS/Ultimaker-Cura.nsi.jinja index 9cc6b53bd6..4e1aa451df 100644 --- a/packaging/NSIS/Ultimaker-Cura.nsi.jinja +++ b/packaging/NSIS/Ultimaker-Cura.nsi.jinja @@ -163,7 +163,7 @@ Delete "$INSTDIR\uninstall.exe" Delete "$INSTDIR\${APP_NAME} website.url" !endif -RmDir "$INSTDIR" +RmDir /r /REBOOTOK "$INSTDIR" !ifdef REG_START_MENU !insertmacro MUI_STARTMENU_GETFOLDER "Application" $SM_Folder From 547d801209f54ff81ccabe3dd0b9a45052f5088f Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Wed, 12 Oct 2022 11:48:10 +0200 Subject: [PATCH 097/103] Add VERSION to REG_APP_PATH and UNINSTALL_PATH This should ensure that updating a patch doesn't override the uninstaller in the settings->Installed apps Fixes: #13337 CURA-9670 Correct the version number in the uninstaller --- packaging/NSIS/Ultimaker-Cura.nsi.jinja | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/NSIS/Ultimaker-Cura.nsi.jinja b/packaging/NSIS/Ultimaker-Cura.nsi.jinja index 9cc6b53bd6..23ce1e58d7 100644 --- a/packaging/NSIS/Ultimaker-Cura.nsi.jinja +++ b/packaging/NSIS/Ultimaker-Cura.nsi.jinja @@ -13,8 +13,8 @@ !define MAIN_APP_EXE "{{ main_app }}" !define INSTALL_TYPE "SetShellVarContext all" !define REG_ROOT "HKLM" -!define REG_APP_PATH "Software\Microsoft\Windows\CurrentVersion\App Paths\${APP_NAME}" -!define UNINSTALL_PATH "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}" +!define REG_APP_PATH "Software\Microsoft\Windows\CurrentVersion\App Paths\${APP_NAME}-${VERSION}" +!define UNINSTALL_PATH "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}-${VERSION}" !define REG_START_MENU "Start Menu Folder" From 7dd37c6a53818755310f3ce0b6176aead48013f6 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 12 Oct 2022 12:02:20 +0200 Subject: [PATCH 098/103] Filter material lists for compatible printers. So that only one identical entry shows up per material, per extruder (per printer). CURA-9689 --- .../Machines/Models/CompatibleMachineModel.py | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/cura/Machines/Models/CompatibleMachineModel.py b/cura/Machines/Models/CompatibleMachineModel.py index 639bba88a0..cf77a15085 100644 --- a/cura/Machines/Models/CompatibleMachineModel.py +++ b/cura/Machines/Models/CompatibleMachineModel.py @@ -38,6 +38,12 @@ class CompatibleMachineModel(ListModel): def _update(self) -> None: self.clear() + def _makeMaterial(brand, name, color): + if name.lower() in ["", "empty"]: + return {"brand": "", "name": "(empty)", "hexcolor": "#ffffff"} + else: + return {"brand": brand, "name": name, "hexcolor": color} + from cura.CuraApplication import CuraApplication machine_manager = CuraApplication.getInstance().getMachineManager() @@ -48,11 +54,8 @@ class CompatibleMachineModel(ListModel): # initialize & add current active material: for extruder in printer.extruders: - materials = [{ - "brand": extruder.activeMaterial.brand, - "name": extruder.activeMaterial.name, - "hexcolor": extruder.activeMaterial.color, - }] + materials = [_makeMaterial( + extruder.activeMaterial.brand, extruder.activeMaterial.name, extruder.activeMaterial.color)] extruder_configs[extruder.getPosition()] = { "position": extruder.getPosition(), "core": extruder.hotendID, @@ -66,11 +69,9 @@ class CompatibleMachineModel(ListModel): Logger.log("w", f"No active extruder for position {extruder.position}.") continue - extruder_configs[extruder.position]["materials"].append({ - "brand": extruder.material.brand, - "name": extruder.material.name, - "hexcolor": extruder.material.color - }) + entry = _makeMaterial(extruder.material.brand, extruder.material.name, extruder.material.color) + if entry not in extruder_configs[extruder.position]["materials"]: + extruder_configs[extruder.position]["materials"].append(entry) if any([len(extruder["materials"]) > 0 for extruder in extruder_configs.values()]): self.appendItem({ From 9bacbb58253f838599a4615122c757e3d4ddd7f5 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Wed, 12 Oct 2022 14:37:26 +0200 Subject: [PATCH 099/103] Sort cloud printers in printer selection dropdown menu CURA-9748 --- cura/Machines/Models/MachineListModel.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cura/Machines/Models/MachineListModel.py b/cura/Machines/Models/MachineListModel.py index df9ca7483f..7306a66740 100644 --- a/cura/Machines/Models/MachineListModel.py +++ b/cura/Machines/Models/MachineListModel.py @@ -89,12 +89,13 @@ class MachineListModel(ListModel): other_machine_stacks.sort(key = lambda machine: machine.getName().upper()) abstract_machine_stacks = CuraContainerRegistry.getInstance().findContainerStacks(is_abstract_machine = "True") - abstract_machine_stacks.sort(key = lambda machine: machine.getName(), reverse = True) + abstract_machine_stacks.sort(key = lambda machine: machine.getName().upper()) for abstract_machine in abstract_machine_stacks: definition_id = abstract_machine.definition.getId() online_machine_stacks = machines_manager.getMachinesWithDefinition(definition_id, online_only = True) online_machine_stacks = list(filter(lambda machine: machine.hasNetworkedConnection(), online_machine_stacks)) + online_machine_stacks.sort(key=lambda machine: machine.getName().upper()) other_machine_stacks.remove(abstract_machine) if abstract_machine in online_machine_stacks: From 8db3f02a4f27f3ed90213d5680935297000e4f96 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 12 Oct 2022 14:43:55 +0200 Subject: [PATCH 100/103] Re-add tooltips for intent profile selection in recommended. They where skipped over when transferring the radio bar to the current large button based setup. CURA-9746 --- .../Recommended/RecommendedQualityProfileSelector.qml | 2 +- .../RecommendedQualityProfileSelectorButton.qml | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml index bc5826fe7c..89644d887f 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml @@ -32,7 +32,7 @@ Item { profileName: model.name icon: model.icon - + tooltipText: (model.description != undefined) ? model.description : "" selected: Cura.MachineManager.activeIntentCategory == model.intent_category diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelectorButton.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelectorButton.qml index 6804e7e5ba..2a63345b48 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelectorButton.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelectorButton.qml @@ -19,6 +19,7 @@ Rectangle property bool selected: false property string profileName: "" property string icon: "" + property alias tooltipText: tooltip.text signal clicked() @@ -30,6 +31,13 @@ Rectangle onClicked: base.clicked() } + UM.ToolTip + { + id: tooltip + visible: mouseArea.containsMouse + targetPoint: Qt.point(base.x + (base.width / 2), base.y + (base.height / 2)) + } + Item { width: intentIcon.width From e9b268bc06ceb4850bf68b6947ba30239d97acce Mon Sep 17 00:00:00 2001 From: Remco Burema <41987080+rburema@users.noreply.github.com> Date: Wed, 12 Oct 2022 14:54:33 +0200 Subject: [PATCH 101/103] Review suggestion; best practices; javascript. done as part of CURA-9746 Co-authored-by: Casper Lamboo --- .../Recommended/RecommendedQualityProfileSelector.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml index 89644d887f..b9fbf04f9c 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml @@ -32,7 +32,7 @@ Item { profileName: model.name icon: model.icon - tooltipText: (model.description != undefined) ? model.description : "" + tooltipText: model.description ? model.description : "" selected: Cura.MachineManager.activeIntentCategory == model.intent_category From e25048d88a76bf184de6fee76a84aaf54b1d8cbb Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Wed, 12 Oct 2022 15:29:08 +0200 Subject: [PATCH 102/103] Add width to intent tool tips CURA-9746 --- .../Recommended/RecommendedQualityProfileSelectorButton.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelectorButton.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelectorButton.qml index 2a63345b48..4e912edfe0 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelectorButton.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelectorButton.qml @@ -36,6 +36,7 @@ Rectangle id: tooltip visible: mouseArea.containsMouse targetPoint: Qt.point(base.x + (base.width / 2), base.y + (base.height / 2)) + width: UM.Theme.getSize("tooltip").width } Item From 5c284cd094b39196e234ccc95bfb5570b18055c4 Mon Sep 17 00:00:00 2001 From: jelle spijker Date: Thu, 13 Oct 2022 13:00:08 +0200 Subject: [PATCH 103/103] Fix nightly builds --- .github/workflows/cura-installer.yml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cura-installer.yml b/.github/workflows/cura-installer.yml index 19f2211234..99d12a5057 100644 --- a/.github/workflows/cura-installer.yml +++ b/.github/workflows/cura-installer.yml @@ -1,5 +1,5 @@ name: Cura Installer -run-name: Cura binaries ${{ inputs.cura_conan_version }} by @${{ github.actor }} +run-name: ${{ inputs.cura_conan_version }} by @${{ github.actor }} on: workflow_dispatch: @@ -53,6 +53,9 @@ env: MACOS_CERT_USER: ${{ secrets.MACOS_CERT_USER }} GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }} MACOS_CERT_PASSPHRASE: ${{ secrets.MACOS_CERT_PASSPHRASE }} + CURA_CONAN_VERSION: ${{ inputs.cura_conan_version }} + ENTERPRISE: ${{ inputs.enterprise }} + STAGING: ${{ inputs.staging }} jobs: cura-installer-create: @@ -157,8 +160,13 @@ jobs: if: ${{ inputs.conan_config_branch == '' }} run: conan config install https://github.com/Ultimaker/conan-config.git - - name: Create the Packages - run: conan install ${{ inputs.cura_conan_version }} ${{ inputs.conan_args }} --build=missing --update -if cura_inst -g VirtualPythonEnv -o cura:enterprise=${{ inputs.enterprise }} -o cura:staging=${{ inputs.staging }} --json "cura_inst/conan_install_info.json" + - name: Create the Packages (Bash) + if: ${{ runner.os != 'Windows' }} + run: conan install $CURA_CONAN_VERSION ${{ inputs.conan_args }} --build=missing --update -if cura_inst -g VirtualPythonEnv -o cura:enterprise=$ENTERPRISE -o cura:staging=$STAGING --json "cura_inst/conan_install_info.json" + + - name: Create the Packages (Powershell) + if: ${{ runner.os == 'Windows' }} + run: conan install $Env:CURA_CONAN_VERSION ${{ inputs.conan_args }} --build=missing --update -if cura_inst -g VirtualPythonEnv -o cura:enterprise=$Env:ENTERPRISE -o cura:staging=$Env:STAGING --json "cura_inst/conan_install_info.json" - name: Set Environment variables for Cura (bash) if: ${{ runner.os != 'Windows' }}