From fb7930e52492f1fd44037d6cc6019aba62db4651 Mon Sep 17 00:00:00 2001 From: eduardo chamorro Date: Fri, 25 Nov 2022 10:40:41 +0100 Subject: [PATCH 01/19] added machine config file and extruder config file of the biomaterial,paste and ceramic printer opensource machine project of FabLab Barcelona --- .../fablabbcn_pasteprinter.def.json | 79 +++++++++++++++++++ resources/extruders/fablabbcn_0.def.json | 15 ++++ 2 files changed, 94 insertions(+) create mode 100644 resources/definitions/fablabbcn_pasteprinter.def.json create mode 100644 resources/extruders/fablabbcn_0.def.json diff --git a/resources/definitions/fablabbcn_pasteprinter.def.json b/resources/definitions/fablabbcn_pasteprinter.def.json new file mode 100644 index 0000000000..01cbd350d6 --- /dev/null +++ b/resources/definitions/fablabbcn_pasteprinter.def.json @@ -0,0 +1,79 @@ +{ + "version": 2, + "name": "PastePrinter", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "eduardo_chamorro", + "manufacturer": "FablabBcn", + "file_formats": "text/x-gcode", + "machine_extruder_trains": + { + "0": "fablabbcn_0" + + }, + "first_start_actions": ["MachineSettingsAction"] + }, + "overrides": { + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_always_write_active_tool": { + "default_value": true + }, + "machine_start_gcode": { + "default_value": ";HEADER;\nG21; Set to metric [change to G20 if you want Imperial]\nG91;Force coordinates to be absolute relative to the origin \nG1 Z10 F1000;\nG90; Force coordinates to be absolute relative to the origin\nG28 X; Home X axis\nG28 Y; Home Y axis\nG28 Z; Home Z axis\nM302 P1; Disable Cold Extrusion Checking\nG92 E0; Reset extruder to [0] zero end of cleaning run\nG91; Force coordinates to be absolute relative to the origin\nG1 Z10 F1000;\nG90;\nT0;\nM117 Printing...;ENDHEADER"}, + "machine_end_gcode": { + "default_value": ";FOOTER\nG91; relative positioning\nM107; turn off layer fan\nG1 Z50 F1000\nM400;Wait finish move\nG90; absolute positioning\nG1 X235 Y235\n;ENDFOOTER" + }, + "machine_width": {"default_value": 235 }, + "machine_depth": {"default_value": 235 }, + "machine_height": {"default_value": 235 }, + + "machine_nozzle_size":{"default_value": 3.0}, + "machine_nozzle_size":{"settable_per_extruder": false}, + + "material_diameter":{"default_value": 1.75}, + + "has_materials":{"default_value": false}, + + "material_bed_temp_wait":{"default_value": false}, + "material_print_temp_wait":{"default_value": false}, + "material_print_temp_prepend":{"default_value": false}, + "material_bed_temp_prepend":{"default_value": false}, + "machine_heated_bed": {"default_value": false}, + + "machine_nozzle_temp_enabled":{"default_value": true}, + + "machine_max_jerk_xy":{"default_value": 50.0}, + "machine_max_jerk_z":{"default_value": 50.0}, + "machine_max_jerk_e":{"default_value": 50.0}, + "layer_height":{"default_value": 1.5}, + "layer_height_0":{"default_value": 1.5}, + + "line_width":{"default_value":"machine_nozzle_size"}, + + + "wall_thickness":{"default_value": "machine_nozzle_size"}, + "wall_line_count":{"default_value": 1}, + "wall_line_width":{"default_value":"machine_nozzle_size"}, + "wall_line_width_0":{"default_value":"machine_nozzle_size"}, + "wall_line_width_x":{"default_value": "machine_nozzle_size"}, + + "skin_line_width":{"default_value":"machine_nozzle_size"}, + "infill_line_width":{"default_value": "machine_nozzle_size"}, + "roofing_line_width":{"default_value": "machine_nozzle_size"}, + "roofing_pattern":{"default_value": "concentric"}, + + "material_diameter": {"default_value": 1.75 }, + "speed_print":{"default_value": 15 }, + "retraction_enable":{"default_value": false }, + + "adhesion_type":{"default_value": "skirt" }, + "infill_pattern":{"default_value": "zigzag" }, + "top_layers":{"default_value": 2 }, + "bottom_layers":{"default_value": 2 }, + "top_bottom_pattern":{"default_value": "concentric" } + + } +} diff --git a/resources/extruders/fablabbcn_0.def.json b/resources/extruders/fablabbcn_0.def.json new file mode 100644 index 0000000000..c3b35bae2a --- /dev/null +++ b/resources/extruders/fablabbcn_0.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder", + "inherits": "fdmextruder", + "metadata": { + "machine": "fablabbcn_pasteprinter", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 3.0 }, + "material_diameter": { "default_value": 1.75 } + } +} From 6460960ea78424dc1dcaa49f39093e2c0cbf336b Mon Sep 17 00:00:00 2001 From: eduardo chamorro Date: Thu, 1 Dec 2022 11:41:22 +0100 Subject: [PATCH 02/19] updates to profile to match lintern code hightlights --- resources/definitions/fablabbcn_pasteprinter.def.json | 8 -------- 1 file changed, 8 deletions(-) diff --git a/resources/definitions/fablabbcn_pasteprinter.def.json b/resources/definitions/fablabbcn_pasteprinter.def.json index 01cbd350d6..3397903ca3 100644 --- a/resources/definitions/fablabbcn_pasteprinter.def.json +++ b/resources/definitions/fablabbcn_pasteprinter.def.json @@ -15,9 +15,6 @@ "first_start_actions": ["MachineSettingsAction"] }, "overrides": { - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, "machine_always_write_active_tool": { "default_value": true }, @@ -41,9 +38,6 @@ "material_print_temp_wait":{"default_value": false}, "material_print_temp_prepend":{"default_value": false}, "material_bed_temp_prepend":{"default_value": false}, - "machine_heated_bed": {"default_value": false}, - - "machine_nozzle_temp_enabled":{"default_value": true}, "machine_max_jerk_xy":{"default_value": 50.0}, "machine_max_jerk_z":{"default_value": 50.0}, @@ -51,8 +45,6 @@ "layer_height":{"default_value": 1.5}, "layer_height_0":{"default_value": 1.5}, - "line_width":{"default_value":"machine_nozzle_size"}, - "wall_thickness":{"default_value": "machine_nozzle_size"}, "wall_line_count":{"default_value": 1}, From 5cadb41b3ecf1925163d980e618858d793f11b4a Mon Sep 17 00:00:00 2001 From: eduardo chamorro Date: Thu, 1 Dec 2022 11:55:19 +0100 Subject: [PATCH 03/19] update machine definition to match lintern --- resources/definitions/fablabbcn_pasteprinter.def.json | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/resources/definitions/fablabbcn_pasteprinter.def.json b/resources/definitions/fablabbcn_pasteprinter.def.json index 3397903ca3..2bcfa70f3e 100644 --- a/resources/definitions/fablabbcn_pasteprinter.def.json +++ b/resources/definitions/fablabbcn_pasteprinter.def.json @@ -10,7 +10,6 @@ "machine_extruder_trains": { "0": "fablabbcn_0" - }, "first_start_actions": ["MachineSettingsAction"] }, @@ -45,16 +44,8 @@ "layer_height":{"default_value": 1.5}, "layer_height_0":{"default_value": 1.5}, - - "wall_thickness":{"default_value": "machine_nozzle_size"}, "wall_line_count":{"default_value": 1}, - "wall_line_width":{"default_value":"machine_nozzle_size"}, - "wall_line_width_0":{"default_value":"machine_nozzle_size"}, - "wall_line_width_x":{"default_value": "machine_nozzle_size"}, - "skin_line_width":{"default_value":"machine_nozzle_size"}, - "infill_line_width":{"default_value": "machine_nozzle_size"}, - "roofing_line_width":{"default_value": "machine_nozzle_size"}, "roofing_pattern":{"default_value": "concentric"}, "material_diameter": {"default_value": 1.75 }, @@ -63,8 +54,6 @@ "adhesion_type":{"default_value": "skirt" }, "infill_pattern":{"default_value": "zigzag" }, - "top_layers":{"default_value": 2 }, - "bottom_layers":{"default_value": 2 }, "top_bottom_pattern":{"default_value": "concentric" } } From 69eba9ffa2a65728b7d9c25fea9a30af6c6dc55c Mon Sep 17 00:00:00 2001 From: eduardo chamorro Date: Thu, 1 Dec 2022 12:07:40 +0100 Subject: [PATCH 04/19] more fixes on default values overrides --- resources/definitions/fablabbcn_pasteprinter.def.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/resources/definitions/fablabbcn_pasteprinter.def.json b/resources/definitions/fablabbcn_pasteprinter.def.json index 2bcfa70f3e..fc765b0242 100644 --- a/resources/definitions/fablabbcn_pasteprinter.def.json +++ b/resources/definitions/fablabbcn_pasteprinter.def.json @@ -44,16 +44,11 @@ "layer_height":{"default_value": 1.5}, "layer_height_0":{"default_value": 1.5}, - "wall_line_count":{"default_value": 1}, - - "roofing_pattern":{"default_value": "concentric"}, - "material_diameter": {"default_value": 1.75 }, "speed_print":{"default_value": 15 }, "retraction_enable":{"default_value": false }, "adhesion_type":{"default_value": "skirt" }, - "infill_pattern":{"default_value": "zigzag" }, "top_bottom_pattern":{"default_value": "concentric" } } From 20c92c4f6bf435928c59ae6a0df56539d8e0eccc Mon Sep 17 00:00:00 2001 From: eduardo chamorro Date: Thu, 1 Dec 2022 12:19:39 +0100 Subject: [PATCH 05/19] erase overrider setting has materials --- .../fablabbcn_pasteprinter.def.json | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/resources/definitions/fablabbcn_pasteprinter.def.json b/resources/definitions/fablabbcn_pasteprinter.def.json index fc765b0242..7f3d3daab2 100644 --- a/resources/definitions/fablabbcn_pasteprinter.def.json +++ b/resources/definitions/fablabbcn_pasteprinter.def.json @@ -26,23 +26,21 @@ "machine_depth": {"default_value": 235 }, "machine_height": {"default_value": 235 }, - "machine_nozzle_size":{"default_value": 3.0}, - "machine_nozzle_size":{"settable_per_extruder": false}, + "machine_nozzle_size":{"default_value": 3.0 }, + "machine_nozzle_size":{"settable_per_extruder": false }, - "material_diameter":{"default_value": 1.75}, + "material_diameter":{"default_value": 1.75 }, - "has_materials":{"default_value": false}, + "material_bed_temp_wait":{"default_value": false }, + "material_print_temp_wait":{"default_value": false }, + "material_print_temp_prepend":{"default_value": false }, + "material_bed_temp_prepend":{"default_value": false }, - "material_bed_temp_wait":{"default_value": false}, - "material_print_temp_wait":{"default_value": false}, - "material_print_temp_prepend":{"default_value": false}, - "material_bed_temp_prepend":{"default_value": false}, - - "machine_max_jerk_xy":{"default_value": 50.0}, - "machine_max_jerk_z":{"default_value": 50.0}, - "machine_max_jerk_e":{"default_value": 50.0}, - "layer_height":{"default_value": 1.5}, - "layer_height_0":{"default_value": 1.5}, + "machine_max_jerk_xy":{"default_value": 50.0 }, + "machine_max_jerk_z":{"default_value": 50.0 }, + "machine_max_jerk_e":{"default_value": 50.0 }, + "layer_height":{"default_value": 1.5 }, + "layer_height_0":{"default_value": 1.5 }, "material_diameter": {"default_value": 1.75 }, "speed_print":{"default_value": 15 }, From 651e56ca9dcc5ba9bcbb051849c3ac67f4233031 Mon Sep 17 00:00:00 2001 From: Luis Gabriel Gomez Date: Sun, 4 Dec 2022 19:33:48 -0300 Subject: [PATCH 06/19] Clarify linter steps for running locally --- printer-linter/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/printer-linter/README.md b/printer-linter/README.md index fc6a9a8e29..36212d6881 100644 --- a/printer-linter/README.md +++ b/printer-linter/README.md @@ -3,9 +3,9 @@ Printer linter is a python package that does linting on Cura definitions files. Running this on your definition files will get them ready for a pull request. ## Running Locally -From the Cura root folder. +From the Cura root folder and pointing to the relative paths of the wanted definition files: -```python3 printer-linter/src/terminal.py "flashforge_dreamer_nx.def.json" "flashforge_base.def.json" --fix --format``` +```python3 printer-linter/src/terminal.py "resources/definitions/flashforge_dreamer_nx.def.json" "resources/definitions/flashforge_base.def.json" --fix --format``` ## Developing ### Printer Linter Rules From 358f20a94e298196d30408b42cef26f839f4e801 Mon Sep 17 00:00:00 2001 From: Luis Gabriel Gomez Date: Sun, 4 Dec 2022 19:45:25 -0300 Subject: [PATCH 07/19] printer-linter: exit on invalid definition file paths This PR prevents silent failure with empty diagnostics if an invalid file path was provided --- printer-linter/src/terminal.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/printer-linter/src/terminal.py b/printer-linter/src/terminal.py index 6e6d1af4e5..e06ccb5e9a 100644 --- a/printer-linter/src/terminal.py +++ b/printer-linter/src/terminal.py @@ -1,5 +1,6 @@ from argparse import ArgumentParser from os import getcwd +from os import path from pathlib import Path from typing import List @@ -41,6 +42,11 @@ def main() -> None: full_body_check = {"Diagnostics": []} + for file in files: + if not path.exists(file): + print(f"Can't find the file: {file}") + return + if to_fix or to_diagnose: for file in files: diagnostics = diagnoseIssuesWithFile(file, settings) From 067a40dbe8fc8d6dabf3db5749a3a425a4f28066 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 6 Dec 2022 17:00:06 +0100 Subject: [PATCH 08/19] Don't just disable the reset/safe buttons, hide them. part of CURA-9347 --- resources/qml/PrintSetupSelector/ProfileWarningReset.qml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/qml/PrintSetupSelector/ProfileWarningReset.qml b/resources/qml/PrintSetupSelector/ProfileWarningReset.qml index 7661943742..7d8ac389ee 100644 --- a/resources/qml/PrintSetupSelector/ProfileWarningReset.qml +++ b/resources/qml/PrintSetupSelector/ProfileWarningReset.qml @@ -121,6 +121,7 @@ Item verticalCenter: parent.verticalCenter } + visible: enabled color: enabled ? UM.Theme.getColor("accent_1") : UM.Theme.getColor("disabled") hoverColor: UM.Theme.getColor("primary_hover") @@ -156,6 +157,7 @@ Item verticalCenter: parent.verticalCenter } + visible: enabled color: enabled ? UM.Theme.getColor("accent_1") : UM.Theme.getColor("disabled") hoverColor: UM.Theme.getColor("primary_hover") From 4ecc0a98bb570385d37bdb148a0cb9f12932f84b Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 6 Dec 2022 17:07:29 +0100 Subject: [PATCH 09/19] Don't show reset for only custom profile when in custom mode. part of CURA-9347 --- resources/qml/PrintSetupSelector/ProfileWarningReset.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/PrintSetupSelector/ProfileWarningReset.qml b/resources/qml/PrintSetupSelector/ProfileWarningReset.qml index 7d8ac389ee..e7a8f0799d 100644 --- a/resources/qml/PrintSetupSelector/ProfileWarningReset.qml +++ b/resources/qml/PrintSetupSelector/ProfileWarningReset.qml @@ -125,7 +125,7 @@ Item color: enabled ? UM.Theme.getColor("accent_1") : UM.Theme.getColor("disabled") hoverColor: UM.Theme.getColor("primary_hover") - enabled: Cura.MachineManager.hasCustomQuality || Cura.MachineManager.hasUserSettings + enabled: (fullWarning && Cura.MachineManager.hasCustomQuality) || Cura.MachineManager.hasUserSettings onClicked: Cura.MachineManager.resetToUseDefaultQuality() UM.ToolTip From 03fac1bc7fd97deab3a1b23cc13abee4b3542d51 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Tue, 6 Dec 2022 18:11:15 +0100 Subject: [PATCH 10/19] Make the width of the ProfileWarningREset 0 when it is hidden. Expand the profile selection dropdown when the ProfileWarningReset is hidden in the custom menu. CURA-9793 --- .../PrintSetupSelector/Custom/CustomPrintSetup.qml | 10 +++++++--- .../qml/PrintSetupSelector/ProfileWarningReset.qml | 11 ++++++----- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml index 298ecc1496..41ab40eb31 100644 --- a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml @@ -52,9 +52,13 @@ Item id: intentSelection onClicked: menu.opened ? menu.close() : menu.open() - anchors.right: profileWarningReset.left - anchors.rightMargin: UM.Theme.getSize("narrow_margin").width - width: UM.Theme.getSize("print_setup_big_item").width - profileWarningReset.width + // Anchoring to the right makes much more sense here, but for some reason this component compresses from the right + // and then expands from the left afterwards. This pushes it left by profileWarningReset.width + // The solution is to anchor from the other direction so this does not happen. + anchors.left: parent.left + // This leftMargin gives us the same spacing as anchoring to the right on profileWarningReset + anchors.leftMargin: parent.width - UM.Theme.getSize("print_setup_big_item").width + width: profileWarningReset.visible ? UM.Theme.getSize("print_setup_big_item").width - profileWarningReset.width - UM.Theme.getSize("default_margin").width : UM.Theme.getSize("print_setup_big_item").width height: textLabel.contentHeight + 2 * UM.Theme.getSize("narrow_margin").height hoverEnabled: true diff --git a/resources/qml/PrintSetupSelector/ProfileWarningReset.qml b/resources/qml/PrintSetupSelector/ProfileWarningReset.qml index e7a8f0799d..c44fcc8cc2 100644 --- a/resources/qml/PrintSetupSelector/ProfileWarningReset.qml +++ b/resources/qml/PrintSetupSelector/ProfileWarningReset.qml @@ -13,7 +13,8 @@ Item property bool fullWarning: true // <- Can you see the warning icon and the text, or is it just the buttons? height: visible ? UM.Theme.getSize("action_button_icon").height : 0 - visible: Cura.MachineManager.hasUserSettings || Cura.MachineManager.hasCustomQuality + width: visible ? childrenRect.width: 0 + visible: Cura.MachineManager.hasUserSettings || (fullWarning && Cura.MachineManager.hasCustomQuality) Rectangle { @@ -46,7 +47,7 @@ Item { left: warningIcon.right verticalCenter: parent.verticalCenter - leftMargin: UM.Theme.getSize("thin_margin").width + leftMargin: visible ? UM.Theme.getSize("thin_margin").width : 0 } wrapMode: Text.WordWrap @@ -113,7 +114,7 @@ Item { id: resetToDefaultQualityButton height: UM.Theme.getSize("action_button_icon").height - width: height + width: visible ? height : 0 iconSource: UM.Theme.getIcon("ArrowReset") anchors { @@ -141,7 +142,7 @@ Item Item { id: buttonsSpacer - width: UM.Theme.getSize("default_margin").width + width: compareAndSaveButton.visible ? UM.Theme.getSize("default_margin").width : 0 anchors.right: compareAndSaveButton.left } @@ -149,7 +150,7 @@ Item { id: compareAndSaveButton height: UM.Theme.getSize("action_button_icon").height - width: height + width: visible ? height : 0 iconSource: UM.Theme.getIcon("Save") anchors { From e9136f654de3ca553b8aee7737b64e2ba77a111d Mon Sep 17 00:00:00 2001 From: jspijker Date: Wed, 7 Dec 2022 10:06:45 +0100 Subject: [PATCH 11/19] Show OS in run-name --- .github/workflows/cura-all-installers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cura-all-installers.yml b/.github/workflows/cura-all-installers.yml index 25f56063af..e0d69bf04c 100644 --- a/.github/workflows/cura-all-installers.yml +++ b/.github/workflows/cura-all-installers.yml @@ -1,5 +1,5 @@ name: Cura All Installers -run-name: ${{ inputs.cura_conan_version }} by @${{ github.actor }} +run-name: ${{ inputs.cura_conan_version }} for ${{ if inputs.build_windows then "Windows" }} ${{ if inputs.build_macos then "Mac" }} ${{ if inputs.build_linux then "Linux" }} on: workflow_dispatch: From d876317df68003c8eb2de99bf772872d75afa3f4 Mon Sep 17 00:00:00 2001 From: jspijker Date: Wed, 7 Dec 2022 10:08:24 +0100 Subject: [PATCH 12/19] Show OS in run-name --- .github/workflows/cura-all-installers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cura-all-installers.yml b/.github/workflows/cura-all-installers.yml index e0d69bf04c..a1fb34f936 100644 --- a/.github/workflows/cura-all-installers.yml +++ b/.github/workflows/cura-all-installers.yml @@ -1,5 +1,5 @@ name: Cura All Installers -run-name: ${{ inputs.cura_conan_version }} for ${{ if inputs.build_windows then "Windows" }} ${{ if inputs.build_macos then "Mac" }} ${{ if inputs.build_linux then "Linux" }} +run-name: ${{ inputs.cura_conan_version }} for ${{ if inputs.build_windows then Windows }} ${{ if inputs.build_macos then Mac }} ${{ if inputs.build_linux then Linux }} on: workflow_dispatch: From 333f0e82828e4e2d57e4e435f99928c21b391b62 Mon Sep 17 00:00:00 2001 From: jspijker Date: Wed, 7 Dec 2022 10:09:42 +0100 Subject: [PATCH 13/19] Show OS in run-name --- .github/workflows/cura-all-installers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cura-all-installers.yml b/.github/workflows/cura-all-installers.yml index a1fb34f936..e8501875a8 100644 --- a/.github/workflows/cura-all-installers.yml +++ b/.github/workflows/cura-all-installers.yml @@ -1,5 +1,5 @@ name: Cura All Installers -run-name: ${{ inputs.cura_conan_version }} for ${{ if inputs.build_windows then Windows }} ${{ if inputs.build_macos then Mac }} ${{ if inputs.build_linux then Linux }} +run-name: ${{ inputs.cura_conan_version }} for Windows ${{ inputs.build_windows }}, MacOS ${{ inputs.build_macos }}, Linux ${{ inputs.build_linux }} on: workflow_dispatch: From 016ab4714d7f93e0cff9eff417e9e3aac8fc414a Mon Sep 17 00:00:00 2001 From: just-trey Date: Wed, 7 Dec 2022 12:18:28 -0500 Subject: [PATCH 14/19] major updates --- resources/definitions/ankermake_m5.def.json | 107 +++++++++++++----- .../ankermake_m5/ankermake_m5_normal.inst.cfg | 2 +- 2 files changed, 82 insertions(+), 27 deletions(-) diff --git a/resources/definitions/ankermake_m5.def.json b/resources/definitions/ankermake_m5.def.json index 00846f9d58..026aa0eeef 100644 --- a/resources/definitions/ankermake_m5.def.json +++ b/resources/definitions/ankermake_m5.def.json @@ -19,44 +19,99 @@ "overrides": { "machine_name": { "default_value": "AnkerMake M5" }, - "machine_width": { "default_value": 235 }, - "machine_height": { "default_value": 250 }, - "machine_depth": { "default_value": 235 }, - "machine_heated_bed": { "default_value": true }, + "machine_start_gcode": { + "default_value": "M104 S{material_print_temperature_layer_0} ; set final nozzle temp\nM190 S{material_bed_temperature_layer_0} ; set and wait for nozzle temp to stabilize\nM109 S{material_print_temperature_layer_0} ; wait for nozzle temp to stabilize\nG28 ;Home\nG1 E10 F3600; push out retracted filament(fix for over retraction after prime)" + }, "material_diameter": { "default_value": 1.75 }, - "speed_print": { "value": 250.0, "maximum_value_warning": 255 }, - "speed_infill": { "maximum_value_warning": 255 }, - "speed_topbottom": { "value": 150.0 }, - "speed_travel": { "value": 250.0 }, - "speed_wall": { "value": 150.0, "maximum_value_warning": 255 }, - "speed_wall_x": { "value": 250.0, "maximum_value_warning": 255 }, + "machine_width": { "default_value": 235 }, + "machine_depth": { "default_value": 235 }, + "machine_height": { "default_value": 250 }, + "machine_heated_bed": { "default_value": true }, + "gantry_height": { "value": 25 }, + + "xy_offset_layer_0": { "value": -0.2 }, + "hole_xy_offset": { "value": 0.2 }, + + "top_bottom_thickness": { "value": "layer_height * 4" }, "skin_monotonic": { "default_value": true }, + + "infill_sparse_density": { "value": 25 }, + "infill_pattern": { + "value": "'lines' if infill_sparse_density >= 25 else 'grid'" + }, + "zig_zaggify_infill": { + "value": "infill_pattern == 'cross' or infill_pattern == 'cross_3d' or infill_pattern == 'lines'" + }, + "material_print_temperature": { "maximum_value_warning": "260" }, "material_print_temperature_layer_0": { "value": "material_print_temperature + 5", - "maximum_value_warning": "260" + "maximum_value_warning": "270" + }, + "material_initial_print_temperature": { + "value": "material_print_temperature" + }, + "material_final_print_temperature": { + "value": "material_print_temperature" }, "material_bed_temperature": { "maximum_value_warning": "110" }, - "material_bed_temperature_layer_0": { - "value": "material_bed_temperature + 5", - "maximum_value_warning": "110" + "material_bed_temperature_layer_0": { "maximum_value_warning": "110" }, + "skin_material_flow": { "value": 97 }, + "material_flow_layer_0": { "value": 115 }, + + "speed_print": { "value": 250.0, "maximum_value_warning": 255 }, + "speed_infill": { "maximum_value_warning": 255 }, + "speed_wall": { "value": 150.0, "maximum_value_warning": 255 }, + "speed_wall_x": { "value": 250.0, "maximum_value_warning": 255 }, + "speed_support": { "maximum_value_warning": 255 }, + "speed_support_infill": { "maximum_value_warning": 255 }, + "speed_support_interface": { "maximum_value_warning": 255 }, + "speed_support_roof": { "maximum_value_warning": 255 }, + "speed_support_bottom": { "maximum_value_warning": 255 }, + "speed_topbottom": { "value": 150.0 }, + "acceleration_print": { "value": "2500" }, + "speed_travel": { "value": 250.0 }, + + "retraction_amount": { "default_value": 1.5 }, + "retraction_speed": { "default_value": 60 }, + "retraction_combing": { + "value": "'off' if retraction_hop_enabled else 'infill'" }, - "material_flow_layer_0": { "value": 120 }, + "retraction_hop": { "value": 0.2 }, + "cool_min_layer_time": { "value": 6 }, "cool_min_speed": { "value": 30 }, - "retraction_amount": { "default_value": 1.5 }, - "retraction_speed": { "default_value": 70 }, - "acceleration_print": { "value": "2500" }, + + "support_angle": { + "value": "math.floor(math.degrees(math.atan(line_width / 2.0 /layer_height)))" + }, + "support_infill_rate": { + "value": "0 if support_enable and support_structure == 'tree' else 20" + }, + "support_z_distance": { "value": "layer_height * 2" }, + "support_xy_distance": { "value": "wall_line_width_0 * 2" }, + "support_top_distance": { + "value": "extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'support_z_distance') + (layer_height if support_structure == 'tree' else 0)" + }, + "support_xy_overrides_z": { "value": "'xy_overrides_z'" }, + "support_xy_distance_overhang": { "value": "wall_line_width_0" }, + "support_brim_width": { "value": 4.0 }, + "minimum_support_area": { "value": 2 }, + "support_interface_enable": { "value": true }, + "support_roof_enable": { "value": true }, + "support_interface_skip_height": { "value": 0.2 }, + "support_interface_density": { "value": 33.333 }, + "support_interface_pattern": { "value": "'grid'" }, + "minimum_interface_area": { "value": 10 }, + "adhesion_type": { "default_value": "skirt" }, - "retraction_combing": { "value": "infill" }, - "machine_start_gcode": { - "default_value": "M104 S{material_print_temperature_layer_0} ; set final nozzle temp\nM190 S{material_bed_temperature_layer_0} ; set and wait for nozzle temp to stabilize\nM109 S{material_print_temperature_layer_0} ; wait for nozzle temp to stabilize\nG28 ;Home\nG1 E10 F3600; push out retracted filament(fix for over retraction after prime)" - }, - "machine_end_gcode": { - "default_value": "M104 S0\nM140 S0\n;Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84" - }, - "gantry_height": { "value": 25 } + "skirt_line_count": { "value": 3 }, + + "wall_overhang_angle": { "value": 55 }, + "wall_overhang_speed_factor": { "value": 55 }, + "small_hole_max_size": { "value": 10 }, + "small_feature_speed_factor_0": { "value": 50 } } } diff --git a/resources/quality/ankermake_m5/ankermake_m5_normal.inst.cfg b/resources/quality/ankermake_m5/ankermake_m5_normal.inst.cfg index fb46cdcd7e..ee8192dd30 100644 --- a/resources/quality/ankermake_m5/ankermake_m5_normal.inst.cfg +++ b/resources/quality/ankermake_m5/ankermake_m5_normal.inst.cfg @@ -12,4 +12,4 @@ weight = 0 [values] layer_height = 0.2 -layer_height_0 = 0.24 \ No newline at end of file +layer_height_0 = 0.2 \ No newline at end of file From 9b2f6c023cdc2995cac94c68a1187a3cf2ff696b Mon Sep 17 00:00:00 2001 From: just-trey Date: Thu, 8 Dec 2022 00:27:45 -0500 Subject: [PATCH 15/19] update as linter suggested --- resources/definitions/ankermake_m5.def.json | 37 +++++++++------------ 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/resources/definitions/ankermake_m5.def.json b/resources/definitions/ankermake_m5.def.json index dd85f120a5..ec3b01d198 100644 --- a/resources/definitions/ankermake_m5.def.json +++ b/resources/definitions/ankermake_m5.def.json @@ -1,19 +1,18 @@ { - "version": 2, - "name": "AnkerMake M5", - "inherits": "fdmprinter", - "metadata": - { - "visible": true, - "author": "just-trey", - "manufacturer": "AnkerMake", - "file_formats": "text/x-gcode", - "platform": "ankermake_m5_platform.obj", - "has_machine_quality": true, - "machine_extruder_trains": { "0": "ankermake_m5_extruder_0" }, - "platform_texture": "ankermake_m5.png", - "preferred_material": "generic_pla", - "preferred_quality_type": "normal" + "version": 2, + "name": "AnkerMake M5", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "just-trey", + "manufacturer": "AnkerMake", + "file_formats": "text/x-gcode", + "platform": "ankermake_m5_platform.obj", + "has_machine_quality": true, + "machine_extruder_trains": { "0": "ankermake_m5_extruder_0" }, + "platform_texture": "ankermake_m5.png", + "preferred_material": "generic_pla", + "preferred_quality_type": "normal" }, "overrides": { @@ -91,9 +90,6 @@ }, "support_z_distance": { "value": "layer_height * 2" }, "support_xy_distance": { "value": "wall_line_width_0 * 2" }, - "support_top_distance": { - "value": "extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'support_z_distance') + (layer_height if support_structure == 'tree' else 0)" - }, "support_xy_overrides_z": { "value": "'xy_overrides_z'" }, "support_xy_distance_overhang": { "value": "wall_line_width_0" }, "support_brim_width": { "value": 4.0 }, @@ -110,7 +106,6 @@ "wall_overhang_angle": { "value": 55 }, "wall_overhang_speed_factor": { "value": 55 }, - "small_hole_max_size": { "value": 10 }, - "small_feature_speed_factor_0": { "value": 50 } + "small_hole_max_size": { "value": 10 } } -} \ No newline at end of file +} From 450cdda8e0dd5911ea7103272908f62cfd901718 Mon Sep 17 00:00:00 2001 From: Joeydelarago Date: Thu, 8 Dec 2022 15:33:29 +0000 Subject: [PATCH 16/19] Applied printer-linter format --- .../fablabbcn_pasteprinter.def.json | 71 ++++++++----------- resources/extruders/fablabbcn_0.def.json | 9 +-- 2 files changed, 33 insertions(+), 47 deletions(-) diff --git a/resources/definitions/fablabbcn_pasteprinter.def.json b/resources/definitions/fablabbcn_pasteprinter.def.json index 7f3d3daab2..bfd0725c06 100644 --- a/resources/definitions/fablabbcn_pasteprinter.def.json +++ b/resources/definitions/fablabbcn_pasteprinter.def.json @@ -2,52 +2,37 @@ "version": 2, "name": "PastePrinter", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "eduardo_chamorro", "manufacturer": "FablabBcn", "file_formats": "text/x-gcode", - "machine_extruder_trains": - { - "0": "fablabbcn_0" - }, - "first_start_actions": ["MachineSettingsAction"] + "first_start_actions": [ "MachineSettingsAction" ], + "machine_extruder_trains": { "0": "fablabbcn_0" } }, - "overrides": { - "machine_always_write_active_tool": { - "default_value": true - }, - "machine_start_gcode": { - "default_value": ";HEADER;\nG21; Set to metric [change to G20 if you want Imperial]\nG91;Force coordinates to be absolute relative to the origin \nG1 Z10 F1000;\nG90; Force coordinates to be absolute relative to the origin\nG28 X; Home X axis\nG28 Y; Home Y axis\nG28 Z; Home Z axis\nM302 P1; Disable Cold Extrusion Checking\nG92 E0; Reset extruder to [0] zero end of cleaning run\nG91; Force coordinates to be absolute relative to the origin\nG1 Z10 F1000;\nG90;\nT0;\nM117 Printing...;ENDHEADER"}, - "machine_end_gcode": { - "default_value": ";FOOTER\nG91; relative positioning\nM107; turn off layer fan\nG1 Z50 F1000\nM400;Wait finish move\nG90; absolute positioning\nG1 X235 Y235\n;ENDFOOTER" - }, - "machine_width": {"default_value": 235 }, - "machine_depth": {"default_value": 235 }, - "machine_height": {"default_value": 235 }, - - "machine_nozzle_size":{"default_value": 3.0 }, - "machine_nozzle_size":{"settable_per_extruder": false }, - - "material_diameter":{"default_value": 1.75 }, - - "material_bed_temp_wait":{"default_value": false }, - "material_print_temp_wait":{"default_value": false }, - "material_print_temp_prepend":{"default_value": false }, - "material_bed_temp_prepend":{"default_value": false }, - - "machine_max_jerk_xy":{"default_value": 50.0 }, - "machine_max_jerk_z":{"default_value": 50.0 }, - "machine_max_jerk_e":{"default_value": 50.0 }, - "layer_height":{"default_value": 1.5 }, - "layer_height_0":{"default_value": 1.5 }, - - "material_diameter": {"default_value": 1.75 }, - "speed_print":{"default_value": 15 }, - "retraction_enable":{"default_value": false }, - - "adhesion_type":{"default_value": "skirt" }, - "top_bottom_pattern":{"default_value": "concentric" } - + "overrides": + { + "adhesion_type": { "default_value": "skirt" }, + "layer_height": { "default_value": 1.5 }, + "layer_height_0": { "default_value": 1.5 }, + "machine_always_write_active_tool": { "default_value": true }, + "machine_depth": { "default_value": 235 }, + "machine_end_gcode": { "default_value": ";FOOTER\nG91; relative positioning\nM107; turn off layer fan\nG1 Z50 F1000\nM400;Wait finish move\nG90; absolute positioning\nG1 X235 Y235\n;ENDFOOTER" }, + "machine_height": { "default_value": 235 }, + "machine_max_jerk_e": { "default_value": 50.0 }, + "machine_max_jerk_xy": { "default_value": 50.0 }, + "machine_max_jerk_z": { "default_value": 50.0 }, + "machine_nozzle_size": { "settable_per_extruder": false }, + "machine_start_gcode": { "default_value": ";HEADER;\nG21; Set to metric [change to G20 if you want Imperial]\nG91;Force coordinates to be absolute relative to the origin \nG1 Z10 F1000;\nG90; Force coordinates to be absolute relative to the origin\nG28 X; Home X axis\nG28 Y; Home Y axis\nG28 Z; Home Z axis\nM302 P1; Disable Cold Extrusion Checking\nG92 E0; Reset extruder to [0] zero end of cleaning run\nG91; Force coordinates to be absolute relative to the origin\nG1 Z10 F1000;\nG90;\nT0;\nM117 Printing...;ENDHEADER" }, + "machine_width": { "default_value": 235 }, + "material_bed_temp_prepend": { "default_value": false }, + "material_bed_temp_wait": { "default_value": false }, + "material_diameter": { "default_value": 1.75 }, + "material_print_temp_prepend": { "default_value": false }, + "material_print_temp_wait": { "default_value": false }, + "retraction_enable": { "default_value": false }, + "speed_print": { "default_value": 15 }, + "top_bottom_pattern": { "default_value": "concentric" } } -} +} \ No newline at end of file diff --git a/resources/extruders/fablabbcn_0.def.json b/resources/extruders/fablabbcn_0.def.json index c3b35bae2a..64f2f820d0 100644 --- a/resources/extruders/fablabbcn_0.def.json +++ b/resources/extruders/fablabbcn_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "fablabbcn_pasteprinter", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 3.0 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file From 140285c0c13e08ce9fb16fe218895782925cf49c Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Fri, 9 Dec 2022 10:48:48 +0100 Subject: [PATCH 17/19] Run workflow an all branches & Forks --- .github/workflows/printer-linter-format.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/printer-linter-format.yml b/.github/workflows/printer-linter-format.yml index 8fb1ab4752..df4e049755 100644 --- a/.github/workflows/printer-linter-format.yml +++ b/.github/workflows/printer-linter-format.yml @@ -2,16 +2,11 @@ name: printer-linter-format on: push: - branches: - - main - - '[1-9].[0-9]' - - '[1-9].[0-9][0-9]' - path: + paths: - 'resources/**' jobs: printer-linter-format: - if: ${{ github.repository_owner == 'Ultimaker' }} name: Printer linter auto format runs-on: ubuntu-latest From ca290a32fb56ecc064982a9005acb9a9c1a0a957 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Fri, 9 Dec 2022 14:05:03 +0100 Subject: [PATCH 18/19] Display "move to top" button in monitor page CURA-9940 --- .../resources/qml/MonitorContextMenu.qml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml index 33fdb0eb38..3acaba68fc 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml @@ -23,7 +23,7 @@ Item //So compute here the visibility of the menu items, so that we can use it for the visibility of the button. property bool sendToTopVisible: { - if (printJob && printJob.state in ("queued", "error") && !isAssigned(printJob)) { + if (printJob && (printJob.state == "queued" || printJob.state == "error")) { if (OutputDevice && OutputDevice.queuedPrintJobs[0] && OutputDevice.canWriteOthersPrintJobs) { return OutputDevice.queuedPrintJobs[0].key != printJob.key; } @@ -246,10 +246,4 @@ Item function close() { popUp.close() } - function isAssigned(job) { - if (!job) { - return false; - } - return job.assignedPrinter ? true : false; - } } From c309b594c2b665ce6a660500c2397107791badbb Mon Sep 17 00:00:00 2001 From: casperlamboo Date: Fri, 9 Dec 2022 15:49:46 +0000 Subject: [PATCH 19/19] Applied printer-linter format --- resources/definitions/ankermake_m5.def.json | 204 ++++++++---------- .../ankermake_m5/ankermake_m5_normal.inst.cfg | 3 +- 2 files changed, 97 insertions(+), 110 deletions(-) diff --git a/resources/definitions/ankermake_m5.def.json b/resources/definitions/ankermake_m5.def.json index ec3b01d198..a7eab04ebc 100644 --- a/resources/definitions/ankermake_m5.def.json +++ b/resources/definitions/ankermake_m5.def.json @@ -1,111 +1,97 @@ { - "version": 2, - "name": "AnkerMake M5", - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "just-trey", - "manufacturer": "AnkerMake", - "file_formats": "text/x-gcode", - "platform": "ankermake_m5_platform.obj", - "has_machine_quality": true, - "machine_extruder_trains": { "0": "ankermake_m5_extruder_0" }, - "platform_texture": "ankermake_m5.png", - "preferred_material": "generic_pla", - "preferred_quality_type": "normal" - }, - - "overrides": { - "machine_name": { "default_value": "AnkerMake M5" }, - "machine_start_gcode": { - "default_value": "M104 S{material_print_temperature_layer_0} ; set final nozzle temp\nM190 S{material_bed_temperature_layer_0} ; set and wait for nozzle temp to stabilize\nM109 S{material_print_temperature_layer_0} ; wait for nozzle temp to stabilize\nG28 ;Home\nG1 E10 F3600; push out retracted filament(fix for over retraction after prime)" + "version": 2, + "name": "AnkerMake M5", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "just-trey", + "manufacturer": "AnkerMake", + "file_formats": "text/x-gcode", + "platform": "ankermake_m5_platform.obj", + "has_machine_quality": true, + "machine_extruder_trains": { "0": "ankermake_m5_extruder_0" }, + "platform_texture": "ankermake_m5.png", + "preferred_material": "generic_pla", + "preferred_quality_type": "normal" }, - "material_diameter": { "default_value": 1.75 }, - "machine_width": { "default_value": 235 }, - "machine_depth": { "default_value": 235 }, - "machine_height": { "default_value": 250 }, - "machine_heated_bed": { "default_value": true }, - "gantry_height": { "value": 25 }, - - "xy_offset_layer_0": { "value": -0.2 }, - "hole_xy_offset": { "value": 0.2 }, - - "top_bottom_thickness": { "value": "layer_height * 4" }, - "skin_monotonic": { "default_value": true }, - - "infill_sparse_density": { "value": 25 }, - "infill_pattern": { - "value": "'lines' if infill_sparse_density >= 25 else 'grid'" - }, - "zig_zaggify_infill": { - "value": "infill_pattern == 'cross' or infill_pattern == 'cross_3d' or infill_pattern == 'lines'" - }, - - "material_print_temperature": { - "maximum_value_warning": "260" - }, - "material_print_temperature_layer_0": { - "value": "material_print_temperature + 5", - "maximum_value_warning": "270" - }, - "material_initial_print_temperature": { - "value": "material_print_temperature" - }, - "material_final_print_temperature": { - "value": "material_print_temperature" - }, - "material_bed_temperature": { "maximum_value_warning": "110" }, - "material_bed_temperature_layer_0": { "maximum_value_warning": "110" }, - "skin_material_flow": { "value": 97 }, - "material_flow_layer_0": { "value": 115 }, - - "speed_print": { "value": 250.0, "maximum_value_warning": 255 }, - "speed_infill": { "maximum_value_warning": 255 }, - "speed_wall": { "value": 150.0, "maximum_value_warning": 255 }, - "speed_wall_x": { "value": 250.0, "maximum_value_warning": 255 }, - "speed_support": { "maximum_value_warning": 255 }, - "speed_support_infill": { "maximum_value_warning": 255 }, - "speed_support_interface": { "maximum_value_warning": 255 }, - "speed_support_roof": { "maximum_value_warning": 255 }, - "speed_support_bottom": { "maximum_value_warning": 255 }, - "speed_topbottom": { "value": 150.0 }, - "acceleration_print": { "value": "2500" }, - "speed_travel": { "value": 250.0 }, - - "retraction_amount": { "default_value": 1.5 }, - "retraction_speed": { "default_value": 60 }, - "retraction_combing": { - "value": "'off' if retraction_hop_enabled else 'infill'" - }, - "retraction_hop": { "value": 0.2 }, - - "cool_min_layer_time": { "value": 6 }, - "cool_min_speed": { "value": 30 }, - - "support_angle": { - "value": "math.floor(math.degrees(math.atan(line_width / 2.0 /layer_height)))" - }, - "support_infill_rate": { - "value": "0 if support_enable and support_structure == 'tree' else 20" - }, - "support_z_distance": { "value": "layer_height * 2" }, - "support_xy_distance": { "value": "wall_line_width_0 * 2" }, - "support_xy_overrides_z": { "value": "'xy_overrides_z'" }, - "support_xy_distance_overhang": { "value": "wall_line_width_0" }, - "support_brim_width": { "value": 4.0 }, - "minimum_support_area": { "value": 2 }, - "support_interface_enable": { "value": true }, - "support_roof_enable": { "value": true }, - "support_interface_skip_height": { "value": 0.2 }, - "support_interface_density": { "value": 33.333 }, - "support_interface_pattern": { "value": "'grid'" }, - "minimum_interface_area": { "value": 10 }, - - "adhesion_type": { "default_value": "skirt" }, - "skirt_line_count": { "value": 3 }, - - "wall_overhang_angle": { "value": 55 }, - "wall_overhang_speed_factor": { "value": 55 }, - "small_hole_max_size": { "value": 10 } - } -} + "overrides": + { + "acceleration_print": { "value": "2500" }, + "adhesion_type": { "default_value": "skirt" }, + "cool_min_layer_time": { "value": 6 }, + "cool_min_speed": { "value": 30 }, + "gantry_height": { "value": 25 }, + "hole_xy_offset": { "value": 0.2 }, + "infill_pattern": { "value": "'lines' if infill_sparse_density >= 25 else 'grid'" }, + "infill_sparse_density": { "value": 25 }, + "machine_depth": { "default_value": 235 }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 250 }, + "machine_name": { "default_value": "AnkerMake M5" }, + "machine_start_gcode": { "default_value": "M104 S{material_print_temperature_layer_0} ; set final nozzle temp\nM190 S{material_bed_temperature_layer_0} ; set and wait for nozzle temp to stabilize\nM109 S{material_print_temperature_layer_0} ; wait for nozzle temp to stabilize\nG28 ;Home\nG1 E10 F3600; push out retracted filament(fix for over retraction after prime)" }, + "machine_width": { "default_value": 235 }, + "material_bed_temperature": { "maximum_value_warning": "110" }, + "material_bed_temperature_layer_0": { "maximum_value_warning": "110" }, + "material_diameter": { "default_value": 1.75 }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_flow_layer_0": { "value": 115 }, + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "material_print_temperature": { "maximum_value_warning": "260" }, + "material_print_temperature_layer_0": + { + "maximum_value_warning": "270", + "value": "material_print_temperature + 5" + }, + "minimum_interface_area": { "value": 10 }, + "minimum_support_area": { "value": 2 }, + "retraction_amount": { "default_value": 1.5 }, + "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'infill'" }, + "retraction_hop": { "value": 0.2 }, + "retraction_speed": { "default_value": 60 }, + "skin_material_flow": { "value": 97 }, + "skin_monotonic": { "default_value": true }, + "skirt_line_count": { "value": 3 }, + "small_hole_max_size": { "value": 10 }, + "speed_infill": { "maximum_value_warning": 255 }, + "speed_print": + { + "maximum_value_warning": 255, + "value": 250.0 + }, + "speed_support": { "maximum_value_warning": 255 }, + "speed_support_bottom": { "maximum_value_warning": 255 }, + "speed_support_infill": { "maximum_value_warning": 255 }, + "speed_support_interface": { "maximum_value_warning": 255 }, + "speed_support_roof": { "maximum_value_warning": 255 }, + "speed_topbottom": { "value": 150.0 }, + "speed_travel": { "value": 250.0 }, + "speed_wall": + { + "maximum_value_warning": 255, + "value": 150.0 + }, + "speed_wall_x": + { + "maximum_value_warning": 255, + "value": 250.0 + }, + "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width / 2.0 /layer_height)))" }, + "support_brim_width": { "value": 4.0 }, + "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" }, + "support_interface_density": { "value": 33.333 }, + "support_interface_enable": { "value": true }, + "support_interface_pattern": { "value": "'grid'" }, + "support_interface_skip_height": { "value": 0.2 }, + "support_roof_enable": { "value": true }, + "support_xy_distance": { "value": "wall_line_width_0 * 2" }, + "support_xy_distance_overhang": { "value": "wall_line_width_0" }, + "support_xy_overrides_z": { "value": "'xy_overrides_z'" }, + "support_z_distance": { "value": "layer_height * 2" }, + "top_bottom_thickness": { "value": "layer_height * 4" }, + "wall_overhang_angle": { "value": 55 }, + "wall_overhang_speed_factor": { "value": 55 }, + "xy_offset_layer_0": { "value": -0.2 }, + "zig_zaggify_infill": { "value": "infill_pattern == 'cross' or infill_pattern == 'cross_3d' or infill_pattern == 'lines'" } + } +} \ No newline at end of file diff --git a/resources/quality/ankermake_m5/ankermake_m5_normal.inst.cfg b/resources/quality/ankermake_m5/ankermake_m5_normal.inst.cfg index ee8192dd30..78cc700133 100644 --- a/resources/quality/ankermake_m5/ankermake_m5_normal.inst.cfg +++ b/resources/quality/ankermake_m5/ankermake_m5_normal.inst.cfg @@ -12,4 +12,5 @@ weight = 0 [values] layer_height = 0.2 -layer_height_0 = 0.2 \ No newline at end of file +layer_height_0 = 0.2 +