From a7dc1b24bc0f1b4659e4f66c182c98086a7b636d Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Thu, 24 Nov 2022 15:16:07 +0100 Subject: [PATCH 001/124] Rename RecommendedInfillDensitySelector.qml since it will now be a more generic Strength selector CURA-9793 --- .../PrintSetupSelector/Recommended/RecommendedPrintSetup.qml | 2 +- ...nfillDensitySelector.qml => RecommendedStrengthSelector.qml} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename resources/qml/PrintSetupSelector/Recommended/{RecommendedInfillDensitySelector.qml => RecommendedStrengthSelector.qml} (100%) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml index 94de16141f..977d90f5e0 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml @@ -83,7 +83,7 @@ Item font: UM.Theme.getFont("medium") } - RecommendedInfillDensitySelector + RecommendedStrengthSelector { width: parent.width labelColumnWidth: parent.firstColumnWidth diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml similarity index 100% rename from resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml rename to resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml From ac2e733ea6d0b445ff669cd182a4f9e9a5dd4635 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Thu, 24 Nov 2022 17:24:28 +0100 Subject: [PATCH 002/124] Add Section Header and Section Setting item components. Upgrade Adhesion to use new components CURA-9793 --- .../RecommendedAdhesionSelector.qml | 73 +++-------------- .../Recommended/RecommendedPrintSetup.qml | 7 +- .../Recommended/RecommendedSettingItem.qml | 36 +++++++++ .../Recommended/RecommendedSettingSection.qml | 80 +++++++++++++++++++ 4 files changed, 127 insertions(+), 69 deletions(-) create mode 100644 resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml create mode 100644 resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml index 8d31d6292d..c87aa96c07 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2022 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.7 @@ -7,74 +7,21 @@ import UM 1.5 as UM import Cura 1.0 as Cura -// -// Adhesion -// -Item +RecommendedSettingSection { id: enableAdhesionRow height: enableAdhesionContainer.height - property real labelColumnWidth: Math.round(width / 3) + title: catalog.i18nc("@label", "Adhesion") + icon: UM.Theme.getIcon("Adhesion") + enableSectionVisible: platformAdhesionType.properties.enabled == "True" + enableSectionChecked: platformAdhesionType.properties.value != "skirt" && platformAdhesionType.properties.value != "none" + enableSectionEnabled: recommendedPrintSetup.settingsEnabled + property var curaRecommendedMode: Cura.RecommendedMode {} - Cura.IconWithText - { - id: enableAdhesionRowTitle - anchors.top: parent.top - anchors.left: parent.left - source: UM.Theme.getIcon("Adhesion") - text: catalog.i18nc("@label", "Adhesion") - font: UM.Theme.getFont("medium") - width: labelColumnWidth - iconSize: UM.Theme.getSize("medium_button_icon").width - } - - Item - { - id: enableAdhesionContainer - height: enableAdhesionCheckBox.height - - anchors - { - left: enableAdhesionRowTitle.right - right: parent.right - verticalCenter: enableAdhesionRowTitle.verticalCenter - } - - UM.CheckBox - { - id: enableAdhesionCheckBox - anchors.verticalCenter: parent.verticalCenter - - //: Setting enable printing build-plate adhesion helper checkbox - enabled: recommendedPrintSetup.settingsEnabled - - visible: platformAdhesionType.properties.enabled == "True" - checked: platformAdhesionType.properties.value != "skirt" && platformAdhesionType.properties.value != "none" - - MouseArea - { - id: adhesionMouseArea - anchors.fill: parent - hoverEnabled: true - // propagateComposedEvents used on adhesionTooltipMouseArea does not work with Controls Components. - // It only works with other MouseAreas, so this is required - onClicked: curaRecommendedMode.setAdhesion(!parent.checked) - } - } - } - - MouseArea - { - id: adhesionTooltipMouseArea - anchors.fill: parent - propagateComposedEvents: true - hoverEnabled: true - - onEntered:base.showTooltip(enableAdhesionCheckBox, Qt.point(-enableAdhesionContainer.x - UM.Theme.getSize("thick_margin").width, 0), - catalog.i18nc("@label", "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards.")); - onExited: base.hideTooltip() + function onEnableSectionChanged(state) { + curaRecommendedMode.setAdhesion(state) } UM.SettingPropertyProvider diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml index 977d90f5e0..472d786618 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml @@ -98,12 +98,7 @@ Item Layout.fillWidth: true } - RecommendedAdhesionSelector - { - width: parent.width - labelColumnWidth: parent.firstColumnWidth - Layout.fillWidth: true - } + RecommendedAdhesionSelector {} } UM.SettingPropertyProvider diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml new file mode 100644 index 0000000000..684a2afd38 --- /dev/null +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml @@ -0,0 +1,36 @@ +// Copyright (c) 2022 Ultimaker B.V. +// Cura is released under the terms of the LGPLv3 or higher. + +import QtQuick 2.10 +import QtQuick.Controls 2.3 +import QtQuick.Layouts 2.10 + +import UM 1.5 as UM +import Cura 1.7 as Cura + + +Item +{ + property Component content: Item { visible: false } + property alias settingName: settingLabel.text + + UM.Label + { + id: settingLabel + anchors.left: parent.left + anchors.verticalCenter: parent.verticalCenter + text: "TEST" + } + + + Loader + { + id: settingLoader + width: parent.width + height: content.height + anchors.left: settingLabel.right + anchors.right: parent.right + anchers.verticalCenter: parent.verticalCenter + sourceComponent: content + } +} \ No newline at end of file diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml new file mode 100644 index 0000000000..b51d273430 --- /dev/null +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml @@ -0,0 +1,80 @@ +// Copyright (c) 2022 Ultimaker B.V. +// Cura is released under the terms of the LGPLv3 or higher. + +import QtQuick 2.10 +import QtQuick.Controls 2.3 +import QtQuick.Layouts 2.10 + +import UM 1.6 as UM +import Cura 1.7 as Cura + +Item +{ + property alias title: sectionTitle.text + property alias icon: sectionTitle.source + property Component content: Item { visible: false } + + property alias enableSectionVisible: enableSectionSwitch.visible + property alias enableSectionChecked: enableSectionSwitch.checked + property alias enableSectionEnabled: enableSectionSwitch.enabled + property var enableSectionClicked: { return } + property int leftColumnWidth: width / 2 + + function onEnableSectionChanged(state) {} + + height: childrenRect.height + width: parent.width + + + Item + { + id: sectionHeader + + Cura.IconWithText + { + id: sectionTitle + width: leftColumnWidth + anchors.left: parent.left + anchors.verticalCenter: parent.verticalCenter + anchors.leftMargin: - UM.Theme.getSize("thick_lining").width + source: UM.Theme.getIcon("PrintQuality") + spacing: UM.Theme.getSize("thick_margin").width + iconSize: UM.Theme.getSize("medium_button_icon").width + iconColor: UM.Theme.getColor("text") + font: UM.Theme.getFont("medium_bold") + } + + UM.Switch + { + id: enableSectionSwitch + anchors.left: sectionTitle.right + anchors.verticalCenter: parent.verticalCenter + visible: false + + onClicked: onEnableSectionChanged(enableSectionSwitch.checked) + } + + MouseArea + { + id: tooltipMouseArea + anchors.fill: parent + propagateComposedEvents: true + hoverEnabled: true + + onEntered: { print("showTooltip") } + onExited: { print("hideTooltip" ) } + } + + } + + Loader + { + id: contentLoader + width: parent.width + height: content.height + anchors.left: settingLabel.right + anchors.right: parent.right + anchors.verticalCenter: parent.verticalCenter + sourceComponent: content + } +} \ No newline at end of file From fb7930e52492f1fd44037d6cc6019aba62db4651 Mon Sep 17 00:00:00 2001 From: eduardo chamorro Date: Fri, 25 Nov 2022 10:40:41 +0100 Subject: [PATCH 003/124] 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 eb13ac7f6b575ea818e13bb229dfc5ab6ff68adb Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Fri, 25 Nov 2022 17:42:50 +0100 Subject: [PATCH 004/124] Getting setting section sized properly CURA-9793 --- .../RecommendedAdhesionSelector.qml | 25 +++++++++++++------ .../Recommended/RecommendedPrintSetup.qml | 5 +++- .../Recommended/RecommendedSettingItem.qml | 18 +++++++------ .../Recommended/RecommendedSettingSection.qml | 12 ++++++--- 4 files changed, 41 insertions(+), 19 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml index c87aa96c07..4eaf4f17ce 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml @@ -10,7 +10,6 @@ import Cura 1.0 as Cura RecommendedSettingSection { id: enableAdhesionRow - height: enableAdhesionContainer.height title: catalog.i18nc("@label", "Adhesion") icon: UM.Theme.getIcon("Adhesion") @@ -20,17 +19,29 @@ RecommendedSettingSection property var curaRecommendedMode: Cura.RecommendedMode {} - function onEnableSectionChanged(state) { - curaRecommendedMode.setAdhesion(state) - } - - UM.SettingPropertyProvider + property UM.SettingPropertyProvider platformAdhesionType: UM.SettingPropertyProvider { - id: platformAdhesionType containerStack: Cura.MachineManager.activeMachine removeUnusedValue: false //Doesn't work with settings that are resolved. key: "adhesion_type" watchedProperties: [ "value", "resolve", "enabled" ] storeIndex: 0 } + + function onEnableSectionChanged(state) { + curaRecommendedMode.setAdhesion(state) + } + + contents: RecommendedSettingItem + { + settingName: catalog.i18nc("@action:label", "Print with") + + settingControl: Rectangle + { + width: 20 + height: 20 + color: Qt.rgba(1, 0, 0, .5) + } + } + } diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml index 472d786618..5bbfcc5550 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml @@ -98,7 +98,10 @@ Item Layout.fillWidth: true } - RecommendedAdhesionSelector {} + RecommendedAdhesionSelector { + width: parent.width + Layout.fillWidth: true + } } UM.SettingPropertyProvider diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml index 684a2afd38..2e1dd826a0 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml @@ -11,26 +11,30 @@ import Cura 1.7 as Cura Item { - property Component content: Item { visible: false } + width: parent.width + height: UM.Theme.getSize("section_header").height + + property alias settingControl: settingContainer.children property alias settingName: settingLabel.text + property int leftColumnWidth: width / 2 UM.Label { id: settingLabel + width: leftColumnWidth anchors.left: parent.left anchors.verticalCenter: parent.verticalCenter - text: "TEST" + // These numbers come from the IconWithText in RecommendedSettingSection + anchors.leftMargin: UM.Theme.getSize("medium_button_icon").width + UM.Theme.getSize("thick_margin").width - UM.Theme.getSize("thick_lining").width } Loader { - id: settingLoader - width: parent.width - height: content.height + id: settingContainer + height: childrenRect.height anchors.left: settingLabel.right anchors.right: parent.right - anchers.verticalCenter: parent.verticalCenter - sourceComponent: content + anchors.verticalCenter: parent.verticalCenter } } \ No newline at end of file diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml index b51d273430..8eb8c57edb 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml @@ -20,15 +20,19 @@ Item property var enableSectionClicked: { return } property int leftColumnWidth: width / 2 + property alias contents: settingColumn.children + function onEnableSectionChanged(state) {} height: childrenRect.height - width: parent.width - Item { id: sectionHeader + anchors.top: parent.top + anchors.right: parent.right + anchors.left: parent.left + height: UM.Theme.getSize("section_header").height Cura.IconWithText { @@ -71,8 +75,8 @@ Item { id: contentLoader width: parent.width - height: content.height - anchors.left: settingLabel.right + height: childrenRect.height + anchors.left: parent.left anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter sourceComponent: content From ba958e1186ef507353fb7e25768762901716cb39 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Fri, 25 Nov 2022 17:42:55 +0100 Subject: [PATCH 005/124] Changes by c.lamboo --- .../Recommended/RecommendedSettingSection.qml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml index 8eb8c57edb..03e7d0c8a7 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml @@ -12,7 +12,6 @@ Item { property alias title: sectionTitle.text property alias icon: sectionTitle.source - property Component content: Item { visible: false } property alias enableSectionVisible: enableSectionSwitch.visible property alias enableSectionChecked: enableSectionSwitch.checked @@ -71,14 +70,13 @@ Item } - Loader + Column { - id: contentLoader + id: settingColumn width: parent.width height: childrenRect.height anchors.left: parent.left anchors.right: parent.right - anchors.verticalCenter: parent.verticalCenter - sourceComponent: content + anchors.top: sectionHeader.bottom } } \ No newline at end of file From 4a59607d0519ce6ca5779e8112fa8453b21c4e61 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Mon, 28 Nov 2022 10:49:53 +0100 Subject: [PATCH 006/124] Switch to ColumnLayout Update part of Support selector to new layout. CURA-9793 --- .../Recommended/RecommendedPrintSetup.qml | 1 - .../Recommended/RecommendedSettingItem.qml | 1 + .../Recommended/RecommendedSettingSection.qml | 5 +- .../RecommendedSupportSelector.qml | 498 ++++++++---------- 4 files changed, 213 insertions(+), 292 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml index 5bbfcc5550..cf8e9e4e2a 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml @@ -94,7 +94,6 @@ Item RecommendedSupportSelector { width: parent.width - labelColumnWidth: parent.firstColumnWidth Layout.fillWidth: true } diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml index 2e1dd826a0..9434e856af 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml @@ -13,6 +13,7 @@ Item { width: parent.width height: UM.Theme.getSize("section_header").height + Layout.fillWidth: true property alias settingControl: settingContainer.children property alias settingName: settingLabel.text diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml index 03e7d0c8a7..445e1663a6 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml @@ -18,6 +18,7 @@ Item property alias enableSectionEnabled: enableSectionSwitch.enabled property var enableSectionClicked: { return } property int leftColumnWidth: width / 2 + property var toolTipText: "" property alias contents: settingColumn.children @@ -60,7 +61,7 @@ Item MouseArea { id: tooltipMouseArea - anchors.fill: parent + anchors.fill: sectionTitle propagateComposedEvents: true hoverEnabled: true @@ -70,7 +71,7 @@ Item } - Column + ColumnLayout { id: settingColumn width: parent.width diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml index 3e40c16d74..b59feeff64 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml @@ -3,305 +3,31 @@ import QtQuick 2.10 import QtQuick.Controls 2.3 +import QtQuick.Layouts 1.3 import UM 1.5 as UM import Cura 1.0 as Cura -// -// Enable support -// -Item +RecommendedSettingSection { id: enableSupportRow - height: UM.Theme.getSize("print_setup_big_item").height - property real labelColumnWidth: Math.round(width / 3) + title: catalog.i18nc("@label", "Support") + icon: UM.Theme.getIcon("Support") + enableSectionVisible: supportEnabled.properties.enabled == "True" + enableSectionChecked: supportEnabled.properties.value == "True" + enableSectionEnabled: recommendedPrintSetup.settingsEnabled + toolTipText: catalog.i18nc("@label", "Generate structures to support parts of the model which have overhangs. Without these structures, such parts would collapse during printing.") - Item - { - id: enableSupportContainer - width: labelColumnWidth + enableSupportCheckBox.width - - anchors - { - left: parent.left - top: parent.top - bottom: parent.bottom - rightMargin: UM.Theme.getSize("thick_margin").width - } - - Cura.IconWithText - { - id: enableSupportRowTitle - anchors.left: parent.left - visible: enableSupportCheckBox.visible - source: UM.Theme.getIcon("Support") - text: catalog.i18nc("@label", "Support") - font: UM.Theme.getFont("medium") - width: labelColumnWidth - iconSize: UM.Theme.getSize("medium_button_icon").width - tooltipText: catalog.i18nc("@label", "Generate structures to support parts of the model which have overhangs. Without these structures, such parts would collapse during printing.") - } - - UM.CheckBox - { - id: enableSupportCheckBox - anchors.verticalCenter: parent.verticalCenter - anchors.left: enableSupportRowTitle.right - - property alias _hovered: enableSupportMouseArea.containsMouse - - enabled: recommendedPrintSetup.settingsEnabled - - visible: supportEnabled.properties.enabled == "True" - checked: supportEnabled.properties.value == "True" - - MouseArea - { - id: enableSupportMouseArea - anchors.fill: parent - hoverEnabled: true - // propagateComposedEvents used on supportToolTipMouseArea does not work with Controls Components. - // It only works with other MouseAreas, so this is required - onClicked: supportEnabled.setPropertyValue("value", supportEnabled.properties.value != "True") - } - } - - MouseArea - { - id: supportToolTipMouseArea - anchors.fill: parent - propagateComposedEvents: true - hoverEnabled: true - onEntered: base.showTooltip(enableSupportContainer, Qt.point(-enableSupportContainer.x - UM.Theme.getSize("thick_margin").width, 0), - catalog.i18nc("@label", "Generate structures to support parts of the model which have overhangs. Without these structures, such parts would collapse during printing.")) - onExited: base.hideTooltip() - } - } - - ComboBox - { - id: supportExtruderCombobox - - height: UM.Theme.getSize("print_setup_big_item").height - anchors - { - left: enableSupportContainer.right - right: parent.right - leftMargin: UM.Theme.getSize("default_margin").width - rightMargin: UM.Theme.getSize("thick_margin").width - verticalCenter: parent.verticalCenter - } - - enabled: recommendedPrintSetup.settingsEnabled - visible: enableSupportCheckBox.visible && (supportEnabled.properties.value == "True") && (extrudersEnabledCount.properties.value > 1) - textRole: "name" // this solves that the combobox isn't populated in the first time Cura is started - - model: extruderModel - - // knowing the extruder position, try to find the item index in the model - function getIndexByPosition(position) - { - var itemIndex = -1 // if position is not found, return -1 - for (var item_index in model.items) - { - var item = model.getItem(item_index) - if (item.index == position) - { - itemIndex = item_index - break - } - } - return itemIndex - } - - onActivated: - { - if (model.getItem(index).enabled) - { - forceActiveFocus(); - supportExtruderNr.setPropertyValue("value", model.getItem(index).index); - } else - { - currentIndex = supportExtruderNr.properties.value; // keep the old value - } - } - - currentIndex: (supportExtruderNr.properties.value !== undefined) ? supportExtruderNr.properties.value : 0 - - property string color: "#fff" - Connections - { - target: extruderModel - function onModelChanged() - { - var maybeColor = supportExtruderCombobox.model.getItem(supportExtruderCombobox.currentIndex).color - if (maybeColor) - { - supportExtruderCombobox.color = maybeColor - } - } - } - onCurrentIndexChanged: - { - var maybeColor = supportExtruderCombobox.model.getItem(supportExtruderCombobox.currentIndex).color - if(maybeColor) - { - supportExtruderCombobox.color = maybeColor - } - } - - Binding - { - target: supportExtruderCombobox - property: "currentIndex" - value: supportExtruderCombobox.getIndexByPosition(supportExtruderNr.properties.value) - // Sometimes when the value is already changed, the model is still being built. - // The when clause ensures that the current index is not updated when this happens. - when: supportExtruderCombobox.model.count > 0 - } - - indicator: UM.ColorImage - { - id: downArrow - x: supportExtruderCombobox.width - width - supportExtruderCombobox.rightPadding - y: supportExtruderCombobox.topPadding + Math.round((supportExtruderCombobox.availableHeight - height) / 2) - - source: UM.Theme.getIcon("ChevronSingleDown") - width: UM.Theme.getSize("standard_arrow").width - height: UM.Theme.getSize("standard_arrow").height - - color: UM.Theme.getColor("setting_control_button") - } - - background: Rectangle - { - color: - { - if (!enabled) - { - return UM.Theme.getColor("setting_control_disabled") - } - if (supportExtruderCombobox.hovered || base.activeFocus) - { - return UM.Theme.getColor("setting_control_highlight") - } - return UM.Theme.getColor("setting_control") - } - radius: UM.Theme.getSize("setting_control_radius").width - border.width: UM.Theme.getSize("default_lining").width - border.color: - { - if (!enabled) - { - return UM.Theme.getColor("setting_control_disabled_border") - } - if (supportExtruderCombobox.hovered || supportExtruderCombobox.activeFocus) - { - return UM.Theme.getColor("setting_control_border_highlight") - } - return UM.Theme.getColor("setting_control_border") - } - } - - contentItem: UM.Label - { - anchors.verticalCenter: parent.verticalCenter - anchors.left: parent.left - anchors.leftMargin: UM.Theme.getSize("setting_unit_margin").width - anchors.right: downArrow.left - rightPadding: swatch.width + UM.Theme.getSize("setting_unit_margin").width - - text: supportExtruderCombobox.currentText - textFormat: Text.PlainText - color: enabled ? UM.Theme.getColor("setting_control_text") : UM.Theme.getColor("setting_control_disabled_text") - - elide: Text.ElideLeft - - - background: Rectangle - { - id: swatch - height: Math.round(parent.height / 2) - width: height - radius: Math.round(width / 2) - anchors.right: parent.right - anchors.verticalCenter: parent.verticalCenter - anchors.rightMargin: UM.Theme.getSize("thin_margin").width - - color: supportExtruderCombobox.color - } - } - - popup: Popup - { - y: supportExtruderCombobox.height - UM.Theme.getSize("default_lining").height - width: supportExtruderCombobox.width - implicitHeight: contentItem.implicitHeight + 2 * UM.Theme.getSize("default_lining").width - padding: UM.Theme.getSize("default_lining").width - - contentItem: ListView - { - implicitHeight: contentHeight - - ScrollBar.vertical: UM.ScrollBar {} - clip: true - model: supportExtruderCombobox.popup.visible ? supportExtruderCombobox.delegateModel : null - currentIndex: supportExtruderCombobox.highlightedIndex - } - - background: Rectangle - { - color: UM.Theme.getColor("setting_control") - border.color: UM.Theme.getColor("setting_control_border") - } - } - - delegate: ItemDelegate - { - width: supportExtruderCombobox.width - 2 * UM.Theme.getSize("default_lining").width - height: supportExtruderCombobox.height - highlighted: supportExtruderCombobox.highlightedIndex == index - - contentItem: UM.Label - { - anchors.fill: parent - anchors.leftMargin: UM.Theme.getSize("setting_unit_margin").width - anchors.rightMargin: UM.Theme.getSize("setting_unit_margin").width - - text: model.name - color: model.enabled ? UM.Theme.getColor("setting_control_text"): UM.Theme.getColor("action_button_disabled_text") - - elide: Text.ElideRight - rightPadding: swatch.width + UM.Theme.getSize("setting_unit_margin").width - - background: Rectangle - { - id: swatch - height: Math.round(parent.height / 2) - width: height - radius: Math.round(width / 2) - anchors.right: parent.right - anchors.verticalCenter: parent.verticalCenter - anchors.rightMargin: UM.Theme.getSize("thin_margin").width - - color: supportExtruderCombobox.model.getItem(index).color - } - } - - background: Rectangle - { - color: parent.highlighted ? UM.Theme.getColor("setting_control_highlight") : "transparent" - border.color: parent.highlighted ? UM.Theme.getColor("setting_control_border_highlight") : "transparent" - } - } + function onEnableSectionChanged(state) { + supportEnabled.setPropertyValue("value", state) } property var extruderModel: CuraApplication.getExtrudersModel() - UM.SettingPropertyProvider + property UM.SettingPropertyProvider supportEnabled: UM.SettingPropertyProvider { id: supportEnabled containerStack: Cura.MachineManager.activeMachine @@ -310,21 +36,215 @@ Item storeIndex: 0 } - UM.SettingPropertyProvider + property UM.SettingPropertyProvider supportExtruderNr: UM.SettingPropertyProvider { - id: supportExtruderNr containerStack: Cura.MachineManager.activeMachine key: "support_extruder_nr" watchedProperties: [ "value" ] storeIndex: 0 } - UM.SettingPropertyProvider + property UM.SettingPropertyProvider machineExtruderCount: UM.SettingPropertyProvider { - id: machineExtruderCount containerStack: Cura.MachineManager.activeMachine key: "machine_extruder_count" watchedProperties: ["value"] storeIndex: 0 } + + //Replace this with the Extruder selector + contents: [ + RecommendedSettingItem + { + settingName: catalog.i18nc("@action:label", "Print with") + settingControl: Rectangle { color: "red"; width: 10; height:10 } +// ComboBox +// { +// id: supportExtruderCombobox +// +// // height: UM.Theme.getSize("print_setup_big_item").height +// +// enabled: recommendedPrintSetup.settingsEnabled +// visible: (supportEnabled.properties.value == "True") && (extrudersEnabledCount.properties.value > 1) +// textRole: "name" // this solves that the combobox isn't populated in the first time Cura is started +// +// model: extruderModel +// +// // knowing the extruder position, try to find the item index in the model +// function getIndexByPosition(position) +// { +// var itemIndex = -1 // if position is not found, return -1 +// for (var item_index in model.items) +// { +// var item = model.getItem(item_index) +// if (item.index == position) +// { +// itemIndex = item_index +// break +// } +// } +// return itemIndex +// } +// +// onActivated: +// { +// if (model.getItem(index).enabled) +// { +// forceActiveFocus(); +// supportExtruderNr.setPropertyValue("value", model.getItem(index).index); +// } else +// { +// currentIndex = supportExtruderNr.properties.value; // keep the old value +// } +// } +// +// // currentIndex: (supportExtruderNr.properties.value !== undefined) ? supportExtruderNr.properties.value : 0 +// +// property string color: "#fff" +// Connections +// { +// target: extruderModel +// function onModelChanged() +// { +// var maybeColor = supportExtruderCombobox.model.getItem(supportExtruderCombobox.currentIndex).color +// if (maybeColor) +// { +// supportExtruderCombobox.color = maybeColor +// } +// } +// } +// onCurrentIndexChanged: +// { +// var maybeColor = supportExtruderCombobox.model.getItem(supportExtruderCombobox.currentIndex).color +// if(maybeColor) +// { +// supportExtruderCombobox.color = maybeColor +// } +// } +// +// Binding +// { +// target: supportExtruderCombobox +// property: "currentIndex" +// value: supportExtruderCombobox.getIndexByPosition(supportExtruderNr.properties.value) +// // Sometimes when the value is already changed, the model is still being built. +// // The when clause ensures that the current index is not updated when this happens. +// when: supportExtruderCombobox.model.count > 0 +// } +// +// indicator: UM.ColorImage +// { +// id: downArrow +// x: supportExtruderCombobox.width - width - supportExtruderCombobox.rightPadding +// y: supportExtruderCombobox.topPadding + Math.round((supportExtruderCombobox.availableHeight - height) / 2) +// +// source: UM.Theme.getIcon("ChevronSingleDown") +// width: UM.Theme.getSize("standard_arrow").width +// height: UM.Theme.getSize("standard_arrow").height +// +// color: UM.Theme.getColor("setting_control_button") +// } +// +// contentItem: UM.Label +// { +// anchors.verticalCenter: parent.verticalCenter +// anchors.left: parent.left +// anchors.leftMargin: UM.Theme.getSize("setting_unit_margin").width +// anchors.right: downArrow.left +// rightPadding: swatch.width + UM.Theme.getSize("setting_unit_margin").width +// +// text: supportExtruderCombobox.currentText +// textFormat: Text.PlainText +// color: enabled ? UM.Theme.getColor("setting_control_text") : UM.Theme.getColor("setting_control_disabled_text") +// +// elide: Text.ElideLeft +// +// +// background: Rectangle +// { +// id: swatch +// height: Math.round(parent.height / 2) +// width: height +// radius: Math.round(width / 2) +// anchors.right: parent.right +// anchors.verticalCenter: parent.verticalCenter +// anchors.rightMargin: UM.Theme.getSize("thin_margin").width +// +// color: supportExtruderCombobox.color +// } +// } +// +// popup: Popup +// { +// y: supportExtruderCombobox.height - UM.Theme.getSize("default_lining").height +// width: supportExtruderCombobox.width +// implicitHeight: contentItem.implicitHeight + 2 * UM.Theme.getSize("default_lining").width +// padding: UM.Theme.getSize("default_lining").width +// +// contentItem: ListView +// { +// implicitHeight: contentHeight +// +// ScrollBar.vertical: UM.ScrollBar {} +// clip: true +// model: supportExtruderCombobox.popup.visible ? supportExtruderCombobox.delegateModel : null +// currentIndex: supportExtruderCombobox.highlightedIndex +// } +// +// background: Rectangle +// { +// color: UM.Theme.getColor("setting_control") +// border.color: UM.Theme.getColor("setting_control_border") +// } +// } +// +// delegate: ItemDelegate +// { +// width: supportExtruderCombobox.width - 2 * UM.Theme.getSize("default_lining").width +// height: supportExtruderCombobox.height +// highlighted: supportExtruderCombobox.highlightedIndex == index +// +// contentItem: UM.Label +// { +// anchors.fill: parent +// anchors.leftMargin: UM.Theme.getSize("setting_unit_margin").width +// anchors.rightMargin: UM.Theme.getSize("setting_unit_margin").width +// +// text: model.name +// color: model.enabled ? UM.Theme.getColor("setting_control_text"): UM.Theme.getColor("action_button_disabled_text") +// +// elide: Text.ElideRight +// rightPadding: swatch.width + UM.Theme.getSize("setting_unit_margin").width +// +// background: Rectangle +// { +// id: swatch +// height: Math.round(parent.height / 2) +// width: height +// radius: Math.round(width / 2) +// anchors.right: parent.right +// anchors.verticalCenter: parent.verticalCenter +// anchors.rightMargin: UM.Theme.getSize("thin_margin").width +// +// color: supportExtruderCombobox.model.getItem(index).color +// } +// } +// +// background: Rectangle +// { +// color: parent.highlighted ? UM.Theme.getColor("setting_control_highlight") : "transparent" +// border.color: parent.highlighted ? UM.Theme.getColor("setting_control_border_highlight") : "transparent" +// } +// } +// } + }, + + RecommendedSettingItem + { + settingName: catalog.i18nc("@action:label", "Placement") + settingControl: Rectangle { color: "red"; width: 10; height:10 } + } + ] + + } From 30d886cfcda886ae03160984ceaa0aa94240f665 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Mon, 28 Nov 2022 13:06:03 +0100 Subject: [PATCH 007/124] Adjust setting first column width to match designs. CURA-9793 --- .../PrintSetupSelector/Recommended/RecommendedSettingItem.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml index 9434e856af..ddd99af1ab 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml @@ -17,7 +17,7 @@ Item property alias settingControl: settingContainer.children property alias settingName: settingLabel.text - property int leftColumnWidth: width / 2 + property int leftColumnWidth: Math.floor(width * 0.35) UM.Label { From 631d6a15b09f82aef08245898ca8297d05c1f294 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Mon, 28 Nov 2022 15:55:55 +0100 Subject: [PATCH 008/124] =?UTF-8?q?Add=20extruder=20button=20bar=20that=20?= =?UTF-8?q?shows=20icons=20for=20each=20extruder=20in=20a=20horizontal=20r?= =?UTF-8?q?ow=20=F0=9F=92=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Make ExtruderButton more generic by moving functionality out. Remove background color from ToolbarButton and add that background color to the Toolbar.qml. Fix Toolbar border being created by overlapping rectangles instead of using border Add scaling options for ToolBarButtons icon CURA-9793 --- .../Recommended/RecommendedSettingItem.qml | 4 +- .../Recommended/RecommendedSettingSection.qml | 2 +- .../RecommendedSupportSelector.qml | 8 ++-- resources/qml/Toolbar.qml | 32 +++++++++------ resources/qml/Widgets/ExtruderSelectorBar.qml | 40 +++++++++++++++++++ resources/qml/qmldir | 2 + 6 files changed, 70 insertions(+), 18 deletions(-) create mode 100644 resources/qml/Widgets/ExtruderSelectorBar.qml diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml index ddd99af1ab..ec777b13d6 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml @@ -12,12 +12,12 @@ import Cura 1.7 as Cura Item { width: parent.width - height: UM.Theme.getSize("section_header").height + Layout.preferredHeight: childrenRect.height + Layout.minimumHeight: UM.Theme.getSize("section_header").height Layout.fillWidth: true property alias settingControl: settingContainer.children property alias settingName: settingLabel.text - property int leftColumnWidth: Math.floor(width * 0.35) UM.Label { diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml index 445e1663a6..ac0c7fbccf 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml @@ -17,7 +17,7 @@ Item property alias enableSectionChecked: enableSectionSwitch.checked property alias enableSectionEnabled: enableSectionSwitch.enabled property var enableSectionClicked: { return } - property int leftColumnWidth: width / 2 + property int leftColumnWidth: Math.floor(width * 0.35) property var toolTipText: "" property alias contents: settingColumn.children diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml index b59feeff64..8da6f8cd01 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml @@ -6,7 +6,7 @@ import QtQuick.Controls 2.3 import QtQuick.Layouts 1.3 import UM 1.5 as UM -import Cura 1.0 as Cura +import Cura 1.6 as Cura RecommendedSettingSection @@ -57,7 +57,9 @@ RecommendedSettingSection RecommendedSettingItem { settingName: catalog.i18nc("@action:label", "Print with") - settingControl: Rectangle { color: "red"; width: 10; height:10 } + settingControl: Cura.ExtruderSelectorBar { model: extruderModel } + + Layout.preferredHeight: childrenRect.height // ComboBox // { // id: supportExtruderCombobox @@ -242,7 +244,7 @@ RecommendedSettingSection RecommendedSettingItem { settingName: catalog.i18nc("@action:label", "Placement") - settingControl: Rectangle { color: "red"; width: 10; height:10 } + settingControl: Rectangle { color: "green"; width: 50; height:50 } } ] diff --git a/resources/qml/Toolbar.qml b/resources/qml/Toolbar.qml index 6ecdc9dce0..e003c6cd6f 100644 --- a/resources/qml/Toolbar.qml +++ b/resources/qml/Toolbar.qml @@ -5,7 +5,7 @@ import QtQuick 2.2 import QtQuick.Controls 2.3 import UM 1.5 as UM -import Cura 1.0 as Cura +import Cura 1.7 as Cura Item { @@ -29,13 +29,13 @@ Item anchors { fill: toolButtons - leftMargin: -radius - border.width - rightMargin: -border.width - topMargin: -border.width - bottomMargin: -border.width + leftMargin: -radius - border.width // Removes border on left side } radius: UM.Theme.getSize("default_radius").width - color: UM.Theme.getColor("lining") + color: UM.Theme.getColor("toolbar_background") + border.color: UM.Theme.getColor("lining") + border.width: UM.Theme.getSize("default_lining").width + } Column @@ -111,13 +111,12 @@ Item anchors { fill: extruderButtons - leftMargin: -radius - border.width - rightMargin: -border.width - topMargin: -border.width - bottomMargin: -border.width + leftMargin: -radius - border.width // Removes border on left side } radius: UM.Theme.getSize("default_radius").width - color: UM.Theme.getColor("lining") + color: UM.Theme.getColor("toolbar_background") + border.color: UM.Theme.getColor("lining") + border.width: UM.Theme.getSize("default_lining").width visible: extrudersModel.items.length > 1 } @@ -135,11 +134,20 @@ Item height: childrenRect.height model: extrudersModel.items.length > 1 ? extrudersModel : 0 - delegate: ExtruderButton + delegate: Cura.ExtruderButton { extruder: model isTopElement: extrudersModel.getItem(0).id == model.id isBottomElement: extrudersModel.getItem(extrudersModel.rowCount() - 1).id == model.id + text: catalog.i18ncp("@label %1 is filled in with the name of an extruder", "Print Selected Model with %1", "Print Selected Models with %1", UM.Selection.selectionCount).arg(extruder.name) + checked: Cura.ExtruderManager.selectedObjectExtruders.indexOf(extruder.id) != -1 + enabled: UM.Selection.hasSelection && extruder.stack.isEnabled + + onClicked: + { + forceActiveFocus() //First grab focus, so all the text fields are updated + CuraActions.setExtruderForSelection(extruder.id) + } } } } diff --git a/resources/qml/Widgets/ExtruderSelectorBar.qml b/resources/qml/Widgets/ExtruderSelectorBar.qml new file mode 100644 index 0000000000..7ac4101ed8 --- /dev/null +++ b/resources/qml/Widgets/ExtruderSelectorBar.qml @@ -0,0 +1,40 @@ +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Layouts 1.3 + +import UM 1.5 as UM +import Cura 1.5 as Cura + +Row +{ + id: extruderSelectionBar + property alias model: extruderButtonRepeater.model + + spacing: 0 + width: parent.width + height: childrenRect.height + + Repeater + { + id: extruderButtonRepeater + + delegate: Item + { + width: { + const maximum_width = Math.floor(extruderSelectionBar.width / extruderButtonRepeater.count); + return Math.min(UM.Theme.getSize("large_button").width, maximum_width); + } + + height: childrenRect.height + + Cura.ExtruderButton + { + extruder: model + isTopElement: extrudersModel.getItem(0).id == model.id + isBottomElement: extrudersModel.getItem(extrudersModel.rowCount() - 1).id == model.id + iconScale: 0.6 + buttonSize: UM.Theme.getSize("large_button").width + } + } + } +} diff --git a/resources/qml/qmldir b/resources/qml/qmldir index d5184f1d8c..1a6739f5fb 100644 --- a/resources/qml/qmldir +++ b/resources/qml/qmldir @@ -38,6 +38,8 @@ ScrollView 1.0 ScrollView.qml Menu 1.0 Menu.qml MenuItem 1.0 MenuItem.qml MenuSeparator 1.0 MenuSeparator.qml +ExtruderSelectorBar 1.6 ExtruderSelectorBar.qml +ExtruderButton 1.6 ExtruderButton.qml # Cura/MachineSettings From 84988a57e503fed0f6c04238036530abb4698d97 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Mon, 28 Nov 2022 22:01:28 +0100 Subject: [PATCH 009/124] Update styling of infill slider CURA-9793 --- .../RecommendedStrengthSelector.qml | 79 +++++++++---------- resources/themes/cura-light/theme.json | 4 +- 2 files changed, 41 insertions(+), 42 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml index 0317cb7814..d0914e8813 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml @@ -6,6 +6,7 @@ import QtQuick.Controls 2.15 import UM 1.5 as UM import Cura 1.0 as Cura +import QtQuick.Layouts 1.3 // @@ -25,24 +26,29 @@ Item property: "source" value: { - var density = parseInt(infillDensity.properties.value) - if (parseInt(infillSteps.properties.value) != 0) + const infill_steps = parseInt(infillSteps.properties.value); + if (infill_steps != 0) { return UM.Theme.getIcon("InfillGradual") } - if (density <= 0) + + const density = parseInt(infillDensity.properties.value) + if (density == 0) { - return UM.Theme.getIcon("Infill0") + return UM.Theme.getIcon("Infill0"); } - if (density < 40) + else if (density < 40) { - return UM.Theme.getIcon("Infill3") + return UM.Theme.getIcon("Infill3"); } - if (density < 90) + else if (density < 90) { - return UM.Theme.getIcon("Infill2") + return UM.Theme.getIcon("Infill2"); + } + else + { + return UM.Theme.getIcon("Infill100"); } - return UM.Theme.getIcon("Infill100") } } @@ -55,7 +61,7 @@ Item // The infill slider has a max value of 100. When it is given a value > 100 onValueChanged updates the setting to be 100. // When changing to an intent with infillDensity > 100, it would always be clamped to 100. // This will force the slider to ignore the first onValueChanged for values > 100 so higher values can be set. - var density = parseInt(infillDensity.properties.value) + const density = parseInt(infillDensity.properties.value) if (density > 100) { infillSlider.ignoreValueChange = true } @@ -71,18 +77,20 @@ Item anchors.top: parent.top anchors.left: parent.left source: UM.Theme.getIcon("Infill1") - text: catalog.i18nc("@label", "Infill") + " (%)" + text: `${catalog.i18nc("@label", "Infill")} (%)` font: UM.Theme.getFont("medium") width: labelColumnWidth iconSize: UM.Theme.getSize("medium_button_icon").width tooltipText: catalog.i18nc("@label", "Gradual infill will gradually increase the amount of infill towards the top.") } - Item + RowLayout { id: infillSliderContainer height: childrenRect.height + spacing: UM.Theme.getSize("default_margin").width + anchors { left: infillRowTitle.right @@ -90,18 +98,19 @@ Item verticalCenter: infillRowTitle.verticalCenter } + UM.Label { Layout.fillWidth: false; text: "0" } + Slider { id: infillSlider + Layout.fillWidth: true property var ignoreValueChange: false width: parent.width - height: UM.Theme.getSize("print_setup_slider_handle").height // The handle is the widest element of the slider + height: childrenRect.height - from: 0 - to: 100 - stepSize: 1 + from: 0; to: 100; stepSize: 1 // disable slider when gradual support is enabled enabled: parseInt(infillSteps.properties.value) == 0 @@ -117,36 +126,24 @@ Item width: parent.width - UM.Theme.getSize("print_setup_slider_handle").width anchors.horizontalCenter: parent.horizontalCenter anchors.verticalCenter: parent.verticalCenter - color: infillSlider.enabled ? UM.Theme.getColor("quality_slider_available") : UM.Theme.getColor("quality_slider_unavailable") + color: UM.Theme.getColor("lining") Repeater { id: repeater anchors.fill: parent - model: infillSlider.to / infillSlider.stepSize + 1 + model: 11 Rectangle { - color: infillSlider.enabled ? UM.Theme.getColor("quality_slider_available") : UM.Theme.getColor("quality_slider_unavailable") + color: UM.Theme.getColor("lining") implicitWidth: UM.Theme.getSize("print_setup_slider_tickmarks").width implicitHeight: UM.Theme.getSize("print_setup_slider_tickmarks").height anchors.verticalCenter: parent.verticalCenter - // Do not use Math.round otherwise the tickmarks won't be aligned - // (space between steps) * index of step - x: (backgroundLine.width / (repeater.count - 1)) * index + x: Math.round(backgroundLine.width / (repeater.count - 1) * index - width / 2) - radius: Math.round(implicitWidth / 2) - visible: (index % 10) == 0 // Only show steps of 10% - - UM.Label - { - text: index - visible: (index % 20) == 0 // Only show steps of 20% - anchors.horizontalCenter: parent.horizontalCenter - y: UM.Theme.getSize("thin_margin").height - color: UM.Theme.getColor("quality_slider_available") - } + radius: Math.round(width / 2) } } } @@ -155,13 +152,13 @@ Item { id: handleButton x: infillSlider.leftPadding + infillSlider.visualPosition * (infillSlider.availableWidth - width) - y: infillSlider.topPadding + infillSlider.availableHeight / 2 - height / 2 - color: infillSlider.enabled ? UM.Theme.getColor("primary") : UM.Theme.getColor("quality_slider_unavailable") + anchors.verticalCenter: parent.verticalCenter implicitWidth: UM.Theme.getSize("print_setup_slider_handle").width - implicitHeight: implicitWidth - radius: Math.round(implicitWidth / 2) - border.color: UM.Theme.getColor("slider_groove_fill") - border.width: UM.Theme.getSize("default_lining").height + implicitHeight: UM.Theme.getSize("print_setup_slider_handle").height + radius: Math.round(width / 2) + color: UM.Theme.getColor("main_background") + border.color: UM.Theme.getColor("primary") + border.width: UM.Theme.getSize("wide_lining").height } Connections @@ -201,6 +198,8 @@ Item } } } + + UM.Label { Layout.fillWidth: false; text: "100" } } // Gradual Support Infill Checkbox @@ -210,7 +209,7 @@ Item property alias _hovered: enableGradualInfillMouseArea.containsMouse anchors.top: infillSliderContainer.bottom - anchors.topMargin: UM.Theme.getSize("wide_margin").height + anchors.topMargin: UM.Theme.getSize("default_margin").height anchors.left: infillSliderContainer.left text: catalog.i18nc("@label", "Gradual infill") diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 809bcfdee8..4fd31db731 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -487,8 +487,8 @@ "print_setup_widget": [38.0, 30.0], "print_setup_extruder_box": [0.0, 6.0], "print_setup_slider_groove": [0.16, 0.16], - "print_setup_slider_handle": [1.0, 1.0], - "print_setup_slider_tickmarks": [0.32, 0.32], + "print_setup_slider_handle": [1.3, 1.3], + "print_setup_slider_tickmarks": [0.5, 0.5], "print_setup_big_item": [28, 2.5], "print_setup_icon": [1.2, 1.2], "drag_icon": [1.416, 0.25], From 3682918efa98e3c2f36cd930f8f7b21be6f9c696 Mon Sep 17 00:00:00 2001 From: jspijker Date: Tue, 29 Nov 2022 08:41:45 +0100 Subject: [PATCH 010/124] Add basic styling to Switch Contributes to CURA-9793 --- resources/themes/cura-light/theme.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 4fd31db731..d1ba93bef1 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -354,6 +354,10 @@ "checkbox_text": "text_default", "checkbox_text_disabled": "text_disabled", + "switch": "background_1", + "switch_state_checked": "accent_1", + "switch_state_unchecked": "text_disabled", + "radio": "background_1", "radio_disabled": "background_2", "radio_selected": "accent_1", From 87ff29499030e4ba83c2d7ec3f8d3c8a4c3b8bc9 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Mon, 28 Nov 2022 16:36:14 +0100 Subject: [PATCH 011/124] Remove redundant parameters. These will now be overriden by the parent. CURA-9793 --- resources/qml/ExtruderButton.qml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/resources/qml/ExtruderButton.qml b/resources/qml/ExtruderButton.qml index 204e9a5469..df1a72e765 100644 --- a/resources/qml/ExtruderButton.qml +++ b/resources/qml/ExtruderButton.qml @@ -13,11 +13,6 @@ UM.ToolbarButton property var extruder - text: catalog.i18ncp("@label %1 is filled in with the name of an extruder", "Print Selected Model with %1", "Print Selected Models with %1", UM.Selection.selectionCount).arg(extruder.name) - - checked: Cura.ExtruderManager.selectedObjectExtruders.indexOf(extruder.id) != -1 - enabled: UM.Selection.hasSelection && extruder.stack.isEnabled - toolItem: ExtruderIcon { materialColor: extruder.color From 5d5915e49edce8577deb5055fb55e1fad28c2b13 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Mon, 28 Nov 2022 16:38:44 +0100 Subject: [PATCH 012/124] Make support selector functional CURA-9793 --- .../RecommendedSupportSelector.qml | 190 +----------------- resources/qml/Widgets/ExtruderSelectorBar.qml | 13 +- 2 files changed, 18 insertions(+), 185 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml index 8da6f8cd01..4e8ac406dc 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml @@ -57,188 +57,18 @@ RecommendedSettingSection RecommendedSettingItem { settingName: catalog.i18nc("@action:label", "Print with") - settingControl: Cura.ExtruderSelectorBar { model: extruderModel } + settingControl: Cura.ExtruderSelectorBar + { + model: extruderModel + selectedIndex: (supportExtruderNr.properties.value !== undefined) ? supportExtruderNr.properties.value : 0 + function onClickExtruder(index) + { + forceActiveFocus(); + supportExtruderNr.setPropertyValue("value", index); + } + } Layout.preferredHeight: childrenRect.height -// ComboBox -// { -// id: supportExtruderCombobox -// -// // height: UM.Theme.getSize("print_setup_big_item").height -// -// enabled: recommendedPrintSetup.settingsEnabled -// visible: (supportEnabled.properties.value == "True") && (extrudersEnabledCount.properties.value > 1) -// textRole: "name" // this solves that the combobox isn't populated in the first time Cura is started -// -// model: extruderModel -// -// // knowing the extruder position, try to find the item index in the model -// function getIndexByPosition(position) -// { -// var itemIndex = -1 // if position is not found, return -1 -// for (var item_index in model.items) -// { -// var item = model.getItem(item_index) -// if (item.index == position) -// { -// itemIndex = item_index -// break -// } -// } -// return itemIndex -// } -// -// onActivated: -// { -// if (model.getItem(index).enabled) -// { -// forceActiveFocus(); -// supportExtruderNr.setPropertyValue("value", model.getItem(index).index); -// } else -// { -// currentIndex = supportExtruderNr.properties.value; // keep the old value -// } -// } -// -// // currentIndex: (supportExtruderNr.properties.value !== undefined) ? supportExtruderNr.properties.value : 0 -// -// property string color: "#fff" -// Connections -// { -// target: extruderModel -// function onModelChanged() -// { -// var maybeColor = supportExtruderCombobox.model.getItem(supportExtruderCombobox.currentIndex).color -// if (maybeColor) -// { -// supportExtruderCombobox.color = maybeColor -// } -// } -// } -// onCurrentIndexChanged: -// { -// var maybeColor = supportExtruderCombobox.model.getItem(supportExtruderCombobox.currentIndex).color -// if(maybeColor) -// { -// supportExtruderCombobox.color = maybeColor -// } -// } -// -// Binding -// { -// target: supportExtruderCombobox -// property: "currentIndex" -// value: supportExtruderCombobox.getIndexByPosition(supportExtruderNr.properties.value) -// // Sometimes when the value is already changed, the model is still being built. -// // The when clause ensures that the current index is not updated when this happens. -// when: supportExtruderCombobox.model.count > 0 -// } -// -// indicator: UM.ColorImage -// { -// id: downArrow -// x: supportExtruderCombobox.width - width - supportExtruderCombobox.rightPadding -// y: supportExtruderCombobox.topPadding + Math.round((supportExtruderCombobox.availableHeight - height) / 2) -// -// source: UM.Theme.getIcon("ChevronSingleDown") -// width: UM.Theme.getSize("standard_arrow").width -// height: UM.Theme.getSize("standard_arrow").height -// -// color: UM.Theme.getColor("setting_control_button") -// } -// -// contentItem: UM.Label -// { -// anchors.verticalCenter: parent.verticalCenter -// anchors.left: parent.left -// anchors.leftMargin: UM.Theme.getSize("setting_unit_margin").width -// anchors.right: downArrow.left -// rightPadding: swatch.width + UM.Theme.getSize("setting_unit_margin").width -// -// text: supportExtruderCombobox.currentText -// textFormat: Text.PlainText -// color: enabled ? UM.Theme.getColor("setting_control_text") : UM.Theme.getColor("setting_control_disabled_text") -// -// elide: Text.ElideLeft -// -// -// background: Rectangle -// { -// id: swatch -// height: Math.round(parent.height / 2) -// width: height -// radius: Math.round(width / 2) -// anchors.right: parent.right -// anchors.verticalCenter: parent.verticalCenter -// anchors.rightMargin: UM.Theme.getSize("thin_margin").width -// -// color: supportExtruderCombobox.color -// } -// } -// -// popup: Popup -// { -// y: supportExtruderCombobox.height - UM.Theme.getSize("default_lining").height -// width: supportExtruderCombobox.width -// implicitHeight: contentItem.implicitHeight + 2 * UM.Theme.getSize("default_lining").width -// padding: UM.Theme.getSize("default_lining").width -// -// contentItem: ListView -// { -// implicitHeight: contentHeight -// -// ScrollBar.vertical: UM.ScrollBar {} -// clip: true -// model: supportExtruderCombobox.popup.visible ? supportExtruderCombobox.delegateModel : null -// currentIndex: supportExtruderCombobox.highlightedIndex -// } -// -// background: Rectangle -// { -// color: UM.Theme.getColor("setting_control") -// border.color: UM.Theme.getColor("setting_control_border") -// } -// } -// -// delegate: ItemDelegate -// { -// width: supportExtruderCombobox.width - 2 * UM.Theme.getSize("default_lining").width -// height: supportExtruderCombobox.height -// highlighted: supportExtruderCombobox.highlightedIndex == index -// -// contentItem: UM.Label -// { -// anchors.fill: parent -// anchors.leftMargin: UM.Theme.getSize("setting_unit_margin").width -// anchors.rightMargin: UM.Theme.getSize("setting_unit_margin").width -// -// text: model.name -// color: model.enabled ? UM.Theme.getColor("setting_control_text"): UM.Theme.getColor("action_button_disabled_text") -// -// elide: Text.ElideRight -// rightPadding: swatch.width + UM.Theme.getSize("setting_unit_margin").width -// -// background: Rectangle -// { -// id: swatch -// height: Math.round(parent.height / 2) -// width: height -// radius: Math.round(width / 2) -// anchors.right: parent.right -// anchors.verticalCenter: parent.verticalCenter -// anchors.rightMargin: UM.Theme.getSize("thin_margin").width -// -// color: supportExtruderCombobox.model.getItem(index).color -// } -// } -// -// background: Rectangle -// { -// color: parent.highlighted ? UM.Theme.getColor("setting_control_highlight") : "transparent" -// border.color: parent.highlighted ? UM.Theme.getColor("setting_control_border_highlight") : "transparent" -// } -// } -// } }, RecommendedSettingItem diff --git a/resources/qml/Widgets/ExtruderSelectorBar.qml b/resources/qml/Widgets/ExtruderSelectorBar.qml index 7ac4101ed8..63d9ca9da4 100644 --- a/resources/qml/Widgets/ExtruderSelectorBar.qml +++ b/resources/qml/Widgets/ExtruderSelectorBar.qml @@ -8,11 +8,15 @@ import Cura 1.5 as Cura Row { id: extruderSelectionBar - property alias model: extruderButtonRepeater.model - spacing: 0 width: parent.width height: childrenRect.height + spacing: 0 + + property alias model: extruderButtonRepeater.model + property int selectedIndex: 0 + function onClickExtruder(index) {} + Repeater { @@ -24,16 +28,15 @@ Row const maximum_width = Math.floor(extruderSelectionBar.width / extruderButtonRepeater.count); return Math.min(UM.Theme.getSize("large_button").width, maximum_width); } - height: childrenRect.height Cura.ExtruderButton { extruder: model - isTopElement: extrudersModel.getItem(0).id == model.id - isBottomElement: extrudersModel.getItem(extrudersModel.rowCount() - 1).id == model.id + checked: extruder.index == selectedIndex iconScale: 0.6 buttonSize: UM.Theme.getSize("large_button").width + onClicked: extruder.enabled && onClickExtruder(extruder.index) } } } From d9a2a3f5b754a70e4d55ebadcf87a18ffc267904 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Mon, 28 Nov 2022 16:39:23 +0100 Subject: [PATCH 013/124] cleanup CURA-9793 --- .../Recommended/RecommendedSupportSelector.qml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml index 4e8ac406dc..8f236ddf4c 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml @@ -52,10 +52,10 @@ RecommendedSettingSection storeIndex: 0 } - //Replace this with the Extruder selector contents: [ RecommendedSettingItem { + Layout.preferredHeight: childrenRect.height settingName: catalog.i18nc("@action:label", "Print with") settingControl: Cura.ExtruderSelectorBar { @@ -68,7 +68,6 @@ RecommendedSettingSection } } - Layout.preferredHeight: childrenRect.height }, RecommendedSettingItem From 261adf06e72a2dbebd6f621c36b7cf95e55399c5 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Tue, 29 Nov 2022 10:32:47 +0100 Subject: [PATCH 014/124] Place `InfillSlider` in sperate file CURA-9793 --- .../Recommended/InfillSlider.qml | 116 +++++++++++++++ .../RecommendedStrengthSelector.qml | 133 +----------------- 2 files changed, 117 insertions(+), 132 deletions(-) create mode 100644 resources/qml/PrintSetupSelector/Recommended/InfillSlider.qml diff --git a/resources/qml/PrintSetupSelector/Recommended/InfillSlider.qml b/resources/qml/PrintSetupSelector/Recommended/InfillSlider.qml new file mode 100644 index 0000000000..cadbd61122 --- /dev/null +++ b/resources/qml/PrintSetupSelector/Recommended/InfillSlider.qml @@ -0,0 +1,116 @@ +// Copyright (c) 2022 UltiMaker +// Cura is released under the terms of the LGPLv3 or higher. + +import QtQuick 2.7 +import QtQuick.Controls 2.15 + +import UM 1.5 as UM +import Cura 1.0 as Cura +import QtQuick.Layouts 1.3 + +RowLayout +{ + height: childrenRect.height + spacing: UM.Theme.getSize("default_margin").width + + anchors + { + left: infillRowTitle.right + right: parent.right + verticalCenter: infillRowTitle.verticalCenter + } + + UM.Label { Layout.fillWidth: false; text: "0" } + + Slider + { + id: infillSlider + Layout.fillWidth: true + + width: parent.width + + from: 0; to: 100; stepSize: 1 + + // disable slider when gradual support is enabled + enabled: parseInt(infillSteps.properties.value) == 0 + + // set initial value from stack + value: parseInt(infillDensity.properties.value) + + //Draw line + background: Rectangle + { + id: backgroundLine + height: UM.Theme.getSize("print_setup_slider_groove").height + width: parent.width - UM.Theme.getSize("print_setup_slider_handle").width + anchors.horizontalCenter: parent.horizontalCenter + anchors.verticalCenter: parent.verticalCenter + color: UM.Theme.getColor("lining") + + Repeater + { + id: repeater + anchors.fill: parent + model: 11 + + Rectangle + { + color: UM.Theme.getColor("lining") + implicitWidth: UM.Theme.getSize("print_setup_slider_tickmarks").width + implicitHeight: UM.Theme.getSize("print_setup_slider_tickmarks").height + anchors.verticalCenter: parent.verticalCenter + + x: Math.round(backgroundLine.width / (repeater.count - 1) * index - width / 2) + + radius: Math.round(width / 2) + } + } + } + + handle: Rectangle + { + id: handleButton + x: infillSlider.leftPadding + infillSlider.visualPosition * (infillSlider.availableWidth - width) + anchors.verticalCenter: parent.verticalCenter + implicitWidth: UM.Theme.getSize("print_setup_slider_handle").width + implicitHeight: UM.Theme.getSize("print_setup_slider_handle").height + radius: Math.round(width / 2) + color: UM.Theme.getColor("main_background") + border.color: UM.Theme.getColor("primary") + border.width: UM.Theme.getSize("wide_lining").height + } + + Connections + { + target: infillSlider + function onValueChanged() + { + // Work around, the `infillDensity.properties.value` is initially `undefined`. As + // `parseInt(infillDensity.properties.value)` is parsed as 0 and is initially set as + // the slider value. By setting this 0 value an update is triggered setting the actual + // infill value to 0. + if (isNaN(parseInt(infillDensity.properties.value))) + { + return; + } + + // Don't update if the setting value, if the slider has the same value + if (parseInt(infillDensity.properties.value) == infillSlider.value) + { + return; + } + + // Round the slider value to the nearest multiple of 10 (simulate step size of 10) + const roundedSliderValue = Math.round(infillSlider.value / 10) * 10; + + // Update the slider value to represent the rounded value + infillSlider.value = roundedSliderValue; + + Cura.MachineManager.setSettingForAllExtruders("infill_sparse_density", "value", roundedSliderValue) + Cura.MachineManager.resetSettingForAllExtruders("infill_line_distance") + } + } + } + + UM.Label { Layout.fillWidth: false; text: "100" } +} diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml index d0914e8813..75beb023ee 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml @@ -6,7 +6,6 @@ import QtQuick.Controls 2.15 import UM 1.5 as UM import Cura 1.0 as Cura -import QtQuick.Layouts 1.3 // @@ -52,24 +51,6 @@ Item } } - // We use a binding to make sure that after manually setting infillSlider.value it is still bound to the property provider - Binding - { - target: infillSlider - property: "value" - value: { - // The infill slider has a max value of 100. When it is given a value > 100 onValueChanged updates the setting to be 100. - // When changing to an intent with infillDensity > 100, it would always be clamped to 100. - // This will force the slider to ignore the first onValueChanged for values > 100 so higher values can be set. - const density = parseInt(infillDensity.properties.value) - if (density > 100) { - infillSlider.ignoreValueChange = true - } - - return density - } - } - // Here are the elements that are shown in the left column Cura.IconWithText { @@ -84,122 +65,10 @@ Item tooltipText: catalog.i18nc("@label", "Gradual infill will gradually increase the amount of infill towards the top.") } - RowLayout + InfillSlider { id: infillSliderContainer height: childrenRect.height - - spacing: UM.Theme.getSize("default_margin").width - - anchors - { - left: infillRowTitle.right - right: parent.right - verticalCenter: infillRowTitle.verticalCenter - } - - UM.Label { Layout.fillWidth: false; text: "0" } - - Slider - { - id: infillSlider - Layout.fillWidth: true - - property var ignoreValueChange: false - - width: parent.width - height: childrenRect.height - - from: 0; to: 100; stepSize: 1 - - // disable slider when gradual support is enabled - enabled: parseInt(infillSteps.properties.value) == 0 - - // set initial value from stack - value: parseInt(infillDensity.properties.value) - - //Draw line - background: Rectangle - { - id: backgroundLine - height: UM.Theme.getSize("print_setup_slider_groove").height - width: parent.width - UM.Theme.getSize("print_setup_slider_handle").width - anchors.horizontalCenter: parent.horizontalCenter - anchors.verticalCenter: parent.verticalCenter - color: UM.Theme.getColor("lining") - - Repeater - { - id: repeater - anchors.fill: parent - model: 11 - - Rectangle - { - color: UM.Theme.getColor("lining") - implicitWidth: UM.Theme.getSize("print_setup_slider_tickmarks").width - implicitHeight: UM.Theme.getSize("print_setup_slider_tickmarks").height - anchors.verticalCenter: parent.verticalCenter - - x: Math.round(backgroundLine.width / (repeater.count - 1) * index - width / 2) - - radius: Math.round(width / 2) - } - } - } - - handle: Rectangle - { - id: handleButton - x: infillSlider.leftPadding + infillSlider.visualPosition * (infillSlider.availableWidth - width) - anchors.verticalCenter: parent.verticalCenter - implicitWidth: UM.Theme.getSize("print_setup_slider_handle").width - implicitHeight: UM.Theme.getSize("print_setup_slider_handle").height - radius: Math.round(width / 2) - color: UM.Theme.getColor("main_background") - border.color: UM.Theme.getColor("primary") - border.width: UM.Theme.getSize("wide_lining").height - } - - Connections - { - target: infillSlider - function onValueChanged() - { - if (infillSlider.ignoreValueChange) - { - infillSlider.ignoreValueChange = false - return - } - - // Don't update if the setting value, if the slider has the same value - if (parseInt(infillDensity.properties.value) == infillSlider.value) - { - return - } - - // Round the slider value to the nearest multiple of 10 (simulate step size of 10) - var roundedSliderValue = Math.round(infillSlider.value / 10) * 10 - - // Update the slider value to represent the rounded value - infillSlider.value = roundedSliderValue - - // Update value only if the Recommended mode is Active, - // Otherwise if I change the value in the Custom mode the Recommended view will try to repeat - // same operation - const active_mode = UM.Preferences.getValue("cura/active_mode") - - if (visible // Workaround: 'visible' is checked because on startup in Windows it spuriously gets an 'onValueChanged' with value '0' if this isn't checked. - && (active_mode == 0 || active_mode == "simple")) - { - Cura.MachineManager.setSettingForAllExtruders("infill_sparse_density", "value", roundedSliderValue) - Cura.MachineManager.resetSettingForAllExtruders("infill_line_distance") - } - } - } - } - - UM.Label { Layout.fillWidth: false; text: "100" } } // Gradual Support Infill Checkbox From f4e7829e0b011fe5a40aec96e7895fe4c45661dc Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Tue, 29 Nov 2022 13:12:11 +0100 Subject: [PATCH 015/124] Remove infill icon changing density on change slider Suggestion from @lorenzoromagnoli CURA-9793 --- .../RecommendedStrengthSelector.qml | 33 ------------------- 1 file changed, 33 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml index 75beb023ee..be4b0dbf0b 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml @@ -18,39 +18,6 @@ Item property real labelColumnWidth: Math.round(width / 3) - // Create a binding to update the icon when the infill density changes - Binding - { - target: infillRowTitle - property: "source" - value: - { - const infill_steps = parseInt(infillSteps.properties.value); - if (infill_steps != 0) - { - return UM.Theme.getIcon("InfillGradual") - } - - const density = parseInt(infillDensity.properties.value) - if (density == 0) - { - return UM.Theme.getIcon("Infill0"); - } - else if (density < 40) - { - return UM.Theme.getIcon("Infill3"); - } - else if (density < 90) - { - return UM.Theme.getIcon("Infill2"); - } - else - { - return UM.Theme.getIcon("Infill100"); - } - } - } - // Here are the elements that are shown in the left column Cura.IconWithText { From a470a6c3336b7207ffc7ff41f91931179ad16a51 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Tue, 29 Nov 2022 14:37:45 +0100 Subject: [PATCH 016/124] Add indicator arrow to slider CURA-9793 --- .../Recommended/InfillSlider.qml | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/resources/qml/PrintSetupSelector/Recommended/InfillSlider.qml b/resources/qml/PrintSetupSelector/Recommended/InfillSlider.qml index cadbd61122..1796ae7ea1 100644 --- a/resources/qml/PrintSetupSelector/Recommended/InfillSlider.qml +++ b/resources/qml/PrintSetupSelector/Recommended/InfillSlider.qml @@ -80,6 +80,26 @@ RowLayout border.width: UM.Theme.getSize("wide_lining").height } + UM.PointingRectangle + { + arrowSize: UM.Theme.getSize("button_tooltip_arrow").width + width: childrenRect.width + height: childrenRect.height + target: Qt.point(handleButton.x + handleButton.width / 2, handleButton.y + handleButton.height / 2) + x: handleButton.x - width / 2 + handleButton.width / 2 + y: handleButton.y - height - UM.Theme.getSize("button_tooltip_arrow").height - UM.Theme.getSize("narrow_margin").height + color: UM.Theme.getColor("tooltip"); + + UM.Label + { + text: `${infillSlider.value}%` + horizontalAlignment: TextInput.AlignHCenter + leftPadding: UM.Theme.getSize("narrow_margin").width + rightPadding: UM.Theme.getSize("narrow_margin").width + color: UM.Theme.getColor("tooltip_text"); + } + } + Connections { target: infillSlider From 0fc4773db38a744c8148f79a950380e31d71dcde Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Tue, 29 Nov 2022 14:56:15 +0100 Subject: [PATCH 017/124] Round possible fractional positional values CURA-9793 --- resources/qml/PrintSetupSelector/Recommended/InfillSlider.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/InfillSlider.qml b/resources/qml/PrintSetupSelector/Recommended/InfillSlider.qml index 1796ae7ea1..6cde19c2a9 100644 --- a/resources/qml/PrintSetupSelector/Recommended/InfillSlider.qml +++ b/resources/qml/PrintSetupSelector/Recommended/InfillSlider.qml @@ -86,7 +86,7 @@ RowLayout width: childrenRect.width height: childrenRect.height target: Qt.point(handleButton.x + handleButton.width / 2, handleButton.y + handleButton.height / 2) - x: handleButton.x - width / 2 + handleButton.width / 2 + x: handleButton.x + Math.round((handleButton.width - width) / 2) y: handleButton.y - height - UM.Theme.getSize("button_tooltip_arrow").height - UM.Theme.getSize("narrow_margin").height color: UM.Theme.getColor("tooltip"); From b53c8aac5499026392297d67a397b5d4cf60c6a2 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Tue, 29 Nov 2022 16:06:55 +0100 Subject: [PATCH 018/124] Add single setting update ComboBox CURA-9793 --- .../RecommendedSupportSelector.qml | 14 +++-- .../qml/Widgets/SingleSettingComboBox.qml | 62 +++++++++++++++++++ resources/qml/qmldir | 1 + 3 files changed, 72 insertions(+), 5 deletions(-) create mode 100644 resources/qml/Widgets/SingleSettingComboBox.qml diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml index 8f236ddf4c..3ff2cc0501 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml @@ -6,7 +6,7 @@ import QtQuick.Controls 2.3 import QtQuick.Layouts 1.3 import UM 1.5 as UM -import Cura 1.6 as Cura +import Cura 1.7 as Cura RecommendedSettingSection @@ -60,7 +60,7 @@ RecommendedSettingSection settingControl: Cura.ExtruderSelectorBar { model: extruderModel - selectedIndex: (supportExtruderNr.properties.value !== undefined) ? supportExtruderNr.properties.value : 0 + selectedIndex: supportExtruderNr.properties.value !== undefined ? supportExtruderNr.properties.value : 0 function onClickExtruder(index) { forceActiveFocus(); @@ -73,9 +73,13 @@ RecommendedSettingSection RecommendedSettingItem { settingName: catalog.i18nc("@action:label", "Placement") - settingControl: Rectangle { color: "green"; width: 50; height:50 } + + settingControl: Cura.SingleSettingComboBox + { + width: parent.width + height: UM.Theme.getSize("combobox").height + settingName: "support_type" + } } ] - - } diff --git a/resources/qml/Widgets/SingleSettingComboBox.qml b/resources/qml/Widgets/SingleSettingComboBox.qml new file mode 100644 index 0000000000..c79ff591e8 --- /dev/null +++ b/resources/qml/Widgets/SingleSettingComboBox.qml @@ -0,0 +1,62 @@ +// Copyright (c) 2022 UltiMaker B.V. +// Cura is released under the terms of the LGPLv3 or higher. + +import QtQuick 2.10 +import QtQuick.Controls 2.3 +import QtQuick.Layouts 1.3 + +import UM 1.5 as UM +import Cura 1.7 as Cura + +// This ComboBox allows changing of a single setting. Only the setting name has to be passed in to "settingName". +// All of the setting updating logic is handled by this component. +// This uses the "options" value of a setting to populate the drop down. This will only work for settings with "options" +Cura.ComboBox { + textRole: "text" + property alias settingName: propertyProvider.key + + model: ListModel { + id: comboboxModel + + // The propertyProvider has not loaded the setting when this components onComplete triggers. Populating the model + // is defered until propertyProvider signals "onIsValueUsedChanged". + function updateModel() + { + clear() + + if(!propertyProvider.properties.options) // No options have been loaded yet to populate combobox + { + return + } + + for (var i = 0; i < propertyProvider.properties["options"].keys().length; i++) + { + var key = propertyProvider.properties["options"].keys()[i] + var value = propertyProvider.properties["options"][key] + comboboxModel.append({ text: value, code: key}) + + if (propertyProvider.properties.value == key) + { + // The combobox is cleared after each value change so the currentIndex must be set each time. + currentIndex = i + } + } + } + } + + property UM.SettingPropertyProvider propertyProvider: UM.SettingPropertyProvider + { + id: propertyProvider + containerStack: Cura.MachineManager.activeMachine + watchedProperties: [ "value" , "options"] + } + + Connections + { + target: propertyProvider + function onContainerStackChanged() { comboboxModel.updateModel() } + function onIsValueUsedChanged() { comboboxModel.updateModel() } + } + + onCurrentIndexChanged: propertyProvider.setPropertyValue("value", comboboxModel.get(currentIndex).code) +} diff --git a/resources/qml/qmldir b/resources/qml/qmldir index 1a6739f5fb..da90f32145 100644 --- a/resources/qml/qmldir +++ b/resources/qml/qmldir @@ -40,6 +40,7 @@ MenuItem 1.0 MenuItem.qml MenuSeparator 1.0 MenuSeparator.qml ExtruderSelectorBar 1.6 ExtruderSelectorBar.qml ExtruderButton 1.6 ExtruderButton.qml +SingleSettingComboBox 1.7 SingleSettingComboBox.qml # Cura/MachineSettings From 788ab7da1b61d5d002ba35914f57b5cc971d2fc9 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Tue, 29 Nov 2022 16:16:32 +0100 Subject: [PATCH 019/124] Fix broken combobox CURA-9793 --- .../MachineSettings/ComboBoxWithOptions.qml | 37 ++++++++++++++----- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/resources/qml/MachineSettings/ComboBoxWithOptions.qml b/resources/qml/MachineSettings/ComboBoxWithOptions.qml index 4ff7cf7092..9f5f89dde1 100644 --- a/resources/qml/MachineSettings/ComboBoxWithOptions.qml +++ b/resources/qml/MachineSettings/ComboBoxWithOptions.qml @@ -68,20 +68,37 @@ UM.TooltipArea function updateModel() { clear() - // Options come in as a string-representation of an OrderedDict - if(propertyProvider.properties.options) + + if(!propertyProvider.properties.options) { - var options = propertyProvider.properties.options.match(/^OrderedDict\(\[\((.*)\)\]\)$/); - if(options) + return + } + + for (var i = 0; i < propertyProvider.properties["options"].keys().length; i++) + { + var key = propertyProvider.properties["options"].keys()[i] + var value = propertyProvider.properties["options"][key] + append({ text: value, code: key}) + + if (propertyProvider.properties.value == key) { - options = options[1].split("), ("); - for(var i = 0; i < options.length; i++) - { - var option = options[i].substring(1, options[i].length - 1).split("', '"); - append({ text: option[1], value: option[0] }); - } + currentIndex = i } } +// // Options come in as a string-representation of an OrderedDict +// if(propertyProvider.properties.options) +// { +// var options = propertyProvider.properties.options.match(/^OrderedDict\(\[\((.*)\)\]\)$/); +// if(options) +// { +// options = options[1].split("), ("); +// for(var i = 0; i < options.length; i++) +// { +// var option = options[i].substring(1, options[i].length - 1).split("', '"); +// append({ text: option[1], value: option[0] }); +// } +// } +// } } Component.onCompleted: updateModel() From c240833868078fc83866d26115a2f04a888ee8be Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Tue, 29 Nov 2022 16:23:49 +0100 Subject: [PATCH 020/124] Add Support type settings CURA-9793 --- .../Recommended/RecommendedSupportSelector.qml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml index 3ff2cc0501..359de13697 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml @@ -53,6 +53,17 @@ RecommendedSettingSection } contents: [ + RecommendedSettingItem + { + settingName: catalog.i18nc("@action:label", "Support Type") + + settingControl: Cura.SingleSettingComboBox + { + width: parent.width + height: UM.Theme.getSize("combobox").height + settingName: "support_structure" + } + }, RecommendedSettingItem { Layout.preferredHeight: childrenRect.height From c356b9d46f7e20dc92492b6dd3fd81dd650be133 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Tue, 29 Nov 2022 16:59:27 +0100 Subject: [PATCH 021/124] Rename ExtruderSelectorBar -> SingleSettingExtruderSelectorBar to be inline with new single setting widgets. Move common functionality into SingleSettingExtruderSelectorBar Add adhesion settings CURA-9793 --- .../RecommendedAdhesionSelector.qml | 21 +++--- .../RecommendedSupportSelector.qml | 18 +----- resources/qml/Widgets/ExtruderSelectorBar.qml | 43 ------------- .../qml/Widgets/SingleSettingComboBox.qml | 2 +- .../SingleSettingExtruderSelectorBar.qml | 64 +++++++++++++++++++ resources/qml/qmldir | 6 +- 6 files changed, 79 insertions(+), 75 deletions(-) delete mode 100644 resources/qml/Widgets/ExtruderSelectorBar.qml create mode 100644 resources/qml/Widgets/SingleSettingExtruderSelectorBar.qml diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml index 4eaf4f17ce..3ffb71e707 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml @@ -1,10 +1,11 @@ -// Copyright (c) 2022 Ultimaker B.V. +// Copyright (c) 2022 UltiMaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.7 +import QtQuick.Layouts 1.3 import UM 1.5 as UM -import Cura 1.0 as Cura +import Cura 1.7 as Cura RecommendedSettingSection @@ -32,16 +33,12 @@ RecommendedSettingSection curaRecommendedMode.setAdhesion(state) } - contents: RecommendedSettingItem - { - settingName: catalog.i18nc("@action:label", "Print with") - - settingControl: Rectangle + contents: [ + RecommendedSettingItem { - width: 20 - height: 20 - color: Qt.rgba(1, 0, 0, .5) + Layout.preferredHeight: childrenRect.height + settingName: catalog.i18nc("@action:label", "Print with") + settingControl: Cura.SingleSettingExtruderSelectorBar { extruderSettingName: "adhesion_extruder_nr" } } - } - + ] } diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml index 359de13697..2a2ec08c70 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2022 Ultimaker B.V. +// Copyright (c) 2022 UltiMaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 @@ -24,9 +24,6 @@ RecommendedSettingSection supportEnabled.setPropertyValue("value", state) } - property var extruderModel: CuraApplication.getExtrudersModel() - - property UM.SettingPropertyProvider supportEnabled: UM.SettingPropertyProvider { id: supportEnabled @@ -68,19 +65,8 @@ RecommendedSettingSection { Layout.preferredHeight: childrenRect.height settingName: catalog.i18nc("@action:label", "Print with") - settingControl: Cura.ExtruderSelectorBar - { - model: extruderModel - selectedIndex: supportExtruderNr.properties.value !== undefined ? supportExtruderNr.properties.value : 0 - function onClickExtruder(index) - { - forceActiveFocus(); - supportExtruderNr.setPropertyValue("value", index); - } - } - + settingControl: Cura.SingleSettingExtruderSelectorBar { extruderSettingName: "support_extruder_nr" } }, - RecommendedSettingItem { settingName: catalog.i18nc("@action:label", "Placement") diff --git a/resources/qml/Widgets/ExtruderSelectorBar.qml b/resources/qml/Widgets/ExtruderSelectorBar.qml deleted file mode 100644 index 63d9ca9da4..0000000000 --- a/resources/qml/Widgets/ExtruderSelectorBar.qml +++ /dev/null @@ -1,43 +0,0 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.3 - -import UM 1.5 as UM -import Cura 1.5 as Cura - -Row -{ - id: extruderSelectionBar - - width: parent.width - height: childrenRect.height - spacing: 0 - - property alias model: extruderButtonRepeater.model - property int selectedIndex: 0 - function onClickExtruder(index) {} - - - Repeater - { - id: extruderButtonRepeater - - delegate: Item - { - width: { - const maximum_width = Math.floor(extruderSelectionBar.width / extruderButtonRepeater.count); - return Math.min(UM.Theme.getSize("large_button").width, maximum_width); - } - height: childrenRect.height - - Cura.ExtruderButton - { - extruder: model - checked: extruder.index == selectedIndex - iconScale: 0.6 - buttonSize: UM.Theme.getSize("large_button").width - onClicked: extruder.enabled && onClickExtruder(extruder.index) - } - } - } -} diff --git a/resources/qml/Widgets/SingleSettingComboBox.qml b/resources/qml/Widgets/SingleSettingComboBox.qml index c79ff591e8..be0b7782f0 100644 --- a/resources/qml/Widgets/SingleSettingComboBox.qml +++ b/resources/qml/Widgets/SingleSettingComboBox.qml @@ -19,7 +19,7 @@ Cura.ComboBox { id: comboboxModel // The propertyProvider has not loaded the setting when this components onComplete triggers. Populating the model - // is defered until propertyProvider signals "onIsValueUsedChanged". + // is defered until propertyProvider signals "onIsValueUsedChanged". The defered upate is triggered with this function. function updateModel() { clear() diff --git a/resources/qml/Widgets/SingleSettingExtruderSelectorBar.qml b/resources/qml/Widgets/SingleSettingExtruderSelectorBar.qml new file mode 100644 index 0000000000..c42b525f6b --- /dev/null +++ b/resources/qml/Widgets/SingleSettingExtruderSelectorBar.qml @@ -0,0 +1,64 @@ +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Layouts 1.3 + +import UM 1.5 as UM +import Cura 1.5 as Cura + +// This component displays a row of extruder icons, clicking on the extruder will update the setting passed to "settingName" +// with the index of that extruder. +// This will only work for settings that take an extruder index. +Row +{ + id: extruderSelectionBar + + width: parent.width + height: childrenRect.height + spacing: 0 + + property int selectedIndex: extruderSettingProvider.properties.value !== undefined ? extruderSettingProvider.properties.value : 0 + property alias model: extruderButtonRepeater.model + property alias extruderSettingName: extruderSettingProvider.key + property alias containerStack: extruderSettingProvider.containerStack + + property UM.SettingPropertyProvider extruderSettingProvider: UM.SettingPropertyProvider + { + id: extruderSettingProvider + containerStack: Cura.MachineManager.activeMachine + watchedProperties: [ "value" ] + storeIndex: 0 + } + + function onClickExtruder(index) + { + forceActiveFocus(); + extruderSettingProvider.setPropertyValue("value", index); + } + + + Repeater + { + id: extruderButtonRepeater + + model: CuraApplication.getExtrudersModel() + + delegate: Item + { + width: { + // This will "squish" the extruder buttons together when the fill up the horizontal space + const maximum_width = Math.floor(extruderSelectionBar.width / extruderButtonRepeater.count); + return Math.min(UM.Theme.getSize("large_button").width, maximum_width); + } + height: childrenRect.height + + Cura.ExtruderButton + { + extruder: model + checked: extruder.index == selectedIndex + iconScale: 0.6 + buttonSize: UM.Theme.getSize("large_button").width + onClicked: extruder.enabled && onClickExtruder(extruder.index) + } + } + } +} diff --git a/resources/qml/qmldir b/resources/qml/qmldir index da90f32145..4616b8c268 100644 --- a/resources/qml/qmldir +++ b/resources/qml/qmldir @@ -38,9 +38,9 @@ ScrollView 1.0 ScrollView.qml Menu 1.0 Menu.qml MenuItem 1.0 MenuItem.qml MenuSeparator 1.0 MenuSeparator.qml -ExtruderSelectorBar 1.6 ExtruderSelectorBar.qml -ExtruderButton 1.6 ExtruderButton.qml -SingleSettingComboBox 1.7 SingleSettingComboBox.qml +SingleSettingExtruderSelectorBar 1.7 SingleSettingExtruderSelectorBar.qml +ExtruderButton 1.7 ExtruderButton.qml +SingleSettingComboBox 1.7 SingleSettingComboBox.qml # Cura/MachineSettings From 1224f076c3971ca83b57037f21e501cee656cec1 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Tue, 29 Nov 2022 17:20:34 +0100 Subject: [PATCH 022/124] Fix switch alignment CURA-9793 --- .../Recommended/RecommendedSettingSection.qml | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml index ac0c7fbccf..71c34737f5 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml @@ -48,16 +48,6 @@ Item font: UM.Theme.getFont("medium_bold") } - UM.Switch - { - id: enableSectionSwitch - anchors.left: sectionTitle.right - anchors.verticalCenter: parent.verticalCenter - visible: false - - onClicked: onEnableSectionChanged(enableSectionSwitch.checked) - } - MouseArea { id: tooltipMouseArea @@ -71,6 +61,18 @@ Item } + UM.Switch + { + id: enableSectionSwitch + anchors.left: parent.left + // These numbers come from the IconWithText in RecommendedSettingSection. + anchors.leftMargin: leftColumnWidth + UM.Theme.getSize("medium_button_icon").width + UM.Theme.getSize("thick_margin").width - (2 * UM.Theme.getSize("thick_lining").width) + anchors.verticalCenter: sectionHeader.verticalCenter + visible: false + + onClicked: onEnableSectionChanged(enableSectionSwitch.checked) + } + ColumnLayout { id: settingColumn From f99f1a4528aedddbb081e5c40a04595f7dc77106 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Tue, 29 Nov 2022 17:49:26 +0100 Subject: [PATCH 023/124] Stop logging spam by checking before setting property. CURA-9793 --- resources/qml/Widgets/SingleSettingComboBox.qml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/resources/qml/Widgets/SingleSettingComboBox.qml b/resources/qml/Widgets/SingleSettingComboBox.qml index be0b7782f0..f0c43c31f7 100644 --- a/resources/qml/Widgets/SingleSettingComboBox.qml +++ b/resources/qml/Widgets/SingleSettingComboBox.qml @@ -58,5 +58,11 @@ Cura.ComboBox { function onIsValueUsedChanged() { comboboxModel.updateModel() } } - onCurrentIndexChanged: propertyProvider.setPropertyValue("value", comboboxModel.get(currentIndex).code) + onCurrentIndexChanged: + { + if (comboboxModel.get(currentIndex) && comboboxModel.get(currentIndex).code) + { + propertyProvider.setPropertyValue("value", comboboxModel.get(currentIndex).code) + } + } } From 7ba02811360abd5e03eb49356b5a182c687f034c Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Tue, 29 Nov 2022 17:50:40 +0100 Subject: [PATCH 024/124] Move required settingPropertyProvider into InfillSlider. Use new RecommendedSetting components for Strength section of recommended. CURA-9793 --- .../Recommended/InfillSlider.qml | 13 +- .../Recommended/RecommendedPrintSetup.qml | 2 - .../Recommended/RecommendedSettingItem.qml | 1 + .../RecommendedStrengthSelector.qml | 119 ++++-------------- .../cura-light/icons/default/Hammer.svg | 8 ++ 5 files changed, 45 insertions(+), 98 deletions(-) create mode 100644 resources/themes/cura-light/icons/default/Hammer.svg diff --git a/resources/qml/PrintSetupSelector/Recommended/InfillSlider.qml b/resources/qml/PrintSetupSelector/Recommended/InfillSlider.qml index 6cde19c2a9..4cc80a835f 100644 --- a/resources/qml/PrintSetupSelector/Recommended/InfillSlider.qml +++ b/resources/qml/PrintSetupSelector/Recommended/InfillSlider.qml @@ -15,9 +15,18 @@ RowLayout anchors { - left: infillRowTitle.right + left: strengthSection.right right: parent.right - verticalCenter: infillRowTitle.verticalCenter + verticalCenter: strengthSection.verticalCenter + } + + UM.SettingPropertyProvider + { + id: infillDensity + containerStackId: Cura.MachineManager.activeStackId + key: "infill_sparse_density" + watchedProperties: [ "value" ] + storeIndex: 0 } UM.Label { Layout.fillWidth: false; text: "0" } diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml index cf8e9e4e2a..7e25785c74 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml @@ -86,9 +86,7 @@ Item RecommendedStrengthSelector { width: parent.width - labelColumnWidth: parent.firstColumnWidth Layout.fillWidth: true - Layout.rightMargin: UM.Theme.getSize("default_margin").width } RecommendedSupportSelector diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml index ec777b13d6..87a95a12e8 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml @@ -18,6 +18,7 @@ Item property alias settingControl: settingContainer.children property alias settingName: settingLabel.text + property string tooltipText: "" UM.Label { diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml index be4b0dbf0b..82fcd64bb9 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml @@ -5,108 +5,39 @@ import QtQuick 2.7 import QtQuick.Controls 2.15 import UM 1.5 as UM -import Cura 1.0 as Cura +import Cura 1.7 as Cura -// -// Infill -// -Item +RecommendedSettingSection { - id: infillRow - height: childrenRect.height + id: strengthSection - property real labelColumnWidth: Math.round(width / 3) + title: catalog.i18nc("@label", "Strength") + icon: UM.Theme.getIcon("Hammer") + enableSectionVisible: false + enableSectionEnabled: false - // Here are the elements that are shown in the left column - Cura.IconWithText - { - id: infillRowTitle - anchors.top: parent.top - anchors.left: parent.left - source: UM.Theme.getIcon("Infill1") - text: `${catalog.i18nc("@label", "Infill")} (%)` - font: UM.Theme.getFont("medium") - width: labelColumnWidth - iconSize: UM.Theme.getSize("medium_button_icon").width - tooltipText: catalog.i18nc("@label", "Gradual infill will gradually increase the amount of infill towards the top.") - } - - InfillSlider - { - id: infillSliderContainer - height: childrenRect.height - } - - // Gradual Support Infill Checkbox - UM.CheckBox - { - id: enableGradualInfillCheckBox - property alias _hovered: enableGradualInfillMouseArea.containsMouse - - anchors.top: infillSliderContainer.bottom - anchors.topMargin: UM.Theme.getSize("default_margin").height - anchors.left: infillSliderContainer.left - - text: catalog.i18nc("@label", "Gradual infill") - enabled: recommendedPrintSetup.settingsEnabled - visible: infillSteps.properties.enabled == "True" - checked: parseInt(infillSteps.properties.value) > 0 - - MouseArea + contents: [ + RecommendedSettingItem { - id: enableGradualInfillMouseArea - - anchors.fill: parent - hoverEnabled: true - enabled: true - - property var previousInfillDensity: parseInt(infillDensity.properties.value) - - onClicked: + settingName: catalog.i18nc("@action:label", "Infill Density") + tooltipText: catalog.i18nc("@label", "Gradual infill will gradually increase the amount of infill towards the top.") + settingControl: InfillSlider { - // Set to 90% only when enabling gradual infill - var newInfillDensity; - if (parseInt(infillSteps.properties.value) == 0) - { - previousInfillDensity = parseInt(infillDensity.properties.value) - newInfillDensity = 90 - } else { - newInfillDensity = previousInfillDensity - } - Cura.MachineManager.setSettingForAllExtruders("infill_sparse_density", "value", String(newInfillDensity)) - - var infill_steps_value = 0 - if (parseInt(infillSteps.properties.value) == 0) - { - infill_steps_value = 5 - } - - Cura.MachineManager.setSettingForAllExtruders("gradual_infill_steps", "value", infill_steps_value) + height: UM.Theme.getSize("combobox").height + width: parent.width } + }, + RecommendedSettingItem + { + settingName: catalog.i18nc("@action:label", "Infill Pattern") - onEntered: base.showTooltip(enableGradualInfillCheckBox, Qt.point(-infillSliderContainer.x - UM.Theme.getSize("thick_margin").width, 0), - catalog.i18nc("@label", "Gradual infill will gradually increase the amount of infill towards the top.")) - - onExited: base.hideTooltip() + settingControl: Cura.SingleSettingComboBox + { + width: parent.width + height: UM.Theme.getSize("combobox").height + settingName: "infill_pattern" + } } - } - - UM.SettingPropertyProvider - { - id: infillDensity - containerStackId: Cura.MachineManager.activeStackId - key: "infill_sparse_density" - watchedProperties: [ "value" ] - storeIndex: 0 - } - - UM.SettingPropertyProvider - { - id: infillSteps - containerStackId: Cura.MachineManager.activeStackId - key: "gradual_infill_steps" - watchedProperties: ["value", "enabled"] - storeIndex: 0 - } + ] } diff --git a/resources/themes/cura-light/icons/default/Hammer.svg b/resources/themes/cura-light/icons/default/Hammer.svg new file mode 100644 index 0000000000..62823682be --- /dev/null +++ b/resources/themes/cura-light/icons/default/Hammer.svg @@ -0,0 +1,8 @@ + + + + + From 69af593d8c26e8e6f2407149f2234a17f4e71a17 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Wed, 30 Nov 2022 11:45:27 +0100 Subject: [PATCH 025/124] Make Slider generic component in UM. Make Infill slider into generic SingleSettinSlider which will work for any setting now. Change slider theme slighly. CURA-9793 --- .../Recommended/InfillSlider.qml | 145 ------------------ .../Recommended/RecommendedSettingSection.qml | 2 +- .../RecommendedStrengthSelector.qml | 21 ++- resources/qml/Widgets/SingleSettingSlider.qml | 109 +++++++++++++ resources/qml/qmldir | 1 + resources/themes/cura-light/theme.json | 2 +- 6 files changed, 132 insertions(+), 148 deletions(-) delete mode 100644 resources/qml/PrintSetupSelector/Recommended/InfillSlider.qml create mode 100644 resources/qml/Widgets/SingleSettingSlider.qml diff --git a/resources/qml/PrintSetupSelector/Recommended/InfillSlider.qml b/resources/qml/PrintSetupSelector/Recommended/InfillSlider.qml deleted file mode 100644 index 4cc80a835f..0000000000 --- a/resources/qml/PrintSetupSelector/Recommended/InfillSlider.qml +++ /dev/null @@ -1,145 +0,0 @@ -// Copyright (c) 2022 UltiMaker -// Cura is released under the terms of the LGPLv3 or higher. - -import QtQuick 2.7 -import QtQuick.Controls 2.15 - -import UM 1.5 as UM -import Cura 1.0 as Cura -import QtQuick.Layouts 1.3 - -RowLayout -{ - height: childrenRect.height - spacing: UM.Theme.getSize("default_margin").width - - anchors - { - left: strengthSection.right - right: parent.right - verticalCenter: strengthSection.verticalCenter - } - - UM.SettingPropertyProvider - { - id: infillDensity - containerStackId: Cura.MachineManager.activeStackId - key: "infill_sparse_density" - watchedProperties: [ "value" ] - storeIndex: 0 - } - - UM.Label { Layout.fillWidth: false; text: "0" } - - Slider - { - id: infillSlider - Layout.fillWidth: true - - width: parent.width - - from: 0; to: 100; stepSize: 1 - - // disable slider when gradual support is enabled - enabled: parseInt(infillSteps.properties.value) == 0 - - // set initial value from stack - value: parseInt(infillDensity.properties.value) - - //Draw line - background: Rectangle - { - id: backgroundLine - height: UM.Theme.getSize("print_setup_slider_groove").height - width: parent.width - UM.Theme.getSize("print_setup_slider_handle").width - anchors.horizontalCenter: parent.horizontalCenter - anchors.verticalCenter: parent.verticalCenter - color: UM.Theme.getColor("lining") - - Repeater - { - id: repeater - anchors.fill: parent - model: 11 - - Rectangle - { - color: UM.Theme.getColor("lining") - implicitWidth: UM.Theme.getSize("print_setup_slider_tickmarks").width - implicitHeight: UM.Theme.getSize("print_setup_slider_tickmarks").height - anchors.verticalCenter: parent.verticalCenter - - x: Math.round(backgroundLine.width / (repeater.count - 1) * index - width / 2) - - radius: Math.round(width / 2) - } - } - } - - handle: Rectangle - { - id: handleButton - x: infillSlider.leftPadding + infillSlider.visualPosition * (infillSlider.availableWidth - width) - anchors.verticalCenter: parent.verticalCenter - implicitWidth: UM.Theme.getSize("print_setup_slider_handle").width - implicitHeight: UM.Theme.getSize("print_setup_slider_handle").height - radius: Math.round(width / 2) - color: UM.Theme.getColor("main_background") - border.color: UM.Theme.getColor("primary") - border.width: UM.Theme.getSize("wide_lining").height - } - - UM.PointingRectangle - { - arrowSize: UM.Theme.getSize("button_tooltip_arrow").width - width: childrenRect.width - height: childrenRect.height - target: Qt.point(handleButton.x + handleButton.width / 2, handleButton.y + handleButton.height / 2) - x: handleButton.x + Math.round((handleButton.width - width) / 2) - y: handleButton.y - height - UM.Theme.getSize("button_tooltip_arrow").height - UM.Theme.getSize("narrow_margin").height - color: UM.Theme.getColor("tooltip"); - - UM.Label - { - text: `${infillSlider.value}%` - horizontalAlignment: TextInput.AlignHCenter - leftPadding: UM.Theme.getSize("narrow_margin").width - rightPadding: UM.Theme.getSize("narrow_margin").width - color: UM.Theme.getColor("tooltip_text"); - } - } - - Connections - { - target: infillSlider - function onValueChanged() - { - // Work around, the `infillDensity.properties.value` is initially `undefined`. As - // `parseInt(infillDensity.properties.value)` is parsed as 0 and is initially set as - // the slider value. By setting this 0 value an update is triggered setting the actual - // infill value to 0. - if (isNaN(parseInt(infillDensity.properties.value))) - { - return; - } - - // Don't update if the setting value, if the slider has the same value - if (parseInt(infillDensity.properties.value) == infillSlider.value) - { - return; - } - - // Round the slider value to the nearest multiple of 10 (simulate step size of 10) - const roundedSliderValue = Math.round(infillSlider.value / 10) * 10; - - // Update the slider value to represent the rounded value - infillSlider.value = roundedSliderValue; - - Cura.MachineManager.setSettingForAllExtruders("infill_sparse_density", "value", roundedSliderValue) - Cura.MachineManager.resetSettingForAllExtruders("infill_line_distance") - } - } - } - - UM.Label { Layout.fillWidth: false; text: "100" } -} diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml index 71c34737f5..ac4abf4a3e 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml @@ -5,7 +5,7 @@ import QtQuick 2.10 import QtQuick.Controls 2.3 import QtQuick.Layouts 2.10 -import UM 1.6 as UM +import UM 1.7 as UM import Cura 1.7 as Cura Item diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml index 82fcd64bb9..e0136401ad 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml @@ -17,15 +17,34 @@ RecommendedSettingSection enableSectionVisible: false enableSectionEnabled: false + UM.SettingPropertyProvider + { + id: infillSteps + containerStackId: Cura.MachineManager.activeStackId + key: "gradual_infill_steps" + watchedProperties: ["value", "enabled"] + storeIndex: 0 + } + contents: [ RecommendedSettingItem { settingName: catalog.i18nc("@action:label", "Infill Density") tooltipText: catalog.i18nc("@label", "Gradual infill will gradually increase the amount of infill towards the top.") - settingControl: InfillSlider + settingControl: Cura.SingleSettingSlider { height: UM.Theme.getSize("combobox").height width: parent.width + settingName: "infill_sparse_density" + roundToNearestTen: true + // disable slider when gradual support is enabled + enabled: parseInt(infillSteps.properties.value) == 0 + + function updateSetting(value) + { + Cura.MachineManager.setSettingForAllExtruders("infill_sparse_density", "value", value) + Cura.MachineManager.resetSettingForAllExtruders("infill_line_distance") + } } }, RecommendedSettingItem diff --git a/resources/qml/Widgets/SingleSettingSlider.qml b/resources/qml/Widgets/SingleSettingSlider.qml new file mode 100644 index 0000000000..d1df835e58 --- /dev/null +++ b/resources/qml/Widgets/SingleSettingSlider.qml @@ -0,0 +1,109 @@ +// Copyright (c) 2022 UltiMaker +// Cura is released under the terms of the LGPLv3 or higher. + +import QtQuick 2.7 +import QtQuick.Controls 2.15 + +import UM 1.7 as UM +import Cura 1.7 as Cura +import QtQuick.Layouts 1.3 + +RowLayout +{ + height: childrenRect.height + spacing: UM.Theme.getSize("default_margin").width + + property alias settingName: settingPropertyProvider.key + property alias enabled: settingSlider.enabled + + property bool roundToNearestTen: false + property int maxValue: 100 + property int minValue: 0 + + anchors + { + left: strengthSection.right + right: parent.right + verticalCenter: strengthSection.verticalCenter + } + + UM.SettingPropertyProvider + { + id: settingPropertyProvider + containerStackId: Cura.MachineManager.activeStackId + watchedProperties: [ "value" ] + storeIndex: 0 + + } + + UM.Label { Layout.fillWidth: false; text: minValue } + + UM.Slider + { + id: settingSlider + Layout.fillWidth: true + + width: parent.width + + from: minValue; to: maxValue; stepSize: 1 + + // set initial value from stack + value: parseInt(settingPropertyProvider.properties.value) + + // When the slider is released trigger an update immediately. This forces the slider to snap to the rounded value. + onPressedChanged: if(!pressed) { parseValueUpdateSetting() } + } + + UM.Label { Layout.fillWidth: false; text: maxValue } + + Connections + { + target: settingPropertyProvider + function onContainerStackChanged() { updateTimer.restart() } + function onIsValueUsedChanged() { updateTimer.restart() } + } + + // Updates to the setting are delayed by interval. This stops lag caused by calling the + // parseValueUpdateSetting() function being call repeatedly while dragging the slider. + Timer + { + id: updateTimer + interval: 100 + repeat: false + onTriggered: + { + parseValueUpdateSetting() + } + } + + function parseValueUpdateSetting() + { + // Work around, the `settingPropertyProvider.properties.value` is initially `undefined`. As + // `parseInt(settingPropertyProvider.properties.value)` is parsed as 0 and is initially set as + // the slider value. By setting this 0 value an update is triggered setting the actual + // sitting value to 0. + if (isNaN(parseInt(settingPropertyProvider.properties.value))) + { + return; + } + + // Don't update if the setting value, if the slider has the same value + if (parseInt(settingPropertyProvider.properties.value) == settingSlider.value) + { + return; + } + + // Round the slider value to the nearest multiple of 10 (simulate step size of 10) + const roundedSliderValue = roundToNearestTen ? Math.round(settingSlider.value / 10) * 10 : Math.round(settingSlider.value) + + // Update the slider value to represent the rounded value + settingSlider.value = roundedSliderValue; + + updateSetting(roundedSliderValue); + } + + // Override this function to update a setting differently + function updateSetting(value) { + propertyProvider.setPropertyValue("value", value) + } +} diff --git a/resources/qml/qmldir b/resources/qml/qmldir index 4616b8c268..dd594d8583 100644 --- a/resources/qml/qmldir +++ b/resources/qml/qmldir @@ -41,6 +41,7 @@ MenuSeparator 1.0 MenuSeparator.qml SingleSettingExtruderSelectorBar 1.7 SingleSettingExtruderSelectorBar.qml ExtruderButton 1.7 ExtruderButton.qml SingleSettingComboBox 1.7 SingleSettingComboBox.qml +SingleSettingSlider 1.7 SingleSettingSlider.qml # Cura/MachineSettings diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index d1ba93bef1..45db2670d1 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -492,7 +492,7 @@ "print_setup_extruder_box": [0.0, 6.0], "print_setup_slider_groove": [0.16, 0.16], "print_setup_slider_handle": [1.3, 1.3], - "print_setup_slider_tickmarks": [0.5, 0.5], + "print_setup_slider_tickmarks": [0.3, 0.3], "print_setup_big_item": [28, 2.5], "print_setup_icon": [1.2, 1.2], "drag_icon": [1.416, 0.25], From 4f8943412f1e4ea6b5d217272a54b9c8b0aebca2 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Wed, 30 Nov 2022 12:10:50 +0100 Subject: [PATCH 026/124] Remove unused anchors CURA-9793 --- resources/qml/Widgets/SingleSettingSlider.qml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/resources/qml/Widgets/SingleSettingSlider.qml b/resources/qml/Widgets/SingleSettingSlider.qml index d1df835e58..8baccfefe7 100644 --- a/resources/qml/Widgets/SingleSettingSlider.qml +++ b/resources/qml/Widgets/SingleSettingSlider.qml @@ -20,13 +20,6 @@ RowLayout property int maxValue: 100 property int minValue: 0 - anchors - { - left: strengthSection.right - right: parent.right - verticalCenter: strengthSection.verticalCenter - } - UM.SettingPropertyProvider { id: settingPropertyProvider From dbf27a432f6aa8d77a567aabd31e7ff9f1a74c11 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Wed, 30 Nov 2022 12:12:41 +0100 Subject: [PATCH 027/124] Change confusing naming of section enable switch. CURA-9793 --- .../Recommended/RecommendedAdhesionSelector.qml | 6 +++--- .../Recommended/RecommendedSettingSection.qml | 6 +++--- .../Recommended/RecommendedStrengthSelector.qml | 4 ++-- .../Recommended/RecommendedSupportSelector.qml | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml index 3ffb71e707..b73faa543f 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml @@ -14,9 +14,9 @@ RecommendedSettingSection title: catalog.i18nc("@label", "Adhesion") icon: UM.Theme.getIcon("Adhesion") - enableSectionVisible: platformAdhesionType.properties.enabled == "True" - enableSectionChecked: platformAdhesionType.properties.value != "skirt" && platformAdhesionType.properties.value != "none" - enableSectionEnabled: recommendedPrintSetup.settingsEnabled + enableSectionSwitchVisible: platformAdhesionType.properties.enabled == "True" + enableSectionSwitchChecked: platformAdhesionType.properties.value != "skirt" && platformAdhesionType.properties.value != "none" + enableSectionSwitchEnabled: recommendedPrintSetup.settingsEnabled property var curaRecommendedMode: Cura.RecommendedMode {} diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml index ac4abf4a3e..81cba57d0e 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml @@ -13,9 +13,9 @@ Item property alias title: sectionTitle.text property alias icon: sectionTitle.source - property alias enableSectionVisible: enableSectionSwitch.visible - property alias enableSectionChecked: enableSectionSwitch.checked - property alias enableSectionEnabled: enableSectionSwitch.enabled + property alias enableSectionSwitchVisible: enableSectionSwitch.visible + property alias enableSectionSwitchChecked: enableSectionSwitch.checked + property alias enableSectionSwitchEnabled: enableSectionSwitch.enabled property var enableSectionClicked: { return } property int leftColumnWidth: Math.floor(width * 0.35) property var toolTipText: "" diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml index e0136401ad..a80d735f59 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml @@ -14,8 +14,8 @@ RecommendedSettingSection title: catalog.i18nc("@label", "Strength") icon: UM.Theme.getIcon("Hammer") - enableSectionVisible: false - enableSectionEnabled: false + enableSectionSwitchVisible: false + enableSectionSwitchEnabled: false UM.SettingPropertyProvider { diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml index 2a2ec08c70..119be2c37e 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml @@ -15,9 +15,9 @@ RecommendedSettingSection title: catalog.i18nc("@label", "Support") icon: UM.Theme.getIcon("Support") - enableSectionVisible: supportEnabled.properties.enabled == "True" - enableSectionChecked: supportEnabled.properties.value == "True" - enableSectionEnabled: recommendedPrintSetup.settingsEnabled + enableSectionSwitchVisible: supportEnabled.properties.enabled == "True" + enableSectionSwitchChecked: supportEnabled.properties.value == "True" + enableSectionSwitchEnabled: recommendedPrintSetup.settingsEnabled toolTipText: catalog.i18nc("@label", "Generate structures to support parts of the model which have overhangs. Without these structures, such parts would collapse during printing.") function onEnableSectionChanged(state) { From 75721f467b2e46081906ba5090b949b2026b2367 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Wed, 30 Nov 2022 14:41:19 +0100 Subject: [PATCH 028/124] Remove margins and padding and scale icon better. CURA-9793 --- resources/qml/Widgets/SingleSettingExtruderSelectorBar.qml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/resources/qml/Widgets/SingleSettingExtruderSelectorBar.qml b/resources/qml/Widgets/SingleSettingExtruderSelectorBar.qml index c42b525f6b..c4045b57f0 100644 --- a/resources/qml/Widgets/SingleSettingExtruderSelectorBar.qml +++ b/resources/qml/Widgets/SingleSettingExtruderSelectorBar.qml @@ -53,10 +53,12 @@ Row Cura.ExtruderButton { + anchors.margins : 0 + padding: 0 extruder: model checked: extruder.index == selectedIndex - iconScale: 0.6 - buttonSize: UM.Theme.getSize("large_button").width + iconScale: 0.8 + buttonSize: UM.Theme.getSize("small_button").width onClicked: extruder.enabled && onClickExtruder(extruder.index) } } From e8ba3695b3629f8599cf472988f63c01b1c18284 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Wed, 30 Nov 2022 14:41:35 +0100 Subject: [PATCH 029/124] Swap out svg for clean export CURA-9793 --- resources/themes/cura-light/icons/default/Hammer.svg | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/resources/themes/cura-light/icons/default/Hammer.svg b/resources/themes/cura-light/icons/default/Hammer.svg index 62823682be..4fd6cd9ce9 100644 --- a/resources/themes/cura-light/icons/default/Hammer.svg +++ b/resources/themes/cura-light/icons/default/Hammer.svg @@ -1,8 +1,3 @@ - - - - + + From 0514c62b3ebaeab0244126b267dfe1b727970601 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Wed, 30 Nov 2022 14:51:45 +0100 Subject: [PATCH 030/124] Remove bad height assignment to dynamic layout CURA-9793 --- .../Recommended/RecommendedSettingSection.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml index 81cba57d0e..e270a31203 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml @@ -77,7 +77,7 @@ Item { id: settingColumn width: parent.width - height: childrenRect.height + spacing: 0 anchors.left: parent.left anchors.right: parent.right anchors.top: sectionHeader.bottom From 680a86c896e229238e4b37a3c89bfe3664a94ae7 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Wed, 30 Nov 2022 15:08:06 +0100 Subject: [PATCH 031/124] Add default height to combobox, not sure why this was never set before. CURA-9793 --- resources/qml/Widgets/ComboBox.qml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/qml/Widgets/ComboBox.qml b/resources/qml/Widgets/ComboBox.qml index efe14497bc..912403a33e 100644 --- a/resources/qml/Widgets/ComboBox.qml +++ b/resources/qml/Widgets/ComboBox.qml @@ -25,6 +25,8 @@ ComboBox enabled: delegateModel.count > 0 + height: UM.Theme.getSize("combobox").height + onVisibleChanged: { popup.close() } states: [ From dbf2ae4f6042cc9511d81b1676f5d5a27062a32b Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Wed, 30 Nov 2022 15:09:05 +0100 Subject: [PATCH 032/124] Fix spacing vertical between Recommended sections and setting items. CURA-9793 --- .../Recommended/RecommendedPrintSetup.qml | 39 ++++++++++--------- .../Recommended/RecommendedSettingSection.qml | 6 ++- .../RecommendedStrengthSelector.qml | 1 - .../RecommendedSupportSelector.qml | 2 - resources/themes/cura-light/theme.json | 2 + 5 files changed, 28 insertions(+), 22 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml index 7e25785c74..d369d3ef2c 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml @@ -76,28 +76,31 @@ Item Layout.fillWidth: true color: UM.Theme.getColor("lining") } - - UM.Label + ColumnLayout { - text: catalog.i18nc("@label", "Print settings") - font: UM.Theme.getFont("medium") - } + spacing: UM.Theme.getSize("thin_margin").height + UM.Label + { + text: catalog.i18nc("@label", "Reccomended print settings") + font: UM.Theme.getFont("medium") + } - RecommendedStrengthSelector - { - width: parent.width - Layout.fillWidth: true - } + RecommendedStrengthSelector + { + width: parent.width + Layout.fillWidth: true + } - RecommendedSupportSelector - { - width: parent.width - Layout.fillWidth: true - } + RecommendedSupportSelector + { + width: parent.width + Layout.fillWidth: true + } - RecommendedAdhesionSelector { - width: parent.width - Layout.fillWidth: true + RecommendedAdhesionSelector { + width: parent.width + Layout.fillWidth: true + } } } diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml index e270a31203..0f63a4e2e5 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml @@ -77,9 +77,13 @@ Item { id: settingColumn width: parent.width - spacing: 0 + spacing: UM.Theme.getSize("thin_margin").height anchors.left: parent.left anchors.right: parent.right anchors.top: sectionHeader.bottom + anchors.topMargin: UM.Theme.getSize("narrow_margin").height + + Layout.preferredHeight: UM.Theme.getSize("recommended_section_setting_item").height + } } \ No newline at end of file diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml index a80d735f59..144f78d19e 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml @@ -54,7 +54,6 @@ RecommendedSettingSection settingControl: Cura.SingleSettingComboBox { width: parent.width - height: UM.Theme.getSize("combobox").height settingName: "infill_pattern" } } diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml index 119be2c37e..7396f95590 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml @@ -57,7 +57,6 @@ RecommendedSettingSection settingControl: Cura.SingleSettingComboBox { width: parent.width - height: UM.Theme.getSize("combobox").height settingName: "support_structure" } }, @@ -74,7 +73,6 @@ RecommendedSettingSection settingControl: Cura.SingleSettingComboBox { width: parent.width - height: UM.Theme.getSize("combobox").height settingName: "support_type" } } diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 45db2670d1..8ddb29c45d 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -653,6 +653,8 @@ "recommended_button_icon": [1.7, 1.7], + "recommended_section_setting_item": [14.0, 2.0], + "reset_profile_icon": [1, 1] } } From b356335f4f35af557222b4b752a36bee1490d094 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Wed, 30 Nov 2022 15:10:19 +0100 Subject: [PATCH 033/124] Correct spelling mistake CURA-9793 --- .../PrintSetupSelector/Recommended/RecommendedPrintSetup.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml index d369d3ef2c..5be35f692c 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml @@ -81,7 +81,7 @@ Item spacing: UM.Theme.getSize("thin_margin").height UM.Label { - text: catalog.i18nc("@label", "Reccomended print settings") + text: catalog.i18nc("@label", "Recommended print settings") font: UM.Theme.getFont("medium") } From 6338085999ede6c8258abaddd3fee91c4bf34ec9 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Wed, 30 Nov 2022 15:11:45 +0100 Subject: [PATCH 034/124] Remove unused fill CURA-9793 --- resources/themes/cura-light/icons/default/Hammer.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/themes/cura-light/icons/default/Hammer.svg b/resources/themes/cura-light/icons/default/Hammer.svg index 4fd6cd9ce9..38b2b6a141 100644 --- a/resources/themes/cura-light/icons/default/Hammer.svg +++ b/resources/themes/cura-light/icons/default/Hammer.svg @@ -1,3 +1,3 @@ - + From d617566db4e2d2bd26378de01426673eb51ccb3a Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Wed, 30 Nov 2022 15:36:15 +0100 Subject: [PATCH 035/124] Move show custom button next to setting section title. CURA-9793 --- .../PrintSetupSelectorContents.qml | 30 +++++++------------ .../Recommended/RecommendedPrintSetup.qml | 25 ++++++++++++++-- 2 files changed, 32 insertions(+), 23 deletions(-) diff --git a/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml b/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml index e53aa693e1..92f0b1d5be 100644 --- a/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml +++ b/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml @@ -67,6 +67,8 @@ Item top: parent.top } visible: currentModeIndex == PrintSetupSelectorContents.Mode.Recommended + + function onModeChanged() { currentModeIndex = PrintSetupSelectorContents.Mode.Custom } } CustomPrintSetup @@ -116,13 +118,20 @@ Item width: parent.width height: UM.Theme.getSize("default_lining").height color: UM.Theme.getColor("lining") + visible: currentModeIndex == PrintSetupSelectorContents.Mode.Custom } Item { id: buttonRow property real padding: UM.Theme.getSize("default_margin").width - height: recommendedButton.height + 2 * padding + (draggableArea.visible ? draggableArea.height : 0) + height: { + if (currentModeIndex == PrintSetupSelectorContents.Mode.Custom) + { + return recommendedButton.height + 2 * padding + (draggableArea.visible ? draggableArea.height : 0) + } + return 0 + } anchors { @@ -145,25 +154,6 @@ Item onClicked: currentModeIndex = PrintSetupSelectorContents.Mode.Recommended } - Cura.SecondaryButton - { - id: customSettingsButton - anchors.top: parent.top - anchors.right: parent.right - anchors.margins: UM.Theme.getSize("default_margin").width - leftPadding: UM.Theme.getSize("default_margin").width - rightPadding: UM.Theme.getSize("default_margin").width - text: catalog.i18nc("@button", "Custom") - iconSource: UM.Theme.getIcon("ChevronSingleRight") - isIconOnRightSide: true - visible: currentModeIndex == PrintSetupSelectorContents.Mode.Recommended - onClicked: - { - currentModeIndex = PrintSetupSelectorContents.Mode.Custom - updateDragPosition(); - } - } - //Invisible area at the bottom with which you can resize the panel. MouseArea { diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml index 5be35f692c..f6edf88495 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml @@ -16,6 +16,8 @@ Item property bool settingsEnabled: Cura.ExtruderManager.activeExtruderStackId || extrudersEnabledCount.properties.value == 1 property real padding: UM.Theme.getSize("default_margin").width + function onModeChanged() {} + ColumnLayout { spacing: UM.Theme.getSize("default_margin").height @@ -79,10 +81,27 @@ Item ColumnLayout { spacing: UM.Theme.getSize("thin_margin").height - UM.Label + + RowLayout { - text: catalog.i18nc("@label", "Recommended print settings") - font: UM.Theme.getFont("medium") + UM.Label + { + text: catalog.i18nc("@label", "Recommended print settings") + font: UM.Theme.getFont("medium") + } + + Item { Layout.fillWidth: true } // Spacer + + Cura.SecondaryButton + { + id: customSettingsButton + anchors.top: parent.top + anchors.right: parent.right + text: catalog.i18nc("@button", "Show Custom") + textFont: UM.Theme.getFont("medium_bold") + outlineColor: "transparent" + onClicked: onModeChanged() + } } RecommendedStrengthSelector From 522bf60e81bc0c8a029371007ffbe72499b2c57a Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Wed, 30 Nov 2022 15:43:14 +0100 Subject: [PATCH 036/124] Adjust left margins CURA-9793 --- .../Recommended/RecommendedSettingItem.qml | 2 +- .../Recommended/RecommendedSettingSection.qml | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml index 87a95a12e8..587ce3ed77 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml @@ -27,7 +27,7 @@ Item anchors.left: parent.left anchors.verticalCenter: parent.verticalCenter // These numbers come from the IconWithText in RecommendedSettingSection - anchors.leftMargin: UM.Theme.getSize("medium_button_icon").width + UM.Theme.getSize("thick_margin").width - UM.Theme.getSize("thick_lining").width + anchors.leftMargin: UM.Theme.getSize("medium_button_icon").width + UM.Theme.getSize("default_margin").width } diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml index 0f63a4e2e5..c202381326 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml @@ -40,9 +40,8 @@ Item width: leftColumnWidth anchors.left: parent.left anchors.verticalCenter: parent.verticalCenter - anchors.leftMargin: - UM.Theme.getSize("thick_lining").width source: UM.Theme.getIcon("PrintQuality") - spacing: UM.Theme.getSize("thick_margin").width + spacing: UM.Theme.getSize("default_margin").width iconSize: UM.Theme.getSize("medium_button_icon").width iconColor: UM.Theme.getColor("text") font: UM.Theme.getFont("medium_bold") @@ -66,7 +65,7 @@ Item id: enableSectionSwitch anchors.left: parent.left // These numbers come from the IconWithText in RecommendedSettingSection. - anchors.leftMargin: leftColumnWidth + UM.Theme.getSize("medium_button_icon").width + UM.Theme.getSize("thick_margin").width - (2 * UM.Theme.getSize("thick_lining").width) + anchors.leftMargin: leftColumnWidth + UM.Theme.getSize("medium_button_icon").width + UM.Theme.getSize("default_margin").width anchors.verticalCenter: sectionHeader.verticalCenter visible: false From 487bf41a7b34b49f4ddf01ec6d8e4ad51fabffdb Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Wed, 30 Nov 2022 16:55:04 +0100 Subject: [PATCH 037/124] Add validators to project. CURA-9793 --- resources/qml/ColorDialog.qml | 2 +- resources/qml/Validators/DoubleValidator.qml | 15 +++++++++++++++ resources/qml/Validators/HexColorValidator.qml | 8 ++++++++ resources/qml/qmldir | 4 ++++ 4 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 resources/qml/Validators/DoubleValidator.qml create mode 100644 resources/qml/Validators/HexColorValidator.qml diff --git a/resources/qml/ColorDialog.qml b/resources/qml/ColorDialog.qml index e5216a3404..94416d77d2 100644 --- a/resources/qml/ColorDialog.qml +++ b/resources/qml/ColorDialog.qml @@ -119,7 +119,7 @@ UM.Dialog text = `#${text}`; } } - validator: RegularExpressionValidator { regularExpression: /^#([a-fA-F0-9]{0,6})$/ } + validator: Cura.HexColorValidator {} } Rectangle diff --git a/resources/qml/Validators/DoubleValidator.qml b/resources/qml/Validators/DoubleValidator.qml new file mode 100644 index 0000000000..dc92dbd1ae --- /dev/null +++ b/resources/qml/Validators/DoubleValidator.qml @@ -0,0 +1,15 @@ +// Copyright (c) 2022 UltiMaker B.V. +// Cura is released under the terms of the LGPLv3 or higher. +import QtQuick 2.15 + +RegularExpressionValidator +{ + property int maxBeforeDecimal: 10 + property int maxAfterDecimal: 10 + + regularExpression: + { + // The build in DoubleValidator doesn't handle "," and "." interchangably. + return "^-?[0-9]{0," + maxBeforeDecimal + "}[.,]?[0-9]{0," + maxAfterDecimal + "}$" + } +} \ No newline at end of file diff --git a/resources/qml/Validators/HexColorValidator.qml b/resources/qml/Validators/HexColorValidator.qml new file mode 100644 index 0000000000..2c3ba706ec --- /dev/null +++ b/resources/qml/Validators/HexColorValidator.qml @@ -0,0 +1,8 @@ +// Copyright (c) 2022 UltiMaker B.V. +// Cura is released under the terms of the LGPLv3 or higher. +import QtQuick 2.15 + +RegularExpressionValidator +{ + regularExpression: /^#([a-fA-F0-9]{0,6})$/ +} \ No newline at end of file diff --git a/resources/qml/qmldir b/resources/qml/qmldir index dd594d8583..9eee76eda7 100644 --- a/resources/qml/qmldir +++ b/resources/qml/qmldir @@ -19,6 +19,9 @@ SettingView 1.0 SettingView.qml ProfileMenu 1.0 ProfileMenu.qml PrintSelectorCard 1.0 PrintSelectorCard.qml +# Cura/Validators +DoubleValidator 1.7 DoubleValidator.qml +HexColorValidator 1.7 HexColorValidator.qml # Cura/WelcomePages @@ -42,6 +45,7 @@ SingleSettingExtruderSelectorBar 1.7 SingleSettingExtruderSelectorBar.qml ExtruderButton 1.7 ExtruderButton.qml SingleSettingComboBox 1.7 SingleSettingComboBox.qml SingleSettingSlider 1.7 SingleSettingSlider.qml +SingleSettingTextFieldWithUnit 1.7 SingleSettingTextFieldWithUnit.qml # Cura/MachineSettings From 574b1000f64b2e7b9d2579481fdd631e9d44a9d4 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Wed, 30 Nov 2022 17:44:58 +0100 Subject: [PATCH 038/124] Add tooltips CURA-9793 --- .../Recommended/RecommendedAdhesionSelector.qml | 2 ++ .../Recommended/RecommendedSettingItem.qml | 10 ++++++++++ .../Recommended/RecommendedSettingSection.qml | 9 ++++----- .../Recommended/RecommendedStrengthSelector.qml | 6 ++++-- .../Recommended/RecommendedSupportSelector.qml | 5 ++++- 5 files changed, 24 insertions(+), 8 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml index b73faa543f..59f0818ebd 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml @@ -17,6 +17,7 @@ RecommendedSettingSection enableSectionSwitchVisible: platformAdhesionType.properties.enabled == "True" enableSectionSwitchChecked: platformAdhesionType.properties.value != "skirt" && platformAdhesionType.properties.value != "none" enableSectionSwitchEnabled: recommendedPrintSetup.settingsEnabled + tooltipText: catalog.i18nc("@label", "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards.") property var curaRecommendedMode: Cura.RecommendedMode {} @@ -38,6 +39,7 @@ RecommendedSettingSection { Layout.preferredHeight: childrenRect.height settingName: catalog.i18nc("@action:label", "Print with") + tooltipText: catalog.i18nc("adhesion_extruder_nr description", "The extruder train to use for printing the skirt/brim/raft. This is used in multi-extrusion.") settingControl: Cura.SingleSettingExtruderSelectorBar { extruderSettingName: "adhesion_extruder_nr" } } ] diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml index 587ce3ed77..05cf09d378 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml @@ -30,6 +30,16 @@ Item anchors.leftMargin: UM.Theme.getSize("medium_button_icon").width + UM.Theme.getSize("default_margin").width } + MouseArea + { + id: tooltipArea + anchors.fill: settingLabel + propagateComposedEvents: true + hoverEnabled: true + onEntered: base.showTooltip(parent, Qt.point(-UM.Theme.getSize("thick_margin").width, 0), tooltipText) + onExited: base.hideTooltip() + } + Loader { diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml index c202381326..219127c075 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml @@ -16,9 +16,9 @@ Item property alias enableSectionSwitchVisible: enableSectionSwitch.visible property alias enableSectionSwitchChecked: enableSectionSwitch.checked property alias enableSectionSwitchEnabled: enableSectionSwitch.enabled + property string tooltipText: "test" property var enableSectionClicked: { return } property int leftColumnWidth: Math.floor(width * 0.35) - property var toolTipText: "" property alias contents: settingColumn.children @@ -49,13 +49,12 @@ Item MouseArea { - id: tooltipMouseArea + id: tooltipArea anchors.fill: sectionTitle propagateComposedEvents: true hoverEnabled: true - - onEntered: { print("showTooltip") } - onExited: { print("hideTooltip" ) } + onEntered: base.showTooltip(parent, Qt.point(-UM.Theme.getSize("thick_margin").width, 0), tooltipText) + onExited: base.hideTooltip() } } diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml index 144f78d19e..0f0d727d8a 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml @@ -16,6 +16,7 @@ RecommendedSettingSection icon: UM.Theme.getIcon("Hammer") enableSectionSwitchVisible: false enableSectionSwitchEnabled: false + tooltipText: "" UM.SettingPropertyProvider { @@ -29,8 +30,8 @@ RecommendedSettingSection contents: [ RecommendedSettingItem { - settingName: catalog.i18nc("@action:label", "Infill Density") - tooltipText: catalog.i18nc("@label", "Gradual infill will gradually increase the amount of infill towards the top.") + settingName: catalog.i18nc("infill_sparse_density description", "Infill Density") + tooltipText: catalog.i18nc("@label", "Adjusts the density of infill of the print.") settingControl: Cura.SingleSettingSlider { height: UM.Theme.getSize("combobox").height @@ -50,6 +51,7 @@ RecommendedSettingSection RecommendedSettingItem { settingName: catalog.i18nc("@action:label", "Infill Pattern") + tooltipText: catalog.i18nc("infill_pattern description", "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Gyroid, cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction. Lightning infill tries to minimize the infill, by only supporting the ceiling of the object.") settingControl: Cura.SingleSettingComboBox { diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml index 7396f95590..ed619e0993 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml @@ -18,7 +18,7 @@ RecommendedSettingSection enableSectionSwitchVisible: supportEnabled.properties.enabled == "True" enableSectionSwitchChecked: supportEnabled.properties.value == "True" enableSectionSwitchEnabled: recommendedPrintSetup.settingsEnabled - toolTipText: catalog.i18nc("@label", "Generate structures to support parts of the model which have overhangs. Without these structures, such parts would collapse during printing.") + tooltipText: catalog.i18nc("@label", "Generate structures to support parts of the model which have overhangs. Without these structures, such parts would collapse during printing.") function onEnableSectionChanged(state) { supportEnabled.setPropertyValue("value", state) @@ -53,6 +53,7 @@ RecommendedSettingSection RecommendedSettingItem { settingName: catalog.i18nc("@action:label", "Support Type") + tooltipText: catalog.i18nc("support_structure description", "Chooses between the techniques available to generate support. \"Normal\" support creates a support structure directly below the overhanging parts and drops those areas straight down. \"Tree\" support creates branches towards the overhanging areas that support the model on the tips of those branches, and allows the branches to crawl around the model to support it from the build plate as much as possible.") settingControl: Cura.SingleSettingComboBox { @@ -64,11 +65,13 @@ RecommendedSettingSection { Layout.preferredHeight: childrenRect.height settingName: catalog.i18nc("@action:label", "Print with") + tooltipText: catalog.i18nc("support_extruder_nr description", "The extruder train to use for printing the support. This is used in multi-extrusion.") settingControl: Cura.SingleSettingExtruderSelectorBar { extruderSettingName: "support_extruder_nr" } }, RecommendedSettingItem { settingName: catalog.i18nc("@action:label", "Placement") + tooltipText: catalog.i18nc("support_type description", "Adjusts the placement of the support structures. The placement can be set to touching build plate or everywhere. When set to everywhere the support structures will also be printed on the model.") settingControl: Cura.SingleSettingComboBox { From 6460960ea78424dc1dcaa49f39093e2c0cbf336b Mon Sep 17 00:00:00 2001 From: eduardo chamorro Date: Thu, 1 Dec 2022 11:41:22 +0100 Subject: [PATCH 039/124] 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 040/124] 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 041/124] 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 042/124] 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 62bae7df19462db42716c5be79d48704b371a157 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Thu, 1 Dec 2022 14:03:11 +0100 Subject: [PATCH 043/124] Collapse the setting section when the switch for the section is disabled. Add collapse animation for setting items and setting section. Swap out ColumnLayout for Layout. Animating the Layouts does not seem to be possible. I had to put spacer back into the Column but it is the lesser of two evils. CURA-9793 --- .../RecommendedAdhesionSelector.qml | 8 +++- .../Recommended/RecommendedPrintSetup.qml | 37 +++++++------- .../Recommended/RecommendedSettingItem.qml | 43 ++++++++++++++++- .../Recommended/RecommendedSettingSection.qml | 48 +++++++++++++++++-- .../RecommendedSupportSelector.qml | 9 +++- 5 files changed, 118 insertions(+), 27 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml index 59f0818ebd..8a83af10dd 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml @@ -37,10 +37,14 @@ RecommendedSettingSection contents: [ RecommendedSettingItem { - Layout.preferredHeight: childrenRect.height + isCompressed: enableAdhesionRow.isCompressed settingName: catalog.i18nc("@action:label", "Print with") tooltipText: catalog.i18nc("adhesion_extruder_nr description", "The extruder train to use for printing the skirt/brim/raft. This is used in multi-extrusion.") - settingControl: Cura.SingleSettingExtruderSelectorBar { extruderSettingName: "adhesion_extruder_nr" } + + settingControl: Cura.SingleSettingExtruderSelectorBar + { + extruderSettingName: "adhesion_extruder_nr" + } } ] } diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml index f6edf88495..5231af7232 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml @@ -1,4 +1,4 @@ -//Copyright (c) 2022 Ultimaker B.V. +//Copyright (c) 2022 UltiMaker B.V. //Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 @@ -18,7 +18,7 @@ Item function onModeChanged() {} - ColumnLayout + Column { spacing: UM.Theme.getSize("default_margin").height @@ -48,7 +48,6 @@ Item RecommendedResolutionSelector { id: recommendedResolutionSelector - Layout.fillWidth: true width: parent.width } @@ -56,46 +55,49 @@ Item { width: parent.width visible: !recommendedResolutionSelector.visible - Layout.fillWidth: true } + Item { height: UM.Theme.getSize("default_margin").height } // Spacer ProfileWarningReset { width: parent.width - Layout.fillWidth: true - Layout.topMargin: UM.Theme.getSize("default_margin").height - Layout.bottomMargin: UM.Theme.getSize("thin_margin").height } + Item { height: UM.Theme.getSize("thin_margin").height + UM.Theme.getSize("narrow_margin").height} // Spacer + //Line between the sections. Rectangle { width: parent.width height: UM.Theme.getSize("default_lining").height - Layout.topMargin: UM.Theme.getSize("narrow_margin").height - Layout.bottomMargin: UM.Theme.getSize("narrow_margin").height - Layout.fillWidth: true color: UM.Theme.getColor("lining") } - ColumnLayout - { + + Item { height: UM.Theme.getSize("narrow_margin").height } //Spacer + + Column { + id: settingColumn + width: parent.width spacing: UM.Theme.getSize("thin_margin").height - RowLayout + Item { + id: recommendedPrintSettingsHeader + height: childrenRect.height + width: parent.width UM.Label { + anchors.verticalCenter: parent.verticalCenter + anchors.left: parent.left text: catalog.i18nc("@label", "Recommended print settings") font: UM.Theme.getFont("medium") } - Item { Layout.fillWidth: true } // Spacer - Cura.SecondaryButton { id: customSettingsButton - anchors.top: parent.top + anchors.verticalCenter: parent.verticalCenter anchors.right: parent.right text: catalog.i18nc("@button", "Show Custom") textFont: UM.Theme.getFont("medium_bold") @@ -107,18 +109,15 @@ Item RecommendedStrengthSelector { width: parent.width - Layout.fillWidth: true } RecommendedSupportSelector { width: parent.width - Layout.fillWidth: true } RecommendedAdhesionSelector { width: parent.width - Layout.fillWidth: true } } } diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml index 05cf09d378..9d61f14704 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2022 Ultimaker B.V. +// Copyright (c) 2022 UltiMaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 @@ -11,14 +11,15 @@ import Cura 1.7 as Cura Item { + id: settingItem width: parent.width - Layout.preferredHeight: childrenRect.height Layout.minimumHeight: UM.Theme.getSize("section_header").height Layout.fillWidth: true property alias settingControl: settingContainer.children property alias settingName: settingLabel.text property string tooltipText: "" + property bool isCompressed: false UM.Label { @@ -49,4 +50,42 @@ Item anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter } + + states: + [ + State + { + name: "sectionClosed" // Section is hidden when the switch in parent is off + when: isCompressed + PropertyChanges + { + target: settingItem; + opacity: 0 + height: 0 + implicitHeight: 0 + Layout.preferredHeight: 0 + Layout.minimumHeight: 0 + } + }, + State + { + // All values are default. This state is only here for the animation. + name: "sectionOpened" + when: !isCompressed + } + ] + + transitions: Transition + { + from: "sectionOpened"; to: "sectionClosed" + reversible: true + ParallelAnimation + { + // Animate section compressing as it closes + NumberAnimation { property: "Layout.minimumHeight"; duration: 100; } + // Animate section dissapearring as it closes + NumberAnimation { property: "opacity"; duration: 100; } + + } + } } \ No newline at end of file diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml index 219127c075..3bdc3cdd65 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2022 Ultimaker B.V. +// Copyright (c) 2022 UltiMaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 @@ -10,6 +10,7 @@ import Cura 1.7 as Cura Item { + id: settingSection property alias title: sectionTitle.text property alias icon: sectionTitle.source @@ -19,6 +20,7 @@ Item property string tooltipText: "test" property var enableSectionClicked: { return } property int leftColumnWidth: Math.floor(width * 0.35) + property bool isCompressed: false property alias contents: settingColumn.children @@ -68,7 +70,15 @@ Item anchors.verticalCenter: sectionHeader.verticalCenter visible: false - onClicked: onEnableSectionChanged(enableSectionSwitch.checked) + // This delay forces the setting change to happen after the setting section open/close animation. This is so the animation is smooth. + Timer + { + id: updateTimer + interval: 500 // This interval is set long enough so you can spam click the button on/off without lag. + repeat: false + onTriggered: onEnableSectionChanged(enableSectionSwitch.checked) + } + onClicked: updateTimer.restart() } ColumnLayout @@ -80,8 +90,40 @@ Item anchors.right: parent.right anchors.top: sectionHeader.bottom anchors.topMargin: UM.Theme.getSize("narrow_margin").height + } - Layout.preferredHeight: UM.Theme.getSize("recommended_section_setting_item").height + states: + [ + State + { + name: "settingListClosed" + when: !enableSectionSwitchChecked && enableSectionSwitchEnabled + PropertyChanges + { + target: settingSection + isCompressed: true + implicitHeight: 0 + } + PropertyChanges + { + target: settingColumn + spacing: 0 + } + }, + State + { + // Use default properties. This is only here for the animation. + name: "settingListOpened" + when: enableSectionSwitchChecked && enableSectionSwitchEnabled + } + ] + // Animate section closing + transitions: Transition + { + from: "settingListOpened"; to: "settingListClosed" + reversible: true + // Animate section compressing as it closes + NumberAnimation { property: "implicitHeight"; duration: 100; } } } \ No newline at end of file diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml index ed619e0993..f7f7df0fe3 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml @@ -54,6 +54,7 @@ RecommendedSettingSection { settingName: catalog.i18nc("@action:label", "Support Type") tooltipText: catalog.i18nc("support_structure description", "Chooses between the techniques available to generate support. \"Normal\" support creates a support structure directly below the overhanging parts and drops those areas straight down. \"Tree\" support creates branches towards the overhanging areas that support the model on the tips of those branches, and allows the branches to crawl around the model to support it from the build plate as much as possible.") + isCompressed: enableSupportRow.isCompressed settingControl: Cura.SingleSettingComboBox { @@ -66,12 +67,18 @@ RecommendedSettingSection Layout.preferredHeight: childrenRect.height settingName: catalog.i18nc("@action:label", "Print with") tooltipText: catalog.i18nc("support_extruder_nr description", "The extruder train to use for printing the support. This is used in multi-extrusion.") - settingControl: Cura.SingleSettingExtruderSelectorBar { extruderSettingName: "support_extruder_nr" } + isCompressed: enableSupportRow.isCompressed + + settingControl: Cura.SingleSettingExtruderSelectorBar + { + extruderSettingName: "support_extruder_nr" + } }, RecommendedSettingItem { settingName: catalog.i18nc("@action:label", "Placement") tooltipText: catalog.i18nc("support_type description", "Adjusts the placement of the support structures. The placement can be set to touching build plate or everywhere. When set to everywhere the support structures will also be printed on the model.") + isCompressed: enableSupportRow.isCompressed settingControl: Cura.SingleSettingComboBox { From 01ebee4aea6bd484d3e471a6c2f781aa6cb14cd0 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Thu, 1 Dec 2022 15:27:14 +0100 Subject: [PATCH 044/124] Cleanup CURA-9793 --- resources/qml/Widgets/SingleSettingComboBox.qml | 4 +++- resources/qml/Widgets/SingleSettingSlider.qml | 5 +---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/resources/qml/Widgets/SingleSettingComboBox.qml b/resources/qml/Widgets/SingleSettingComboBox.qml index f0c43c31f7..151a9b1cd9 100644 --- a/resources/qml/Widgets/SingleSettingComboBox.qml +++ b/resources/qml/Widgets/SingleSettingComboBox.qml @@ -58,7 +58,9 @@ Cura.ComboBox { function onIsValueUsedChanged() { comboboxModel.updateModel() } } - onCurrentIndexChanged: + onCurrentIndexChanged: updateSetting() + + function updateSetting(value) { if (comboboxModel.get(currentIndex) && comboboxModel.get(currentIndex).code) { diff --git a/resources/qml/Widgets/SingleSettingSlider.qml b/resources/qml/Widgets/SingleSettingSlider.qml index 8baccfefe7..855af45417 100644 --- a/resources/qml/Widgets/SingleSettingSlider.qml +++ b/resources/qml/Widgets/SingleSettingSlider.qml @@ -63,10 +63,7 @@ RowLayout id: updateTimer interval: 100 repeat: false - onTriggered: - { - parseValueUpdateSetting() - } + onTriggered: parseValueUpdateSetting() } function parseValueUpdateSetting() From 9c4716416e660b2ede59dab40553064e4d6b5c1e Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Thu, 1 Dec 2022 16:58:29 +0100 Subject: [PATCH 045/124] Add validators that match validators for SettingTextField. CURA-9793 --- resources/qml/Validators/DoubleValidator.qml | 15 --------------- resources/qml/Validators/FloatValidator.qml | 11 +++++++++++ resources/qml/Validators/IntListValidator.qml | 8 ++++++++ resources/qml/Validators/IntValidator.qml | 10 ++++++++++ 4 files changed, 29 insertions(+), 15 deletions(-) delete mode 100644 resources/qml/Validators/DoubleValidator.qml create mode 100644 resources/qml/Validators/FloatValidator.qml create mode 100644 resources/qml/Validators/IntListValidator.qml create mode 100644 resources/qml/Validators/IntValidator.qml diff --git a/resources/qml/Validators/DoubleValidator.qml b/resources/qml/Validators/DoubleValidator.qml deleted file mode 100644 index dc92dbd1ae..0000000000 --- a/resources/qml/Validators/DoubleValidator.qml +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright (c) 2022 UltiMaker B.V. -// Cura is released under the terms of the LGPLv3 or higher. -import QtQuick 2.15 - -RegularExpressionValidator -{ - property int maxBeforeDecimal: 10 - property int maxAfterDecimal: 10 - - regularExpression: - { - // The build in DoubleValidator doesn't handle "," and "." interchangably. - return "^-?[0-9]{0," + maxBeforeDecimal + "}[.,]?[0-9]{0," + maxAfterDecimal + "}$" - } -} \ No newline at end of file diff --git a/resources/qml/Validators/FloatValidator.qml b/resources/qml/Validators/FloatValidator.qml new file mode 100644 index 0000000000..62ff981e2e --- /dev/null +++ b/resources/qml/Validators/FloatValidator.qml @@ -0,0 +1,11 @@ +// Copyright (c) 2022 UltiMaker B.V. +// Cura is released under the terms of the LGPLv3 or higher. +import QtQuick 2.15 + +RegularExpressionValidator +{ + property int maxBeforeDecimal: 11 + property int maxAfterDecimal: 3 + + regularExpression: new RegExp("^-?[0-9]{0,%0}[.,]?[0-9]{0,%1}$".arg(maxBeforeDecimal).arg(maxAfterDecimal)) +} \ No newline at end of file diff --git a/resources/qml/Validators/IntListValidator.qml b/resources/qml/Validators/IntListValidator.qml new file mode 100644 index 0000000000..2f5b3c829a --- /dev/null +++ b/resources/qml/Validators/IntListValidator.qml @@ -0,0 +1,8 @@ +// Copyright (c) 2022 UltiMaker B.V. +// Cura is released under the terms of the LGPLv3 or higher. +import QtQuick 2.15 + +RegularExpressionValidator +{ + regularExpression: new RegExp("^\[?(\s*-?[0-9]{0,11}\s*,)*(\s*-?[0-9]{0,11})\s*\]?$") +} \ No newline at end of file diff --git a/resources/qml/Validators/IntValidator.qml b/resources/qml/Validators/IntValidator.qml new file mode 100644 index 0000000000..6b7ced9ce8 --- /dev/null +++ b/resources/qml/Validators/IntValidator.qml @@ -0,0 +1,10 @@ +// Copyright (c) 2022 UltiMaker B.V. +// Cura is released under the terms of the LGPLv3 or higher. +import QtQuick 2.15 + +RegularExpressionValidator +{ + property int maxNumbers: 12 + + regularExpression: new RegExp("^-?[0-9]{0,%0}$".arg(maxNumbers)) +} \ No newline at end of file From df6ea1ea745163c931e4bd9fa3f9a962668d2da5 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Thu, 1 Dec 2022 17:08:46 +0100 Subject: [PATCH 046/124] Rename TextFieldWithUnit.qml -> TextField and put all base textfield styling in it. CURA-9793 --- resources/qml/qmldir | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/resources/qml/qmldir b/resources/qml/qmldir index 9eee76eda7..109cbc0823 100644 --- a/resources/qml/qmldir +++ b/resources/qml/qmldir @@ -20,7 +20,9 @@ ProfileMenu 1.0 ProfileMenu.qml PrintSelectorCard 1.0 PrintSelectorCard.qml # Cura/Validators -DoubleValidator 1.7 DoubleValidator.qml +FloatValidator 1.7 FloatValidator.qml +IntValidator 1.7 IntValidator +IntListValidator 1.7 IntListValidator HexColorValidator 1.7 HexColorValidator.qml # Cura/WelcomePages @@ -45,7 +47,7 @@ SingleSettingExtruderSelectorBar 1.7 SingleSettingExtruderSelectorBar.qml ExtruderButton 1.7 ExtruderButton.qml SingleSettingComboBox 1.7 SingleSettingComboBox.qml SingleSettingSlider 1.7 SingleSettingSlider.qml -SingleSettingTextFieldWithUnit 1.7 SingleSettingTextFieldWithUnit.qml +SingleSettingTextField 1.7 SingleSettingTextField.qml # Cura/MachineSettings From 73137a140a51e99970b6eab1915691b7a8235629 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Thu, 1 Dec 2022 17:09:19 +0100 Subject: [PATCH 047/124] Inherit UM.TextField in Cura.TextField and remove redundant properties CURA-9793 --- resources/qml/Widgets/TextField.qml | 81 ++--------------------------- 1 file changed, 3 insertions(+), 78 deletions(-) diff --git a/resources/qml/Widgets/TextField.qml b/resources/qml/Widgets/TextField.qml index 085c7b7742..f16d4abb11 100644 --- a/resources/qml/Widgets/TextField.qml +++ b/resources/qml/Widgets/TextField.qml @@ -4,87 +4,12 @@ import QtQuick 2.10 import QtQuick.Controls 2.3 -import UM 1.5 as UM +import UM 1.7 as UM import Cura 1.1 as Cura - -// -// Cura-style TextField -// -TextField +UM.TextField { id: control - - property alias leftIcon: iconLeft.source - height: UM.Theme.getSize("setting_control").height - - hoverEnabled: true - selectByMouse: true - font: UM.Theme.getFont("default") - color: UM.Theme.getColor("text_field_text") - selectedTextColor: UM.Theme.getColor("text_field_text") - placeholderTextColor: UM.Theme.getColor("text_field_text_disabled") - renderType: Text.NativeRendering - selectionColor: UM.Theme.getColor("text_selection") - leftPadding: iconLeft.visible ? iconLeft.width + UM.Theme.getSize("default_margin").width * 2 : UM.Theme.getSize("thin_margin").width - - states: [ - State - { - name: "disabled" - when: !control.enabled - PropertyChanges { target: control; color: UM.Theme.getColor("text_field_text_disabled")} - PropertyChanges { target: backgroundRectangle; liningColor: UM.Theme.getColor("text_field_border_disabled")} - }, - State - { - name: "invalid" - when: !control.acceptableInput - PropertyChanges { target: backgroundRectangle; color: UM.Theme.getColor("setting_validation_error_background")} - }, - State - { - name: "active" - when: control.activeFocus - PropertyChanges - { - target: backgroundRectangle - liningColor: UM.Theme.getColor("text_field_border_active") - borderColor: UM.Theme.getColor("text_field_border_active") - } - }, - State - { - name: "hovered" - when: control.hovered && !control.activeFocus - PropertyChanges - { - target: backgroundRectangle - liningColor: UM.Theme.getColor("text_field_border_hovered") - } - } - ] - - background: UM.UnderlineBackground - { - id: backgroundRectangle - //Optional icon added on the left hand side. - UM.ColorImage - { - id: iconLeft - - anchors - { - verticalCenter: parent.verticalCenter - left: parent.left - leftMargin: UM.Theme.getSize("default_margin").width - } - - visible: source != "" - height: UM.Theme.getSize("small_button_icon").height - width: visible ? height : 0 - color: control.color - } - } + leftPadding: UM.Theme.getSize("thin_margin").width } From f24e6b19610855f8f42eb75c75ab6d20b685e678 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Thu, 1 Dec 2022 17:09:41 +0100 Subject: [PATCH 048/124] Fix NumericTextFieldWithUnit not validating text CURA-9793 --- resources/qml/MachineSettings/NumericTextFieldWithUnit.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/MachineSettings/NumericTextFieldWithUnit.qml b/resources/qml/MachineSettings/NumericTextFieldWithUnit.qml index 2484adb912..64beeb9834 100644 --- a/resources/qml/MachineSettings/NumericTextFieldWithUnit.qml +++ b/resources/qml/MachineSettings/NumericTextFieldWithUnit.qml @@ -59,7 +59,7 @@ UM.TooltipArea UM.SettingPropertyProvider { id: propertyProvider - watchedProperties: [ "value", "description" ] + watchedProperties: [ "value", "description", "validationState" ] } UM.Label From 36ac3d77440ccc2aa55db18326dfb51b3246b7df Mon Sep 17 00:00:00 2001 From: whoseyoung Date: Fri, 2 Dec 2022 18:29:20 +0800 Subject: [PATCH 049/124] add geeetech profiles --- resources/definitions/Geeetech_base.def.json | 143 ++++++++++++++++++ resources/definitions/geeetech_A10.def.json | 59 -------- resources/definitions/geeetech_A10M.def.json | 70 +++------ .../definitions/geeetech_A10Pro.def.json | 26 ++++ resources/definitions/geeetech_A10T.def.json | 72 +++------ resources/definitions/geeetech_A20.def.json | 63 ++------ resources/definitions/geeetech_A20M.def.json | 70 +++------ resources/definitions/geeetech_A20T.def.json | 71 +++------ resources/definitions/geeetech_A30M.def.json | 32 ++++ .../definitions/geeetech_A30Pro.def.json | 26 ++++ resources/definitions/geeetech_A30T.def.json | 32 ++++ resources/definitions/geeetech_E180.def.json | 26 ++++ .../geeetech_GiantArmD200.def.json | 25 +++ .../definitions/geeetech_I3ProB.def.json | 25 +++ .../definitions/geeetech_I3ProC.def.json | 31 ++++ .../definitions/geeetech_I3ProW.def.json | 25 +++ .../definitions/geeetech_MeCreator.def.json | 25 +++ .../definitions/geeetech_MeCreator2.def.json | 25 +++ .../definitions/geeetech_MeDucer.def.json | 25 +++ resources/definitions/geeetech_Mizar.def.json | 26 ++++ .../definitions/geeetech_MizarM.def.json | 34 +++++ .../definitions/geeetech_MizarMax.def.json | 26 ++++ .../definitions/geeetech_MizarPro.def.json | 26 ++++ .../definitions/geeetech_MizarS.def.json | 26 ++++ .../definitions/geeetech_Mizar_S.def.json | 59 -------- .../definitions/geeetech_Thunder.def.json | 69 +++++++++ resources/definitions/geeetech_a30.def.json | 113 -------------- ...json => Geeetech_Dual_Extruder_0.def.json} | 32 ++-- ...json => Geeetech_Dual_Extruder_1.def.json} | 33 ++-- ...son => Geeetech_Multi_Extruder_0.def.json} | 9 +- .../Geeetech_Multi_Extruder_1.def.json | 16 ++ .../Geeetech_Multi_Extruder_2.def.json | 16 ++ ...json => Geeetech_base_extruder_0.def.json} | 3 +- resources/extruders/geeetech_A10M_1.def.json | 19 --- resources/extruders/geeetech_A10M_2.def.json | 19 --- resources/extruders/geeetech_A10T_1.def.json | 19 --- resources/extruders/geeetech_A10T_2.def.json | 19 --- resources/extruders/geeetech_A10T_3.def.json | 19 --- resources/extruders/geeetech_A20M_1.def.json | 19 --- resources/extruders/geeetech_A20M_2.def.json | 19 --- resources/extruders/geeetech_A20T_1.def.json | 19 --- resources/extruders/geeetech_A20T_2.def.json | 19 --- resources/extruders/geeetech_A20T_3.def.json | 19 --- .../base/Geeetech_base_0.2_ABS_super.inst.cfg | 14 ++ .../base/Geeetech_base_0.2_ABS_ultra.inst.cfg | 14 ++ .../Geeetech_base_0.2_PETG_super.inst.cfg | 17 +++ .../Geeetech_base_0.2_PETG_ultra.inst.cfg | 16 ++ .../base/Geeetech_base_0.2_PLA_super.inst.cfg | 13 ++ .../base/Geeetech_base_0.2_PLA_ultra.inst.cfg | 13 ++ .../Geeetech_base_0.3_ABS_adaptive.inst.cfg | 14 ++ .../base/Geeetech_base_0.3_ABS_low.inst.cfg | 14 ++ .../Geeetech_base_0.3_ABS_standard.inst.cfg | 14 ++ .../base/Geeetech_base_0.3_ABS_super.inst.cfg | 14 ++ .../Geeetech_base_0.3_PETG_adaptive.inst.cfg | 16 ++ .../base/Geeetech_base_0.3_PETG_low.inst.cfg | 16 ++ .../Geeetech_base_0.3_PETG_standard.inst.cfg | 16 ++ .../Geeetech_base_0.3_PETG_super.inst.cfg | 16 ++ .../Geeetech_base_0.3_PLA_adaptive.inst.cfg | 13 ++ .../base/Geeetech_base_0.3_PLA_low.inst.cfg | 13 ++ .../Geeetech_base_0.3_PLA_standard.inst.cfg | 13 ++ .../base/Geeetech_base_0.3_PLA_super.inst.cfg | 13 ++ .../Geeetech_base_0.3_TPU_adaptive.inst.cfg | 13 ++ .../Geeetech_base_0.3_TPU_standard.inst.cfg | 13 ++ .../base/Geeetech_base_0.3_TPU_super.inst.cfg | 13 ++ .../Geeetech_base_0.4_ABS_adaptive.inst.cfg | 14 ++ .../base/Geeetech_base_0.4_ABS_low.inst.cfg | 14 ++ .../Geeetech_base_0.4_ABS_standard.inst.cfg | 14 ++ .../base/Geeetech_base_0.4_ABS_super.inst.cfg | 14 ++ .../Geeetech_base_0.4_PETG_adaptive.inst.cfg | 16 ++ .../base/Geeetech_base_0.4_PETG_low.inst.cfg | 16 ++ .../Geeetech_base_0.4_PETG_standard.inst.cfg | 16 ++ .../Geeetech_base_0.4_PETG_super.inst.cfg | 16 ++ .../Geeetech_base_0.4_PLA_adaptive.inst.cfg | 13 ++ .../base/Geeetech_base_0.4_PLA_low.inst.cfg | 13 ++ .../Geeetech_base_0.4_PLA_standard.inst.cfg | 13 ++ .../base/Geeetech_base_0.4_PLA_super.inst.cfg | 13 ++ .../Geeetech_base_0.4_TPU_adaptive.inst.cfg | 13 ++ .../Geeetech_base_0.4_TPU_standard.inst.cfg | 13 ++ .../base/Geeetech_base_0.4_TPU_super.inst.cfg | 13 ++ .../Geeetech_base_0.5_ABS_adaptive.inst.cfg | 14 ++ .../base/Geeetech_base_0.5_ABS_low.inst.cfg | 14 ++ .../Geeetech_base_0.5_ABS_standard.inst.cfg | 14 ++ .../base/Geeetech_base_0.5_ABS_super.inst.cfg | 14 ++ .../Geeetech_base_0.5_PETG_adaptive.inst.cfg | 16 ++ .../base/Geeetech_base_0.5_PETG_low.inst.cfg | 16 ++ .../Geeetech_base_0.5_PETG_standard.inst.cfg | 16 ++ .../Geeetech_base_0.5_PETG_super.inst.cfg | 16 ++ .../Geeetech_base_0.5_PLA_adaptive.inst.cfg | 13 ++ .../base/Geeetech_base_0.5_PLA_low.inst.cfg | 13 ++ .../Geeetech_base_0.5_PLA_standard.inst.cfg | 13 ++ .../base/Geeetech_base_0.5_PLA_super.inst.cfg | 13 ++ .../Geeetech_base_0.5_TPU_adaptive.inst.cfg | 13 ++ .../Geeetech_base_0.5_TPU_standard.inst.cfg | 13 ++ .../base/Geeetech_base_0.5_TPU_super.inst.cfg | 13 ++ .../Geeetech_base_0.6_ABS_standard.inst.cfg | 14 ++ .../Geeetech_base_0.6_PETG_standard.inst.cfg | 16 ++ .../base/Geeetech_base_0.6_PLA_draft.inst.cfg | 13 ++ .../base/Geeetech_base_0.6_PLA_low.inst.cfg | 13 ++ .../Geeetech_base_0.6_PLA_standard.inst.cfg | 13 ++ .../Geeetech_base_0.6_TPU_standard.inst.cfg | 13 ++ .../base/Geeetech_base_0.8_ABS_draft.inst.cfg | 14 ++ .../Geeetech_base_0.8_PETG_draft.inst.cfg | 16 ++ .../base/Geeetech_base_0.8_PLA_draft.inst.cfg | 13 ++ .../base/Geeetech_base_0.8_TPU_draft.inst.cfg | 13 ++ .../base/Geeetech_base_1.0_ABS_draft.inst.cfg | 14 ++ .../Geeetech_base_1.0_PETG_draft.inst.cfg | 16 ++ .../base/Geeetech_base_1.0_PLA_draft.inst.cfg | 13 ++ .../base/Geeetech_base_1.0_TPU_draft.inst.cfg | 13 ++ .../Geeetech_base_global_adaptive.inst.cfg | 19 +++ .../base/Geeetech_base_global_draft.inst.cfg | 18 +++ .../base/Geeetech_base_global_low.inst.cfg | 18 +++ .../Geeetech_base_global_standard.inst.cfg | 18 +++ .../base/Geeetech_base_global_super.inst.cfg | 18 +++ .../base/Geeetech_base_global_ultra.inst.cfg | 18 +++ .../variants/geeetech_A10Pro_0.2.inst.cfg | 12 ++ .../variants/geeetech_A10Pro_0.3.inst.cfg | 12 ++ .../variants/geeetech_A10Pro_0.4.inst.cfg | 12 ++ .../variants/geeetech_A10Pro_0.5.inst.cfg | 12 ++ .../variants/geeetech_A10Pro_0.6.inst.cfg | 12 ++ .../variants/geeetech_A10Pro_0.8.inst.cfg | 12 ++ .../variants/geeetech_A10Pro_1.0.inst.cfg | 12 ++ resources/variants/geeetech_A20_0.2.inst.cfg | 12 ++ resources/variants/geeetech_A20_0.3.inst.cfg | 12 ++ resources/variants/geeetech_A20_0.4.inst.cfg | 12 ++ resources/variants/geeetech_A20_0.5.inst.cfg | 12 ++ resources/variants/geeetech_A20_0.6.inst.cfg | 12 ++ resources/variants/geeetech_A20_0.8.inst.cfg | 12 ++ resources/variants/geeetech_A20_1.0.inst.cfg | 12 ++ .../variants/geeetech_A30Pro_0.2.inst.cfg | 12 ++ .../variants/geeetech_A30Pro_0.3.inst.cfg | 12 ++ .../variants/geeetech_A30Pro_0.4.inst.cfg | 12 ++ .../variants/geeetech_A30Pro_0.5.inst.cfg | 12 ++ .../variants/geeetech_A30Pro_0.6.inst.cfg | 12 ++ .../variants/geeetech_A30Pro_0.8.inst.cfg | 12 ++ .../variants/geeetech_A30Pro_1.0.inst.cfg | 12 ++ resources/variants/geeetech_E180_0.2.inst.cfg | 12 ++ resources/variants/geeetech_E180_0.3.inst.cfg | 12 ++ resources/variants/geeetech_E180_0.4.inst.cfg | 12 ++ resources/variants/geeetech_E180_0.5.inst.cfg | 12 ++ resources/variants/geeetech_E180_0.6.inst.cfg | 12 ++ resources/variants/geeetech_E180_0.8.inst.cfg | 12 ++ resources/variants/geeetech_E180_1.0.inst.cfg | 12 ++ .../geeetech_GiantArmD200_0.2.inst.cfg | 12 ++ .../geeetech_GiantArmD200_0.3.inst.cfg | 12 ++ .../geeetech_GiantArmD200_0.4.inst.cfg | 12 ++ .../geeetech_GiantArmD200_0.5.inst.cfg | 12 ++ .../geeetech_GiantArmD200_0.6.inst.cfg | 12 ++ .../geeetech_GiantArmD200_0.8.inst.cfg | 12 ++ .../geeetech_GiantArmD200_1.0.inst.cfg | 12 ++ .../variants/geeetech_I3ProB_0.2.inst.cfg | 12 ++ .../variants/geeetech_I3ProB_0.3.inst.cfg | 12 ++ .../variants/geeetech_I3ProB_0.4.inst.cfg | 12 ++ .../variants/geeetech_I3ProB_0.5.inst.cfg | 12 ++ .../variants/geeetech_I3ProB_0.6.inst.cfg | 12 ++ .../variants/geeetech_I3ProB_0.8.inst.cfg | 12 ++ .../variants/geeetech_I3ProB_1.0.inst.cfg | 12 ++ .../variants/geeetech_I3ProW_0.2.inst.cfg | 12 ++ .../variants/geeetech_I3ProW_0.3.inst.cfg | 12 ++ .../variants/geeetech_I3ProW_0.4.inst.cfg | 12 ++ .../variants/geeetech_I3ProW_0.5.inst.cfg | 12 ++ .../variants/geeetech_I3ProW_0.6.inst.cfg | 12 ++ .../variants/geeetech_I3ProW_0.8.inst.cfg | 12 ++ .../variants/geeetech_I3ProW_1.0.inst.cfg | 12 ++ .../variants/geeetech_MeCreator2_0.2.inst.cfg | 12 ++ .../variants/geeetech_MeCreator2_0.3.inst.cfg | 12 ++ .../variants/geeetech_MeCreator2_0.4.inst.cfg | 12 ++ .../variants/geeetech_MeCreator2_0.5.inst.cfg | 12 ++ .../variants/geeetech_MeCreator2_0.6.inst.cfg | 12 ++ .../variants/geeetech_MeCreator2_0.8.inst.cfg | 12 ++ .../variants/geeetech_MeCreator2_1.0.inst.cfg | 12 ++ .../variants/geeetech_MeCreator_0.2.inst.cfg | 12 ++ .../variants/geeetech_MeCreator_0.3.inst.cfg | 12 ++ .../variants/geeetech_MeCreator_0.4.inst.cfg | 12 ++ .../variants/geeetech_MeCreator_0.5.inst.cfg | 12 ++ .../variants/geeetech_MeCreator_0.6.inst.cfg | 12 ++ .../variants/geeetech_MeCreator_0.8.inst.cfg | 12 ++ .../variants/geeetech_MeCreator_1.0.inst.cfg | 12 ++ .../variants/geeetech_MeDucer_0.2.inst.cfg | 12 ++ .../variants/geeetech_MeDucer_0.3.inst.cfg | 12 ++ .../variants/geeetech_MeDucer_0.4.inst.cfg | 12 ++ .../variants/geeetech_MeDucer_0.5.inst.cfg | 12 ++ .../variants/geeetech_MeDucer_0.6.inst.cfg | 12 ++ .../variants/geeetech_MeDucer_0.8.inst.cfg | 12 ++ .../variants/geeetech_MeDucer_1.0.inst.cfg | 12 ++ .../variants/geeetech_MizarMax_0.2.inst.cfg | 12 ++ .../variants/geeetech_MizarMax_0.3.inst.cfg | 12 ++ .../variants/geeetech_MizarMax_0.4.inst.cfg | 12 ++ .../variants/geeetech_MizarMax_0.5.inst.cfg | 12 ++ .../variants/geeetech_MizarMax_0.6.inst.cfg | 12 ++ .../variants/geeetech_MizarMax_0.8.inst.cfg | 12 ++ .../variants/geeetech_MizarMax_1.0.inst.cfg | 12 ++ .../variants/geeetech_MizarPro_0.2.inst.cfg | 12 ++ .../variants/geeetech_MizarPro_0.3.inst.cfg | 12 ++ .../variants/geeetech_MizarPro_0.4.inst.cfg | 12 ++ .../variants/geeetech_MizarPro_0.5.inst.cfg | 12 ++ .../variants/geeetech_MizarPro_0.6.inst.cfg | 12 ++ .../variants/geeetech_MizarPro_0.8.inst.cfg | 12 ++ .../variants/geeetech_MizarPro_1.0.inst.cfg | 12 ++ .../variants/geeetech_MizarS_0.2.inst.cfg | 12 ++ .../variants/geeetech_MizarS_0.3.inst.cfg | 12 ++ .../variants/geeetech_MizarS_0.4.inst.cfg | 12 ++ .../variants/geeetech_MizarS_0.5.inst.cfg | 12 ++ .../variants/geeetech_MizarS_0.6.inst.cfg | 12 ++ .../variants/geeetech_MizarS_0.8.inst.cfg | 12 ++ .../variants/geeetech_MizarS_1.0.inst.cfg | 12 ++ .../variants/geeetech_Mizar_0.2.inst.cfg | 12 ++ .../variants/geeetech_Mizar_0.3.inst.cfg | 12 ++ .../variants/geeetech_Mizar_0.4.inst.cfg | 12 ++ .../variants/geeetech_Mizar_0.5.inst.cfg | 12 ++ .../variants/geeetech_Mizar_0.6.inst.cfg | 12 ++ .../variants/geeetech_Mizar_0.8.inst.cfg | 12 ++ .../variants/geeetech_Mizar_1.0.inst.cfg | 12 ++ .../variants/geeetech_Thunder_0.2.inst.cfg | 12 ++ .../variants/geeetech_Thunder_0.3.inst.cfg | 12 ++ .../variants/geeetech_Thunder_0.4.inst.cfg | 12 ++ .../variants/geeetech_Thunder_0.5.inst.cfg | 12 ++ .../variants/geeetech_Thunder_0.6.inst.cfg | 12 ++ .../variants/geeetech_Thunder_0.8.inst.cfg | 12 ++ .../variants/geeetech_Thunder_1.0.inst.cfg | 12 ++ 219 files changed, 3130 insertions(+), 702 deletions(-) create mode 100644 resources/definitions/Geeetech_base.def.json delete mode 100644 resources/definitions/geeetech_A10.def.json create mode 100644 resources/definitions/geeetech_A10Pro.def.json create mode 100644 resources/definitions/geeetech_A30M.def.json create mode 100644 resources/definitions/geeetech_A30Pro.def.json create mode 100644 resources/definitions/geeetech_A30T.def.json create mode 100644 resources/definitions/geeetech_E180.def.json create mode 100644 resources/definitions/geeetech_GiantArmD200.def.json create mode 100644 resources/definitions/geeetech_I3ProB.def.json create mode 100644 resources/definitions/geeetech_I3ProC.def.json create mode 100644 resources/definitions/geeetech_I3ProW.def.json create mode 100644 resources/definitions/geeetech_MeCreator.def.json create mode 100644 resources/definitions/geeetech_MeCreator2.def.json create mode 100644 resources/definitions/geeetech_MeDucer.def.json create mode 100644 resources/definitions/geeetech_Mizar.def.json create mode 100644 resources/definitions/geeetech_MizarM.def.json create mode 100644 resources/definitions/geeetech_MizarMax.def.json create mode 100644 resources/definitions/geeetech_MizarPro.def.json create mode 100644 resources/definitions/geeetech_MizarS.def.json delete mode 100644 resources/definitions/geeetech_Mizar_S.def.json create mode 100644 resources/definitions/geeetech_Thunder.def.json delete mode 100644 resources/definitions/geeetech_a30.def.json rename resources/extruders/{geeetech_A20_1.def.json => Geeetech_Dual_Extruder_0.def.json} (64%) rename resources/extruders/{geeetech_A10_1.def.json => Geeetech_Dual_Extruder_1.def.json} (57%) rename resources/extruders/{geeetech_Mizar_S_1.def.json => Geeetech_Multi_Extruder_0.def.json} (64%) create mode 100644 resources/extruders/Geeetech_Multi_Extruder_1.def.json create mode 100644 resources/extruders/Geeetech_Multi_Extruder_2.def.json rename resources/extruders/{geeetech_a30_extruder_0.def.json => Geeetech_base_extruder_0.def.json} (87%) delete mode 100644 resources/extruders/geeetech_A10M_1.def.json delete mode 100644 resources/extruders/geeetech_A10M_2.def.json delete mode 100644 resources/extruders/geeetech_A10T_1.def.json delete mode 100644 resources/extruders/geeetech_A10T_2.def.json delete mode 100644 resources/extruders/geeetech_A10T_3.def.json delete mode 100644 resources/extruders/geeetech_A20M_1.def.json delete mode 100644 resources/extruders/geeetech_A20M_2.def.json delete mode 100644 resources/extruders/geeetech_A20T_1.def.json delete mode 100644 resources/extruders/geeetech_A20T_2.def.json delete mode 100644 resources/extruders/geeetech_A20T_3.def.json create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.2_ABS_super.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.2_ABS_ultra.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.2_PETG_super.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.2_PETG_ultra.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.2_PLA_super.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.2_PLA_ultra.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.3_ABS_adaptive.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.3_ABS_low.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.3_ABS_standard.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.3_ABS_super.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.3_PETG_adaptive.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.3_PETG_low.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.3_PETG_standard.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.3_PETG_super.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.3_PLA_adaptive.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.3_PLA_low.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.3_PLA_standard.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.3_PLA_super.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.3_TPU_adaptive.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.3_TPU_standard.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.3_TPU_super.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.4_ABS_adaptive.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.4_ABS_low.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.4_ABS_standard.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.4_ABS_super.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.4_PETG_adaptive.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.4_PETG_low.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.4_PETG_standard.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.4_PETG_super.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.4_PLA_adaptive.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.4_PLA_low.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.4_PLA_standard.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.4_PLA_super.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.4_TPU_adaptive.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.4_TPU_standard.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.4_TPU_super.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.5_ABS_adaptive.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.5_ABS_low.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.5_ABS_standard.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.5_ABS_super.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.5_PETG_adaptive.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.5_PETG_low.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.5_PETG_standard.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.5_PETG_super.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.5_PLA_adaptive.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.5_PLA_low.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.5_PLA_standard.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.5_PLA_super.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.5_TPU_adaptive.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.5_TPU_standard.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.5_TPU_super.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.6_ABS_standard.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.6_PETG_standard.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.6_PLA_draft.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.6_PLA_low.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.6_PLA_standard.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.6_TPU_standard.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.8_ABS_draft.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.8_PETG_draft.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.8_PLA_draft.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_0.8_TPU_draft.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_1.0_ABS_draft.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_1.0_PETG_draft.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_1.0_PLA_draft.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_1.0_TPU_draft.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_global_adaptive.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_global_draft.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_global_low.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_global_standard.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_global_super.inst.cfg create mode 100644 resources/quality/geeetech/base/Geeetech_base_global_ultra.inst.cfg create mode 100644 resources/variants/geeetech_A10Pro_0.2.inst.cfg create mode 100644 resources/variants/geeetech_A10Pro_0.3.inst.cfg create mode 100644 resources/variants/geeetech_A10Pro_0.4.inst.cfg create mode 100644 resources/variants/geeetech_A10Pro_0.5.inst.cfg create mode 100644 resources/variants/geeetech_A10Pro_0.6.inst.cfg create mode 100644 resources/variants/geeetech_A10Pro_0.8.inst.cfg create mode 100644 resources/variants/geeetech_A10Pro_1.0.inst.cfg create mode 100644 resources/variants/geeetech_A20_0.2.inst.cfg create mode 100644 resources/variants/geeetech_A20_0.3.inst.cfg create mode 100644 resources/variants/geeetech_A20_0.4.inst.cfg create mode 100644 resources/variants/geeetech_A20_0.5.inst.cfg create mode 100644 resources/variants/geeetech_A20_0.6.inst.cfg create mode 100644 resources/variants/geeetech_A20_0.8.inst.cfg create mode 100644 resources/variants/geeetech_A20_1.0.inst.cfg create mode 100644 resources/variants/geeetech_A30Pro_0.2.inst.cfg create mode 100644 resources/variants/geeetech_A30Pro_0.3.inst.cfg create mode 100644 resources/variants/geeetech_A30Pro_0.4.inst.cfg create mode 100644 resources/variants/geeetech_A30Pro_0.5.inst.cfg create mode 100644 resources/variants/geeetech_A30Pro_0.6.inst.cfg create mode 100644 resources/variants/geeetech_A30Pro_0.8.inst.cfg create mode 100644 resources/variants/geeetech_A30Pro_1.0.inst.cfg create mode 100644 resources/variants/geeetech_E180_0.2.inst.cfg create mode 100644 resources/variants/geeetech_E180_0.3.inst.cfg create mode 100644 resources/variants/geeetech_E180_0.4.inst.cfg create mode 100644 resources/variants/geeetech_E180_0.5.inst.cfg create mode 100644 resources/variants/geeetech_E180_0.6.inst.cfg create mode 100644 resources/variants/geeetech_E180_0.8.inst.cfg create mode 100644 resources/variants/geeetech_E180_1.0.inst.cfg create mode 100644 resources/variants/geeetech_GiantArmD200_0.2.inst.cfg create mode 100644 resources/variants/geeetech_GiantArmD200_0.3.inst.cfg create mode 100644 resources/variants/geeetech_GiantArmD200_0.4.inst.cfg create mode 100644 resources/variants/geeetech_GiantArmD200_0.5.inst.cfg create mode 100644 resources/variants/geeetech_GiantArmD200_0.6.inst.cfg create mode 100644 resources/variants/geeetech_GiantArmD200_0.8.inst.cfg create mode 100644 resources/variants/geeetech_GiantArmD200_1.0.inst.cfg create mode 100644 resources/variants/geeetech_I3ProB_0.2.inst.cfg create mode 100644 resources/variants/geeetech_I3ProB_0.3.inst.cfg create mode 100644 resources/variants/geeetech_I3ProB_0.4.inst.cfg create mode 100644 resources/variants/geeetech_I3ProB_0.5.inst.cfg create mode 100644 resources/variants/geeetech_I3ProB_0.6.inst.cfg create mode 100644 resources/variants/geeetech_I3ProB_0.8.inst.cfg create mode 100644 resources/variants/geeetech_I3ProB_1.0.inst.cfg create mode 100644 resources/variants/geeetech_I3ProW_0.2.inst.cfg create mode 100644 resources/variants/geeetech_I3ProW_0.3.inst.cfg create mode 100644 resources/variants/geeetech_I3ProW_0.4.inst.cfg create mode 100644 resources/variants/geeetech_I3ProW_0.5.inst.cfg create mode 100644 resources/variants/geeetech_I3ProW_0.6.inst.cfg create mode 100644 resources/variants/geeetech_I3ProW_0.8.inst.cfg create mode 100644 resources/variants/geeetech_I3ProW_1.0.inst.cfg create mode 100644 resources/variants/geeetech_MeCreator2_0.2.inst.cfg create mode 100644 resources/variants/geeetech_MeCreator2_0.3.inst.cfg create mode 100644 resources/variants/geeetech_MeCreator2_0.4.inst.cfg create mode 100644 resources/variants/geeetech_MeCreator2_0.5.inst.cfg create mode 100644 resources/variants/geeetech_MeCreator2_0.6.inst.cfg create mode 100644 resources/variants/geeetech_MeCreator2_0.8.inst.cfg create mode 100644 resources/variants/geeetech_MeCreator2_1.0.inst.cfg create mode 100644 resources/variants/geeetech_MeCreator_0.2.inst.cfg create mode 100644 resources/variants/geeetech_MeCreator_0.3.inst.cfg create mode 100644 resources/variants/geeetech_MeCreator_0.4.inst.cfg create mode 100644 resources/variants/geeetech_MeCreator_0.5.inst.cfg create mode 100644 resources/variants/geeetech_MeCreator_0.6.inst.cfg create mode 100644 resources/variants/geeetech_MeCreator_0.8.inst.cfg create mode 100644 resources/variants/geeetech_MeCreator_1.0.inst.cfg create mode 100644 resources/variants/geeetech_MeDucer_0.2.inst.cfg create mode 100644 resources/variants/geeetech_MeDucer_0.3.inst.cfg create mode 100644 resources/variants/geeetech_MeDucer_0.4.inst.cfg create mode 100644 resources/variants/geeetech_MeDucer_0.5.inst.cfg create mode 100644 resources/variants/geeetech_MeDucer_0.6.inst.cfg create mode 100644 resources/variants/geeetech_MeDucer_0.8.inst.cfg create mode 100644 resources/variants/geeetech_MeDucer_1.0.inst.cfg create mode 100644 resources/variants/geeetech_MizarMax_0.2.inst.cfg create mode 100644 resources/variants/geeetech_MizarMax_0.3.inst.cfg create mode 100644 resources/variants/geeetech_MizarMax_0.4.inst.cfg create mode 100644 resources/variants/geeetech_MizarMax_0.5.inst.cfg create mode 100644 resources/variants/geeetech_MizarMax_0.6.inst.cfg create mode 100644 resources/variants/geeetech_MizarMax_0.8.inst.cfg create mode 100644 resources/variants/geeetech_MizarMax_1.0.inst.cfg create mode 100644 resources/variants/geeetech_MizarPro_0.2.inst.cfg create mode 100644 resources/variants/geeetech_MizarPro_0.3.inst.cfg create mode 100644 resources/variants/geeetech_MizarPro_0.4.inst.cfg create mode 100644 resources/variants/geeetech_MizarPro_0.5.inst.cfg create mode 100644 resources/variants/geeetech_MizarPro_0.6.inst.cfg create mode 100644 resources/variants/geeetech_MizarPro_0.8.inst.cfg create mode 100644 resources/variants/geeetech_MizarPro_1.0.inst.cfg create mode 100644 resources/variants/geeetech_MizarS_0.2.inst.cfg create mode 100644 resources/variants/geeetech_MizarS_0.3.inst.cfg create mode 100644 resources/variants/geeetech_MizarS_0.4.inst.cfg create mode 100644 resources/variants/geeetech_MizarS_0.5.inst.cfg create mode 100644 resources/variants/geeetech_MizarS_0.6.inst.cfg create mode 100644 resources/variants/geeetech_MizarS_0.8.inst.cfg create mode 100644 resources/variants/geeetech_MizarS_1.0.inst.cfg create mode 100644 resources/variants/geeetech_Mizar_0.2.inst.cfg create mode 100644 resources/variants/geeetech_Mizar_0.3.inst.cfg create mode 100644 resources/variants/geeetech_Mizar_0.4.inst.cfg create mode 100644 resources/variants/geeetech_Mizar_0.5.inst.cfg create mode 100644 resources/variants/geeetech_Mizar_0.6.inst.cfg create mode 100644 resources/variants/geeetech_Mizar_0.8.inst.cfg create mode 100644 resources/variants/geeetech_Mizar_1.0.inst.cfg create mode 100644 resources/variants/geeetech_Thunder_0.2.inst.cfg create mode 100644 resources/variants/geeetech_Thunder_0.3.inst.cfg create mode 100644 resources/variants/geeetech_Thunder_0.4.inst.cfg create mode 100644 resources/variants/geeetech_Thunder_0.5.inst.cfg create mode 100644 resources/variants/geeetech_Thunder_0.6.inst.cfg create mode 100644 resources/variants/geeetech_Thunder_0.8.inst.cfg create mode 100644 resources/variants/geeetech_Thunder_1.0.inst.cfg diff --git a/resources/definitions/Geeetech_base.def.json b/resources/definitions/Geeetech_base.def.json new file mode 100644 index 0000000000..00f7902d8c --- /dev/null +++ b/resources/definitions/Geeetech_base.def.json @@ -0,0 +1,143 @@ +{ + "version": 2, + "name": "Geeetech Base Printer", + "inherits": "fdmprinter", + "metadata": { + "visible": false, + "author": "Teddy.Hu", + "manufacturer": "Geeetech", + "file_formats": "text/x-gcode", + "first_start_actions": ["MachineSettingsAction"], + "has_materials": true, + "has_variants": false, + "has_machine_quality": true, + "variants_name": "Nozzle Size", + "preferred_variant_name": "0.4mm Nozzle", + "preferred_quality_type": "standard", + "preferred_material": "generic_pla", + "machine_extruder_trains": { + "0": "Geeetech_base_extruder_0" + } + }, + + "overrides":{ + "machine_name": { "default_value": "Geeetech Base Printer" }, + "machine_width": { "default_value": 250 }, + "machine_depth": { "default_value": 250 }, + "machine_height": {"default_value": 260 }, + "machine_head_with_fans_polygon": { "default_value": [[-31, 31], [34, 31], [34, -40], [-31, -40]] }, + "gantry_height": { "value": 30 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + + "machine_start_gcode": { "default_value": ";Geeetech Custom Start G-code\nM104 S{material_print_temperature_layer_0} ;Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ;Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ;Wait for Hotend Temperature\nG92 E0 ;Reset Extruder\nG28 ;Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ;ON Light\n;M106 P0 S383 ;ON MainFan 150% if need\n;M106 P1 S255 ;ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ;Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ;Draw the first line\nG92 E0 ;Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ;Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ;Scrape off nozzle residue" }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_extruder_count": { "default_value": 1}, + "machine_heated_bed": { "default_value": true }, + + "machine_max_feedrate_x": { "value": 500 }, + "machine_max_feedrate_y": { "value": 500 }, + "machine_max_feedrate_z": { "value": 10 }, + "machine_max_feedrate_e": { "value": 40 }, + "machine_max_acceleration_x": { "value": 500 }, + "machine_max_acceleration_y": { "value": 500 }, + "machine_max_acceleration_z": { "value": 100 }, + "machine_max_acceleration_e": { "value": 1000 }, + "machine_acceleration": { "value": 500 }, + "machine_max_jerk_xy": { "value": 10 }, + "machine_max_jerk_z": { "value": 0.3 }, + "machine_max_jerk_e": { "value": 5 }, + "acceleration_enabled": { "value": false }, + "acceleration_travel_enabled":{ "value": false }, + "acceleration_print": { "value": 500 }, + "acceleration_travel": { "value": 500 }, + "acceleration_travel_layer_0": { "value": "acceleration_travel" }, + "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" }, + + "line_width": {"default_value":"machine_nozzle_size","value": "1.125*machine_nozzle_size if speed_infill<=100 else machine_nozzle_size"}, + "fill_outline_gaps": {"label": "Print Thin Walls", "value": true }, + "retraction_amount": { "default_value": 6.5 }, + "retraction_enable": { "default_value": true }, + "retraction_speed": { "default_value": 40 }, + "infill_sparse_density": {"label": "Infill Density","value": "20" }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'grid'" }, + "small_hole_max_size":{"default_value": 0,"value": "5 if speed_infill>=150 else 0" }, + "cool_min_layer_time":{"default_value": 5,"value": "1.3 if speed_infill>=200 else 5" }, + "material_print_temperature": { "default_value": 200,"value": "200 if speed_infill <=100 else 210 if speed_infill <= 150 else 220 if speed_infill <= 180 else 230", "maximum_value": "250" }, + "material_print_temperature_layer_0": { "value": "material_print_temperature + 5", "maximum_value_warning": 250 }, + "material_initial_print_temperature": { "value": "material_print_temperature - 5", "minimum_value_warning": "material_standby_temperature - 10" }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_bed_temperature": { "maximum_value_warning": 110 }, + + "speed_print": { "default_value": 60, "maximum_value_warning": "300" }, + "speed_infill": {"default_value": 60, "value":"speed_print", "maximum_value_warning": "300"}, + "speed_wall": {"label": " Wall Speed ", "default_value": 30, "value": "60 if speed_print==60 else math.ceil(round(speed_print*0.90))", "maximum_value_warning": "300"}, + "speed_wall_0": {"label": "Outer Wall Speed","default_value": 30, "value": "30 if speed_print==60 else math.ceil(round(speed_print*0.75))", "maximum_value_warning": "300"}, + "speed_wall_x": {"label": "Inner Wall Speed","default_value": 60, "value": "60 if speed_print==60 else math.ceil(round(speed_print*0.90))", "maximum_value_warning": "300"}, + "speed_roofing":{"default_value": 25, "value": "speed_print", "maximum_value_warning": "300"}, + "speed_topbottom": {"default_value": 30, "value": "speed_print", "maximum_value_warning": "300"}, + "speed_travel": {"default_value": 120, "value": "200 if 120<=speed_print<=200 else speed_print if speed_print>200 else 120", "maximum_value_warning": "300"}, + "speed_layer_0": {"default_value": 30, "value":"speed_travel_layer_0","maximum_value_warning": "300"}, + "speed_print_layer_0": {"default_value": 30, "value": "25 if speed_infill <= 150 else 35", "maximum_value_warning": "60"}, + "speed_travel_layer_0": {"default_value": 60,"value": "2*speed_print_layer_0", "maximum_value_warning": "300"}, + "skirt_brim_speed": {"default_value": 30, "value":"speed_print_layer_0", "maximum_value_warning": "60"}, + + "speed_support": {"default_value": 60, "value": "speed_print*0.5", "maximum_value_warning": "300"}, + "speed_support_infill": {"default_value":60, "value": "speed_support", "maximum_value_warning": "300"}, + "speed_support_interface": {"default_value": 40, "value": "speed_support", "maximum_value_warning": "300"}, + "speed_support_roof": {"default_value": 40, "value": "speed_support", "maximum_value_warning": "300"}, + "speed_support_bottom": {"default_value": 40, "value": "speed_support", "maximum_value_warning": "300"}, + + "wall_transition_filter_deviation":{"label": "Wall Transitioning Filter Margin","value": 0.15 }, + "inset_direction":{"label": "Wall Ordering","default_value": "inside_out" }, + "travel_avoid_other_parts": { "value": true }, + "travel_avoid_supports": { "value": true }, + "travel_retract_before_outer_wall": { "value": false }, + "retraction_hop_enabled": { "value": "False" }, + "retraction_hop": { "value": 0.2 }, + "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'all'" }, + "retraction_combing_max_distance": { "value": 30 }, + "optimize_wall_printing_order": { "value": "True" }, + "z_seam_type": { "value": "'sharpest_corner'"}, + "z_seam_corner": { "value": "'z_seam_corner_inner'"}, + + "support_enable": {"default_value": false }, + "support_use_towers": { "value": false }, + "support_angle": { "value": 50 }, + "support_type": {"default_value": "'everywhere'" }, + "support_pattern": { "value": "'zigzag'" }, + "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 25" }, + "support_xy_distance": { "value": "wall_line_width_0 * 2" }, + "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_brim_enable": { "value": true }, + "support_brim_width": { "value": 5 }, + + "support_interface_enable": { "value": false }, + "support_roof_enable": {"default_value": false }, + "support_interface_height": { "value": "layer_height * 4" }, + "support_interface_density": { "value": 33.333 }, + "support_interface_pattern": {"default_value": "zigzag" }, + "support_interface_skip_height": { "value": 0.2 }, + "support_roof_pattern": {"default_value": "zigzag" }, + "support_bottom_pattern": {"default_value": "zigzag" }, + + "minimum_support_area": { "value": 2 }, + "minimum_interface_area": { "value": 10 }, + "top_bottom_thickness": {"value": "layer_height_0 + layer_height * 3" }, + "wall_thickness": {"value": "line_width * 2" }, + + "adhesion_type": { "value": "'skirt'" }, + "brim_replaces_support": { "value": false }, + "skirt_gap": { "value": 6 }, + "skirt_line_count": { "value": 1 }, + "brim_line_count": {"default_value": 5 }, + + "prime_tower_enable":{ "value": false }, + "prime_tower_size": { "value": 30 }, + "prime_tower_min_volume":{ "value": 85, "maximum_value_warning":150 }, + "prime_tower_wipe_enabled":{ "value": true }, + "prime_tower_brim_enable":{ "value": true } + } +} diff --git a/resources/definitions/geeetech_A10.def.json b/resources/definitions/geeetech_A10.def.json deleted file mode 100644 index 6b17223d7b..0000000000 --- a/resources/definitions/geeetech_A10.def.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "version": 2, - "name": "Geeetech A10", - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "Amit L", - "manufacturer": "Geeetech", - "file_formats": "text/x-gcode", - "has_materials": true, - "machine_extruder_trains": - { - "0": "geeetech_A10_1" - } - - }, - - "overrides": { - "machine_name": { "default_value": "Geeetech A10" }, - "machine_width": { - "default_value": 220 - }, - "machine_height": { - "default_value": 260 - }, - "machine_depth": { - "default_value": 220 - }, - "machine_center_is_zero": { - "default_value": false - }, - "layer_height": { "default_value": 0.1 }, - "layer_height_0": { "default_value": 0.15 }, - "retraction_amount": { "default_value": 0.8 }, - "retraction_speed": { "default_value": 35 }, - "adhesion_type": { "default_value": "skirt" }, - "machine_head_with_fans_polygon": { "default_value": [[-31,31],[34,31],[34,-40],[-31,-40]] }, - "gantry_height": { "value": "28" }, - "machine_max_feedrate_z": { "default_value": 12 }, - "machine_max_feedrate_e": { "default_value": 120 }, - "machine_max_acceleration_z": { "default_value": 500 }, - "machine_acceleration": { "default_value": 1000 }, - "machine_max_jerk_xy": { "default_value": 10 }, - "machine_max_jerk_z": { "default_value": 0.2 }, - "machine_max_jerk_e": { "default_value": 2.5 }, - "machine_heated_bed": { "default_value": true }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { - "default_value": "G28 ; Auto home\nG1 Z15 F300 ;Move up slightly\nM107 ;Off fans\nG90 ;Switch to absolute positioning\nM82 ;Extruder absolute mode\nG92 E0 ;Set position of extruder to 0\nG0 X10 Y20 F1500 ;Move to X10 Y20 at 1500mms\nG1 Z0.8 ;Move Z to 0.8\nG1 F300 X180 E40 ;Extrude a line of filament\nG1 F1200 Z2 ;Raise Z\nG92 E0 ;Set extruder position to zero\nG28 ;Auto home" - }, - "machine_end_gcode": { - "default_value": "G91 ;Switch to relative positioning\nG1 E-1 ;Retract filament to lower pressure\nG0 X0 Y200 ;Move hotend to left and bed forward\nM104 S0 ;Cooldown hotend\nG90 ;Switch to absolute mode\nG92 E0 ;Set extruder to zero\nM140 S0 ;Cooldown bed\nM84 ; Disable steppers" - }, - "machine_extruder_count": { - "default_value": 1 - } - - } -} diff --git a/resources/definitions/geeetech_A10M.def.json b/resources/definitions/geeetech_A10M.def.json index c8f0d16712..049a7d75bb 100644 --- a/resources/definitions/geeetech_A10M.def.json +++ b/resources/definitions/geeetech_A10M.def.json @@ -1,58 +1,32 @@ { "version": 2, "name": "Geeetech A10M", - "inherits": "fdmprinter", + "inherits": "Geeetech_base", "metadata": { + "quality_definition": "Geeetech_base", "visible": true, - "author": "Amit L", - "manufacturer": "Geeetech", - "file_formats": "text/x-gcode", "has_materials": true, - "machine_extruder_trains": - { - "0": "geeetech_A10M_1", - "1": "geeetech_A10M_2" - } - - }, + "has_variants": false, + "has_machine_quality": true, + "preferred_material": "Geeetech_PLA_Cyan", + "machine_extruder_trains": { + "0": "Geeetech_Dual_Extruder_0", "1": "Geeetech_Dual_Extruder_1" + } + }, "overrides": { "machine_name": { "default_value": "Geeetech A10M" }, - "machine_width": { - "default_value": 220 - }, - "machine_height": { - "default_value": 260 - }, - "machine_depth": { - "default_value": 220 - }, "machine_center_is_zero": { - "default_value": false - }, - "layer_height": { "default_value": 0.1 }, - "layer_height_0": { "default_value": 0.15 }, - "retraction_amount": { "default_value": 0.8 }, - "retraction_speed": { "default_value": 35 }, - "adhesion_type": { "default_value": "skirt" }, - "machine_head_with_fans_polygon": { "default_value": [[-31,31],[34,31],[34,-40],[-31,-40]] }, - "gantry_height": { "value": "28" }, - "machine_max_feedrate_z": { "default_value": 12 }, - "machine_max_feedrate_e": { "default_value": 120 }, - "machine_max_acceleration_z": { "default_value": 500 }, - "machine_acceleration": { "default_value": 1000 }, - "machine_max_jerk_xy": { "default_value": 10 }, - "machine_max_jerk_z": { "default_value": 0.2 }, - "machine_max_jerk_e": { "default_value": 2.5 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { - "default_value": ";GeeeTech A10M start script\nG28 ;home\nG90 ;absolute positioning\nG1 X0 Y0 Z15 E0 F300 ;go to wait position\nM140 S{material_bed_temperature_layer_0} ;set bed temp\nM109 S{material_print_temperature_layer_0} ;set extruder temp and wait\nG1 Z0.8 F200 ;set extruder height\nG1 X220 Y0 E80 F1000 ;purge line\n;end of start script" - }, - "machine_end_gcode": { - "default_value": "G91\nG1 E-1\nG0 X0 Y200\nM104 S0\nG90\nG92 E0\nM140 S0\nM84\nM104 S0\nM140 S0\nM84" - }, - "machine_extruder_count": { - "default_value": 2 - } - - } + "machine_width": { "default_value": 220 }, + "machine_depth": { "default_value": 220 }, + "machine_height": {"default_value": 260 }, + "machine_head_with_fans_polygon": { "default_value": [[-31, 31], [34, 31], [34, -40], [-31, -40]] }, + "gantry_height": { "value": 28 }, + "prime_tower_position_x":{ "value": 190 }, + "prime_tower_position_y":{ "value": 160 }, + + "machine_start_gcode": { "default_value": ";Geeetech A10M Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_heated_bed": { "default_value": true } + } } diff --git a/resources/definitions/geeetech_A10Pro.def.json b/resources/definitions/geeetech_A10Pro.def.json new file mode 100644 index 0000000000..7bc2384f40 --- /dev/null +++ b/resources/definitions/geeetech_A10Pro.def.json @@ -0,0 +1,26 @@ +{ + "version": 2, + "name": "Geeetech A10Pro", + "inherits": "Geeetech_base", + "metadata": { + "quality_definition": "Geeetech_base", + "visible": true, + "has_materials": true, + "has_variants": true, + "has_machine_quality": true + }, + + "overrides": { + "machine_name": { "default_value": "Geeetech A10Pro" }, + "machine_width": { "default_value": 220 }, + "machine_depth": { "default_value": 220 }, + "machine_height": {"default_value": 260 }, + "machine_head_with_fans_polygon": { "default_value": [[-31, 31], [34, 31], [34, -40], [-31, -40]] }, + "gantry_height": { "value": 28 }, + + "machine_start_gcode": { "default_value": ";Geeetech A10Pro Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_extruder_count": { "default_value": 1 }, + "machine_heated_bed": { "default_value": true } + } +} diff --git a/resources/definitions/geeetech_A10T.def.json b/resources/definitions/geeetech_A10T.def.json index 0f1a0b76ab..30437723be 100644 --- a/resources/definitions/geeetech_A10T.def.json +++ b/resources/definitions/geeetech_A10T.def.json @@ -1,60 +1,32 @@ { "version": 2, "name": "Geeetech A10T", - "inherits": "fdmprinter", + "inherits": "Geeetech_base", "metadata": { + "quality_definition": "Geeetech_base", "visible": true, - "author": "Amit L", - "manufacturer": "Geeetech", - "file_formats": "text/x-gcode", "has_materials": true, - "machine_extruder_trains": - { - "0": "geeetech_A10T_1", - "1": "geeetech_A10T_2", - "2": "geeetech_A10T_3" - } - - }, + "has_variants": false, + "has_machine_quality": true, + "preferred_material": "Geeetech_PLA_Magenta", + "machine_extruder_trains": { + "0": "Geeetech_Multi_Extruder_0", "1": "Geeetech_Multi_Extruder_1", "2": "Geeetech_Multi_Extruder_2" + } + }, "overrides": { "machine_name": { "default_value": "Geeetech A10T" }, - "machine_width": { - "default_value": 220 - }, - "machine_height": { - "default_value": 220 - }, - "machine_depth": { - "default_value": 260 - }, - "machine_center_is_zero": { - "default_value": false - }, - "layer_height": { "default_value": 0.1 }, - "layer_height_0": { "default_value": 0.15 }, - "retraction_amount": { "default_value": 0.8 }, - "retraction_speed": { "default_value": 35 }, - "adhesion_type": { "default_value": "skirt" }, - "machine_head_with_fans_polygon": { "default_value": [[-31,31],[34,31],[34,-40],[-31,-40]] }, - "gantry_height": { "value": "28" }, - "machine_max_feedrate_z": { "default_value": 12 }, - "machine_max_feedrate_e": { "default_value": 120 }, - "machine_max_acceleration_z": { "default_value": 500 }, - "machine_acceleration": { "default_value": 1000 }, - "machine_max_jerk_xy": { "default_value": 10 }, - "machine_max_jerk_z": { "default_value": 0.2 }, - "machine_max_jerk_e": { "default_value": 2.5 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { - "default_value": "G28 \nG1 Z15 F300\nM107\nG90\nM82\nM104 S215\nM140 S55\nG92 E0\nM109 S215\nM107\nM163 S0 P0.33\nM163 S1 P0.33\nM163 S2 P0.33\nM164 S4\nG0 X10 Y20 F6000\nG1 Z0.8\nG1 F300 X180 E40\nG1 F1200 Z2\nG92 E0\nG28" - }, - "machine_end_gcode": { - "default_value": "G91\nG1 E-1\nG0 X0 Y200\nM104 S0\nG90\nG92 E0\nM140 S0\nM84\nM104 S0\nM140 S0\nM84" - }, - "machine_extruder_count": { - "default_value": 3 - } - - } + "machine_width": { "default_value": 220 }, + "machine_depth": { "default_value": 220 }, + "machine_height": {"default_value": 260 }, + "machine_head_with_fans_polygon": { "default_value": [[-31, 31], [34, 31], [34, -40], [-31, -40]] }, + "gantry_height": { "value": 28 }, + "prime_tower_position_x":{ "value": 190 }, + "prime_tower_position_y":{ "value": 160 }, + + "machine_start_gcode": { "default_value": ";Geeetech A10T Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_extruder_count": { "default_value": 3 }, + "machine_heated_bed": { "default_value": true } + } } diff --git a/resources/definitions/geeetech_A20.def.json b/resources/definitions/geeetech_A20.def.json index d96452176f..e8017ea1a3 100644 --- a/resources/definitions/geeetech_A20.def.json +++ b/resources/definitions/geeetech_A20.def.json @@ -1,57 +1,26 @@ { "version": 2, "name": "Geeetech A20", - "inherits": "fdmprinter", + "inherits": "Geeetech_base", "metadata": { + "quality_definition": "Geeetech_base", "visible": true, - "author": "Amit L", - "manufacturer": "Geeetech", - "file_formats": "text/x-gcode", "has_materials": true, - "machine_extruder_trains": - { - "0": "geeetech_A20_1" - } - - }, + "has_variants": true, + "has_machine_quality": true + }, "overrides": { "machine_name": { "default_value": "Geeetech A20" }, - "machine_width": { - "default_value": 250 - }, - "machine_height": { - "default_value": 250 - }, - "machine_depth": { - "default_value": 250 - }, "machine_center_is_zero": { - "default_value": false - }, - "layer_height": { "default_value": 0.1 }, - "layer_height_0": { "default_value": 0.15 }, - "retraction_amount": { "default_value": 0.8 }, - "retraction_speed": { "default_value": 35 }, - "adhesion_type": { "default_value": "skirt" }, - "machine_head_with_fans_polygon": { "default_value": [[-31,31],[34,31],[34,-40],[-31,-40]] }, - "gantry_height": { "value": "28" }, - "machine_max_feedrate_z": { "default_value": 12 }, - "machine_max_feedrate_e": { "default_value": 120 }, - "machine_max_acceleration_z": { "default_value": 500 }, - "machine_acceleration": { "default_value": 1000 }, - "machine_max_jerk_xy": { "default_value": 10 }, - "machine_max_jerk_z": { "default_value": 0.2 }, - "machine_max_jerk_e": { "default_value": 2.5 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { - "default_value": "G28 \nG1 Z15 F300\nM107\nG90\nM82\nM104 S215\nM140 S55\nG92 E0\nM109 S215\nM107\nG0 X10 Y20 F6000\nG1 Z0.8\nG1 F300 X200 E40\nG1 F1200 Z2\nG92 E0\nG28" - }, - "machine_end_gcode": { - "default_value": "G91\nG1 E-1\nG0 X0 Y200\nM104 S0\nG90\nG92 E0\nM140 S0\nM84\nM104 S0\nM140 S0\nM84" - }, - "machine_extruder_count": { - "default_value": 1 - } - - } + "machine_width": { "default_value": 250 }, + "machine_depth": { "default_value": 250 }, + "machine_height": {"default_value": 250 }, + "machine_head_with_fans_polygon": { "default_value": [[-31, 31], [34, 31], [34, -40], [-31, -40]] }, + "gantry_height": { "value": 35 }, + + "machine_start_gcode": { "default_value": ";Geeetech A20 Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_extruder_count": { "default_value": 1}, + "machine_heated_bed": { "default_value": true } + } } diff --git a/resources/definitions/geeetech_A20M.def.json b/resources/definitions/geeetech_A20M.def.json index d06cf9565f..ffe728efbf 100644 --- a/resources/definitions/geeetech_A20M.def.json +++ b/resources/definitions/geeetech_A20M.def.json @@ -1,58 +1,32 @@ { "version": 2, "name": "Geeetech A20M", - "inherits": "fdmprinter", + "inherits": "Geeetech_base", "metadata": { + "quality_definition": "Geeetech_base", "visible": true, - "author": "Amit L", - "manufacturer": "Geeetech", - "file_formats": "text/x-gcode", "has_materials": true, - "machine_extruder_trains": - { - "0": "geeetech_A20M_1", - "1": "geeetech_A20M_2" - } - - }, + "has_variants": false, + "has_machine_quality": true, + "preferred_material": "Geeetech_PLA_Yellow", + "machine_extruder_trains": { + "0": "Geeetech_Dual_Extruder_0", "1": "Geeetech_Dual_Extruder_1" + } + }, "overrides": { "machine_name": { "default_value": "Geeetech A20M" }, - "machine_width": { - "default_value": 250 - }, - "machine_height": { - "default_value": 250 - }, - "machine_depth": { - "default_value": 250 - }, "machine_center_is_zero": { - "default_value": false - }, - "layer_height": { "default_value": 0.1 }, - "layer_height_0": { "default_value": 0.15 }, - "retraction_amount": { "default_value": 0.8 }, - "retraction_speed": { "default_value": 35 }, - "adhesion_type": { "default_value": "skirt" }, - "machine_head_with_fans_polygon": { "default_value": [[-31,31],[34,31],[34,-40],[-31,-40]] }, - "gantry_height": { "value": "28" }, - "machine_max_feedrate_z": { "default_value": 12 }, - "machine_max_feedrate_e": { "default_value": 120 }, - "machine_max_acceleration_z": { "default_value": 500 }, - "machine_acceleration": { "default_value": 1000 }, - "machine_max_jerk_xy": { "default_value": 10 }, - "machine_max_jerk_z": { "default_value": 0.2 }, - "machine_max_jerk_e": { "default_value": 2.5 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { - "default_value": ";GeeeTech A20M start script\nG28 ;home\nG90 ;absolute positioning\nG1 X0 Y0 Z15 E0 F300 ;go to wait position\nM140 S{material_bed_temperature_layer_0} ;set bed temp\nM109 S{material_print_temperature_layer_0} ;set extruder temp and wait\nG1 Z0.8 F200 ;set extruder height\nG1 X220 Y0 E80 F1000 ;purge line\n;end of start script" - }, - "machine_end_gcode": { - "default_value": "G91\nG1 E-1\nG0 X0 Y200\nM104 S0\nG90\nG92 E0\nM140 S0\nM84\nM104 S0\nM140 S0\nM84" - }, - "machine_extruder_count": { - "default_value": 2 - } - - } + "machine_width": { "default_value": 250 }, + "machine_depth": { "default_value": 250 }, + "machine_height": {"default_value": 250 }, + "machine_head_with_fans_polygon": { "default_value": [[-31, 31], [34, 31], [34, -40], [-31, -40]] }, + "gantry_height": { "value": 35 }, + "prime_tower_position_x":{ "value": 220 }, + "prime_tower_position_y":{ "value": 190 }, + + "machine_start_gcode": { "default_value": ";Geeetech A20M Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_heated_bed": { "default_value": true } + } } diff --git a/resources/definitions/geeetech_A20T.def.json b/resources/definitions/geeetech_A20T.def.json index 72ed97978c..bc78b65af2 100644 --- a/resources/definitions/geeetech_A20T.def.json +++ b/resources/definitions/geeetech_A20T.def.json @@ -1,59 +1,32 @@ { "version": 2, "name": "Geeetech A20T", - "inherits": "fdmprinter", + "inherits": "Geeetech_base", "metadata": { + "quality_definition": "Geeetech_base", "visible": true, - "author": "Amit L", - "manufacturer": "Geeetech", - "file_formats": "text/x-gcode", "has_materials": true, - "machine_extruder_trains": - { - "0": "geeetech_A20T_1", - "1": "geeetech_A20T_2", - "2": "geeetech_A20T_3" - } - - }, + "has_variants": false, + "has_machine_quality": true, + "preferred_material": "Geeetech_PLA_Red", + "machine_extruder_trains": { + "0": "Geeetech_Multi_Extruder_0", "1": "Geeetech_Multi_Extruder_1", "2": "Geeetech_Multi_Extruder_2" + } + }, "overrides": { "machine_name": { "default_value": "Geeetech A20T" }, - "machine_width": { - "default_value": 250 - }, - "machine_height": { - "default_value": 250 - }, - "machine_depth": { - "default_value": 250 - }, "machine_center_is_zero": { - "default_value": false - }, - "layer_height": { "default_value": 0.1 }, - "layer_height_0": { "default_value": 0.15 }, - "retraction_amount": { "default_value": 0.8 }, - "retraction_speed": { "default_value": 35 }, - "adhesion_type": { "default_value": "skirt" }, - "machine_head_with_fans_polygon": { "default_value": [[-31,31],[34,31],[34,-40],[-31,-40]] }, - "gantry_height": { "value": "28" }, - "machine_max_feedrate_z": { "default_value": 12 }, - "machine_max_feedrate_e": { "default_value": 120 }, - "machine_max_acceleration_z": { "default_value": 500 }, - "machine_acceleration": { "default_value": 1000 }, - "machine_max_jerk_xy": { "default_value": 10 }, - "machine_max_jerk_z": { "default_value": 0.2 }, - "machine_max_jerk_e": { "default_value": 2.5 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { - "default_value": "G28 \nG1 Z15 F300\nM107\nG90\nM82\nM104 S215\nM140 S55\nG92 E0\nM109 S215\nM107\nM163 S0 P0.33\nM163 S1 P0.33\nM163 S2 P0.33\nM164 S4\nG0 X10 Y20 F6000\nG1 Z0.8\nG1 F300 X200 E40\nG1 F1200 Z2\nG92 E0\nG28" - }, - "machine_end_gcode": { - "default_value": "G91\nG1 E-1\nG0 X0 Y200\nM104 S0\nG90\nG92 E0\nM140 S0\nM84\nM104 S0\nM140 S0\nM84" - }, - "machine_extruder_count": { - "default_value": 3 - } - - } + "machine_width": { "default_value": 250 }, + "machine_depth": { "default_value": 250 }, + "machine_height": {"default_value": 250 }, + "machine_head_with_fans_polygon": { "default_value": [[-31, 31], [34, 31], [34, -40], [-31, -40]] }, + "gantry_height": { "value": 35 }, + "prime_tower_position_x":{ "value": 220 }, + "prime_tower_position_y":{ "value": 190 }, + + "machine_start_gcode": { "default_value": ";Geeetech A20T Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_extruder_count": { "default_value": 3 }, + "machine_heated_bed": { "default_value": true } + } } diff --git a/resources/definitions/geeetech_A30M.def.json b/resources/definitions/geeetech_A30M.def.json new file mode 100644 index 0000000000..6f60dd2914 --- /dev/null +++ b/resources/definitions/geeetech_A30M.def.json @@ -0,0 +1,32 @@ +{ + "version": 2, + "name": "Geeetech A30M", + "inherits": "Geeetech_base", + "metadata": { + "quality_definition": "Geeetech_base", + "visible": true, + "has_materials": true, + "has_variants": false, + "has_machine_quality": true, + "preferred_material": "Geeetech_PLA_Green", + "machine_extruder_trains": { + "0": "Geeetech_Dual_Extruder_0", "1": "Geeetech_Dual_Extruder_1" + } + }, + + "overrides": { + "machine_name": { "default_value": "Geeetech A30M" }, + "machine_width": { "default_value": 320 }, + "machine_depth": { "default_value": 320 }, + "machine_height": {"default_value": 420 }, + "machine_head_with_fans_polygon": { "default_value": [[-75, 35], [18, 35], [18, -18], [-75, -18]] }, + "gantry_height": { "value": 55 }, + "prime_tower_position_x":{ "value": 290 }, + "prime_tower_position_y":{ "value": 260 }, + + "machine_start_gcode": { "default_value": ";Geeetech A30M Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_heated_bed": { "default_value": true } + } +} diff --git a/resources/definitions/geeetech_A30Pro.def.json b/resources/definitions/geeetech_A30Pro.def.json new file mode 100644 index 0000000000..43f78fef90 --- /dev/null +++ b/resources/definitions/geeetech_A30Pro.def.json @@ -0,0 +1,26 @@ +{ + "version": 2, + "name": "Geeetech A30Pro", + "inherits": "Geeetech_base", + "metadata": { + "quality_definition": "Geeetech_base", + "visible": true, + "has_materials": true, + "has_variants": true, + "has_machine_quality": true + }, + + "overrides": { + "machine_name": { "default_value": "Geeetech A30Pro" }, + "machine_width": { "default_value": 320 }, + "machine_depth": { "default_value": 320 }, + "machine_height": {"default_value": 420 }, + "machine_head_with_fans_polygon": { "default_value": [[-75, 35], [18, 35], [18, -18], [-75, -18]] }, + "gantry_height": { "value": 55 }, + + "machine_start_gcode": { "default_value": ";Geeetech A30Pro Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_extruder_count": { "default_value": 1}, + "machine_heated_bed": { "default_value": true } + } +} diff --git a/resources/definitions/geeetech_A30T.def.json b/resources/definitions/geeetech_A30T.def.json new file mode 100644 index 0000000000..11c75a0aab --- /dev/null +++ b/resources/definitions/geeetech_A30T.def.json @@ -0,0 +1,32 @@ +{ + "version": 2, + "name": "Geeetech A30T", + "inherits": "Geeetech_base", + "metadata": { + "quality_definition": "Geeetech_base", + "visible": true, + "has_materials": true, + "has_variants": false, + "has_machine_quality": true, + "preferred_material": "Geeetech_PLA_Blue", + "machine_extruder_trains": { + "0": "Geeetech_Multi_Extruder_0", "1": "Geeetech_Multi_Extruder_1", "2": "Geeetech_Multi_Extruder_2" + } + }, + + "overrides": { + "machine_name": { "default_value": "Geeetech A30T" }, + "machine_width": { "default_value": 320 }, + "machine_depth": { "default_value": 320 }, + "machine_height": {"default_value": 420 }, + "machine_head_with_fans_polygon": { "default_value": [[-75, 35], [18, 35], [18, -18], [-75, -18]] }, + "gantry_height": { "value": 55 }, + "prime_tower_position_x":{ "value": 290 }, + "prime_tower_position_y":{ "value": 260 }, + + "machine_start_gcode": { "default_value": ";Geeetech A30T Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_extruder_count": { "default_value": 3 }, + "machine_heated_bed": { "default_value": true } + } +} diff --git a/resources/definitions/geeetech_E180.def.json b/resources/definitions/geeetech_E180.def.json new file mode 100644 index 0000000000..9259ee715d --- /dev/null +++ b/resources/definitions/geeetech_E180.def.json @@ -0,0 +1,26 @@ +{ + "version": 2, + "name": "Geeetech E180", + "inherits": "Geeetech_base", + "metadata": { + "quality_definition": "Geeetech_base", + "visible": true, + "has_materials": true, + "has_variants": true, + "has_machine_quality": true + }, + + "overrides": { + "machine_name": { "default_value": "Geeetech E180" }, + "machine_width": { "default_value": 125 }, + "machine_depth": { "default_value": 130 }, + "machine_height": {"default_value": 126 }, + "machine_head_with_fans_polygon": { "default_value": [[-31, 31], [34, 31], [34, -40], [-31, -40]] }, + "gantry_height": { "value": 28 }, + + "machine_start_gcode": { "default_value": ";Geeetech E180 Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y10 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y120.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y120.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y10 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y10 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_extruder_count": { "default_value": 1}, + "machine_heated_bed": { "default_value": false } + } +} diff --git a/resources/definitions/geeetech_GiantArmD200.def.json b/resources/definitions/geeetech_GiantArmD200.def.json new file mode 100644 index 0000000000..ca673b5260 --- /dev/null +++ b/resources/definitions/geeetech_GiantArmD200.def.json @@ -0,0 +1,25 @@ +{ + "version": 2, + "name": "Geeetech GiantArmD200", + "inherits": "Geeetech_base", + "metadata": { + "quality_definition": "Geeetech_base", + "visible": true, + "has_materials": true, + "has_variants": true, + "has_machine_quality": true + }, + + "overrides": { + "machine_name": { "default_value": "Geeetech GiantArmD200" }, + "machine_width": { "default_value": 300 }, + "machine_depth": { "default_value": 180 }, + "machine_height": {"default_value": 180 }, + "retraction_amount": { "default_value": 2 }, + + "machine_start_gcode": { "default_value": ";Geeetech GiantArmD200 Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y10 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y160.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y160.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y10 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y10 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_extruder_count": { "default_value": 1 }, + "machine_heated_bed": { "default_value": true } + } +} diff --git a/resources/definitions/geeetech_I3ProB.def.json b/resources/definitions/geeetech_I3ProB.def.json new file mode 100644 index 0000000000..9027ac7e19 --- /dev/null +++ b/resources/definitions/geeetech_I3ProB.def.json @@ -0,0 +1,25 @@ +{ + "version": 2, + "name": "Geeetech I3ProB", + "inherits": "Geeetech_base", + "metadata": { + "quality_definition": "Geeetech_base", + "visible": true, + "has_materials": true, + "has_variants": true, + "has_machine_quality": true + }, + + "overrides": { + "machine_name": { "default_value": "Geeetech I3ProB" }, + "machine_width": { "default_value": 200 }, + "machine_depth": { "default_value": 200 }, + "machine_height": {"default_value": 180 }, + "retraction_amount": { "default_value": 2 }, + + "machine_start_gcode": { "default_value": ";Geeetech I3ProB Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y10 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y180.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y180.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y10 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_extruder_count": { "default_value": 1 }, + "machine_heated_bed": { "default_value": true } + } +} diff --git a/resources/definitions/geeetech_I3ProC.def.json b/resources/definitions/geeetech_I3ProC.def.json new file mode 100644 index 0000000000..b8a74d3aa9 --- /dev/null +++ b/resources/definitions/geeetech_I3ProC.def.json @@ -0,0 +1,31 @@ +{ + "version": 2, + "name": "Geeetech I3ProC", + "inherits": "Geeetech_base", + "metadata": { + "quality_definition": "Geeetech_base", + "visible": true, + "has_materials": true, + "has_variants": false, + "has_machine_quality": true, + "preferred_material": "Geeetech_PLA_Black", + "machine_extruder_trains": { + "0": "Geeetech_Dual_Extruder_0", "1": "Geeetech_Dual_Extruder_1" + } + }, + + "overrides": { + "machine_name": { "default_value": "Geeetech I3ProC" }, + "machine_width": { "default_value": 200 }, + "machine_depth": { "default_value": 200 }, + "machine_height": {"default_value": 180 }, + "retraction_amount": { "default_value": 2 }, + "prime_tower_position_x":{ "value": 170 }, + "prime_tower_position_y":{ "value": 140 }, + + "machine_start_gcode": { "default_value": ";Geeetech I3ProC Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y10 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y180.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y180.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y10 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_heated_bed": { "default_value": true } + } +} diff --git a/resources/definitions/geeetech_I3ProW.def.json b/resources/definitions/geeetech_I3ProW.def.json new file mode 100644 index 0000000000..e0d98a8927 --- /dev/null +++ b/resources/definitions/geeetech_I3ProW.def.json @@ -0,0 +1,25 @@ +{ + "version": 2, + "name": "Geeetech I3ProW", + "inherits": "Geeetech_base", + "metadata": { + "quality_definition": "Geeetech_base", + "visible": true, + "has_materials": true, + "has_variants": true, + "has_machine_quality": true + }, + + "overrides": { + "machine_name": { "default_value": "Geeetech I3ProW" }, + "machine_width": { "default_value": 200 }, + "machine_depth": { "default_value": 200 }, + "machine_height": {"default_value": 180 }, + "retraction_amount": { "default_value": 2 }, + + "machine_start_gcode": { "default_value": ";Geeetech I3ProW Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y10 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y180.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y180.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y10 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_extruder_count": { "default_value": 1 }, + "machine_heated_bed": { "default_value": true } + } +} diff --git a/resources/definitions/geeetech_MeCreator.def.json b/resources/definitions/geeetech_MeCreator.def.json new file mode 100644 index 0000000000..240ea210c1 --- /dev/null +++ b/resources/definitions/geeetech_MeCreator.def.json @@ -0,0 +1,25 @@ +{ + "version": 2, + "name": "Geeetech MeCreator", + "inherits": "Geeetech_base", + "metadata": { + "quality_definition": "Geeetech_base", + "visible": true, + "has_materials": true, + "has_variants": true, + "has_machine_quality": true + }, + + "overrides": { + "machine_name": { "default_value": "Geeetech MeCreator" }, + "machine_width": { "default_value": 150 }, + "machine_depth": { "default_value": 150 }, + "machine_height": {"default_value": 125 }, + "retraction_amount": { "default_value": 2 }, + + "machine_start_gcode": { "default_value": ";Geeetech MeCreator Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y10 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y130.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y130.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y10 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y10 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_extruder_count": { "default_value": 1 }, + "machine_heated_bed": { "default_value": true } + } +} diff --git a/resources/definitions/geeetech_MeCreator2.def.json b/resources/definitions/geeetech_MeCreator2.def.json new file mode 100644 index 0000000000..81e2a915c4 --- /dev/null +++ b/resources/definitions/geeetech_MeCreator2.def.json @@ -0,0 +1,25 @@ +{ + "version": 2, + "name": "Geeetech MeCreator2", + "inherits": "Geeetech_base", + "metadata": { + "quality_definition": "Geeetech_base", + "visible": true, + "has_materials": true, + "has_variants": true, + "has_machine_quality": true + }, + + "overrides": { + "machine_name": { "default_value": "Geeetech MeCreator2" }, + "machine_width": { "default_value": 160 }, + "machine_depth": { "default_value": 160 }, + "machine_height": {"default_value": 160 }, + "retraction_amount": { "default_value": 2 }, + + "machine_start_gcode": { "default_value": ";Geeetech MeCreator2 Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y10 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y140.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y140.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y10 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y10 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_extruder_count": { "default_value": 1 }, + "machine_heated_bed": { "default_value": true } + } +} diff --git a/resources/definitions/geeetech_MeDucer.def.json b/resources/definitions/geeetech_MeDucer.def.json new file mode 100644 index 0000000000..2a95658bd5 --- /dev/null +++ b/resources/definitions/geeetech_MeDucer.def.json @@ -0,0 +1,25 @@ +{ + "version": 2, + "name": "Geeetech MeDucer", + "inherits": "Geeetech_base", + "metadata": { + "quality_definition": "Geeetech_base", + "visible": true, + "has_materials": true, + "has_variants": true, + "has_machine_quality": true + }, + + "overrides": { + "machine_name": { "default_value": "Geeetech MeDucer" }, + "machine_width": { "default_value": 180 }, + "machine_depth": { "default_value": 150 }, + "machine_height": {"default_value": 150 }, + "retraction_amount": { "default_value": 2 }, + + "machine_start_gcode": { "default_value": ";Geeetech MeDucer Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y10 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y130.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y130.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y10 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y10 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_extruder_count": { "default_value": 1 }, + "machine_heated_bed": { "default_value": true } + } +} diff --git a/resources/definitions/geeetech_Mizar.def.json b/resources/definitions/geeetech_Mizar.def.json new file mode 100644 index 0000000000..cfcd708319 --- /dev/null +++ b/resources/definitions/geeetech_Mizar.def.json @@ -0,0 +1,26 @@ +{ + "version": 2, + "name": "Geeetech Mizar", + "inherits": "Geeetech_base", + "metadata": { + "quality_definition": "Geeetech_base", + "visible": true, + "has_materials": true, + "has_variants": true, + "has_machine_quality": true + }, + + "overrides": { + "machine_name": { "default_value": "Geeetech Mizar" }, + "machine_width": { "default_value": 220 }, + "machine_depth": { "default_value": 220 }, + "machine_height": {"default_value": 260 }, + "machine_head_with_fans_polygon": { "default_value": [[-31, 31], [34, 31], [34, -40], [-31, -40]] }, + "gantry_height": { "value": 35 }, + + "machine_start_gcode": { "default_value": ";Official open-source firmware for Mizar: https://github.com/Geeetech3D/Mizar \n\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_extruder_count": { "default_value": 1}, + "machine_heated_bed": { "default_value": true } + } +} diff --git a/resources/definitions/geeetech_MizarM.def.json b/resources/definitions/geeetech_MizarM.def.json new file mode 100644 index 0000000000..ba291b028e --- /dev/null +++ b/resources/definitions/geeetech_MizarM.def.json @@ -0,0 +1,34 @@ +{ + "version": 2, + "name": "Geeetech MizarM", + "inherits": "Geeetech_base", + "metadata": { + "quality_definition": "Geeetech_base", + "visible": true, + "has_materials": true, + "has_variants": false, + "has_machine_quality": true, + "preferred_material": "Geeetech_PLA_Magenta", + "machine_extruder_trains": { + "0": "Geeetech_Dual_Extruder_0", "1": "Geeetech_Dual_Extruder_1" + } + }, + + "overrides": { + "machine_name": { "default_value": "Geeetech MizarM" }, + "machine_width": { "default_value": 255 }, + "machine_depth": { "default_value": 255 }, + "machine_height": {"default_value": 260 }, + "machine_head_with_fans_polygon": { "default_value": [[-31, 31], [34, 31], [34, -40], [-31, -40]] }, + "gantry_height": { "value": 35 }, + "brim_width":{ "value": 10 }, + "prime_tower_position_x":{ "value": 225 }, + "prime_tower_position_y":{ "value": 195 }, + + "machine_start_gcode": { "default_value": ";Official open-source firmware for MizarM: https://github.com/Geeetech3D/Mizar-M \n\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_extruder_count": { "default_value": 2 }, + "material_standby_temperature": {"value": 200 }, + "machine_heated_bed": { "default_value": true } + } +} diff --git a/resources/definitions/geeetech_MizarMax.def.json b/resources/definitions/geeetech_MizarMax.def.json new file mode 100644 index 0000000000..cc070ab029 --- /dev/null +++ b/resources/definitions/geeetech_MizarMax.def.json @@ -0,0 +1,26 @@ +{ + "version": 2, + "name": "Geeetech MizarMax", + "inherits": "Geeetech_base", + "metadata": { + "quality_definition": "Geeetech_base", + "visible": true, + "has_materials": true, + "has_variants": true, + "has_machine_quality": true + }, + + "overrides": { + "machine_name": { "default_value": "Geeetech MizarMax" }, + "machine_width": { "default_value": 320 }, + "machine_depth": { "default_value": 320 }, + "machine_height": {"default_value": 400 }, + "machine_head_with_fans_polygon": { "default_value": [[-31, 31], [34, 31], [34, -40], [-31, -40]] }, + "gantry_height": { "value": 35 }, + + "machine_start_gcode": { "default_value": ";Official open-source firmware for MizarMax: https://github.com/Geeetech3D/Mizar-Max \n\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_extruder_count": { "default_value": 1}, + "machine_heated_bed": { "default_value": true } + } +} diff --git a/resources/definitions/geeetech_MizarPro.def.json b/resources/definitions/geeetech_MizarPro.def.json new file mode 100644 index 0000000000..81130bd0de --- /dev/null +++ b/resources/definitions/geeetech_MizarPro.def.json @@ -0,0 +1,26 @@ +{ + "version": 2, + "name": "Geeetech MizarPro", + "inherits": "Geeetech_base", + "metadata": { + "quality_definition": "Geeetech_base", + "visible": true, + "has_materials": true, + "has_variants": true, + "has_machine_quality": true + }, + + "overrides": { + "machine_name": { "default_value": "Geeetech MizarPro" }, + "machine_width": { "default_value": 220 }, + "machine_depth": { "default_value": 220 }, + "machine_height": {"default_value": 260 }, + "machine_head_with_fans_polygon": { "default_value": [[-31, 31], [34, 31], [34, -40], [-31, -40]] }, + "gantry_height": { "value": 35 }, + + "machine_start_gcode": { "default_value": ";Official open-source firmware for MizarPro: https://github.com/Geeetech3D/Mizar-Pro \n\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_extruder_count": { "default_value": 1}, + "machine_heated_bed": { "default_value": true } + } +} diff --git a/resources/definitions/geeetech_MizarS.def.json b/resources/definitions/geeetech_MizarS.def.json new file mode 100644 index 0000000000..7c6ef40fef --- /dev/null +++ b/resources/definitions/geeetech_MizarS.def.json @@ -0,0 +1,26 @@ +{ + "version": 2, + "name": "Geeetech MizarS", + "inherits": "Geeetech_base", + "metadata": { + "quality_definition": "Geeetech_base", + "visible": true, + "has_materials": true, + "has_variants": true, + "has_machine_quality": true + }, + + "overrides": { + "machine_name": { "default_value": "Geeetech MizarS" }, + "machine_width": { "default_value": 255 }, + "machine_depth": { "default_value": 255 }, + "machine_height": {"default_value": 260 }, + "machine_head_with_fans_polygon": { "default_value": [[-31, 31], [34, 31], [34, -40], [-31, -40]] }, + "gantry_height": { "value": 35 }, + + "machine_start_gcode": { "default_value": ";Official open-source firmware for MizarS: https://github.com/Geeetech3D/Mizar-S \n\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_extruder_count": { "default_value": 1}, + "machine_heated_bed": { "default_value": true } + } +} diff --git a/resources/definitions/geeetech_Mizar_S.def.json b/resources/definitions/geeetech_Mizar_S.def.json deleted file mode 100644 index 7cd7e42e68..0000000000 --- a/resources/definitions/geeetech_Mizar_S.def.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "version": 2, - "name": "Geeetech Mizar_S", - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "Amit L", - "manufacturer": "Geeetech", - "file_formats": "text/x-gcode", - "has_materials": true, - "machine_extruder_trains": - { - "0": "geeetech_Mizar_S_1" - } - - }, - - "overrides": { - "machine_name": { "default_value": "Geeetech Mizar_S" }, - "machine_width": { - "default_value": 255 - }, - "machine_height": { - "default_value": 260 - }, - "machine_depth": { - "default_value": 255 - }, - "machine_center_is_zero": { - "default_value": false - }, - "layer_height": { "default_value": 0.1 }, - "layer_height_0": { "default_value": 0.15 }, - "retraction_amount": { "default_value": 0.8 }, - "retraction_speed": { "default_value": 35 }, - "adhesion_type": { "default_value": "skirt" }, - "machine_head_with_fans_polygon": { "default_value": [[-31,31],[34,31],[34,-40],[-31,-40]] }, - "gantry_height": { "value": "28" }, - "machine_max_feedrate_z": { "default_value": 12 }, - "machine_max_feedrate_e": { "default_value": 120 }, - "machine_max_acceleration_z": { "default_value": 500 }, - "machine_acceleration": { "default_value": 1000 }, - "machine_max_jerk_xy": { "default_value": 10 }, - "machine_max_jerk_z": { "default_value": 0.2 }, - "machine_max_jerk_e": { "default_value": 2.5 }, - "machine_heated_bed": { "default_value": true }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { - "default_value": "G28 ; Auto home\nG1 Z15 F300 ;Move up slightly\nM107 ;Off fans\nG90 ;Switch to absolute positioning\nM82 ;Extruder absolute mode\nG92 E0 ;Set position of extruder to 0\nG0 X10 Y20 F1500 ;Move to X10 Y20 at 1500mms\nG1 Z0.8 ;Move Z to 0.8\nG1 F300 X180 E40 ;Extrude a line of filament\nG1 F1200 Z2 ;Raise Z\nG92 E0 ;Set extruder position to zero\nG28 ;Auto home" - }, - "machine_end_gcode": { - "default_value": "G91 ;Switch to relative positioning\nG1 E-1 ;Retract filament to lower pressure\nG0 X0 Y200 ;Move hotend to left and bed forward\nM104 S0 ;Cooldown hotend\nG90 ;Switch to absolute mode\nG92 E0 ;Set extruder to zero\nM140 S0 ;Cooldown bed\nM84 ; Disable steppers" - }, - "machine_extruder_count": { - "default_value": 1 - } - - } -} diff --git a/resources/definitions/geeetech_Thunder.def.json b/resources/definitions/geeetech_Thunder.def.json new file mode 100644 index 0000000000..a5676d59f2 --- /dev/null +++ b/resources/definitions/geeetech_Thunder.def.json @@ -0,0 +1,69 @@ +{ + "version": 2, + "name": "Geeetech Thunder", + "inherits": "Geeetech_base", + "metadata": { + "quality_definition": "Geeetech_base", + "visible": true, + "has_materials": true, + "has_variants": true, + "has_machine_quality": true + }, + + "overrides": { + "machine_name": { "default_value": "Geeetech Thunder" }, + "machine_width": { "default_value": 250 }, + "machine_depth": { "default_value": 250 }, + "machine_height": {"default_value": 260 }, + "machine_start_gcode": { "default_value": ";Official viki homepage for Thunder:https://www.geeetech.com/wiki/index.php/Geeetech_Thunder_3D_printer \n\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_extruder_count": { "default_value": 1}, + "machine_heated_bed": { "default_value": true }, + + "machine_max_feedrate_x": { "value": 300 }, + "machine_max_feedrate_y": { "value": 500 }, + "machine_max_feedrate_z": { "value": 10 }, + "machine_max_feedrate_e": { "value": 60 }, + "machine_max_acceleration_x": { "value": 5000 }, + "machine_max_acceleration_y": { "value": 4000 }, + "machine_max_acceleration_z": { "value": 50 }, + "machine_max_acceleration_e": { "value": 3500 }, + "machine_max_jerk_xy": { "value": 45 }, + "machine_max_jerk_z": { "value": 0.8 }, + "machine_max_jerk_e": { "value": 8 }, + "acceleration_enabled": { "value": false }, + "acceleration_travel_enabled":{ "value": false }, + "acceleration_print": { "value": 3500 }, + "acceleration_travel": { "value": 5000 }, + + "line_width": {"default_value":"machine_nozzle_size","value": "1.2*machine_nozzle_size if speed_infill>=200 else machine_nozzle_size"}, + "fill_outline_gaps": {"label": "Print Thin Walls", "value": false }, + "retraction_amount": { "default_value": 6.5 }, + "retraction_enable": { "default_value": true }, + "retraction_speed": { "default_value": 35 }, + "infill_sparse_density": {"label": "Infill Density","value": "15" }, + "cool_min_layer_time":{"default_value": 5,"value": "1.3 if speed_infill>=200 else 2.5" }, + "small_hole_max_size":{"default_value": 0,"value": "8 if speed_infill>=200 else 0" }, + "cool_fan_full_at_height": {"label": "Regular Fan Speed at Height","value": "layer_height_0 + layer_height" }, + "cool_fan_enabled": { "value": true }, + "cool_fan_speed":{"maximum_value": "151","default_value": 100,"value": "151 if speed_infill>=200 else 100" }, + "cool_fan_speed_min":{"maximum_value": "151","default_value": 100,"value": "cool_fan_speed"}, + "cool_fan_speed_max":{"maximum_value": "151","default_value": 100,"value": "cool_fan_speed"}, + + "material_print_temperature": {"default_value": 210,"value": "200 if speed_infill <=150 else 205 if speed_infill <= 200 else 215 if speed_infill <= 260 else 220","maximum_value": "250" }, + "material_print_temperature_layer_0": { "value": "material_print_temperature" }, + "material_initial_print_temperature": { "value": "material_print_temperature - 5 " }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_flow_layer_0": { "default_value": 95 }, + + "speed_print": { "default_value":250, "maximum_value_warning": "300" }, + "speed_equalize_flow_width_factor":{"label": "Flow Equalization Ratio", "default_value": 100.0, "minimum_value": "0.0", "maximum_value_warning": "200.0"}, + "infill_before_walls": {"label": "Infill Before Walls", "value": false }, + "infill_wipe_dist": {"label": "Infill Wipe Distance", "value": 0.0 }, + "wall_0_wipe_dist": {"label": "Outer Wall Wipe Distance","value": 0.0 }, + + "infill_overlap": {"label": "Infill Overlap Percentage", "value": 10.0 }, + "skin_overlap": {"label": "Skin Overlap Percentage", "value": 10.0 }, + "zig_zaggify_infill": {"label": "Connect Infill Lines","value": true } + } +} diff --git a/resources/definitions/geeetech_a30.def.json b/resources/definitions/geeetech_a30.def.json deleted file mode 100644 index d4f7df139f..0000000000 --- a/resources/definitions/geeetech_a30.def.json +++ /dev/null @@ -1,113 +0,0 @@ -{ - "version": 2, - "name": "Geeetech A30", - "inherits": "fdmprinter", - "metadata": { - "author": "William & Cataldo URSO", - "manufacturer": "Geeetech", - "file_formats": "text/x-gcode", - "visible": true, - "has_materials": true, - "preferred_quality_type": "draft", - "machine_extruder_trains": { - "0": "geeetech_a30_extruder_0" - } - }, - "overrides": { - "machine_name": { - "default_value": "Geeetech A30" - }, - "machine_start_gcode": { - "default_value": "G28 ;Home\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG1 Z15.0 F6000 ;Move the platform down 15mm\nG92 E0\nG1 F200 E3\nG92 E0" - }, - "machine_end_gcode": { - "default_value": "M104 S0;Cooling the heat end\nM140 S0;Cooling the heat bed\nG92 E1\nG1 E-1 F300\nG28 X0 Y0;Home X axis and Y axis\nM84" - }, - "machine_width": { - "default_value": 320 - }, - "machine_height": { - "default_value": 420 - }, - "machine_depth": { - "default_value": 320 - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_center_is_zero": { - "default_value": false - }, - "material_diameter": { - "default_value": 1.75 - }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "layer_height": { - "default_value": 0.1 - }, - "layer_height_0": { - "default_value": 0.3 - }, - "retraction_amount": { - "default_value": 2 - }, - "retraction_speed": { - "default_value": 25 - }, - "adhesion_type": { - "default_value": "skirt" - }, - "machine_head_with_fans_polygon": { - "default_value": [ - [-75, 35], - [18, 35], - [18, -18], - [-75, -18] - ] - }, - "gantry_height": { - "value": "55" - }, - "machine_max_feedrate_x": { - "default_value": 300 - }, - "machine_max_feedrate_y": { - "default_value": 300 - }, - "machine_max_feedrate_z": { - "default_value": 7 - }, - "machine_max_feedrate_e": { - "default_value": 50 - }, - "machine_max_acceleration_x": { - "default_value": 2000 - }, - "machine_max_acceleration_y": { - "default_value": 2000 - }, - "machine_max_acceleration_z": { - "default_value": 100 - }, - "machine_max_acceleration_e": { - "default_value": 10000 - }, - "machine_acceleration": { - "default_value": 2000 - }, - "machine_max_jerk_xy": { - "default_value": 10 - }, - "machine_max_jerk_z": { - "default_value": 1 - }, - "machine_max_jerk_e": { - "default_value": 5 - }, - "machine_gcode_flavor": { - "default_value": "Repetier" - } - } -} diff --git a/resources/extruders/geeetech_A20_1.def.json b/resources/extruders/Geeetech_Dual_Extruder_0.def.json similarity index 64% rename from resources/extruders/geeetech_A20_1.def.json rename to resources/extruders/Geeetech_Dual_Extruder_0.def.json index ce47abb402..1d39b2c56e 100644 --- a/resources/extruders/geeetech_A20_1.def.json +++ b/resources/extruders/Geeetech_Dual_Extruder_0.def.json @@ -1,16 +1,16 @@ -{ - "version": 2, - "name": "Extruder 1", - "inherits": "fdmextruder", - "metadata": { - "machine": "geeetech_A20", - "position": "0" - }, - - "overrides": { - "extruder_nr": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } - - } -} +{ + "version": 2, + "name": "E0", + "inherits": "fdmextruder", + "metadata": { + "machine": "Geeetech_base", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 ,"maximum_value": "1" }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + + } +} diff --git a/resources/extruders/geeetech_A10_1.def.json b/resources/extruders/Geeetech_Dual_Extruder_1.def.json similarity index 57% rename from resources/extruders/geeetech_A10_1.def.json rename to resources/extruders/Geeetech_Dual_Extruder_1.def.json index bcf889ab43..b3e07049a4 100644 --- a/resources/extruders/geeetech_A10_1.def.json +++ b/resources/extruders/Geeetech_Dual_Extruder_1.def.json @@ -1,17 +1,16 @@ -{ - - "version": 2, - "name": "Extruder 1", - "inherits": "fdmextruder", - "metadata": { - "machine": "geeetech_A10", - "position": "0" - }, - - "overrides": { - "extruder_nr": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } - - } -} +{ + "version": 2, + "name": "E1", + "inherits": "fdmextruder", + "metadata": { + "machine": "Geeetech_base", + "position": "1" + }, + + "overrides": { + "extruder_nr": { "default_value": 1 ,"maximum_value": "1" }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + + } +} diff --git a/resources/extruders/geeetech_Mizar_S_1.def.json b/resources/extruders/Geeetech_Multi_Extruder_0.def.json similarity index 64% rename from resources/extruders/geeetech_Mizar_S_1.def.json rename to resources/extruders/Geeetech_Multi_Extruder_0.def.json index da4440cd87..07c93062eb 100644 --- a/resources/extruders/geeetech_Mizar_S_1.def.json +++ b/resources/extruders/Geeetech_Multi_Extruder_0.def.json @@ -1,17 +1,16 @@ { - "version": 2, - "name": "Extruder 1", + "name": "E0", "inherits": "fdmextruder", "metadata": { - "machine": "geeetech_Mizar_S", + "machine": "Geeetech_base", "position": "0" }, "overrides": { - "extruder_nr": { "default_value": 0 }, + "extruder_nr": { "default_value": 0 ,"maximum_value": "2" }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } - + } } diff --git a/resources/extruders/Geeetech_Multi_Extruder_1.def.json b/resources/extruders/Geeetech_Multi_Extruder_1.def.json new file mode 100644 index 0000000000..2333332f85 --- /dev/null +++ b/resources/extruders/Geeetech_Multi_Extruder_1.def.json @@ -0,0 +1,16 @@ +{ + "version": 2, + "name": "E1", + "inherits": "fdmextruder", + "metadata": { + "machine": "Geeetech_base", + "position": "1" + }, + + "overrides": { + "extruder_nr": { "default_value": 1 ,"maximum_value": "2" }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + + } +} diff --git a/resources/extruders/Geeetech_Multi_Extruder_2.def.json b/resources/extruders/Geeetech_Multi_Extruder_2.def.json new file mode 100644 index 0000000000..a50605be7d --- /dev/null +++ b/resources/extruders/Geeetech_Multi_Extruder_2.def.json @@ -0,0 +1,16 @@ +{ + "version": 2, + "name": "E2", + "inherits": "fdmextruder", + "metadata": { + "machine": "Geeetech_base", + "position": "2" + }, + + "overrides": { + "extruder_nr": { "default_value": 2 ,"maximum_value": "2" }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + + } +} diff --git a/resources/extruders/geeetech_a30_extruder_0.def.json b/resources/extruders/Geeetech_base_extruder_0.def.json similarity index 87% rename from resources/extruders/geeetech_a30_extruder_0.def.json rename to resources/extruders/Geeetech_base_extruder_0.def.json index 90cb496877..3ef9af0405 100644 --- a/resources/extruders/geeetech_a30_extruder_0.def.json +++ b/resources/extruders/Geeetech_base_extruder_0.def.json @@ -3,7 +3,7 @@ "name": "Extruder 1", "inherits": "fdmextruder", "metadata": { - "machine": "geeetech_a30", + "machine": "Geeetech_base", "position": "0" }, @@ -11,5 +11,6 @@ "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } + } } diff --git a/resources/extruders/geeetech_A10M_1.def.json b/resources/extruders/geeetech_A10M_1.def.json deleted file mode 100644 index b3c87489e9..0000000000 --- a/resources/extruders/geeetech_A10M_1.def.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "version": 2, - "name": "Extruder 1", - "inherits": "fdmextruder", - "metadata": { - "machine": "geeetech_A10M", - "position": "0" - }, - - "overrides": { - "extruder_nr": { - "default_value": 0, - "maximum_value": "1" - }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } - - } -} diff --git a/resources/extruders/geeetech_A10M_2.def.json b/resources/extruders/geeetech_A10M_2.def.json deleted file mode 100644 index 59c8d36aab..0000000000 --- a/resources/extruders/geeetech_A10M_2.def.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "version": 2, - "name": "Extruder 2", - "inherits": "fdmextruder", - "metadata": { - "machine": "geeetech_A10M", - "position": "1" - }, - - "overrides": { - "extruder_nr": { - "default_value": 1, - "maximum_value": "1" - }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } - - } -} diff --git a/resources/extruders/geeetech_A10T_1.def.json b/resources/extruders/geeetech_A10T_1.def.json deleted file mode 100644 index 240a71ccc4..0000000000 --- a/resources/extruders/geeetech_A10T_1.def.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "version": 2, - "name": "Extruder 1", - "inherits": "fdmextruder", - "metadata": { - "machine": "geeetech_A10T", - "position": "0" - }, - - "overrides": { - "extruder_nr": { - "default_value": 0, - "maximum_value": "2" - }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } - - } -} diff --git a/resources/extruders/geeetech_A10T_2.def.json b/resources/extruders/geeetech_A10T_2.def.json deleted file mode 100644 index cc93fdd416..0000000000 --- a/resources/extruders/geeetech_A10T_2.def.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "version": 2, - "name": "Extruder 2", - "inherits": "fdmextruder", - "metadata": { - "machine": "geeetech_A10T", - "position": "1" - }, - - "overrides": { - "extruder_nr": { - "default_value": 1, - "maximum_value": "2" - }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } - - } -} diff --git a/resources/extruders/geeetech_A10T_3.def.json b/resources/extruders/geeetech_A10T_3.def.json deleted file mode 100644 index ddee8fcd3b..0000000000 --- a/resources/extruders/geeetech_A10T_3.def.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "version": 2, - "name": "Extruder 3", - "inherits": "fdmextruder", - "metadata": { - "machine": "geeetech_A10T", - "position": "2" - }, - - "overrides": { - "extruder_nr": { - "default_value": 2, - "maximum_value": "2" - }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } - - } -} diff --git a/resources/extruders/geeetech_A20M_1.def.json b/resources/extruders/geeetech_A20M_1.def.json deleted file mode 100644 index b0c00f4144..0000000000 --- a/resources/extruders/geeetech_A20M_1.def.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "version": 2, - "name": "Extruder 1", - "inherits": "fdmextruder", - "metadata": { - "machine": "geeetech_A20M", - "position": "0" - }, - - "overrides": { - "extruder_nr": { - "default_value": 0, - "maximum_value": "1" - }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } - - } -} diff --git a/resources/extruders/geeetech_A20M_2.def.json b/resources/extruders/geeetech_A20M_2.def.json deleted file mode 100644 index 51dd29723a..0000000000 --- a/resources/extruders/geeetech_A20M_2.def.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "version": 2, - "name": "Extruder 2", - "inherits": "fdmextruder", - "metadata": { - "machine": "geeetech_A20M", - "position": "1" - }, - - "overrides": { - "extruder_nr": { - "default_value": 1, - "maximum_value": "1" - }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } - - } -} diff --git a/resources/extruders/geeetech_A20T_1.def.json b/resources/extruders/geeetech_A20T_1.def.json deleted file mode 100644 index 4880f2147b..0000000000 --- a/resources/extruders/geeetech_A20T_1.def.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "version": 2, - "name": "Extruder 1", - "inherits": "fdmextruder", - "metadata": { - "machine": "geeetech_A20T", - "position": "0" - }, - - "overrides": { - "extruder_nr": { - "default_value": 0, - "maximum_value": "2" - }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } - - } -} diff --git a/resources/extruders/geeetech_A20T_2.def.json b/resources/extruders/geeetech_A20T_2.def.json deleted file mode 100644 index d001cbc291..0000000000 --- a/resources/extruders/geeetech_A20T_2.def.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "version": 2, - "name": "Extruder 2", - "inherits": "fdmextruder", - "metadata": { - "machine": "geeetech_A20T", - "position": "1" - }, - - "overrides": { - "extruder_nr": { - "default_value": 1, - "maximum_value": "2" - }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } - - } -} diff --git a/resources/extruders/geeetech_A20T_3.def.json b/resources/extruders/geeetech_A20T_3.def.json deleted file mode 100644 index db60908cb9..0000000000 --- a/resources/extruders/geeetech_A20T_3.def.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "version": 2, - "name": "Extruder 3", - "inherits": "fdmextruder", - "metadata": { - "machine": "geeetech_A20T", - "position": "2" - }, - - "overrides": { - "extruder_nr": { - "default_value": 2, - "maximum_value": "2" - }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } - - } -} diff --git a/resources/quality/geeetech/base/Geeetech_base_0.2_ABS_super.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.2_ABS_super.inst.cfg new file mode 100644 index 0000000000..01b80df9a8 --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.2_ABS_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Super Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_abs +variant = 0.2mm Nozzle + +[values] +wall_thickness = =line_width*8 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.2_ABS_ultra.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.2_ABS_ultra.inst.cfg new file mode 100644 index 0000000000..7550335d32 --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.2_ABS_ultra.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Ultra Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = ultra +material = generic_abs +variant = 0.2mm Nozzle + +[values] +wall_thickness = =line_width*8 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.2_PETG_super.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.2_PETG_super.inst.cfg new file mode 100644 index 0000000000..b08ceb3356 --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.2_PETG_super.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Super Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_petg +variant = 0.2mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*8 +#retraction_extra_prime_amount = 0.5 + diff --git a/resources/quality/geeetech/base/Geeetech_base_0.2_PETG_ultra.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.2_PETG_ultra.inst.cfg new file mode 100644 index 0000000000..f4ec88b0d5 --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.2_PETG_ultra.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Ultra Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = ultra +material = generic_petg +variant = 0.2mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*8 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.2_PLA_super.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.2_PLA_super.inst.cfg new file mode 100644 index 0000000000..5f509567b6 --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.2_PLA_super.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Super Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_pla +variant = 0.2mm Nozzle + +[values] diff --git a/resources/quality/geeetech/base/Geeetech_base_0.2_PLA_ultra.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.2_PLA_ultra.inst.cfg new file mode 100644 index 0000000000..2de66cde6a --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.2_PLA_ultra.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Ultra Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = ultra +material = generic_pla +variant = 0.2mm Nozzle + +[values] diff --git a/resources/quality/geeetech/base/Geeetech_base_0.3_ABS_adaptive.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.3_ABS_adaptive.inst.cfg new file mode 100644 index 0000000000..0e8245c33f --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.3_ABS_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Dynamic Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = adaptive +material = generic_abs +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.3_ABS_low.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.3_ABS_low.inst.cfg new file mode 100644 index 0000000000..073be69795 --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.3_ABS_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Low Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = low +material = generic_abs +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.3_ABS_standard.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.3_ABS_standard.inst.cfg new file mode 100644 index 0000000000..39d893ac2e --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.3_ABS_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_abs +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.3_ABS_super.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.3_ABS_super.inst.cfg new file mode 100644 index 0000000000..10796f5202 --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.3_ABS_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Super Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_abs +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.3_PETG_adaptive.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.3_PETG_adaptive.inst.cfg new file mode 100644 index 0000000000..6b72e53635 --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.3_PETG_adaptive.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Dynamic Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = adaptive +material = generic_petg +variant = 0.3mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.3_PETG_low.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.3_PETG_low.inst.cfg new file mode 100644 index 0000000000..cf35907ca2 --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.3_PETG_low.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Low Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = low +material = generic_petg +variant = 0.3mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.3_PETG_standard.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.3_PETG_standard.inst.cfg new file mode 100644 index 0000000000..bb678ce041 --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.3_PETG_standard.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Standard Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_petg +variant = 0.3mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.3_PETG_super.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.3_PETG_super.inst.cfg new file mode 100644 index 0000000000..ada5f7a390 --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.3_PETG_super.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Super Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_petg +variant = 0.3mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.3_PLA_adaptive.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.3_PLA_adaptive.inst.cfg new file mode 100644 index 0000000000..bf95f6a9a8 --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.3_PLA_adaptive.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Dynamic Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = adaptive +material = generic_pla +variant = 0.3mm Nozzle + +[values] diff --git a/resources/quality/geeetech/base/Geeetech_base_0.3_PLA_low.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.3_PLA_low.inst.cfg new file mode 100644 index 0000000000..3eee9d53f1 --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.3_PLA_low.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Low Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = low +material = generic_pla +variant = 0.3mm Nozzle + +[values] diff --git a/resources/quality/geeetech/base/Geeetech_base_0.3_PLA_standard.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.3_PLA_standard.inst.cfg new file mode 100644 index 0000000000..a11f13a986 --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.3_PLA_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_pla +variant = 0.3mm Nozzle + +[values] diff --git a/resources/quality/geeetech/base/Geeetech_base_0.3_PLA_super.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.3_PLA_super.inst.cfg new file mode 100644 index 0000000000..8db81a0c0e --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.3_PLA_super.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Super Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_pla +variant = 0.3mm Nozzle + +[values] diff --git a/resources/quality/geeetech/base/Geeetech_base_0.3_TPU_adaptive.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.3_TPU_adaptive.inst.cfg new file mode 100644 index 0000000000..c7c06d090b --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.3_TPU_adaptive.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Dynamic Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = adaptive +material = generic_tpu +variant = 0.3mm Nozzle + +[values] diff --git a/resources/quality/geeetech/base/Geeetech_base_0.3_TPU_standard.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.3_TPU_standard.inst.cfg new file mode 100644 index 0000000000..a3ef7db048 --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.3_TPU_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_tpu +variant = 0.3mm Nozzle + +[values] diff --git a/resources/quality/geeetech/base/Geeetech_base_0.3_TPU_super.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.3_TPU_super.inst.cfg new file mode 100644 index 0000000000..dbf2ca78ba --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.3_TPU_super.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Super Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_tpu +variant = 0.3mm Nozzle + +[values] diff --git a/resources/quality/geeetech/base/Geeetech_base_0.4_ABS_adaptive.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.4_ABS_adaptive.inst.cfg new file mode 100644 index 0000000000..6fc3222d99 --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.4_ABS_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Dynamic Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = adaptive +material = generic_abs +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.4_ABS_low.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.4_ABS_low.inst.cfg new file mode 100644 index 0000000000..f8b743a19a --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.4_ABS_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Low Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = low +material = generic_abs +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.4_ABS_standard.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.4_ABS_standard.inst.cfg new file mode 100644 index 0000000000..5a17bbca91 --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.4_ABS_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_abs +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.4_ABS_super.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.4_ABS_super.inst.cfg new file mode 100644 index 0000000000..aecdd7022b --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.4_ABS_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Super Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_abs +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.4_PETG_adaptive.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.4_PETG_adaptive.inst.cfg new file mode 100644 index 0000000000..51765854d5 --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.4_PETG_adaptive.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Dynamic Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = adaptive +material = generic_petg +variant = 0.4mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.4_PETG_low.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.4_PETG_low.inst.cfg new file mode 100644 index 0000000000..62de9a4d69 --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.4_PETG_low.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Low Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = low +material = generic_petg +variant = 0.4mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.4_PETG_standard.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.4_PETG_standard.inst.cfg new file mode 100644 index 0000000000..19ca63f536 --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.4_PETG_standard.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Standard Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_petg +variant = 0.4mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.4_PETG_super.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.4_PETG_super.inst.cfg new file mode 100644 index 0000000000..d3fbf0e8f4 --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.4_PETG_super.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Super Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_petg +variant = 0.4mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.4_PLA_adaptive.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.4_PLA_adaptive.inst.cfg new file mode 100644 index 0000000000..43bf6c9de6 --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.4_PLA_adaptive.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Dynamic Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = adaptive +material = generic_pla +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/geeetech/base/Geeetech_base_0.4_PLA_low.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.4_PLA_low.inst.cfg new file mode 100644 index 0000000000..4f686cbe78 --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.4_PLA_low.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Low Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = low +material = generic_pla +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/geeetech/base/Geeetech_base_0.4_PLA_standard.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.4_PLA_standard.inst.cfg new file mode 100644 index 0000000000..d434d498a4 --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.4_PLA_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_pla +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/geeetech/base/Geeetech_base_0.4_PLA_super.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.4_PLA_super.inst.cfg new file mode 100644 index 0000000000..2fcb4ff8e1 --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.4_PLA_super.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Super Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_pla +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/geeetech/base/Geeetech_base_0.4_TPU_adaptive.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.4_TPU_adaptive.inst.cfg new file mode 100644 index 0000000000..f03817c70a --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.4_TPU_adaptive.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Dynamic Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = adaptive +material = generic_tpu +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/geeetech/base/Geeetech_base_0.4_TPU_standard.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.4_TPU_standard.inst.cfg new file mode 100644 index 0000000000..3af1b80ed4 --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.4_TPU_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_tpu +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/geeetech/base/Geeetech_base_0.4_TPU_super.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.4_TPU_super.inst.cfg new file mode 100644 index 0000000000..4b27e8e13c --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.4_TPU_super.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Super Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_tpu +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/geeetech/base/Geeetech_base_0.5_ABS_adaptive.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.5_ABS_adaptive.inst.cfg new file mode 100644 index 0000000000..92d3aa871e --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.5_ABS_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Dynamic Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = adaptive +material = generic_abs +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.5_ABS_low.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.5_ABS_low.inst.cfg new file mode 100644 index 0000000000..25c9737ea9 --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.5_ABS_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Low Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = low +material = generic_abs +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.5_ABS_standard.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.5_ABS_standard.inst.cfg new file mode 100644 index 0000000000..f5f31773aa --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.5_ABS_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_abs +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.5_ABS_super.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.5_ABS_super.inst.cfg new file mode 100644 index 0000000000..bdbb44b782 --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.5_ABS_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Super Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_abs +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.5_PETG_adaptive.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.5_PETG_adaptive.inst.cfg new file mode 100644 index 0000000000..a7edf563b0 --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.5_PETG_adaptive.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Dynamic Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = adaptive +material = generic_petg +variant = 0.5mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.5_PETG_low.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.5_PETG_low.inst.cfg new file mode 100644 index 0000000000..e5030ebe4e --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.5_PETG_low.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Low Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = low +material = generic_petg +variant = 0.5mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.5_PETG_standard.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.5_PETG_standard.inst.cfg new file mode 100644 index 0000000000..bfad08010a --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.5_PETG_standard.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Standard Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_petg +variant = 0.5mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.5_PETG_super.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.5_PETG_super.inst.cfg new file mode 100644 index 0000000000..62cdd9091f --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.5_PETG_super.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Super Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_petg +variant = 0.5mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.5_PLA_adaptive.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.5_PLA_adaptive.inst.cfg new file mode 100644 index 0000000000..81e518d267 --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.5_PLA_adaptive.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Dynamic Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = adaptive +material = generic_pla +variant = 0.5mm Nozzle + +[values] diff --git a/resources/quality/geeetech/base/Geeetech_base_0.5_PLA_low.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.5_PLA_low.inst.cfg new file mode 100644 index 0000000000..3ee1663092 --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.5_PLA_low.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Low Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = low +material = generic_pla +variant = 0.5mm Nozzle + +[values] diff --git a/resources/quality/geeetech/base/Geeetech_base_0.5_PLA_standard.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.5_PLA_standard.inst.cfg new file mode 100644 index 0000000000..9ecff4cde8 --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.5_PLA_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_pla +variant = 0.5mm Nozzle + +[values] diff --git a/resources/quality/geeetech/base/Geeetech_base_0.5_PLA_super.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.5_PLA_super.inst.cfg new file mode 100644 index 0000000000..1b0a6908da --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.5_PLA_super.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Super Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_pla +variant = 0.5mm Nozzle + +[values] diff --git a/resources/quality/geeetech/base/Geeetech_base_0.5_TPU_adaptive.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.5_TPU_adaptive.inst.cfg new file mode 100644 index 0000000000..288e9511a4 --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.5_TPU_adaptive.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Dynamic Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = adaptive +material = generic_tpu +variant = 0.5mm Nozzle + +[values] diff --git a/resources/quality/geeetech/base/Geeetech_base_0.5_TPU_standard.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.5_TPU_standard.inst.cfg new file mode 100644 index 0000000000..fd22b36d3e --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.5_TPU_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_tpu +variant = 0.5mm Nozzle + +[values] diff --git a/resources/quality/geeetech/base/Geeetech_base_0.5_TPU_super.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.5_TPU_super.inst.cfg new file mode 100644 index 0000000000..28a4f0513f --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.5_TPU_super.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Super Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_tpu +variant = 0.5mm Nozzle + +[values] diff --git a/resources/quality/geeetech/base/Geeetech_base_0.6_ABS_standard.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.6_ABS_standard.inst.cfg new file mode 100644 index 0000000000..9b4587f8c7 --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.6_ABS_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_abs +variant = 0.6mm Nozzle + +[values] +wall_thickness = =line_width*3 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.6_PETG_standard.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.6_PETG_standard.inst.cfg new file mode 100644 index 0000000000..a84ff6726a --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.6_PETG_standard.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Standard Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_petg +variant = 0.6mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*3 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.6_PLA_draft.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.6_PLA_draft.inst.cfg new file mode 100644 index 0000000000..10f291f23a --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.6_PLA_draft.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Draft Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +material = generic_pla +variant = 0.6mm Nozzle + +[values] diff --git a/resources/quality/geeetech/base/Geeetech_base_0.6_PLA_low.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.6_PLA_low.inst.cfg new file mode 100644 index 0000000000..2b54a3aab7 --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.6_PLA_low.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Low Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = low +material = generic_pla +variant = 0.6mm Nozzle + +[values] diff --git a/resources/quality/geeetech/base/Geeetech_base_0.6_PLA_standard.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.6_PLA_standard.inst.cfg new file mode 100644 index 0000000000..3da51149fb --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.6_PLA_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_pla +variant = 0.6mm Nozzle + +[values] diff --git a/resources/quality/geeetech/base/Geeetech_base_0.6_TPU_standard.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.6_TPU_standard.inst.cfg new file mode 100644 index 0000000000..b4cd165c86 --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.6_TPU_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_tpu +variant = 0.6mm Nozzle + +[values] diff --git a/resources/quality/geeetech/base/Geeetech_base_0.8_ABS_draft.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.8_ABS_draft.inst.cfg new file mode 100644 index 0000000000..2fe8a1cbc9 --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.8_ABS_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Draft Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +material = generic_abs +variant = 0.8mm Nozzle + +[values] +wall_thickness = =line_width*3 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.8_PETG_draft.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.8_PETG_draft.inst.cfg new file mode 100644 index 0000000000..1d12e5116d --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.8_PETG_draft.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Draft Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +material = generic_petg +variant = 0.8mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*3 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.8_PLA_draft.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.8_PLA_draft.inst.cfg new file mode 100644 index 0000000000..7029bc3b41 --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.8_PLA_draft.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Draft Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +material = generic_pla +variant = 0.8mm Nozzle + +[values] diff --git a/resources/quality/geeetech/base/Geeetech_base_0.8_TPU_draft.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_0.8_TPU_draft.inst.cfg new file mode 100644 index 0000000000..894a96bf0e --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_0.8_TPU_draft.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Draft Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +material = generic_tpu +variant = 0.8mm Nozzle + +[values] diff --git a/resources/quality/geeetech/base/Geeetech_base_1.0_ABS_draft.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_1.0_ABS_draft.inst.cfg new file mode 100644 index 0000000000..c89a05de6b --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_1.0_ABS_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Draft Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +material = generic_abs +variant = 1.0mm Nozzle + +[values] +wall_thickness = =line_width*3 diff --git a/resources/quality/geeetech/base/Geeetech_base_1.0_PETG_draft.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_1.0_PETG_draft.inst.cfg new file mode 100644 index 0000000000..72c56b76ee --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_1.0_PETG_draft.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Draft Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +material = generic_petg +variant = 1.0mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*3 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/geeetech/base/Geeetech_base_1.0_PLA_draft.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_1.0_PLA_draft.inst.cfg new file mode 100644 index 0000000000..6208a26582 --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_1.0_PLA_draft.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Draft Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +material = generic_pla +variant = 1.0mm Nozzle + +[values] diff --git a/resources/quality/geeetech/base/Geeetech_base_1.0_TPU_draft.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_1.0_TPU_draft.inst.cfg new file mode 100644 index 0000000000..02b1566db0 --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_1.0_TPU_draft.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Draft Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +material = generic_tpu +variant = 1.0mm Nozzle + +[values] diff --git a/resources/quality/geeetech/base/Geeetech_base_global_adaptive.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_global_adaptive.inst.cfg new file mode 100644 index 0000000000..3a5f42d1d5 --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_global_adaptive.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = Dynamic Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = adaptive +weight = -2 +global_quality = True + +[values] +layer_height = 0.16 +layer_height_0 = 0.20 +top_bottom_thickness = =layer_height_0+layer_height*4 +wall_thickness = =line_width*3 +support_interface_height = =layer_height*6 +adaptive_layer_height_enabled = true diff --git a/resources/quality/geeetech/base/Geeetech_base_global_draft.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_global_draft.inst.cfg new file mode 100644 index 0000000000..ec6a8f4e33 --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_global_draft.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Draft Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +weight = -5 +global_quality = True + +[values] +layer_height = 0.32 +layer_height_0 = 0.32 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*2 +support_interface_height = =layer_height*4 diff --git a/resources/quality/geeetech/base/Geeetech_base_global_low.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_global_low.inst.cfg new file mode 100644 index 0000000000..910a75b8c9 --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_global_low.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Low Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = low +weight = -4 +global_quality = True + +[values] +layer_height = 0.28 +layer_height_0 = 0.28 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*2 +support_interface_height = =layer_height*4 diff --git a/resources/quality/geeetech/base/Geeetech_base_global_standard.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_global_standard.inst.cfg new file mode 100644 index 0000000000..b1e56d70c5 --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_global_standard.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Standard Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +weight = -3 +global_quality = True + +[values] +layer_height = 0.2 +layer_height_0 = 0.2 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*2 +support_interface_height = =layer_height*4 diff --git a/resources/quality/geeetech/base/Geeetech_base_global_super.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_global_super.inst.cfg new file mode 100644 index 0000000000..80be22c1bf --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_global_super.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Super Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = super +weight = -1 +global_quality = True + +[values] +layer_height = 0.12 +layer_height_0 = 0.12 +top_bottom_thickness = =layer_height_0+layer_height*6 +wall_thickness = =line_width*3 +support_interface_height = =layer_height*8 diff --git a/resources/quality/geeetech/base/Geeetech_base_global_ultra.inst.cfg b/resources/quality/geeetech/base/Geeetech_base_global_ultra.inst.cfg new file mode 100644 index 0000000000..e8106f71a6 --- /dev/null +++ b/resources/quality/geeetech/base/Geeetech_base_global_ultra.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Ultra Quality +definition = Geeetech_base + +[metadata] +setting_version = 20 +type = quality +quality_type = ultra +weight = 0 +global_quality = True + +[values] +layer_height = 0.08 +layer_height_0 = 0.12 +top_bottom_thickness = =layer_height_0+layer_height*10 +wall_thickness = =line_width*3 +support_interface_height = =layer_height*12 diff --git a/resources/variants/geeetech_A10Pro_0.2.inst.cfg b/resources/variants/geeetech_A10Pro_0.2.inst.cfg new file mode 100644 index 0000000000..e57bd02c59 --- /dev/null +++ b/resources/variants/geeetech_A10Pro_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = geeetech_A10Pro + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/geeetech_A10Pro_0.3.inst.cfg b/resources/variants/geeetech_A10Pro_0.3.inst.cfg new file mode 100644 index 0000000000..0a11654fcb --- /dev/null +++ b/resources/variants/geeetech_A10Pro_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = geeetech_A10Pro + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/geeetech_A10Pro_0.4.inst.cfg b/resources/variants/geeetech_A10Pro_0.4.inst.cfg new file mode 100644 index 0000000000..6a56b67260 --- /dev/null +++ b/resources/variants/geeetech_A10Pro_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = geeetech_A10Pro + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/geeetech_A10Pro_0.5.inst.cfg b/resources/variants/geeetech_A10Pro_0.5.inst.cfg new file mode 100644 index 0000000000..016b7a7538 --- /dev/null +++ b/resources/variants/geeetech_A10Pro_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = geeetech_A10Pro + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/geeetech_A10Pro_0.6.inst.cfg b/resources/variants/geeetech_A10Pro_0.6.inst.cfg new file mode 100644 index 0000000000..f98a4dfe1c --- /dev/null +++ b/resources/variants/geeetech_A10Pro_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = geeetech_A10Pro + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/geeetech_A10Pro_0.8.inst.cfg b/resources/variants/geeetech_A10Pro_0.8.inst.cfg new file mode 100644 index 0000000000..b10582fccc --- /dev/null +++ b/resources/variants/geeetech_A10Pro_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = geeetech_A10Pro + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/geeetech_A10Pro_1.0.inst.cfg b/resources/variants/geeetech_A10Pro_1.0.inst.cfg new file mode 100644 index 0000000000..bade1f88f8 --- /dev/null +++ b/resources/variants/geeetech_A10Pro_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = geeetech_A10Pro + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/geeetech_A20_0.2.inst.cfg b/resources/variants/geeetech_A20_0.2.inst.cfg new file mode 100644 index 0000000000..65002e9a9a --- /dev/null +++ b/resources/variants/geeetech_A20_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = geeetech_A20 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/geeetech_A20_0.3.inst.cfg b/resources/variants/geeetech_A20_0.3.inst.cfg new file mode 100644 index 0000000000..883153496e --- /dev/null +++ b/resources/variants/geeetech_A20_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = geeetech_A20 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/geeetech_A20_0.4.inst.cfg b/resources/variants/geeetech_A20_0.4.inst.cfg new file mode 100644 index 0000000000..be2b02c8e0 --- /dev/null +++ b/resources/variants/geeetech_A20_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = geeetech_A20 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/geeetech_A20_0.5.inst.cfg b/resources/variants/geeetech_A20_0.5.inst.cfg new file mode 100644 index 0000000000..39f26b5ed9 --- /dev/null +++ b/resources/variants/geeetech_A20_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = geeetech_A20 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/geeetech_A20_0.6.inst.cfg b/resources/variants/geeetech_A20_0.6.inst.cfg new file mode 100644 index 0000000000..b2d063c99e --- /dev/null +++ b/resources/variants/geeetech_A20_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = geeetech_A20 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/geeetech_A20_0.8.inst.cfg b/resources/variants/geeetech_A20_0.8.inst.cfg new file mode 100644 index 0000000000..cf8751fc97 --- /dev/null +++ b/resources/variants/geeetech_A20_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = geeetech_A20 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/geeetech_A20_1.0.inst.cfg b/resources/variants/geeetech_A20_1.0.inst.cfg new file mode 100644 index 0000000000..818115cd87 --- /dev/null +++ b/resources/variants/geeetech_A20_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = geeetech_A20 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/geeetech_A30Pro_0.2.inst.cfg b/resources/variants/geeetech_A30Pro_0.2.inst.cfg new file mode 100644 index 0000000000..a50968c5d2 --- /dev/null +++ b/resources/variants/geeetech_A30Pro_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = geeetech_A30Pro + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/geeetech_A30Pro_0.3.inst.cfg b/resources/variants/geeetech_A30Pro_0.3.inst.cfg new file mode 100644 index 0000000000..11321ad662 --- /dev/null +++ b/resources/variants/geeetech_A30Pro_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = geeetech_A30Pro + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/geeetech_A30Pro_0.4.inst.cfg b/resources/variants/geeetech_A30Pro_0.4.inst.cfg new file mode 100644 index 0000000000..2d2e170e16 --- /dev/null +++ b/resources/variants/geeetech_A30Pro_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = geeetech_A30Pro + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/geeetech_A30Pro_0.5.inst.cfg b/resources/variants/geeetech_A30Pro_0.5.inst.cfg new file mode 100644 index 0000000000..8a174e1c7b --- /dev/null +++ b/resources/variants/geeetech_A30Pro_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = geeetech_A30Pro + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/geeetech_A30Pro_0.6.inst.cfg b/resources/variants/geeetech_A30Pro_0.6.inst.cfg new file mode 100644 index 0000000000..ab2711ced0 --- /dev/null +++ b/resources/variants/geeetech_A30Pro_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = geeetech_A30Pro + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/geeetech_A30Pro_0.8.inst.cfg b/resources/variants/geeetech_A30Pro_0.8.inst.cfg new file mode 100644 index 0000000000..5e40bb7d7e --- /dev/null +++ b/resources/variants/geeetech_A30Pro_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = geeetech_A30Pro + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/geeetech_A30Pro_1.0.inst.cfg b/resources/variants/geeetech_A30Pro_1.0.inst.cfg new file mode 100644 index 0000000000..270dd9163d --- /dev/null +++ b/resources/variants/geeetech_A30Pro_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = geeetech_A30Pro + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/geeetech_E180_0.2.inst.cfg b/resources/variants/geeetech_E180_0.2.inst.cfg new file mode 100644 index 0000000000..333d613a05 --- /dev/null +++ b/resources/variants/geeetech_E180_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = geeetech_E180 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/geeetech_E180_0.3.inst.cfg b/resources/variants/geeetech_E180_0.3.inst.cfg new file mode 100644 index 0000000000..aa5e29015f --- /dev/null +++ b/resources/variants/geeetech_E180_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = geeetech_E180 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/geeetech_E180_0.4.inst.cfg b/resources/variants/geeetech_E180_0.4.inst.cfg new file mode 100644 index 0000000000..99fd1c851d --- /dev/null +++ b/resources/variants/geeetech_E180_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = geeetech_E180 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/geeetech_E180_0.5.inst.cfg b/resources/variants/geeetech_E180_0.5.inst.cfg new file mode 100644 index 0000000000..bf4ca9f9a0 --- /dev/null +++ b/resources/variants/geeetech_E180_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = geeetech_E180 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/geeetech_E180_0.6.inst.cfg b/resources/variants/geeetech_E180_0.6.inst.cfg new file mode 100644 index 0000000000..3e3f270574 --- /dev/null +++ b/resources/variants/geeetech_E180_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = geeetech_E180 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/geeetech_E180_0.8.inst.cfg b/resources/variants/geeetech_E180_0.8.inst.cfg new file mode 100644 index 0000000000..3b91e4a0b2 --- /dev/null +++ b/resources/variants/geeetech_E180_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = geeetech_E180 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/geeetech_E180_1.0.inst.cfg b/resources/variants/geeetech_E180_1.0.inst.cfg new file mode 100644 index 0000000000..4008b20a89 --- /dev/null +++ b/resources/variants/geeetech_E180_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = geeetech_E180 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/geeetech_GiantArmD200_0.2.inst.cfg b/resources/variants/geeetech_GiantArmD200_0.2.inst.cfg new file mode 100644 index 0000000000..3081e76e13 --- /dev/null +++ b/resources/variants/geeetech_GiantArmD200_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = geeetech_GiantArmD200 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/geeetech_GiantArmD200_0.3.inst.cfg b/resources/variants/geeetech_GiantArmD200_0.3.inst.cfg new file mode 100644 index 0000000000..916611db8a --- /dev/null +++ b/resources/variants/geeetech_GiantArmD200_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = geeetech_GiantArmD200 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/geeetech_GiantArmD200_0.4.inst.cfg b/resources/variants/geeetech_GiantArmD200_0.4.inst.cfg new file mode 100644 index 0000000000..c38df3246b --- /dev/null +++ b/resources/variants/geeetech_GiantArmD200_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = geeetech_GiantArmD200 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/geeetech_GiantArmD200_0.5.inst.cfg b/resources/variants/geeetech_GiantArmD200_0.5.inst.cfg new file mode 100644 index 0000000000..6424117cc6 --- /dev/null +++ b/resources/variants/geeetech_GiantArmD200_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = geeetech_GiantArmD200 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/geeetech_GiantArmD200_0.6.inst.cfg b/resources/variants/geeetech_GiantArmD200_0.6.inst.cfg new file mode 100644 index 0000000000..d0ac2691a7 --- /dev/null +++ b/resources/variants/geeetech_GiantArmD200_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = geeetech_GiantArmD200 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/geeetech_GiantArmD200_0.8.inst.cfg b/resources/variants/geeetech_GiantArmD200_0.8.inst.cfg new file mode 100644 index 0000000000..0ac434758b --- /dev/null +++ b/resources/variants/geeetech_GiantArmD200_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = geeetech_GiantArmD200 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/geeetech_GiantArmD200_1.0.inst.cfg b/resources/variants/geeetech_GiantArmD200_1.0.inst.cfg new file mode 100644 index 0000000000..60c88742bd --- /dev/null +++ b/resources/variants/geeetech_GiantArmD200_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = geeetech_GiantArmD200 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/geeetech_I3ProB_0.2.inst.cfg b/resources/variants/geeetech_I3ProB_0.2.inst.cfg new file mode 100644 index 0000000000..79470b558f --- /dev/null +++ b/resources/variants/geeetech_I3ProB_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = geeetech_I3ProB + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/geeetech_I3ProB_0.3.inst.cfg b/resources/variants/geeetech_I3ProB_0.3.inst.cfg new file mode 100644 index 0000000000..e7c1a7dafc --- /dev/null +++ b/resources/variants/geeetech_I3ProB_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = geeetech_I3ProB + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/geeetech_I3ProB_0.4.inst.cfg b/resources/variants/geeetech_I3ProB_0.4.inst.cfg new file mode 100644 index 0000000000..24b80c5d43 --- /dev/null +++ b/resources/variants/geeetech_I3ProB_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = geeetech_I3ProB + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/geeetech_I3ProB_0.5.inst.cfg b/resources/variants/geeetech_I3ProB_0.5.inst.cfg new file mode 100644 index 0000000000..0e6ee0f6e2 --- /dev/null +++ b/resources/variants/geeetech_I3ProB_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = geeetech_I3ProB + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/geeetech_I3ProB_0.6.inst.cfg b/resources/variants/geeetech_I3ProB_0.6.inst.cfg new file mode 100644 index 0000000000..fca2dcd3c9 --- /dev/null +++ b/resources/variants/geeetech_I3ProB_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = geeetech_I3ProB + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/geeetech_I3ProB_0.8.inst.cfg b/resources/variants/geeetech_I3ProB_0.8.inst.cfg new file mode 100644 index 0000000000..6da1f460ca --- /dev/null +++ b/resources/variants/geeetech_I3ProB_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = geeetech_I3ProB + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/geeetech_I3ProB_1.0.inst.cfg b/resources/variants/geeetech_I3ProB_1.0.inst.cfg new file mode 100644 index 0000000000..79ac7c5bae --- /dev/null +++ b/resources/variants/geeetech_I3ProB_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = geeetech_I3ProB + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/geeetech_I3ProW_0.2.inst.cfg b/resources/variants/geeetech_I3ProW_0.2.inst.cfg new file mode 100644 index 0000000000..31c396af51 --- /dev/null +++ b/resources/variants/geeetech_I3ProW_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = geeetech_I3ProW + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/geeetech_I3ProW_0.3.inst.cfg b/resources/variants/geeetech_I3ProW_0.3.inst.cfg new file mode 100644 index 0000000000..d3083a05db --- /dev/null +++ b/resources/variants/geeetech_I3ProW_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = geeetech_I3ProW + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/geeetech_I3ProW_0.4.inst.cfg b/resources/variants/geeetech_I3ProW_0.4.inst.cfg new file mode 100644 index 0000000000..634a7edaf5 --- /dev/null +++ b/resources/variants/geeetech_I3ProW_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = geeetech_I3ProW + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/geeetech_I3ProW_0.5.inst.cfg b/resources/variants/geeetech_I3ProW_0.5.inst.cfg new file mode 100644 index 0000000000..2bab59e13e --- /dev/null +++ b/resources/variants/geeetech_I3ProW_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = geeetech_I3ProW + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/geeetech_I3ProW_0.6.inst.cfg b/resources/variants/geeetech_I3ProW_0.6.inst.cfg new file mode 100644 index 0000000000..0b93659a22 --- /dev/null +++ b/resources/variants/geeetech_I3ProW_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = geeetech_I3ProW + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/geeetech_I3ProW_0.8.inst.cfg b/resources/variants/geeetech_I3ProW_0.8.inst.cfg new file mode 100644 index 0000000000..f861d69db5 --- /dev/null +++ b/resources/variants/geeetech_I3ProW_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = geeetech_I3ProW + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/geeetech_I3ProW_1.0.inst.cfg b/resources/variants/geeetech_I3ProW_1.0.inst.cfg new file mode 100644 index 0000000000..5db97005a1 --- /dev/null +++ b/resources/variants/geeetech_I3ProW_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = geeetech_I3ProW + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/geeetech_MeCreator2_0.2.inst.cfg b/resources/variants/geeetech_MeCreator2_0.2.inst.cfg new file mode 100644 index 0000000000..ed4ccbb000 --- /dev/null +++ b/resources/variants/geeetech_MeCreator2_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = geeetech_MMeCreator2 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/geeetech_MeCreator2_0.3.inst.cfg b/resources/variants/geeetech_MeCreator2_0.3.inst.cfg new file mode 100644 index 0000000000..cb22f0229c --- /dev/null +++ b/resources/variants/geeetech_MeCreator2_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = geeetech_MeCreator2 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/geeetech_MeCreator2_0.4.inst.cfg b/resources/variants/geeetech_MeCreator2_0.4.inst.cfg new file mode 100644 index 0000000000..954210a493 --- /dev/null +++ b/resources/variants/geeetech_MeCreator2_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = geeetech_MeCreator2 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/geeetech_MeCreator2_0.5.inst.cfg b/resources/variants/geeetech_MeCreator2_0.5.inst.cfg new file mode 100644 index 0000000000..e9ef35f4a2 --- /dev/null +++ b/resources/variants/geeetech_MeCreator2_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = geeetech_MeCreator2 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/geeetech_MeCreator2_0.6.inst.cfg b/resources/variants/geeetech_MeCreator2_0.6.inst.cfg new file mode 100644 index 0000000000..8375acfc7e --- /dev/null +++ b/resources/variants/geeetech_MeCreator2_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = geeetech_MeCreator2 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/geeetech_MeCreator2_0.8.inst.cfg b/resources/variants/geeetech_MeCreator2_0.8.inst.cfg new file mode 100644 index 0000000000..373c0fb025 --- /dev/null +++ b/resources/variants/geeetech_MeCreator2_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = geeetech_MeCreator2 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/geeetech_MeCreator2_1.0.inst.cfg b/resources/variants/geeetech_MeCreator2_1.0.inst.cfg new file mode 100644 index 0000000000..a8b8ae8b16 --- /dev/null +++ b/resources/variants/geeetech_MeCreator2_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = geeetech_MeCreator2 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/geeetech_MeCreator_0.2.inst.cfg b/resources/variants/geeetech_MeCreator_0.2.inst.cfg new file mode 100644 index 0000000000..d435f7b955 --- /dev/null +++ b/resources/variants/geeetech_MeCreator_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = geeetech_MeCreator + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/geeetech_MeCreator_0.3.inst.cfg b/resources/variants/geeetech_MeCreator_0.3.inst.cfg new file mode 100644 index 0000000000..fa237bfaec --- /dev/null +++ b/resources/variants/geeetech_MeCreator_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = geeetech_MeCreator + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/geeetech_MeCreator_0.4.inst.cfg b/resources/variants/geeetech_MeCreator_0.4.inst.cfg new file mode 100644 index 0000000000..4a458227e3 --- /dev/null +++ b/resources/variants/geeetech_MeCreator_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = geeetech_MeCreator + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/geeetech_MeCreator_0.5.inst.cfg b/resources/variants/geeetech_MeCreator_0.5.inst.cfg new file mode 100644 index 0000000000..3d967ac82d --- /dev/null +++ b/resources/variants/geeetech_MeCreator_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = geeetech_MeCreator + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/geeetech_MeCreator_0.6.inst.cfg b/resources/variants/geeetech_MeCreator_0.6.inst.cfg new file mode 100644 index 0000000000..0b1b39bb67 --- /dev/null +++ b/resources/variants/geeetech_MeCreator_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = geeetech_MeCreator + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/geeetech_MeCreator_0.8.inst.cfg b/resources/variants/geeetech_MeCreator_0.8.inst.cfg new file mode 100644 index 0000000000..3b3814aeaf --- /dev/null +++ b/resources/variants/geeetech_MeCreator_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = geeetech_MeCreator + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/geeetech_MeCreator_1.0.inst.cfg b/resources/variants/geeetech_MeCreator_1.0.inst.cfg new file mode 100644 index 0000000000..8698920f4b --- /dev/null +++ b/resources/variants/geeetech_MeCreator_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = geeetech_MeCreator + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/geeetech_MeDucer_0.2.inst.cfg b/resources/variants/geeetech_MeDucer_0.2.inst.cfg new file mode 100644 index 0000000000..20badd050c --- /dev/null +++ b/resources/variants/geeetech_MeDucer_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = geeetech_MeDucer + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/geeetech_MeDucer_0.3.inst.cfg b/resources/variants/geeetech_MeDucer_0.3.inst.cfg new file mode 100644 index 0000000000..f5febb1217 --- /dev/null +++ b/resources/variants/geeetech_MeDucer_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = geeetech_MeDucer + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/geeetech_MeDucer_0.4.inst.cfg b/resources/variants/geeetech_MeDucer_0.4.inst.cfg new file mode 100644 index 0000000000..cf6dcfb4ee --- /dev/null +++ b/resources/variants/geeetech_MeDucer_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = geeetech_MeDucer + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/geeetech_MeDucer_0.5.inst.cfg b/resources/variants/geeetech_MeDucer_0.5.inst.cfg new file mode 100644 index 0000000000..fa1938da75 --- /dev/null +++ b/resources/variants/geeetech_MeDucer_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = geeetech_MeDucer + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/geeetech_MeDucer_0.6.inst.cfg b/resources/variants/geeetech_MeDucer_0.6.inst.cfg new file mode 100644 index 0000000000..a6cd26da56 --- /dev/null +++ b/resources/variants/geeetech_MeDucer_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = geeetech_MeDucer + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/geeetech_MeDucer_0.8.inst.cfg b/resources/variants/geeetech_MeDucer_0.8.inst.cfg new file mode 100644 index 0000000000..9b49fca060 --- /dev/null +++ b/resources/variants/geeetech_MeDucer_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = geeetech_MeDucer + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/geeetech_MeDucer_1.0.inst.cfg b/resources/variants/geeetech_MeDucer_1.0.inst.cfg new file mode 100644 index 0000000000..47f526a9fa --- /dev/null +++ b/resources/variants/geeetech_MeDucer_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = geeetech_MeDucer + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/geeetech_MizarMax_0.2.inst.cfg b/resources/variants/geeetech_MizarMax_0.2.inst.cfg new file mode 100644 index 0000000000..46e3df1963 --- /dev/null +++ b/resources/variants/geeetech_MizarMax_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = geeetech_MizarMax + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/geeetech_MizarMax_0.3.inst.cfg b/resources/variants/geeetech_MizarMax_0.3.inst.cfg new file mode 100644 index 0000000000..6eba484b45 --- /dev/null +++ b/resources/variants/geeetech_MizarMax_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = geeetech_MizarMax + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/geeetech_MizarMax_0.4.inst.cfg b/resources/variants/geeetech_MizarMax_0.4.inst.cfg new file mode 100644 index 0000000000..aedfbba397 --- /dev/null +++ b/resources/variants/geeetech_MizarMax_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = geeetech_MizarMax + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/geeetech_MizarMax_0.5.inst.cfg b/resources/variants/geeetech_MizarMax_0.5.inst.cfg new file mode 100644 index 0000000000..da8c73b800 --- /dev/null +++ b/resources/variants/geeetech_MizarMax_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = geeetech_MizarMax + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/geeetech_MizarMax_0.6.inst.cfg b/resources/variants/geeetech_MizarMax_0.6.inst.cfg new file mode 100644 index 0000000000..0c05ed2c47 --- /dev/null +++ b/resources/variants/geeetech_MizarMax_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = geeetech_MizarMax + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/geeetech_MizarMax_0.8.inst.cfg b/resources/variants/geeetech_MizarMax_0.8.inst.cfg new file mode 100644 index 0000000000..19a523686e --- /dev/null +++ b/resources/variants/geeetech_MizarMax_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = geeetech_MizarMax + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/geeetech_MizarMax_1.0.inst.cfg b/resources/variants/geeetech_MizarMax_1.0.inst.cfg new file mode 100644 index 0000000000..838816bfa3 --- /dev/null +++ b/resources/variants/geeetech_MizarMax_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = geeetech_MizarMax + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/geeetech_MizarPro_0.2.inst.cfg b/resources/variants/geeetech_MizarPro_0.2.inst.cfg new file mode 100644 index 0000000000..168d96c0e7 --- /dev/null +++ b/resources/variants/geeetech_MizarPro_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = geeetech_MizarPro + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/geeetech_MizarPro_0.3.inst.cfg b/resources/variants/geeetech_MizarPro_0.3.inst.cfg new file mode 100644 index 0000000000..e608cd0520 --- /dev/null +++ b/resources/variants/geeetech_MizarPro_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = geeetech_MizarPro + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/geeetech_MizarPro_0.4.inst.cfg b/resources/variants/geeetech_MizarPro_0.4.inst.cfg new file mode 100644 index 0000000000..07865035e4 --- /dev/null +++ b/resources/variants/geeetech_MizarPro_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = geeetech_MizarPro + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/geeetech_MizarPro_0.5.inst.cfg b/resources/variants/geeetech_MizarPro_0.5.inst.cfg new file mode 100644 index 0000000000..d5c4f94752 --- /dev/null +++ b/resources/variants/geeetech_MizarPro_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = geeetech_MizarPro + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/geeetech_MizarPro_0.6.inst.cfg b/resources/variants/geeetech_MizarPro_0.6.inst.cfg new file mode 100644 index 0000000000..8aca8f5c7b --- /dev/null +++ b/resources/variants/geeetech_MizarPro_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = geeetech_MizarPro + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/geeetech_MizarPro_0.8.inst.cfg b/resources/variants/geeetech_MizarPro_0.8.inst.cfg new file mode 100644 index 0000000000..0fc1c2a72a --- /dev/null +++ b/resources/variants/geeetech_MizarPro_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = geeetech_MizarPro + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/geeetech_MizarPro_1.0.inst.cfg b/resources/variants/geeetech_MizarPro_1.0.inst.cfg new file mode 100644 index 0000000000..4117d4e7f0 --- /dev/null +++ b/resources/variants/geeetech_MizarPro_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = geeetech_MizarPro + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/geeetech_MizarS_0.2.inst.cfg b/resources/variants/geeetech_MizarS_0.2.inst.cfg new file mode 100644 index 0000000000..282a840126 --- /dev/null +++ b/resources/variants/geeetech_MizarS_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = geeetech_MizarS + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/geeetech_MizarS_0.3.inst.cfg b/resources/variants/geeetech_MizarS_0.3.inst.cfg new file mode 100644 index 0000000000..4033375477 --- /dev/null +++ b/resources/variants/geeetech_MizarS_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = geeetech_MizarS + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/geeetech_MizarS_0.4.inst.cfg b/resources/variants/geeetech_MizarS_0.4.inst.cfg new file mode 100644 index 0000000000..7eaffac17d --- /dev/null +++ b/resources/variants/geeetech_MizarS_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = geeetech_MizarS + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/geeetech_MizarS_0.5.inst.cfg b/resources/variants/geeetech_MizarS_0.5.inst.cfg new file mode 100644 index 0000000000..932a271175 --- /dev/null +++ b/resources/variants/geeetech_MizarS_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = geeetech_MizarS + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/geeetech_MizarS_0.6.inst.cfg b/resources/variants/geeetech_MizarS_0.6.inst.cfg new file mode 100644 index 0000000000..0e850b4a4e --- /dev/null +++ b/resources/variants/geeetech_MizarS_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = geeetech_MizarS + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/geeetech_MizarS_0.8.inst.cfg b/resources/variants/geeetech_MizarS_0.8.inst.cfg new file mode 100644 index 0000000000..41c3b8bf90 --- /dev/null +++ b/resources/variants/geeetech_MizarS_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = geeetech_MizarS + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/geeetech_MizarS_1.0.inst.cfg b/resources/variants/geeetech_MizarS_1.0.inst.cfg new file mode 100644 index 0000000000..664229e644 --- /dev/null +++ b/resources/variants/geeetech_MizarS_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = geeetech_MizarS + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/geeetech_Mizar_0.2.inst.cfg b/resources/variants/geeetech_Mizar_0.2.inst.cfg new file mode 100644 index 0000000000..8b0b86f92d --- /dev/null +++ b/resources/variants/geeetech_Mizar_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = geeetech_Mizar + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/geeetech_Mizar_0.3.inst.cfg b/resources/variants/geeetech_Mizar_0.3.inst.cfg new file mode 100644 index 0000000000..8621a8a578 --- /dev/null +++ b/resources/variants/geeetech_Mizar_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = geeetech_Mizar + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/geeetech_Mizar_0.4.inst.cfg b/resources/variants/geeetech_Mizar_0.4.inst.cfg new file mode 100644 index 0000000000..dbc65e777f --- /dev/null +++ b/resources/variants/geeetech_Mizar_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = geeetech_Mizar + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/geeetech_Mizar_0.5.inst.cfg b/resources/variants/geeetech_Mizar_0.5.inst.cfg new file mode 100644 index 0000000000..514d9c0d5b --- /dev/null +++ b/resources/variants/geeetech_Mizar_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = geeetech_Mizar + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/geeetech_Mizar_0.6.inst.cfg b/resources/variants/geeetech_Mizar_0.6.inst.cfg new file mode 100644 index 0000000000..1d2289ed94 --- /dev/null +++ b/resources/variants/geeetech_Mizar_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = geeetech_Mizar + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/geeetech_Mizar_0.8.inst.cfg b/resources/variants/geeetech_Mizar_0.8.inst.cfg new file mode 100644 index 0000000000..08f107c725 --- /dev/null +++ b/resources/variants/geeetech_Mizar_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = geeetech_Mizar + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/geeetech_Mizar_1.0.inst.cfg b/resources/variants/geeetech_Mizar_1.0.inst.cfg new file mode 100644 index 0000000000..2608b2d4f6 --- /dev/null +++ b/resources/variants/geeetech_Mizar_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = geeetech_Mizar + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/geeetech_Thunder_0.2.inst.cfg b/resources/variants/geeetech_Thunder_0.2.inst.cfg new file mode 100644 index 0000000000..efcf9ea3c6 --- /dev/null +++ b/resources/variants/geeetech_Thunder_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = geeetech_Thunder + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/geeetech_Thunder_0.3.inst.cfg b/resources/variants/geeetech_Thunder_0.3.inst.cfg new file mode 100644 index 0000000000..2ae1381068 --- /dev/null +++ b/resources/variants/geeetech_Thunder_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = geeetech_Thunder + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/geeetech_Thunder_0.4.inst.cfg b/resources/variants/geeetech_Thunder_0.4.inst.cfg new file mode 100644 index 0000000000..c83a143f1a --- /dev/null +++ b/resources/variants/geeetech_Thunder_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = geeetech_Thunder + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/geeetech_Thunder_0.5.inst.cfg b/resources/variants/geeetech_Thunder_0.5.inst.cfg new file mode 100644 index 0000000000..2ac58f4ff7 --- /dev/null +++ b/resources/variants/geeetech_Thunder_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = geeetech_Thunder + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/geeetech_Thunder_0.6.inst.cfg b/resources/variants/geeetech_Thunder_0.6.inst.cfg new file mode 100644 index 0000000000..b9c4673121 --- /dev/null +++ b/resources/variants/geeetech_Thunder_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = geeetech_Thunder + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/geeetech_Thunder_0.8.inst.cfg b/resources/variants/geeetech_Thunder_0.8.inst.cfg new file mode 100644 index 0000000000..3ac746efa3 --- /dev/null +++ b/resources/variants/geeetech_Thunder_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = geeetech_Thunder + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/geeetech_Thunder_1.0.inst.cfg b/resources/variants/geeetech_Thunder_1.0.inst.cfg new file mode 100644 index 0000000000..4380bfed1c --- /dev/null +++ b/resources/variants/geeetech_Thunder_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = geeetech_Thunder + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 From dfb6c04d00579ba5a9f13d0b74530dd8cdc609ce Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Fri, 2 Dec 2022 11:48:50 +0100 Subject: [PATCH 050/124] Add SingleSettingTextField.qml Added a workaround for states of inheriting components. See comments for details. CURA-9793 --- .../RecommendedStrengthSelector.qml | 12 ++ .../qml/Widgets/SingleSettingTextField.qml | 154 ++++++++++++++++++ 2 files changed, 166 insertions(+) create mode 100644 resources/qml/Widgets/SingleSettingTextField.qml diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml index 0f0d727d8a..dd603df195 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml @@ -58,6 +58,18 @@ RecommendedSettingSection width: parent.width settingName: "infill_pattern" } + }, + RecommendedSettingItem + { + settingName: catalog.i18nc("@action:label", "Shell Thickness") + + settingControl: Cura.SingleSettingTextField + { + width: parent.width + settingName: "wall_thickness" + validator: Cura.FloatValidator {} + unitText: catalog.i18nc("@label", "mm") + } } ] } diff --git a/resources/qml/Widgets/SingleSettingTextField.qml b/resources/qml/Widgets/SingleSettingTextField.qml new file mode 100644 index 0000000000..c128a5070e --- /dev/null +++ b/resources/qml/Widgets/SingleSettingTextField.qml @@ -0,0 +1,154 @@ +// Copyright (c) 2022 UltiMaker B.V. +// Cura is released under the terms of the LGPLv3 or higher. + +import QtQuick 2.10 +import QtQuick.Controls 2.3 +import QtQuick.Layouts 1.3 + +import UM 1.7 as UM +import Cura 1.7 as Cura + +// This text field allows you to edit a single setting. The setting can be passed by "settingName". +// You must specify a validator with Validator. We store our default setting validators in qml/Validators +UM.TextField +{ + id: control + property alias settingName: propertyProvider.key + + // Resolving the value in the textField. + Binding + { + target: control + property: "text" + + value: + { + if (control.activeFocus) + { + // This stops the text being reformatted as you edit. For example "10.1" -Edit-> "10." -Auto Format-> "10.0". + return control.text + } + return propertyProvider.properties.value + } + + } + + property UM.SettingPropertyProvider propertyProvider: UM.SettingPropertyProvider + { + id: propertyProvider + containerStack: Cura.MachineManager.activeMachine + watchedProperties: [ "value", "validationState" ] + } + + Connections + { + target: propertyProvider + function onContainerStackChanged() { updateTimer.restart() } + function onIsValueUsedChanged() { updateTimer.restart() } + } + + // Restart update timer right after releasing a key. This stops lag while typing, but you still get warning and error + // textfield styling while typing. + Keys.onReleased: updateTimer.restart() + // Forces formatting when you finish editing "10.1" -Edit-> "10." -Focus Change-> "10" + onActiveFocusChanged: updateTime.restart() + + // Updates to the setting are delayed by interval. This stops lag caused by calling the + // parseValueUpdateSetting() function being called repeatedly while changing the text value. + Timer + { + id: updateTimer + interval: 50 + repeat: false + onTriggered: parseValueUpdateSetting() + } + + function parseValueUpdateSetting() + { + // Do some parsing of text here + updateSetting(text); + } + + function updateSetting(value) + { + if (propertyProvider && text != propertyProvider.properties.value) + { + propertyProvider.setPropertyValue("value", text) + } + } + + // Forced to override parent states using overrideState. Otherwise hover in TextField.qml would override the validation states. + // The first state to evaluate true applies styling. States in inheriting components get appended to the state list of their parent. + overrideState: true + states: + [ + State + { + name: "validationError" + when: propertyProvider.properties.validationState == "ValidatorState.Exception" || propertyProvider.properties.validationState == "ValidatorState.MinimumError" || propertyProvider.properties.validationState == "ValidatorState.MaximumError" + PropertyChanges + { + target: background + liningColor: UM.Theme.getColor("setting_validation_error") + color: UM.Theme.getColor("setting_validation_error_background") + } + }, + State + { + name: "validationWarning" + when: propertyProvider.properties.validationState == "ValidatorState.MinimumWarning" || propertyProvider.properties.validationState == "ValidatorState.MaximumWarning" + PropertyChanges + { + target: background + liningColor: UM.Theme.getColor("setting_validation_warning") + color: UM.Theme.getColor("setting_validation_warning_background") + } + }, + State + { + name: "disabled" + when: !control.enabled + PropertyChanges + { + target: control + color: UM.Theme.getColor("text_field_text_disabled") + } + PropertyChanges + { + target: background + liningColor: UM.Theme.getColor("text_field_border_disabled") + } + }, + State + { + name: "invalid" + when: !control.acceptableInput + PropertyChanges + { + target: background + color: UM.Theme.getColor("setting_validation_error_background") + } + }, + State + { + name: "active" + when: control.activeFocus + PropertyChanges + { + target: background + liningColor: UM.Theme.getColor("text_field_border_active") + borderColor: UM.Theme.getColor("text_field_border_active") + } + }, + State + { + name: "hovered" + when: control.hovered && !control.activeFocus + PropertyChanges + { + target: background + liningColor: UM.Theme.getColor("text_field_border_hovered") + } + } + ] +} From 5b76e3dd7c06b6b0ab64518959257dccc982dfd9 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Fri, 2 Dec 2022 12:41:04 +0100 Subject: [PATCH 051/124] Add component with icon generic component. Add print walls and print top/bottom settings to recommended menu CURA-9793 --- .../RecommendedStrengthSelector.qml | 35 +++++++++++++++---- .../cura-light/icons/default/PrintWalls.svg | 12 +++++++ 2 files changed, 41 insertions(+), 6 deletions(-) create mode 100644 resources/themes/cura-light/icons/default/PrintWalls.svg diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml index dd603df195..54f005bb9e 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml @@ -3,8 +3,9 @@ import QtQuick 2.7 import QtQuick.Controls 2.15 +import QtQuick.Layouts 2.10 -import UM 1.5 as UM +import UM 1.7 as UM import Cura 1.7 as Cura @@ -63,12 +64,34 @@ RecommendedSettingSection { settingName: catalog.i18nc("@action:label", "Shell Thickness") - settingControl: Cura.SingleSettingTextField + settingControl: RowLayout { - width: parent.width - settingName: "wall_thickness" - validator: Cura.FloatValidator {} - unitText: catalog.i18nc("@label", "mm") + anchors.fill: parent + spacing: UM.Theme.getSize("default_margin").width + UM.ComponentWithIcon + { + Layout.fillWidth: true + source: UM.Theme.getIcon("PrintWalls") + displayComponent: Cura.SingleSettingTextField + { + width: parent.width + settingName: "wall_thickness" + validator: Cura.FloatValidator {} + unitText: catalog.i18nc("@label", "mm") + } + } + UM.ComponentWithIcon + { + Layout.fillWidth: true + source: UM.Theme.getIcon("PrintTopBottom") + displayComponent: Cura.SingleSettingTextField + { + width: parent.width + settingName: "top_bottom_thickness" + validator: Cura.FloatValidator {} + unitText: catalog.i18nc("@label", "mm") + } + } } } ] diff --git a/resources/themes/cura-light/icons/default/PrintWalls.svg b/resources/themes/cura-light/icons/default/PrintWalls.svg new file mode 100644 index 0000000000..156a87177d --- /dev/null +++ b/resources/themes/cura-light/icons/default/PrintWalls.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + From 02572311bf732e24a39829afbeb28ce39b2598b2 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Fri, 2 Dec 2022 16:19:29 +0100 Subject: [PATCH 052/124] Components were clickable when hidden. CURA-9793 --- .../PrintSetupSelector/Recommended/RecommendedSettingItem.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml index 9d61f14704..1b5ad8bd17 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml @@ -65,6 +65,7 @@ Item implicitHeight: 0 Layout.preferredHeight: 0 Layout.minimumHeight: 0 + enabled: false // Components can still be clickable with height 0 so they need to be disabled as well. } }, State From df8d0e9b469a6682d08c71655f6d8c1b05d07418 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Fri, 2 Dec 2022 18:01:12 +0100 Subject: [PATCH 053/124] Make it easier to override how the settingComboBox updates a setting. CURA-9793 --- resources/qml/Widgets/SingleSettingComboBox.qml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/resources/qml/Widgets/SingleSettingComboBox.qml b/resources/qml/Widgets/SingleSettingComboBox.qml index 151a9b1cd9..5c56fedb9c 100644 --- a/resources/qml/Widgets/SingleSettingComboBox.qml +++ b/resources/qml/Widgets/SingleSettingComboBox.qml @@ -58,13 +58,19 @@ Cura.ComboBox { function onIsValueUsedChanged() { comboboxModel.updateModel() } } - onCurrentIndexChanged: updateSetting() + onCurrentIndexChanged: parseValueAndUpdateSetting() + + function parseValueAndUpdateSetting() + { + if (comboboxModel.get(currentIndex) && comboboxModel.get(currentIndex).code != propertyProvider.properties.value) + { + updateSetting(comboboxModel.get(currentIndex).code) + } + + } function updateSetting(value) { - if (comboboxModel.get(currentIndex) && comboboxModel.get(currentIndex).code) - { - propertyProvider.setPropertyValue("value", comboboxModel.get(currentIndex).code) - } + propertyProvider.setPropertyValue("value", value) } } From 7e15acb95929f8c62987fc832b00f9eb1ee50316 Mon Sep 17 00:00:00 2001 From: Luis Gabriel Gomez Date: Sun, 4 Dec 2022 19:14:42 -0300 Subject: [PATCH 054/124] Update Sermoon V1 profile with better hotend specifics --- resources/definitions/creality_sermoonv1.def.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/resources/definitions/creality_sermoonv1.def.json b/resources/definitions/creality_sermoonv1.def.json index 214b189e58..18662dd1a4 100644 --- a/resources/definitions/creality_sermoonv1.def.json +++ b/resources/definitions/creality_sermoonv1.def.json @@ -33,6 +33,18 @@ "gantry_height": { "value": 25 }, + "retraction_speed": { + "default_value": 40 + }, + "retraction_amount": { + "value": 0.8 + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_center_is_zero": { + "default_value": false + }, "machine_center_is_zero": { "default_value": false }, From 80373b25b355fdde9416c149ee457ba2bd271e60 Mon Sep 17 00:00:00 2001 From: Luis Gabriel Gomez Date: Sun, 4 Dec 2022 19:26:21 -0300 Subject: [PATCH 055/124] Run printer-linter format/fix --- .../definitions/creality_sermoonv1.def.json | 32 ++++++------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/resources/definitions/creality_sermoonv1.def.json b/resources/definitions/creality_sermoonv1.def.json index 401fecac54..d40c172f43 100644 --- a/resources/definitions/creality_sermoonv1.def.json +++ b/resources/definitions/creality_sermoonv1.def.json @@ -11,7 +11,10 @@ }, "overrides": { + "gantry_height": { "value": 25 }, + "machine_center_is_zero": { "default_value": false }, "machine_depth": { "default_value": 175 }, + "machine_end_gcode": { "default_value": "; -- END GCODE --\nG91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z0.5 ;Raise Z more\nG90 ;Absolute positioning\n\nG1 X0 Y0 ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z" }, "machine_head_with_fans_polygon": { "default_value": [ @@ -21,28 +24,11 @@ [32, 34] ] }, - "preferred_variant_name": "0.4mm Nozzle", - "gantry_height": { - "value": 25 - }, - "retraction_speed": { - "default_value": 40 - }, - "retraction_amount": { - "value": 0.8 - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_start_gcode": { - "default_value": "; -- START GCODE --\nG28 ;Home\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y170.0 Z0.28 F1500.0 E12 ;Draw the first line\nG1 X10.4 Y170.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E25 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up" - }, - "machine_end_gcode": { - "default_value": "; -- END GCODE --\nG91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z0.5 ;Raise Z more\nG90 ;Absolute positioning\n\nG1 X0 Y0 ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z" - }, - "speed_print": { "value": 50 } + "machine_height": { "default_value": 165 }, + "machine_name": { "default_value": "Creality Sermoon V1" }, + "machine_start_gcode": { "default_value": "; -- START GCODE --\nG28 ;Home\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y170.0 Z0.28 F1500.0 E12 ;Draw the first line\nG1 X10.4 Y170.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E25 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up" }, + "machine_width": { "default_value": 175 }, + "retraction_amount": { "value": 0.8 }, + "retraction_speed": { "default_value": 40 } } } \ No newline at end of file From 651e56ca9dcc5ba9bcbb051849c3ac67f4233031 Mon Sep 17 00:00:00 2001 From: Luis Gabriel Gomez Date: Sun, 4 Dec 2022 19:33:48 -0300 Subject: [PATCH 056/124] 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 057/124] 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 540d81029327a4824d5dfccd855bec98b0be2adf Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Mon, 5 Dec 2022 10:23:40 +0100 Subject: [PATCH 058/124] The slider was not forcing its setting value to stay the same when changes were made in the "Advanced" menu. This is because the slider updating and setting updating functions were intertwined. I've seperated them so that the slider no longer interferes with changes to the setting. The Shell thickness settings were not being read or set correctly. I fixed this by setting the value to all extruders and reading from extruder 1. This setting is not set per machine but for all extruders. Not sure why. CURA-9793 --- .../RecommendedStrengthSelector.qml | 7 +++ resources/qml/Widgets/SingleSettingSlider.qml | 61 ++++++++++--------- .../qml/Widgets/SingleSettingTextField.qml | 31 ++++++++-- 3 files changed, 65 insertions(+), 34 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml index 54f005bb9e..61079c8fca 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml @@ -58,6 +58,11 @@ RecommendedSettingSection { width: parent.width settingName: "infill_pattern" + + function updateSetting(value) + { + Cura.MachineManager.setSettingForAllExtruders("infill_pattern", "value", value) + } } }, RecommendedSettingItem @@ -76,6 +81,7 @@ RecommendedSettingSection { width: parent.width settingName: "wall_thickness" + updateAllExtruders: true validator: Cura.FloatValidator {} unitText: catalog.i18nc("@label", "mm") } @@ -88,6 +94,7 @@ RecommendedSettingSection { width: parent.width settingName: "top_bottom_thickness" + updateAllExtruders: true validator: Cura.FloatValidator {} unitText: catalog.i18nc("@label", "mm") } diff --git a/resources/qml/Widgets/SingleSettingSlider.qml b/resources/qml/Widgets/SingleSettingSlider.qml index 855af45417..8fc81f6c2f 100644 --- a/resources/qml/Widgets/SingleSettingSlider.qml +++ b/resources/qml/Widgets/SingleSettingSlider.qml @@ -8,25 +8,29 @@ import UM 1.7 as UM import Cura 1.7 as Cura import QtQuick.Layouts 1.3 +// This silder allows changing of a single setting. Only the setting name has to be passed in to "settingName". +// All of the setting updating logic is handled by this component. +// This component allows you to choose values between minValue -> maxValue and rounds them to the nearest 10. + RowLayout { height: childrenRect.height spacing: UM.Theme.getSize("default_margin").width - property alias settingName: settingPropertyProvider.key + property alias settingName: propertyProvider.key property alias enabled: settingSlider.enabled property bool roundToNearestTen: false property int maxValue: 100 property int minValue: 0 + property int previousValue: -1 UM.SettingPropertyProvider { - id: settingPropertyProvider + id: propertyProvider containerStackId: Cura.MachineManager.activeStackId watchedProperties: [ "value" ] storeIndex: 0 - } UM.Label { Layout.fillWidth: false; text: minValue } @@ -41,55 +45,56 @@ RowLayout from: minValue; to: maxValue; stepSize: 1 // set initial value from stack - value: parseInt(settingPropertyProvider.properties.value) + value: parseInt(propertyProvider.properties.value) // When the slider is released trigger an update immediately. This forces the slider to snap to the rounded value. - onPressedChanged: if(!pressed) { parseValueUpdateSetting() } + onPressedChanged: if(!pressed) { roundSliderValueUpdateSetting() } } UM.Label { Layout.fillWidth: false; text: maxValue } Connections { - target: settingPropertyProvider + target: propertyProvider function onContainerStackChanged() { updateTimer.restart() } function onIsValueUsedChanged() { updateTimer.restart() } } - // Updates to the setting are delayed by interval. This stops lag caused by calling the - // parseValueUpdateSetting() function being call repeatedly while dragging the slider. + // Updates to the setting are delayed by interval. This reduces lag by waiting a bit after a setting change to update the slider contents. Timer { id: updateTimer interval: 100 repeat: false - onTriggered: parseValueUpdateSetting() + onTriggered: parseValueUpdateSetting(false) } - function parseValueUpdateSetting() + function updateSlider(value) { - // Work around, the `settingPropertyProvider.properties.value` is initially `undefined`. As - // `parseInt(settingPropertyProvider.properties.value)` is parsed as 0 and is initially set as - // the slider value. By setting this 0 value an update is triggered setting the actual - // sitting value to 0. - if (isNaN(parseInt(settingPropertyProvider.properties.value))) - { - return; - } + settingSlider.value = value + } - // Don't update if the setting value, if the slider has the same value - if (parseInt(settingPropertyProvider.properties.value) == settingSlider.value) - { - return; - } - - // Round the slider value to the nearest multiple of 10 (simulate step size of 10) + function roundSliderValueUpdateSetting() + { + // If the user interacts with the slider we round the value and update the setting. + print("roundSliderValueUpdateSetting()") const roundedSliderValue = roundToNearestTen ? Math.round(settingSlider.value / 10) * 10 : Math.round(settingSlider.value) + settingSlider.value = roundedSliderValue + updateSetting(roundedSliderValue) + } - // Update the slider value to represent the rounded value - settingSlider.value = roundedSliderValue; - updateSetting(roundedSliderValue); + function parseValueUpdateSetting(triggerUpdate) + { + // Only run when the setting value is updated by something other than the slider. + // This sets the slider value based on the setting value, it does not update the setting value. + + if (parseInt(propertyProvider.properties.value) == settingSlider.value) + { + return + } + + settingSlider.value = propertyProvider.properties.value } // Override this function to update a setting differently diff --git a/resources/qml/Widgets/SingleSettingTextField.qml b/resources/qml/Widgets/SingleSettingTextField.qml index c128a5070e..f3cc433ace 100644 --- a/resources/qml/Widgets/SingleSettingTextField.qml +++ b/resources/qml/Widgets/SingleSettingTextField.qml @@ -15,6 +15,10 @@ UM.TextField id: control property alias settingName: propertyProvider.key + // If true, all extruders will have "settingName" property updated. + // The displayed value will be read from the first extruder instead of the machine. + property bool updateAllExtruders: false + // Resolving the value in the textField. Binding { @@ -28,6 +32,15 @@ UM.TextField // This stops the text being reformatted as you edit. For example "10.1" -Edit-> "10." -Auto Format-> "10.0". return control.text } + + if (( propertyProvider.properties.resolve != "None" && propertyProvider.properties.resolve) && ( propertyProvider.properties.stackLevels[0] != 0) && ( propertyProvider.properties.stackLevels[0] != 1)) + { + // We have a resolve function. Indicates that the setting is not settable per extruder and that + // we have to choose between the resolved value (default) and the global value + // (if user has explicitly set this). + return base.resolve + } + return propertyProvider.properties.value } @@ -36,8 +49,8 @@ UM.TextField property UM.SettingPropertyProvider propertyProvider: UM.SettingPropertyProvider { id: propertyProvider - containerStack: Cura.MachineManager.activeMachine - watchedProperties: [ "value", "validationState" ] + watchedProperties: [ "value", "validationState", "resolve" ] + containerStackId: updateAllExtruders ? Cura.ExtruderManager.extruderIds[0] : Cura.MachineManager.activeMachine } Connections @@ -51,7 +64,7 @@ UM.TextField // textfield styling while typing. Keys.onReleased: updateTimer.restart() // Forces formatting when you finish editing "10.1" -Edit-> "10." -Focus Change-> "10" - onActiveFocusChanged: updateTime.restart() + onActiveFocusChanged: updateTimer.restart() // Updates to the setting are delayed by interval. This stops lag caused by calling the // parseValueUpdateSetting() function being called repeatedly while changing the text value. @@ -65,13 +78,19 @@ UM.TextField function parseValueUpdateSetting() { - // Do some parsing of text here - updateSetting(text); + if (propertyProvider && text != propertyProvider.properties.value) + { + updateSetting(text); + } } function updateSetting(value) { - if (propertyProvider && text != propertyProvider.properties.value) + if (updateAllExtruders) + { + Cura.MachineManager.setSettingForAllExtruders(propertyProvider.key, "value", value) + } + else { propertyProvider.setPropertyValue("value", text) } From d7e1aa08ac155b0ac54340035cdf70267c1592c1 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Mon, 5 Dec 2022 11:32:24 +0100 Subject: [PATCH 059/124] Update the single setting components to optionally update all extruders when a setting is settable per extruder or limited to extruder. This forces all extruders to have their settings updated but only displays the value from a single extruder. CURA-9793 --- .../RecommendedStrengthSelector.qml | 6 +----- .../qml/Widgets/SingleSettingComboBox.qml | 20 +++++++++++++++--- resources/qml/Widgets/SingleSettingSlider.qml | 21 +++++++++++++++---- .../qml/Widgets/SingleSettingTextField.qml | 9 +++++--- 4 files changed, 41 insertions(+), 15 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml index 61079c8fca..52a2197b99 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml @@ -39,6 +39,7 @@ RecommendedSettingSection width: parent.width settingName: "infill_sparse_density" roundToNearestTen: true + updateAllExtruders: true // disable slider when gradual support is enabled enabled: parseInt(infillSteps.properties.value) == 0 @@ -58,11 +59,6 @@ RecommendedSettingSection { width: parent.width settingName: "infill_pattern" - - function updateSetting(value) - { - Cura.MachineManager.setSettingForAllExtruders("infill_pattern", "value", value) - } } }, RecommendedSettingItem diff --git a/resources/qml/Widgets/SingleSettingComboBox.qml b/resources/qml/Widgets/SingleSettingComboBox.qml index 5c56fedb9c..0767c271ca 100644 --- a/resources/qml/Widgets/SingleSettingComboBox.qml +++ b/resources/qml/Widgets/SingleSettingComboBox.qml @@ -11,10 +11,17 @@ import Cura 1.7 as Cura // This ComboBox allows changing of a single setting. Only the setting name has to be passed in to "settingName". // All of the setting updating logic is handled by this component. // This uses the "options" value of a setting to populate the drop down. This will only work for settings with "options" +// If the setting is limited to a single extruder or is settable with different values per extruder use "updateAllExtruders: true" Cura.ComboBox { textRole: "text" property alias settingName: propertyProvider.key + // If true, all extruders will have "settingName" property updated. + // The displayed value will be read from the extruder with index "defaultExtruderIndex" instead of the machine. + property bool updateAllExtruders: false + // This is only used if updateAllExtruders == true + property int defaultExtruderIndex: 0 + model: ListModel { id: comboboxModel @@ -47,8 +54,8 @@ Cura.ComboBox { property UM.SettingPropertyProvider propertyProvider: UM.SettingPropertyProvider { id: propertyProvider - containerStack: Cura.MachineManager.activeMachine - watchedProperties: [ "value" , "options"] + containerStackId: updateAllExtruders ? Cura.ExtruderManager.extruderIds[defaultExtruderIndex] : Cura.MachineManager.activeMachine.id + watchedProperties: ["value" , "options"] } Connections @@ -71,6 +78,13 @@ Cura.ComboBox { function updateSetting(value) { - propertyProvider.setPropertyValue("value", value) + if (updateAllExtruders) + { + Cura.MachineManager.setSettingForAllExtruders(propertyProvider.key, "value", value) + } + else + { + propertyProvider.setPropertyValue("value", value) + } } } diff --git a/resources/qml/Widgets/SingleSettingSlider.qml b/resources/qml/Widgets/SingleSettingSlider.qml index 8fc81f6c2f..f1b0f2c54d 100644 --- a/resources/qml/Widgets/SingleSettingSlider.qml +++ b/resources/qml/Widgets/SingleSettingSlider.qml @@ -11,7 +11,7 @@ import QtQuick.Layouts 1.3 // This silder allows changing of a single setting. Only the setting name has to be passed in to "settingName". // All of the setting updating logic is handled by this component. // This component allows you to choose values between minValue -> maxValue and rounds them to the nearest 10. - +// If the setting is limited to a single extruder or is settable with different values per extruder use "updateAllExtruders: true" RowLayout { height: childrenRect.height @@ -20,6 +20,12 @@ RowLayout property alias settingName: propertyProvider.key property alias enabled: settingSlider.enabled + // If true, all extruders will have "settingName" property updated. + // The displayed value will be read from the extruder with index "defaultExtruderIndex" instead of the machine. + property bool updateAllExtruders: false + // This is only used if updateAllExtruders == true + property int defaultExtruderIndex: 0 + property bool roundToNearestTen: false property int maxValue: 100 property int minValue: 0 @@ -28,8 +34,8 @@ RowLayout UM.SettingPropertyProvider { id: propertyProvider - containerStackId: Cura.MachineManager.activeStackId - watchedProperties: [ "value" ] + containerStackId: updateAllExtruders ? Cura.ExtruderManager.extruderIds[defaultExtruderIndex] : Cura.MachineManager.activeMachine.id + watchedProperties: ["value"] storeIndex: 0 } @@ -99,6 +105,13 @@ RowLayout // Override this function to update a setting differently function updateSetting(value) { - propertyProvider.setPropertyValue("value", value) + if (updateAllExtruders) + { + Cura.MachineManager.setSettingForAllExtruders(propertyProvider.key, "value", value) + } + else + { + propertyProvider.setPropertyValue("value", value) + } } } diff --git a/resources/qml/Widgets/SingleSettingTextField.qml b/resources/qml/Widgets/SingleSettingTextField.qml index f3cc433ace..72edf58681 100644 --- a/resources/qml/Widgets/SingleSettingTextField.qml +++ b/resources/qml/Widgets/SingleSettingTextField.qml @@ -10,14 +10,17 @@ import Cura 1.7 as Cura // This text field allows you to edit a single setting. The setting can be passed by "settingName". // You must specify a validator with Validator. We store our default setting validators in qml/Validators +// If the setting is limited to a single extruder or is settable with different values per extruder use "updateAllExtruders: true" UM.TextField { id: control property alias settingName: propertyProvider.key // If true, all extruders will have "settingName" property updated. - // The displayed value will be read from the first extruder instead of the machine. + // The displayed value will be read from the extruder with index "defaultExtruderIndex" instead of the machine. property bool updateAllExtruders: false + // This is only used if updateAllExtruders == true + property int defaultExtruderIndex: 0 // Resolving the value in the textField. Binding @@ -49,8 +52,8 @@ UM.TextField property UM.SettingPropertyProvider propertyProvider: UM.SettingPropertyProvider { id: propertyProvider - watchedProperties: [ "value", "validationState", "resolve" ] - containerStackId: updateAllExtruders ? Cura.ExtruderManager.extruderIds[0] : Cura.MachineManager.activeMachine + watchedProperties: ["value", "validationState", "resolve"] + containerStackId: updateAllExtruders ? Cura.ExtruderManager.extruderIds[defaultExtruderIndex] : Cura.MachineManager.activeMachine.id } Connections From 29172014ad0f7a095403bca2cf384f09977af3da Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Mon, 5 Dec 2022 11:37:18 +0100 Subject: [PATCH 060/124] Add all new recommended items to ignored custom settings keys. This stops the reset setting button from appearing even though we have changed these settings. CURA-9793 --- cura/Settings/SimpleModeSettingsManager.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cura/Settings/SimpleModeSettingsManager.py b/cura/Settings/SimpleModeSettingsManager.py index af8707f235..44d2ce2cbb 100644 --- a/cura/Settings/SimpleModeSettingsManager.py +++ b/cura/Settings/SimpleModeSettingsManager.py @@ -57,6 +57,12 @@ class SimpleModeSettingsManager(QObject): # changed, we consider it as a user customized profile in the Simple ("Recommended") Mode. __ignored_custom_setting_keys = ["support_enable", "infill_sparse_density", + "infill_pattern", "gradual_infill_steps", + "wall_thickness", + "top_bottom_thickness", + "support_structure", + "support_extruder_nr", + "support_type", "adhesion_type", - "support_extruder_nr"] + "adhesion_extruder_nr"] From 33b815dec59fc79e474017cee4d9c42515ee430d Mon Sep 17 00:00:00 2001 From: whoseyoung Date: Mon, 5 Dec 2022 18:45:09 +0800 Subject: [PATCH 061/124] add Geeetech 24 machine profiles --- resources/definitions/Geeetech_base.def.json | 151 ++++++++---------- resources/definitions/geeetech_A10M.def.json | 4 +- .../definitions/geeetech_A10Pro.def.json | 4 +- resources/definitions/geeetech_A10T.def.json | 4 +- resources/definitions/geeetech_A20.def.json | 4 +- resources/definitions/geeetech_A20M.def.json | 4 +- resources/definitions/geeetech_A20T.def.json | 4 +- resources/definitions/geeetech_A30M.def.json | 6 +- .../definitions/geeetech_A30Pro.def.json | 6 +- resources/definitions/geeetech_A30T.def.json | 6 +- resources/definitions/geeetech_E180.def.json | 1 - .../geeetech_GiantArmD200.def.json | 6 +- .../definitions/geeetech_I3ProB.def.json | 6 +- .../definitions/geeetech_I3ProC.def.json | 6 +- .../definitions/geeetech_I3ProW.def.json | 6 +- .../definitions/geeetech_MeCreator.def.json | 6 +- .../definitions/geeetech_MeCreator2.def.json | 6 +- .../definitions/geeetech_MeDucer.def.json | 6 +- resources/definitions/geeetech_Mizar.def.json | 4 +- .../definitions/geeetech_MizarM.def.json | 3 +- .../definitions/geeetech_MizarMax.def.json | 4 +- .../definitions/geeetech_MizarPro.def.json | 4 +- .../definitions/geeetech_MizarS.def.json | 4 +- .../definitions/geeetech_Thunder.def.json | 47 +++--- .../Geeetech_Dual_Extruder_0.def.json | 4 +- .../Geeetech_Dual_Extruder_1.def.json | 4 +- .../Geeetech_Multi_Extruder_0.def.json | 4 +- .../Geeetech_Multi_Extruder_1.def.json | 4 +- .../Geeetech_Multi_Extruder_2.def.json | 4 +- .../Geeetech_base_extruder_0.def.json | 4 +- 30 files changed, 141 insertions(+), 185 deletions(-) diff --git a/resources/definitions/Geeetech_base.def.json b/resources/definitions/Geeetech_base.def.json index 00f7902d8c..910d6a351d 100644 --- a/resources/definitions/Geeetech_base.def.json +++ b/resources/definitions/Geeetech_base.def.json @@ -22,122 +22,99 @@ "overrides":{ "machine_name": { "default_value": "Geeetech Base Printer" }, - "machine_width": { "default_value": 250 }, - "machine_depth": { "default_value": 250 }, - "machine_height": {"default_value": 260 }, - "machine_head_with_fans_polygon": { "default_value": [[-31, 31], [34, 31], [34, -40], [-31, -40]] }, - "gantry_height": { "value": 30 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_width": { "default_value": 300 }, + "machine_depth": { "default_value": 300 }, + "machine_height": {"default_value": 300 }, + "machine_head_with_fans_polygon": { "default_value": [[-40, 40], [40, 40], [40, -40], [-40, -40]] }, + "gantry_height": { "value": 40 }, "machine_start_gcode": { "default_value": ";Geeetech Custom Start G-code\nM104 S{material_print_temperature_layer_0} ;Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ;Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ;Wait for Hotend Temperature\nG92 E0 ;Reset Extruder\nG28 ;Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ;ON Light\n;M106 P0 S383 ;ON MainFan 150% if need\n;M106 P1 S255 ;ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ;Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ;Draw the first line\nG92 E0 ;Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ;Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ;Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, - "machine_extruder_count": { "default_value": 1}, - "machine_heated_bed": { "default_value": true }, - + "machine_end_gcode": { "default_value": ";Geeetech Custom end G-code\nG91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers\n\n\n" }, + "machine_heated_bed": { "default_value": true }, + "machine_max_feedrate_x": { "value": 500 }, "machine_max_feedrate_y": { "value": 500 }, "machine_max_feedrate_z": { "value": 10 }, "machine_max_feedrate_e": { "value": 40 }, "machine_max_acceleration_x": { "value": 500 }, "machine_max_acceleration_y": { "value": 500 }, - "machine_max_acceleration_z": { "value": 100 }, + "machine_max_acceleration_z": { "value": 111 }, "machine_max_acceleration_e": { "value": 1000 }, "machine_acceleration": { "value": 500 }, "machine_max_jerk_xy": { "value": 10 }, "machine_max_jerk_z": { "value": 0.3 }, - "machine_max_jerk_e": { "value": 5 }, - "acceleration_enabled": { "value": false }, - "acceleration_travel_enabled":{ "value": false }, + "machine_max_jerk_e": { "value": 4.9 }, + "acceleration_print": { "value": 500 }, "acceleration_travel": { "value": 500 }, "acceleration_travel_layer_0": { "value": "acceleration_travel" }, - "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" }, + "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" }, - "line_width": {"default_value":"machine_nozzle_size","value": "1.125*machine_nozzle_size if speed_infill<=100 else machine_nozzle_size"}, - "fill_outline_gaps": {"label": "Print Thin Walls", "value": true }, - "retraction_amount": { "default_value": 6.5 }, - "retraction_enable": { "default_value": true }, - "retraction_speed": { "default_value": 40 }, - "infill_sparse_density": {"label": "Infill Density","value": "20" }, - "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'grid'" }, - "small_hole_max_size":{"default_value": 0,"value": "5 if speed_infill>=150 else 0" }, - "cool_min_layer_time":{"default_value": 5,"value": "1.3 if speed_infill>=200 else 5" }, - "material_print_temperature": { "default_value": 200,"value": "200 if speed_infill <=100 else 210 if speed_infill <= 150 else 220 if speed_infill <= 180 else 230", "maximum_value": "250" }, - "material_print_temperature_layer_0": { "value": "material_print_temperature + 5", "maximum_value_warning": 250 }, - "material_initial_print_temperature": { "value": "material_print_temperature - 5", "minimum_value_warning": "material_standby_temperature - 10" }, - "material_final_print_temperature": { "value": "material_print_temperature" }, - "material_bed_temperature": { "maximum_value_warning": 110 }, + "line_width": {"value": "1.125*machine_nozzle_size if speed_infill<=100 else machine_nozzle_size"}, + "retraction_speed": {"default_value": 40 }, + "infill_pattern": {"value": "'lines' if infill_sparse_density > 50 else 'grid'" }, + "small_hole_max_size":{"value": "5 if speed_infill>=150 else 0" }, + "cool_min_layer_time":{"value": "1.3 if speed_infill>=200 else 5" }, + "material_print_temperature": {"default_value": 200,"value": "200 if speed_infill <=100 else 210 if speed_infill <= 150 else 220 if speed_infill <= 180 else 230", "maximum_value": "250" }, + "material_print_temperature_layer_0": {"value": "material_print_temperature + 5", "maximum_value_warning": 250 }, + "material_initial_print_temperature": {"value": "material_print_temperature - 5", "minimum_value_warning": "material_standby_temperature - 10" }, + "material_final_print_temperature": {"value": "material_print_temperature" }, + "material_bed_temperature": {"maximum_value_warning": 110 }, - "speed_print": { "default_value": 60, "maximum_value_warning": "300" }, - "speed_infill": {"default_value": 60, "value":"speed_print", "maximum_value_warning": "300"}, - "speed_wall": {"label": " Wall Speed ", "default_value": 30, "value": "60 if speed_print==60 else math.ceil(round(speed_print*0.90))", "maximum_value_warning": "300"}, - "speed_wall_0": {"label": "Outer Wall Speed","default_value": 30, "value": "30 if speed_print==60 else math.ceil(round(speed_print*0.75))", "maximum_value_warning": "300"}, - "speed_wall_x": {"label": "Inner Wall Speed","default_value": 60, "value": "60 if speed_print==60 else math.ceil(round(speed_print*0.90))", "maximum_value_warning": "300"}, - "speed_roofing":{"default_value": 25, "value": "speed_print", "maximum_value_warning": "300"}, - "speed_topbottom": {"default_value": 30, "value": "speed_print", "maximum_value_warning": "300"}, - "speed_travel": {"default_value": 120, "value": "200 if 120<=speed_print<=200 else speed_print if speed_print>200 else 120", "maximum_value_warning": "300"}, - "speed_layer_0": {"default_value": 30, "value":"speed_travel_layer_0","maximum_value_warning": "300"}, - "speed_print_layer_0": {"default_value": 30, "value": "25 if speed_infill <= 150 else 35", "maximum_value_warning": "60"}, - "speed_travel_layer_0": {"default_value": 60,"value": "2*speed_print_layer_0", "maximum_value_warning": "300"}, - "skirt_brim_speed": {"default_value": 30, "value":"speed_print_layer_0", "maximum_value_warning": "60"}, - - "speed_support": {"default_value": 60, "value": "speed_print*0.5", "maximum_value_warning": "300"}, - "speed_support_infill": {"default_value":60, "value": "speed_support", "maximum_value_warning": "300"}, - "speed_support_interface": {"default_value": 40, "value": "speed_support", "maximum_value_warning": "300"}, - "speed_support_roof": {"default_value": 40, "value": "speed_support", "maximum_value_warning": "300"}, - "speed_support_bottom": {"default_value": 40, "value": "speed_support", "maximum_value_warning": "300"}, - - "wall_transition_filter_deviation":{"label": "Wall Transitioning Filter Margin","value": 0.15 }, - "inset_direction":{"label": "Wall Ordering","default_value": "inside_out" }, - "travel_avoid_other_parts": { "value": true }, - "travel_avoid_supports": { "value": true }, - "travel_retract_before_outer_wall": { "value": false }, - "retraction_hop_enabled": { "value": "False" }, - "retraction_hop": { "value": 0.2 }, - "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'all'" }, - "retraction_combing_max_distance": { "value": 30 }, - "optimize_wall_printing_order": { "value": "True" }, - "z_seam_type": { "value": "'sharpest_corner'"}, - "z_seam_corner": { "value": "'z_seam_corner_inner'"}, - - "support_enable": {"default_value": false }, - "support_use_towers": { "value": false }, - "support_angle": { "value": 50 }, - "support_type": {"default_value": "'everywhere'" }, - "support_pattern": { "value": "'zigzag'" }, - "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 25" }, - "support_xy_distance": { "value": "wall_line_width_0 * 2" }, - "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_brim_enable": { "value": true }, - "support_brim_width": { "value": 5 }, + "speed_wall": {"value": "60 if speed_print==60 else math.ceil(round(speed_print*0.90))"}, + "speed_wall_0": {"value": "30 if speed_print==60 else math.ceil(round(speed_print*0.75))"}, + "speed_wall_x": {"value": "60 if speed_print==60 else math.ceil(round(speed_print*0.90))"}, + "speed_topbottom": {"value": "speed_print"}, + "speed_travel": {"value": "200 if 120<=speed_print<=200 else speed_print if speed_print>200 else 120"}, + "speed_layer_0": {"value":"50 if speed_infill <= 150 else 75","maximum_value_warning": "100"}, + "speed_print_layer_0": {"value": "25 if speed_infill <= 150 else 35","maximum_value_warning": "60"}, + "speed_travel_layer_0": {"value": "speed_layer_0","maximum_value_warning": "150"}, + "skirt_brim_speed": {"value":"speed_print_layer_0","maximum_value_warning": "60"}, - "support_interface_enable": { "value": false }, - "support_roof_enable": {"default_value": false }, - "support_interface_height": { "value": "layer_height * 4" }, - "support_interface_density": { "value": 33.333 }, + "speed_support": {"value": "speed_print*0.5"}, + "speed_support_interface": {"value": "speed_support / 0.8"}, + "speed_support_roof": {"value": "speed_support_interface / 2"}, + "speed_support_bottom": {"value": "speed_support_roof"}, + + "wall_transition_filter_deviation":{"value": 0.15 }, + "travel_avoid_supports": {"value": true }, + "retraction_hop": {"value": 0.5 }, + "retraction_combing": {"value": "'off' if retraction_hop_enabled else 'all'" }, + "retraction_combing_max_distance": {"value": 30 }, + "optimize_wall_printing_order": {"value": true }, + "z_seam_type": {"value": "'sharpest_corner'"}, + "z_seam_corner": {"value": "'z_seam_corner_inner'"}, + + "support_type": {"default_value": "'everywhere'" }, + "support_use_towers": {"value": false }, + "support_pattern": {"value": "'zigzag'" }, + "support_wall_count": {"value": 0 }, + "support_infill_rate": {"value": "0 if support_enable and support_structure == 'tree' else 20" }, + "support_brim_enable": {"value": true }, + "support_brim_width": {"value": 5 }, + "support_z_distance": {"value": "layer_height if layer_height >= 0.16 else layer_height*2" }, + "support_xy_distance": {"value": "wall_line_width_0 * 2" }, + "support_xy_distance_overhang": {"value": "wall_line_width_0" }, + + "support_interface_height": {"value": "layer_height * 3" }, + "support_interface_density": {"value": 33.333 }, + "support_interface_skip_height": {"value": 0.2 }, "support_interface_pattern": {"default_value": "zigzag" }, - "support_interface_skip_height": { "value": 0.2 }, "support_roof_pattern": {"default_value": "zigzag" }, "support_bottom_pattern": {"default_value": "zigzag" }, - "minimum_support_area": { "value": 2 }, - "minimum_interface_area": { "value": 10 }, + "minimum_support_area": {"value": 2 }, + "minimum_interface_area": {"value": 10 }, "top_bottom_thickness": {"value": "layer_height_0 + layer_height * 3" }, "wall_thickness": {"value": "line_width * 2" }, - "adhesion_type": { "value": "'skirt'" }, - "brim_replaces_support": { "value": false }, - "skirt_gap": { "value": 6 }, - "skirt_line_count": { "value": 1 }, + "adhesion_type": {"value": "'skirt'" }, + "brim_replaces_support": {"value": false }, + "skirt_gap": {"value": 6 }, "brim_line_count": {"default_value": 5 }, - "prime_tower_enable":{ "value": false }, "prime_tower_size": { "value": 30 }, "prime_tower_min_volume":{ "value": 85, "maximum_value_warning":150 }, - "prime_tower_wipe_enabled":{ "value": true }, "prime_tower_brim_enable":{ "value": true } } } diff --git a/resources/definitions/geeetech_A10M.def.json b/resources/definitions/geeetech_A10M.def.json index 049a7d75bb..752db2dfa1 100644 --- a/resources/definitions/geeetech_A10M.def.json +++ b/resources/definitions/geeetech_A10M.def.json @@ -21,12 +21,12 @@ "machine_height": {"default_value": 260 }, "machine_head_with_fans_polygon": { "default_value": [[-31, 31], [34, 31], [34, -40], [-31, -40]] }, "gantry_height": { "value": 28 }, + "brim_width":{ "value": 10 }, "prime_tower_position_x":{ "value": 190 }, "prime_tower_position_y":{ "value": 160 }, "machine_start_gcode": { "default_value": ";Geeetech A10M Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, - "machine_extruder_count": { "default_value": 2 }, - "machine_heated_bed": { "default_value": true } + "machine_extruder_count": { "default_value": 2 } } } diff --git a/resources/definitions/geeetech_A10Pro.def.json b/resources/definitions/geeetech_A10Pro.def.json index 7bc2384f40..bb93eb67b1 100644 --- a/resources/definitions/geeetech_A10Pro.def.json +++ b/resources/definitions/geeetech_A10Pro.def.json @@ -19,8 +19,6 @@ "gantry_height": { "value": 28 }, "machine_start_gcode": { "default_value": ";Geeetech A10Pro Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, - "machine_extruder_count": { "default_value": 1 }, - "machine_heated_bed": { "default_value": true } + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } } } diff --git a/resources/definitions/geeetech_A10T.def.json b/resources/definitions/geeetech_A10T.def.json index 30437723be..8ce9b67bd7 100644 --- a/resources/definitions/geeetech_A10T.def.json +++ b/resources/definitions/geeetech_A10T.def.json @@ -21,12 +21,12 @@ "machine_height": {"default_value": 260 }, "machine_head_with_fans_polygon": { "default_value": [[-31, 31], [34, 31], [34, -40], [-31, -40]] }, "gantry_height": { "value": 28 }, + "brim_width":{ "value": 10 }, "prime_tower_position_x":{ "value": 190 }, "prime_tower_position_y":{ "value": 160 }, "machine_start_gcode": { "default_value": ";Geeetech A10T Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, - "machine_extruder_count": { "default_value": 3 }, - "machine_heated_bed": { "default_value": true } + "machine_extruder_count": { "default_value": 3 } } } diff --git a/resources/definitions/geeetech_A20.def.json b/resources/definitions/geeetech_A20.def.json index e8017ea1a3..0caa866b7b 100644 --- a/resources/definitions/geeetech_A20.def.json +++ b/resources/definitions/geeetech_A20.def.json @@ -19,8 +19,6 @@ "gantry_height": { "value": 35 }, "machine_start_gcode": { "default_value": ";Geeetech A20 Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, - "machine_extruder_count": { "default_value": 1}, - "machine_heated_bed": { "default_value": true } + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } } } diff --git a/resources/definitions/geeetech_A20M.def.json b/resources/definitions/geeetech_A20M.def.json index ffe728efbf..f7770a87d0 100644 --- a/resources/definitions/geeetech_A20M.def.json +++ b/resources/definitions/geeetech_A20M.def.json @@ -21,12 +21,12 @@ "machine_height": {"default_value": 250 }, "machine_head_with_fans_polygon": { "default_value": [[-31, 31], [34, 31], [34, -40], [-31, -40]] }, "gantry_height": { "value": 35 }, + "brim_width":{ "value": 10 }, "prime_tower_position_x":{ "value": 220 }, "prime_tower_position_y":{ "value": 190 }, "machine_start_gcode": { "default_value": ";Geeetech A20M Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, - "machine_extruder_count": { "default_value": 2 }, - "machine_heated_bed": { "default_value": true } + "machine_extruder_count": { "default_value": 2 } } } diff --git a/resources/definitions/geeetech_A20T.def.json b/resources/definitions/geeetech_A20T.def.json index bc78b65af2..2771499554 100644 --- a/resources/definitions/geeetech_A20T.def.json +++ b/resources/definitions/geeetech_A20T.def.json @@ -21,12 +21,12 @@ "machine_height": {"default_value": 250 }, "machine_head_with_fans_polygon": { "default_value": [[-31, 31], [34, 31], [34, -40], [-31, -40]] }, "gantry_height": { "value": 35 }, + "brim_width":{ "value": 10 }, "prime_tower_position_x":{ "value": 220 }, "prime_tower_position_y":{ "value": 190 }, "machine_start_gcode": { "default_value": ";Geeetech A20T Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, - "machine_extruder_count": { "default_value": 3 }, - "machine_heated_bed": { "default_value": true } + "machine_extruder_count": { "default_value": 3 } } } diff --git a/resources/definitions/geeetech_A30M.def.json b/resources/definitions/geeetech_A30M.def.json index 6f60dd2914..225f3f5d59 100644 --- a/resources/definitions/geeetech_A30M.def.json +++ b/resources/definitions/geeetech_A30M.def.json @@ -20,13 +20,13 @@ "machine_depth": { "default_value": 320 }, "machine_height": {"default_value": 420 }, "machine_head_with_fans_polygon": { "default_value": [[-75, 35], [18, 35], [18, -18], [-75, -18]] }, - "gantry_height": { "value": 55 }, + "gantry_height": { "value": 35 }, + "brim_width":{ "value": 10 }, "prime_tower_position_x":{ "value": 290 }, "prime_tower_position_y":{ "value": 260 }, "machine_start_gcode": { "default_value": ";Geeetech A30M Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, - "machine_extruder_count": { "default_value": 2 }, - "machine_heated_bed": { "default_value": true } + "machine_extruder_count": { "default_value": 2 } } } diff --git a/resources/definitions/geeetech_A30Pro.def.json b/resources/definitions/geeetech_A30Pro.def.json index 43f78fef90..5b428080fc 100644 --- a/resources/definitions/geeetech_A30Pro.def.json +++ b/resources/definitions/geeetech_A30Pro.def.json @@ -16,11 +16,9 @@ "machine_depth": { "default_value": 320 }, "machine_height": {"default_value": 420 }, "machine_head_with_fans_polygon": { "default_value": [[-75, 35], [18, 35], [18, -18], [-75, -18]] }, - "gantry_height": { "value": 55 }, + "gantry_height": { "value": 35 }, "machine_start_gcode": { "default_value": ";Geeetech A30Pro Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, - "machine_extruder_count": { "default_value": 1}, - "machine_heated_bed": { "default_value": true } + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } } } diff --git a/resources/definitions/geeetech_A30T.def.json b/resources/definitions/geeetech_A30T.def.json index 11c75a0aab..7c44017a5f 100644 --- a/resources/definitions/geeetech_A30T.def.json +++ b/resources/definitions/geeetech_A30T.def.json @@ -20,13 +20,13 @@ "machine_depth": { "default_value": 320 }, "machine_height": {"default_value": 420 }, "machine_head_with_fans_polygon": { "default_value": [[-75, 35], [18, 35], [18, -18], [-75, -18]] }, - "gantry_height": { "value": 55 }, + "gantry_height": { "value": 35 }, + "brim_width":{ "value": 10 }, "prime_tower_position_x":{ "value": 290 }, "prime_tower_position_y":{ "value": 260 }, "machine_start_gcode": { "default_value": ";Geeetech A30T Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, - "machine_extruder_count": { "default_value": 3 }, - "machine_heated_bed": { "default_value": true } + "machine_extruder_count": { "default_value": 3 } } } diff --git a/resources/definitions/geeetech_E180.def.json b/resources/definitions/geeetech_E180.def.json index 9259ee715d..28e93ab57b 100644 --- a/resources/definitions/geeetech_E180.def.json +++ b/resources/definitions/geeetech_E180.def.json @@ -20,7 +20,6 @@ "machine_start_gcode": { "default_value": ";Geeetech E180 Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y10 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y120.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y120.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y10 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y10 Z0.4 F3000.0 ; Scrape off nozzle residue" }, "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, - "machine_extruder_count": { "default_value": 1}, "machine_heated_bed": { "default_value": false } } } diff --git a/resources/definitions/geeetech_GiantArmD200.def.json b/resources/definitions/geeetech_GiantArmD200.def.json index ca673b5260..27e7ae24ce 100644 --- a/resources/definitions/geeetech_GiantArmD200.def.json +++ b/resources/definitions/geeetech_GiantArmD200.def.json @@ -15,11 +15,11 @@ "machine_width": { "default_value": 300 }, "machine_depth": { "default_value": 180 }, "machine_height": {"default_value": 180 }, + "machine_head_with_fans_polygon": { "default_value": [[-75, 35], [18, 35], [18, -18], [-75, -18]] }, + "gantry_height": { "value": 45 }, "retraction_amount": { "default_value": 2 }, "machine_start_gcode": { "default_value": ";Geeetech GiantArmD200 Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y10 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y160.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y160.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y10 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y10 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, - "machine_extruder_count": { "default_value": 1 }, - "machine_heated_bed": { "default_value": true } + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } } } diff --git a/resources/definitions/geeetech_I3ProB.def.json b/resources/definitions/geeetech_I3ProB.def.json index 9027ac7e19..25b7a6c987 100644 --- a/resources/definitions/geeetech_I3ProB.def.json +++ b/resources/definitions/geeetech_I3ProB.def.json @@ -15,11 +15,11 @@ "machine_width": { "default_value": 200 }, "machine_depth": { "default_value": 200 }, "machine_height": {"default_value": 180 }, + "machine_head_with_fans_polygon": { "default_value": [[-75, 35], [18, 35], [18, -18], [-75, -18]] }, + "gantry_height": { "value": 45 }, "retraction_amount": { "default_value": 2 }, "machine_start_gcode": { "default_value": ";Geeetech I3ProB Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y10 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y180.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y180.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y10 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, - "machine_extruder_count": { "default_value": 1 }, - "machine_heated_bed": { "default_value": true } + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } } } diff --git a/resources/definitions/geeetech_I3ProC.def.json b/resources/definitions/geeetech_I3ProC.def.json index b8a74d3aa9..c7e5d01410 100644 --- a/resources/definitions/geeetech_I3ProC.def.json +++ b/resources/definitions/geeetech_I3ProC.def.json @@ -19,13 +19,15 @@ "machine_width": { "default_value": 200 }, "machine_depth": { "default_value": 200 }, "machine_height": {"default_value": 180 }, + "machine_head_with_fans_polygon": { "default_value": [[-75, 35], [18, 35], [18, -18], [-75, -18]] }, + "gantry_height": { "value": 45 }, "retraction_amount": { "default_value": 2 }, + "brim_width":{ "value": 10 }, "prime_tower_position_x":{ "value": 170 }, "prime_tower_position_y":{ "value": 140 }, "machine_start_gcode": { "default_value": ";Geeetech I3ProC Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y10 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y180.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y180.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y10 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, - "machine_extruder_count": { "default_value": 2 }, - "machine_heated_bed": { "default_value": true } + "machine_extruder_count": { "default_value": 2 } } } diff --git a/resources/definitions/geeetech_I3ProW.def.json b/resources/definitions/geeetech_I3ProW.def.json index e0d98a8927..1db41552db 100644 --- a/resources/definitions/geeetech_I3ProW.def.json +++ b/resources/definitions/geeetech_I3ProW.def.json @@ -15,11 +15,11 @@ "machine_width": { "default_value": 200 }, "machine_depth": { "default_value": 200 }, "machine_height": {"default_value": 180 }, + "machine_head_with_fans_polygon": { "default_value": [[-75, 35], [18, 35], [18, -18], [-75, -18]] }, + "gantry_height": { "value": 45 }, "retraction_amount": { "default_value": 2 }, "machine_start_gcode": { "default_value": ";Geeetech I3ProW Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y10 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y180.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y180.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y10 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, - "machine_extruder_count": { "default_value": 1 }, - "machine_heated_bed": { "default_value": true } + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } } } diff --git a/resources/definitions/geeetech_MeCreator.def.json b/resources/definitions/geeetech_MeCreator.def.json index 240ea210c1..a35756f440 100644 --- a/resources/definitions/geeetech_MeCreator.def.json +++ b/resources/definitions/geeetech_MeCreator.def.json @@ -15,11 +15,11 @@ "machine_width": { "default_value": 150 }, "machine_depth": { "default_value": 150 }, "machine_height": {"default_value": 125 }, + "machine_head_with_fans_polygon": { "default_value": [[-75, 35], [18, 35], [18, -18], [-75, -18]] }, + "gantry_height": { "value": 45 }, "retraction_amount": { "default_value": 2 }, "machine_start_gcode": { "default_value": ";Geeetech MeCreator Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y10 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y130.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y130.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y10 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y10 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, - "machine_extruder_count": { "default_value": 1 }, - "machine_heated_bed": { "default_value": true } + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } } } diff --git a/resources/definitions/geeetech_MeCreator2.def.json b/resources/definitions/geeetech_MeCreator2.def.json index 81e2a915c4..c9bed615fa 100644 --- a/resources/definitions/geeetech_MeCreator2.def.json +++ b/resources/definitions/geeetech_MeCreator2.def.json @@ -15,11 +15,11 @@ "machine_width": { "default_value": 160 }, "machine_depth": { "default_value": 160 }, "machine_height": {"default_value": 160 }, + "machine_head_with_fans_polygon": { "default_value": [[-75, 35], [18, 35], [18, -18], [-75, -18]] }, + "gantry_height": { "value": 45 }, "retraction_amount": { "default_value": 2 }, "machine_start_gcode": { "default_value": ";Geeetech MeCreator2 Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y10 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y140.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y140.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y10 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y10 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, - "machine_extruder_count": { "default_value": 1 }, - "machine_heated_bed": { "default_value": true } + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } } } diff --git a/resources/definitions/geeetech_MeDucer.def.json b/resources/definitions/geeetech_MeDucer.def.json index 2a95658bd5..c4b65bfe3b 100644 --- a/resources/definitions/geeetech_MeDucer.def.json +++ b/resources/definitions/geeetech_MeDucer.def.json @@ -15,11 +15,11 @@ "machine_width": { "default_value": 180 }, "machine_depth": { "default_value": 150 }, "machine_height": {"default_value": 150 }, + "machine_head_with_fans_polygon": { "default_value": [[-75, 35], [18, 35], [18, -18], [-75, -18]] }, + "gantry_height": { "value": 45 }, "retraction_amount": { "default_value": 2 }, "machine_start_gcode": { "default_value": ";Geeetech MeDucer Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y10 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y130.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y130.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y10 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y10 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, - "machine_extruder_count": { "default_value": 1 }, - "machine_heated_bed": { "default_value": true } + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } } } diff --git a/resources/definitions/geeetech_Mizar.def.json b/resources/definitions/geeetech_Mizar.def.json index cfcd708319..38fcb151e6 100644 --- a/resources/definitions/geeetech_Mizar.def.json +++ b/resources/definitions/geeetech_Mizar.def.json @@ -19,8 +19,6 @@ "gantry_height": { "value": 35 }, "machine_start_gcode": { "default_value": ";Official open-source firmware for Mizar: https://github.com/Geeetech3D/Mizar \n\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, - "machine_extruder_count": { "default_value": 1}, - "machine_heated_bed": { "default_value": true } + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } } } diff --git a/resources/definitions/geeetech_MizarM.def.json b/resources/definitions/geeetech_MizarM.def.json index ba291b028e..28bf7dfe76 100644 --- a/resources/definitions/geeetech_MizarM.def.json +++ b/resources/definitions/geeetech_MizarM.def.json @@ -28,7 +28,6 @@ "machine_start_gcode": { "default_value": ";Official open-source firmware for MizarM: https://github.com/Geeetech3D/Mizar-M \n\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, "machine_extruder_count": { "default_value": 2 }, - "material_standby_temperature": {"value": 200 }, - "machine_heated_bed": { "default_value": true } + "material_standby_temperature": {"value": 200 } } } diff --git a/resources/definitions/geeetech_MizarMax.def.json b/resources/definitions/geeetech_MizarMax.def.json index cc070ab029..4856ac5065 100644 --- a/resources/definitions/geeetech_MizarMax.def.json +++ b/resources/definitions/geeetech_MizarMax.def.json @@ -19,8 +19,6 @@ "gantry_height": { "value": 35 }, "machine_start_gcode": { "default_value": ";Official open-source firmware for MizarMax: https://github.com/Geeetech3D/Mizar-Max \n\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, - "machine_extruder_count": { "default_value": 1}, - "machine_heated_bed": { "default_value": true } + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } } } diff --git a/resources/definitions/geeetech_MizarPro.def.json b/resources/definitions/geeetech_MizarPro.def.json index 81130bd0de..0040fb3dd8 100644 --- a/resources/definitions/geeetech_MizarPro.def.json +++ b/resources/definitions/geeetech_MizarPro.def.json @@ -19,8 +19,6 @@ "gantry_height": { "value": 35 }, "machine_start_gcode": { "default_value": ";Official open-source firmware for MizarPro: https://github.com/Geeetech3D/Mizar-Pro \n\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, - "machine_extruder_count": { "default_value": 1}, - "machine_heated_bed": { "default_value": true } + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } } } diff --git a/resources/definitions/geeetech_MizarS.def.json b/resources/definitions/geeetech_MizarS.def.json index 7c6ef40fef..8f097e2bde 100644 --- a/resources/definitions/geeetech_MizarS.def.json +++ b/resources/definitions/geeetech_MizarS.def.json @@ -19,8 +19,6 @@ "gantry_height": { "value": 35 }, "machine_start_gcode": { "default_value": ";Official open-source firmware for MizarS: https://github.com/Geeetech3D/Mizar-S \n\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, - "machine_extruder_count": { "default_value": 1}, - "machine_heated_bed": { "default_value": true } + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } } } diff --git a/resources/definitions/geeetech_Thunder.def.json b/resources/definitions/geeetech_Thunder.def.json index a5676d59f2..0261b5396a 100644 --- a/resources/definitions/geeetech_Thunder.def.json +++ b/resources/definitions/geeetech_Thunder.def.json @@ -14,15 +14,13 @@ "machine_name": { "default_value": "Geeetech Thunder" }, "machine_width": { "default_value": 250 }, "machine_depth": { "default_value": 250 }, - "machine_height": {"default_value": 260 }, + "machine_height": {"default_value": 260 }, + "machine_head_with_fans_polygon": { "default_value": [[-20, 25], [20, 25], [20, -25], [-20, -25]] }, + "gantry_height": { "value": 35 }, "machine_start_gcode": { "default_value": ";Official viki homepage for Thunder:https://www.geeetech.com/wiki/index.php/Geeetech_Thunder_3D_printer \n\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, - "machine_extruder_count": { "default_value": 1}, - "machine_heated_bed": { "default_value": true }, "machine_max_feedrate_x": { "value": 300 }, - "machine_max_feedrate_y": { "value": 500 }, - "machine_max_feedrate_z": { "value": 10 }, "machine_max_feedrate_e": { "value": 60 }, "machine_max_acceleration_x": { "value": 5000 }, "machine_max_acceleration_y": { "value": 4000 }, @@ -31,37 +29,44 @@ "machine_max_jerk_xy": { "value": 45 }, "machine_max_jerk_z": { "value": 0.8 }, "machine_max_jerk_e": { "value": 8 }, - "acceleration_enabled": { "value": false }, - "acceleration_travel_enabled":{ "value": false }, "acceleration_print": { "value": 3500 }, "acceleration_travel": { "value": 5000 }, - - "line_width": {"default_value":"machine_nozzle_size","value": "1.2*machine_nozzle_size if speed_infill>=200 else machine_nozzle_size"}, + + "line_width": {"value": "1.2*machine_nozzle_size if speed_infill>=200 else machine_nozzle_size"}, "fill_outline_gaps": {"label": "Print Thin Walls", "value": false }, - "retraction_amount": { "default_value": 6.5 }, - "retraction_enable": { "default_value": true }, "retraction_speed": { "default_value": 35 }, "infill_sparse_density": {"label": "Infill Density","value": "15" }, - "cool_min_layer_time":{"default_value": 5,"value": "1.3 if speed_infill>=200 else 2.5" }, - "small_hole_max_size":{"default_value": 0,"value": "8 if speed_infill>=200 else 0" }, - "cool_fan_full_at_height": {"label": "Regular Fan Speed at Height","value": "layer_height_0 + layer_height" }, - "cool_fan_enabled": { "value": true }, + "small_hole_max_size":{"value": "8 if speed_infill>=200 else 0" }, + "cool_min_layer_time":{"value": "1.3 if speed_infill>=200 else 2.5" }, + "cool_fan_full_at_height": {"label": "Regular Fan Speed at Height","value": "layer_height_0 + layer_height" }, "cool_fan_speed":{"maximum_value": "151","default_value": 100,"value": "151 if speed_infill>=200 else 100" }, "cool_fan_speed_min":{"maximum_value": "151","default_value": 100,"value": "cool_fan_speed"}, "cool_fan_speed_max":{"maximum_value": "151","default_value": 100,"value": "cool_fan_speed"}, - - "material_print_temperature": {"default_value": 210,"value": "200 if speed_infill <=150 else 205 if speed_infill <= 200 else 215 if speed_infill <= 260 else 220","maximum_value": "250" }, + + "material_print_temperature": {"value": "200 if speed_infill <=150 else 205 if speed_infill <= 200 else 215 if speed_infill <= 260 else 220","maximum_value": "250" }, "material_print_temperature_layer_0": { "value": "material_print_temperature" }, "material_initial_print_temperature": { "value": "material_print_temperature - 5 " }, - "material_final_print_temperature": { "value": "material_print_temperature" }, "material_flow_layer_0": { "default_value": 95 }, - "speed_print": { "default_value":250, "maximum_value_warning": "300" }, - "speed_equalize_flow_width_factor":{"label": "Flow Equalization Ratio", "default_value": 100.0, "minimum_value": "0.0", "maximum_value_warning": "200.0"}, + "speed_print": { "default_value":250, "maximum_value_warning": "300" }, + "speed_infill": {"maximum_value_warning": "300"}, + "speed_wall": {"maximum_value_warning": "300"}, + "speed_wall_0": {"maximum_value_warning": "300"}, + "speed_wall_x": {"maximum_value_warning": "300"}, + "speed_topbottom": {"maximum_value_warning": "300"}, + "speed_roofing":{"maximum_value_warning": "300"}, + "speed_travel_layer_0": {"maximum_value_warning": "200"}, + + "speed_support": {"maximum_value_warning": "200"}, + "speed_support_infill": {"maximum_value_warning": "200"}, + "speed_support_interface": {"maximum_value_warning": "200"}, + "speed_support_roof": {"maximum_value_warning": "200"}, + "speed_support_bottom": {"maximum_value_warning": "200"}, + "infill_before_walls": {"label": "Infill Before Walls", "value": false }, "infill_wipe_dist": {"label": "Infill Wipe Distance", "value": 0.0 }, "wall_0_wipe_dist": {"label": "Outer Wall Wipe Distance","value": 0.0 }, - + "infill_overlap": {"label": "Infill Overlap Percentage", "value": 10.0 }, "skin_overlap": {"label": "Skin Overlap Percentage", "value": 10.0 }, "zig_zaggify_infill": {"label": "Connect Infill Lines","value": true } diff --git a/resources/extruders/Geeetech_Dual_Extruder_0.def.json b/resources/extruders/Geeetech_Dual_Extruder_0.def.json index 1d39b2c56e..643e764759 100644 --- a/resources/extruders/Geeetech_Dual_Extruder_0.def.json +++ b/resources/extruders/Geeetech_Dual_Extruder_0.def.json @@ -9,8 +9,6 @@ "overrides": { "extruder_nr": { "default_value": 0 ,"maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } - + "material_diameter": { "default_value": 1.75 } } } diff --git a/resources/extruders/Geeetech_Dual_Extruder_1.def.json b/resources/extruders/Geeetech_Dual_Extruder_1.def.json index b3e07049a4..e16bba320e 100644 --- a/resources/extruders/Geeetech_Dual_Extruder_1.def.json +++ b/resources/extruders/Geeetech_Dual_Extruder_1.def.json @@ -9,8 +9,6 @@ "overrides": { "extruder_nr": { "default_value": 1 ,"maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } - + "material_diameter": { "default_value": 1.75 } } } diff --git a/resources/extruders/Geeetech_Multi_Extruder_0.def.json b/resources/extruders/Geeetech_Multi_Extruder_0.def.json index 07c93062eb..b76d15a243 100644 --- a/resources/extruders/Geeetech_Multi_Extruder_0.def.json +++ b/resources/extruders/Geeetech_Multi_Extruder_0.def.json @@ -9,8 +9,6 @@ "overrides": { "extruder_nr": { "default_value": 0 ,"maximum_value": "2" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } - + "material_diameter": { "default_value": 1.75 } } } diff --git a/resources/extruders/Geeetech_Multi_Extruder_1.def.json b/resources/extruders/Geeetech_Multi_Extruder_1.def.json index 2333332f85..bafd632c2d 100644 --- a/resources/extruders/Geeetech_Multi_Extruder_1.def.json +++ b/resources/extruders/Geeetech_Multi_Extruder_1.def.json @@ -9,8 +9,6 @@ "overrides": { "extruder_nr": { "default_value": 1 ,"maximum_value": "2" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } - + "material_diameter": { "default_value": 1.75 } } } diff --git a/resources/extruders/Geeetech_Multi_Extruder_2.def.json b/resources/extruders/Geeetech_Multi_Extruder_2.def.json index a50605be7d..de8d8e7cf4 100644 --- a/resources/extruders/Geeetech_Multi_Extruder_2.def.json +++ b/resources/extruders/Geeetech_Multi_Extruder_2.def.json @@ -9,8 +9,6 @@ "overrides": { "extruder_nr": { "default_value": 2 ,"maximum_value": "2" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } - + "material_diameter": { "default_value": 1.75 } } } diff --git a/resources/extruders/Geeetech_base_extruder_0.def.json b/resources/extruders/Geeetech_base_extruder_0.def.json index 3ef9af0405..92ce300264 100644 --- a/resources/extruders/Geeetech_base_extruder_0.def.json +++ b/resources/extruders/Geeetech_base_extruder_0.def.json @@ -9,8 +9,6 @@ "overrides": { "extruder_nr": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } - + "material_diameter": { "default_value": 1.75 } } } From 6d474dfe408dabccdcd6412daa83dcc15993ea70 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Mon, 5 Dec 2022 11:56:22 +0100 Subject: [PATCH 062/124] Remove comments CURA-9793 --- .../qml/MachineSettings/ComboBoxWithOptions.qml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/resources/qml/MachineSettings/ComboBoxWithOptions.qml b/resources/qml/MachineSettings/ComboBoxWithOptions.qml index 9f5f89dde1..18c8745f17 100644 --- a/resources/qml/MachineSettings/ComboBoxWithOptions.qml +++ b/resources/qml/MachineSettings/ComboBoxWithOptions.qml @@ -85,20 +85,6 @@ UM.TooltipArea currentIndex = i } } -// // Options come in as a string-representation of an OrderedDict -// if(propertyProvider.properties.options) -// { -// var options = propertyProvider.properties.options.match(/^OrderedDict\(\[\((.*)\)\]\)$/); -// if(options) -// { -// options = options[1].split("), ("); -// for(var i = 0; i < options.length; i++) -// { -// var option = options[i].substring(1, options[i].length - 1).split("', '"); -// append({ text: option[1], value: option[0] }); -// } -// } -// } } Component.onCompleted: updateModel() From 741a112282bda591ae42fa2077de33d98f63d7a5 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Mon, 5 Dec 2022 14:05:22 +0100 Subject: [PATCH 063/124] Remove recommended adhesion selector. CURA-9793 --- .../Recommended/RecommendedAdhesionSelector.qml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml index 8a83af10dd..7deef3cd3e 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml @@ -33,18 +33,4 @@ RecommendedSettingSection function onEnableSectionChanged(state) { curaRecommendedMode.setAdhesion(state) } - - contents: [ - RecommendedSettingItem - { - isCompressed: enableAdhesionRow.isCompressed - settingName: catalog.i18nc("@action:label", "Print with") - tooltipText: catalog.i18nc("adhesion_extruder_nr description", "The extruder train to use for printing the skirt/brim/raft. This is used in multi-extrusion.") - - settingControl: Cura.SingleSettingExtruderSelectorBar - { - extruderSettingName: "adhesion_extruder_nr" - } - } - ] } From ce5691c12dc79b4af1b75bef56f1d3a6d8ec83bf Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Mon, 5 Dec 2022 14:42:35 +0100 Subject: [PATCH 064/124] Apply suggestions from code review Co-authored-by: Jelle Spijker --- .../qml/PrintSetupSelector/PrintSetupSelectorContents.qml | 8 ++++++-- .../Recommended/RecommendedAdhesionSelector.qml | 2 +- .../Recommended/RecommendedPrintSetup.qml | 2 +- .../Recommended/RecommendedSettingItem.qml | 2 +- .../Recommended/RecommendedSettingSection.qml | 4 ++-- .../Recommended/RecommendedStrengthSelector.qml | 2 +- .../Recommended/RecommendedSupportSelector.qml | 3 ++- resources/qml/Validators/FloatValidator.qml | 3 ++- resources/qml/Validators/HexColorValidator.qml | 3 ++- resources/qml/Validators/IntListValidator.qml | 3 ++- resources/qml/Validators/IntValidator.qml | 1 + resources/qml/Widgets/SingleSettingComboBox.qml | 2 +- .../qml/Widgets/SingleSettingExtruderSelectorBar.qml | 3 +++ resources/qml/Widgets/SingleSettingSlider.qml | 3 ++- resources/qml/Widgets/SingleSettingTextField.qml | 2 +- 15 files changed, 28 insertions(+), 15 deletions(-) diff --git a/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml b/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml index 92f0b1d5be..9d3da51356 100644 --- a/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml +++ b/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml @@ -68,7 +68,10 @@ Item } visible: currentModeIndex == PrintSetupSelectorContents.Mode.Recommended - function onModeChanged() { currentModeIndex = PrintSetupSelectorContents.Mode.Custom } + function onModeChanged() + { + currentModeIndex = PrintSetupSelectorContents.Mode.Custom; + } } CustomPrintSetup @@ -125,7 +128,8 @@ Item { id: buttonRow property real padding: UM.Theme.getSize("default_margin").width - height: { + height: + { if (currentModeIndex == PrintSetupSelectorContents.Mode.Custom) { return recommendedButton.height + 2 * padding + (draggableArea.visible ? draggableArea.height : 0) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml index 7deef3cd3e..3d0c4ac82c 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2022 UltiMaker B.V. +// Copyright (c) 2022 UltiMaker // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.7 diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml index 5231af7232..1149ef220f 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml @@ -1,4 +1,4 @@ -//Copyright (c) 2022 UltiMaker B.V. +// Copyright (c) 2022 UltiMaker //Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml index 1b5ad8bd17..ca9869db68 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2022 UltiMaker B.V. +// Copyright (c) 2022 UltiMaker // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml index 3bdc3cdd65..a8cfaee79f 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2022 UltiMaker B.V. +// Copyright (c) 2022 UltiMaker // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 @@ -17,7 +17,7 @@ Item property alias enableSectionSwitchVisible: enableSectionSwitch.visible property alias enableSectionSwitchChecked: enableSectionSwitch.checked property alias enableSectionSwitchEnabled: enableSectionSwitch.enabled - property string tooltipText: "test" + property string tooltipText: "" property var enableSectionClicked: { return } property int leftColumnWidth: Math.floor(width * 0.35) property bool isCompressed: false diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml index 52a2197b99..53a54cdc94 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2022 Ultimaker B.V. +// Copyright (c) 2022 Ultimaker // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.7 diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml index f7f7df0fe3..457585936f 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml @@ -20,7 +20,8 @@ RecommendedSettingSection enableSectionSwitchEnabled: recommendedPrintSetup.settingsEnabled tooltipText: catalog.i18nc("@label", "Generate structures to support parts of the model which have overhangs. Without these structures, such parts would collapse during printing.") - function onEnableSectionChanged(state) { + function onEnableSectionChanged(state) + { supportEnabled.setPropertyValue("value", state) } diff --git a/resources/qml/Validators/FloatValidator.qml b/resources/qml/Validators/FloatValidator.qml index 62ff981e2e..55f2fbae00 100644 --- a/resources/qml/Validators/FloatValidator.qml +++ b/resources/qml/Validators/FloatValidator.qml @@ -1,5 +1,6 @@ -// Copyright (c) 2022 UltiMaker B.V. +// Copyright (c) 2022 UltiMaker // Cura is released under the terms of the LGPLv3 or higher. + import QtQuick 2.15 RegularExpressionValidator diff --git a/resources/qml/Validators/HexColorValidator.qml b/resources/qml/Validators/HexColorValidator.qml index 2c3ba706ec..4a15000b8a 100644 --- a/resources/qml/Validators/HexColorValidator.qml +++ b/resources/qml/Validators/HexColorValidator.qml @@ -1,5 +1,6 @@ -// Copyright (c) 2022 UltiMaker B.V. +// Copyright (c) 2022 UltiMaker // Cura is released under the terms of the LGPLv3 or higher. + import QtQuick 2.15 RegularExpressionValidator diff --git a/resources/qml/Validators/IntListValidator.qml b/resources/qml/Validators/IntListValidator.qml index 2f5b3c829a..f0b9d790e2 100644 --- a/resources/qml/Validators/IntListValidator.qml +++ b/resources/qml/Validators/IntListValidator.qml @@ -1,5 +1,6 @@ -// Copyright (c) 2022 UltiMaker B.V. +// Copyright (c) 2022 UltiMaker // Cura is released under the terms of the LGPLv3 or higher. + import QtQuick 2.15 RegularExpressionValidator diff --git a/resources/qml/Validators/IntValidator.qml b/resources/qml/Validators/IntValidator.qml index 6b7ced9ce8..29b04ea94c 100644 --- a/resources/qml/Validators/IntValidator.qml +++ b/resources/qml/Validators/IntValidator.qml @@ -1,5 +1,6 @@ // Copyright (c) 2022 UltiMaker B.V. // Cura is released under the terms of the LGPLv3 or higher. + import QtQuick 2.15 RegularExpressionValidator diff --git a/resources/qml/Widgets/SingleSettingComboBox.qml b/resources/qml/Widgets/SingleSettingComboBox.qml index 0767c271ca..9d3f0402c3 100644 --- a/resources/qml/Widgets/SingleSettingComboBox.qml +++ b/resources/qml/Widgets/SingleSettingComboBox.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2022 UltiMaker B.V. +// Copyright (c) 2022 UltiMaker // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 diff --git a/resources/qml/Widgets/SingleSettingExtruderSelectorBar.qml b/resources/qml/Widgets/SingleSettingExtruderSelectorBar.qml index c4045b57f0..389f70f4f9 100644 --- a/resources/qml/Widgets/SingleSettingExtruderSelectorBar.qml +++ b/resources/qml/Widgets/SingleSettingExtruderSelectorBar.qml @@ -1,3 +1,6 @@ +// Copyright (c) 2022 UltiMaker +// Cura is released under the terms of the LGPLv3 or higher. + import QtQuick 2.12 import QtQuick.Controls 2.12 import QtQuick.Layouts 1.3 diff --git a/resources/qml/Widgets/SingleSettingSlider.qml b/resources/qml/Widgets/SingleSettingSlider.qml index f1b0f2c54d..91ff9c1ed4 100644 --- a/resources/qml/Widgets/SingleSettingSlider.qml +++ b/resources/qml/Widgets/SingleSettingSlider.qml @@ -104,7 +104,8 @@ RowLayout } // Override this function to update a setting differently - function updateSetting(value) { + function updateSetting(value) + { if (updateAllExtruders) { Cura.MachineManager.setSettingForAllExtruders(propertyProvider.key, "value", value) diff --git a/resources/qml/Widgets/SingleSettingTextField.qml b/resources/qml/Widgets/SingleSettingTextField.qml index 72edf58681..4def7f4179 100644 --- a/resources/qml/Widgets/SingleSettingTextField.qml +++ b/resources/qml/Widgets/SingleSettingTextField.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2022 UltiMaker B.V. +// Copyright (c) 2022 UltiMaker // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 From f034c115be8b28e09e73799a4dc5949996bbf2cf Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Mon, 5 Dec 2022 15:11:48 +0100 Subject: [PATCH 065/124] Rename slider theme items CURA-9793 --- .../resources/qml/MonitorBuildplateConfiguration.qml | 2 +- resources/themes/cura-light/theme.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml index 0bd57e76d8..a81bec3884 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml @@ -27,7 +27,7 @@ Item Row { height: parent.height - spacing: UM.Theme.getSize("print_setup_slider_handle").width // TODO: Theme! (Should be same as extruder spacing) + spacing: UM.Theme.getSize("slider_handle").width // TODO: Theme! (Should be same as extruder spacing) // This wrapper ensures that the buildplate icon is located centered // below an extruder icon. diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index e61f7938fc..f2d7cbcced 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -490,9 +490,9 @@ "print_setup_widget": [38.0, 30.0], "print_setup_extruder_box": [0.0, 6.0], - "print_setup_slider_groove": [0.16, 0.16], - "print_setup_slider_handle": [1.3, 1.3], - "print_setup_slider_tickmarks": [0.3, 0.3], + "slider_groove": [0.16, 0.16], + "slider_handle": [1.3, 1.3], + "slider_tickmarks": [0.3, 0.3], "print_setup_big_item": [28, 2.5], "print_setup_icon": [1.2, 1.2], "drag_icon": [1.416, 0.25], From 80e9f64c85d8bf9af8a1a0065a2711ad254e9240 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Mon, 5 Dec 2022 15:30:51 +0100 Subject: [PATCH 066/124] Fix overwritten theme name for slider Add property for background ticks. CURA-9793 --- resources/themes/cura-light/theme.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index f2d7cbcced..2cb4aa91db 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -490,9 +490,9 @@ "print_setup_widget": [38.0, 30.0], "print_setup_extruder_box": [0.0, 6.0], - "slider_groove": [0.16, 0.16], - "slider_handle": [1.3, 1.3], - "slider_tickmarks": [0.3, 0.3], + "slider_widget_groove": [0.16, 0.16], + "slider_widget_handle": [1.3, 1.3], + "slider_widget_tickmarks": [0.3, 0.3], "print_setup_big_item": [28, 2.5], "print_setup_icon": [1.2, 1.2], "drag_icon": [1.416, 0.25], From 5a415b832442d5144a66d5e5fe6c9bb91d48ca0c Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Mon, 5 Dec 2022 16:55:48 +0100 Subject: [PATCH 067/124] Remove black fill from icons. This fill prevents themeing CURA-9793 --- .../cura-light/icons/default/Hammer.svg | 2 +- .../cura-light/icons/default/PrintWalls.svg | 20 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/resources/themes/cura-light/icons/default/Hammer.svg b/resources/themes/cura-light/icons/default/Hammer.svg index 38b2b6a141..c32f27a0e2 100644 --- a/resources/themes/cura-light/icons/default/Hammer.svg +++ b/resources/themes/cura-light/icons/default/Hammer.svg @@ -1,3 +1,3 @@ - + diff --git a/resources/themes/cura-light/icons/default/PrintWalls.svg b/resources/themes/cura-light/icons/default/PrintWalls.svg index 156a87177d..f582a5599d 100644 --- a/resources/themes/cura-light/icons/default/PrintWalls.svg +++ b/resources/themes/cura-light/icons/default/PrintWalls.svg @@ -1,12 +1,12 @@ - - - - - - - - - - + + + + + + + + + + From c495f0de3fa4866e915e57a50e8da2119fb499ec Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Mon, 5 Dec 2022 17:11:05 +0100 Subject: [PATCH 068/124] Hide extruder selector when there is only one extruder. CURA-9793 --- .../Recommended/RecommendedSupportSelector.qml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml index 457585936f..50bfbcbbcf 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml @@ -68,10 +68,14 @@ RecommendedSettingSection Layout.preferredHeight: childrenRect.height settingName: catalog.i18nc("@action:label", "Print with") tooltipText: catalog.i18nc("support_extruder_nr description", "The extruder train to use for printing the support. This is used in multi-extrusion.") - isCompressed: enableSupportRow.isCompressed + // Hide this component when there is only one extruder + enabled: machineExtruderCount.properties.value > 1 + visible: machineExtruderCount.properties.value > 1 + isCompressed: enableSupportRow.isCompressed || machineExtruderCount.properties.value <= 1 settingControl: Cura.SingleSettingExtruderSelectorBar { + extruderSettingName: "support_extruder_nr" } }, From 3ddebe7a84b5e6fa4f3a7b95aec7c2838c2b18a8 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Tue, 6 Dec 2022 10:37:06 +0100 Subject: [PATCH 069/124] The extrudersCHanged signal was incorrectly being emitted before the global stack had updated. This was causing the extruderIds to always return the old extruderIds to connected qml components. The setting slider was incorrectly setting the slider value when updating the model. CURA-9793 --- cura/Settings/ExtruderManager.py | 12 ++++++++---- .../Recommended/RecommendedStrengthSelector.qml | 1 + resources/qml/Widgets/SingleSettingSlider.qml | 2 -- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/cura/Settings/ExtruderManager.py b/cura/Settings/ExtruderManager.py index f429a0de19..aff1498a2a 100755 --- a/cura/Settings/ExtruderManager.py +++ b/cura/Settings/ExtruderManager.py @@ -2,13 +2,14 @@ # Cura is released under the terms of the LGPLv3 or higher. from PyQt6.QtCore import pyqtSignal, pyqtProperty, QObject, QVariant # For communicating data and events to Qt. + +from UM.Application import Application from UM.FlameProfiler import pyqtSlot import cura.CuraApplication # To get the global container stack to find the current machine. from cura.Settings.GlobalStack import GlobalStack from UM.Logger import Logger from UM.Scene.Iterator.DepthFirstIterator import DepthFirstIterator -from UM.Scene.SceneNode import SceneNode from UM.Scene.Selection import Selection from UM.Scene.Iterator.BreadthFirstIterator import BreadthFirstIterator from UM.Settings.ContainerRegistry import ContainerRegistry # Finding containers by ID. @@ -45,13 +46,18 @@ class ExtruderManager(QObject): self._selected_object_extruders = [] # type: List[Union[str, "ExtruderStack"]] Selection.selectionChanged.connect(self.resetSelectedObjectExtruders) + Application.getInstance().globalContainerStackChanged.connect(self.emitExtrudersChanged) # When the machine is swapped we must update the active machine extruders - extrudersChanged = pyqtSignal(QVariant) + extrudersChanged = pyqtSignal() """Signal to notify other components when the list of extruders for a machine definition changes.""" activeExtruderChanged = pyqtSignal() """Notify when the user switches the currently active extruder.""" + def emitExtrudersChanged(self): + # The emit function can't be directly connected to another signal. This wrapper function is required. + self.extrudersChanged.emit() + @pyqtProperty(str, notify = activeExtruderChanged) def activeExtruderStackId(self) -> Optional[str]: """Gets the unique identifier of the currently active extruder stack. @@ -375,8 +381,6 @@ class ExtruderManager(QObject): extruders_changed = True self.fixSingleExtrusionMachineExtruderDefinition(global_stack) - if extruders_changed: - self.extrudersChanged.emit(global_stack_id) # After 3.4, all single-extrusion machines have their own extruder definition files instead of reusing # "fdmextruder". We need to check a machine here so its extruder definition is correct according to this. diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml index 53a54cdc94..7424aed01c 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml @@ -59,6 +59,7 @@ RecommendedSettingSection { width: parent.width settingName: "infill_pattern" + updateAllExtruders: true } }, RecommendedSettingItem diff --git a/resources/qml/Widgets/SingleSettingSlider.qml b/resources/qml/Widgets/SingleSettingSlider.qml index 91ff9c1ed4..24692f75fc 100644 --- a/resources/qml/Widgets/SingleSettingSlider.qml +++ b/resources/qml/Widgets/SingleSettingSlider.qml @@ -83,9 +83,7 @@ RowLayout function roundSliderValueUpdateSetting() { // If the user interacts with the slider we round the value and update the setting. - print("roundSliderValueUpdateSetting()") const roundedSliderValue = roundToNearestTen ? Math.round(settingSlider.value / 10) * 10 : Math.round(settingSlider.value) - settingSlider.value = roundedSliderValue updateSetting(roundedSliderValue) } From ea5d4a8211c6b89ba01540b27100916b3d30ca29 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Tue, 6 Dec 2022 10:38:49 +0100 Subject: [PATCH 070/124] Make tickmarks bigger to avoid issues with pixel rounding errors causing the tickmarks to appear above or below the background line. CURA-9793 --- resources/themes/cura-light/theme.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 2cb4aa91db..6bf89a92fa 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -492,7 +492,7 @@ "print_setup_extruder_box": [0.0, 6.0], "slider_widget_groove": [0.16, 0.16], "slider_widget_handle": [1.3, 1.3], - "slider_widget_tickmarks": [0.3, 0.3], + "slider_widget_tickmarks": [0.5, 0.5], "print_setup_big_item": [28, 2.5], "print_setup_icon": [1.2, 1.2], "drag_icon": [1.416, 0.25], From 362877dee13d25bf64e5e9db26b7f884b48cbc5c Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Tue, 6 Dec 2022 10:50:04 +0100 Subject: [PATCH 071/124] Add new recommended mode tooltips and remove extra margin at the bottom of tooltips. CURA-9793 --- .../Recommended/RecommendedStrengthSelector.qml | 6 ++++-- .../Recommended/RecommendedSupportSelector.qml | 6 +++--- resources/qml/PrintSetupTooltip.qml | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml index 7424aed01c..086f9a7728 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml @@ -17,7 +17,7 @@ RecommendedSettingSection icon: UM.Theme.getIcon("Hammer") enableSectionSwitchVisible: false enableSectionSwitchEnabled: false - tooltipText: "" + tooltipText: catalog.i18nc("@label", "The following settings define the strength of your part.") UM.SettingPropertyProvider { @@ -53,7 +53,8 @@ RecommendedSettingSection RecommendedSettingItem { settingName: catalog.i18nc("@action:label", "Infill Pattern") - tooltipText: catalog.i18nc("infill_pattern description", "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Gyroid, cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction. Lightning infill tries to minimize the infill, by only supporting the ceiling of the object.") + tooltipText: catalog.i18nc("@label", + "The pattern of the infill material of the print:\n\nFor quick prints of non functional model choose line, zig zag or lighting infill.\n\nFor functional part not subjected to a lot of stress we reccomend grid or triangle or tri hexagon.\n\nFor functional 3D prints which require high strenght in multiple directions use cubic, cubic subdivision, quarter cubic, octet, and gyroid.") settingControl: Cura.SingleSettingComboBox { @@ -65,6 +66,7 @@ RecommendedSettingSection RecommendedSettingItem { settingName: catalog.i18nc("@action:label", "Shell Thickness") + tooltipText: catalog.i18nc("@label", "Defines the tickness of your part side walls, roof and floor.") settingControl: RowLayout { diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml index 50bfbcbbcf..e9c4ff69cd 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml @@ -18,7 +18,7 @@ RecommendedSettingSection enableSectionSwitchVisible: supportEnabled.properties.enabled == "True" enableSectionSwitchChecked: supportEnabled.properties.value == "True" enableSectionSwitchEnabled: recommendedPrintSetup.settingsEnabled - tooltipText: catalog.i18nc("@label", "Generate structures to support parts of the model which have overhangs. Without these structures, such parts would collapse during printing.") + tooltipText: catalog.i18nc("@label", "Generate structures to support parts of the model which have overhangs. Without these structures, these parts would collapse during printing.") function onEnableSectionChanged(state) { @@ -54,7 +54,7 @@ RecommendedSettingSection RecommendedSettingItem { settingName: catalog.i18nc("@action:label", "Support Type") - tooltipText: catalog.i18nc("support_structure description", "Chooses between the techniques available to generate support. \"Normal\" support creates a support structure directly below the overhanging parts and drops those areas straight down. \"Tree\" support creates branches towards the overhanging areas that support the model on the tips of those branches, and allows the branches to crawl around the model to support it from the build plate as much as possible.") + tooltipText: catalog.i18nc("@label", "Chooses between the techniques available to generate support. \n\n\"Normal\" support creates a support structure directly below the overhanging parts and drops those areas straight down. \n\n\"Tree\" support creates branches towards the overhanging areas that support the model on the tips of those branches, and allows the branches to crawl around the model to support it from the build plate as much as possible.") isCompressed: enableSupportRow.isCompressed settingControl: Cura.SingleSettingComboBox @@ -67,7 +67,7 @@ RecommendedSettingSection { Layout.preferredHeight: childrenRect.height settingName: catalog.i18nc("@action:label", "Print with") - tooltipText: catalog.i18nc("support_extruder_nr description", "The extruder train to use for printing the support. This is used in multi-extrusion.") + tooltipText: catalog.i18nc("@label", "The extruder train to use for printing the support. This is used in multi-extrusion.") // Hide this component when there is only one extruder enabled: machineExtruderCount.properties.value > 1 visible: machineExtruderCount.properties.value > 1 diff --git a/resources/qml/PrintSetupTooltip.qml b/resources/qml/PrintSetupTooltip.qml index af4280342c..195f7fb204 100644 --- a/resources/qml/PrintSetupTooltip.qml +++ b/resources/qml/PrintSetupTooltip.qml @@ -11,7 +11,7 @@ UM.PointingRectangle id: base property real sourceWidth: 0 width: UM.Theme.getSize("tooltip").width - height: textScroll.height + UM.Theme.getSize("tooltip_margins").height * 2 + height: textScroll.height + UM.Theme.getSize("tooltip_margins").height color: UM.Theme.getColor("tooltip") arrowSize: UM.Theme.getSize("default_arrow").width From 93d1f05aec2c4ef45ebfe7db4846505964344dd6 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Tue, 6 Dec 2022 12:07:07 +0100 Subject: [PATCH 072/124] Remove ignored changes list. All changes will now trigger the reset setting button to appear CURA-9793 --- cura/Settings/SimpleModeSettingsManager.py | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/cura/Settings/SimpleModeSettingsManager.py b/cura/Settings/SimpleModeSettingsManager.py index 44d2ce2cbb..7ea21ed295 100644 --- a/cura/Settings/SimpleModeSettingsManager.py +++ b/cura/Settings/SimpleModeSettingsManager.py @@ -42,27 +42,8 @@ class SimpleModeSettingsManager(QObject): for extruder_stack in global_stack.extruderList: user_setting_keys.update(extruder_stack.userChanges.getAllKeys()) - # remove settings that are visible in recommended (we don't show the reset button for those) - for skip_key in self.__ignored_custom_setting_keys: - if skip_key in user_setting_keys: - user_setting_keys.remove(skip_key) - has_customized_user_settings = len(user_setting_keys) > 0 if has_customized_user_settings != self._is_profile_customized: self._is_profile_customized = has_customized_user_settings self.isProfileCustomizedChanged.emit() - - # These are the settings included in the Simple ("Recommended") Mode, so only when the other settings have been - # changed, we consider it as a user customized profile in the Simple ("Recommended") Mode. - __ignored_custom_setting_keys = ["support_enable", - "infill_sparse_density", - "infill_pattern", - "gradual_infill_steps", - "wall_thickness", - "top_bottom_thickness", - "support_structure", - "support_extruder_nr", - "support_type", - "adhesion_type", - "adhesion_extruder_nr"] From bec02cf312e08888006850a3ff41e6a279647f32 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Tue, 6 Dec 2022 12:08:00 +0100 Subject: [PATCH 073/124] Fix extruder icon text scaling. I've added a new font size here since there is not any real way I can see to scale the font based on the component size. This is because we do some magic with the font numbers before passing them to the QML. CURA-9793 --- resources/qml/ExtruderButton.qml | 2 ++ resources/qml/ExtruderIcon.qml | 1 + resources/qml/Toolbar.qml | 1 + .../SingleSettingExtruderSelectorBar.qml | 1 + resources/themes/cura-light/theme.json | 20 +++++++++++++++++++ 5 files changed, 25 insertions(+) diff --git a/resources/qml/ExtruderButton.qml b/resources/qml/ExtruderButton.qml index df1a72e765..3ad77660c6 100644 --- a/resources/qml/ExtruderButton.qml +++ b/resources/qml/ExtruderButton.qml @@ -12,12 +12,14 @@ UM.ToolbarButton id: base property var extruder + property var extrdurerNumberFont: UM.Theme.getFont("small_emphasis") toolItem: ExtruderIcon { materialColor: extruder.color extruderEnabled: extruder.stack.isEnabled iconVariant: "default" + font: extruderNumberFont property int index: extruder.index } diff --git a/resources/qml/ExtruderIcon.qml b/resources/qml/ExtruderIcon.qml index 718f1bcd87..c59521cdc3 100644 --- a/resources/qml/ExtruderIcon.qml +++ b/resources/qml/ExtruderIcon.qml @@ -14,6 +14,7 @@ Item property bool extruderEnabled: true property var iconSize: UM.Theme.getSize("extruder_icon").width property string iconVariant: "medium" + property alias font: extruderNumberText.font implicitWidth: iconSize implicitHeight: iconSize diff --git a/resources/qml/Toolbar.qml b/resources/qml/Toolbar.qml index e003c6cd6f..894f280240 100644 --- a/resources/qml/Toolbar.qml +++ b/resources/qml/Toolbar.qml @@ -142,6 +142,7 @@ Item text: catalog.i18ncp("@label %1 is filled in with the name of an extruder", "Print Selected Model with %1", "Print Selected Models with %1", UM.Selection.selectionCount).arg(extruder.name) checked: Cura.ExtruderManager.selectedObjectExtruders.indexOf(extruder.id) != -1 enabled: UM.Selection.hasSelection && extruder.stack.isEnabled + font: UM.Theme.getFont("small_emphasis") onClicked: { diff --git a/resources/qml/Widgets/SingleSettingExtruderSelectorBar.qml b/resources/qml/Widgets/SingleSettingExtruderSelectorBar.qml index 389f70f4f9..80f77304c3 100644 --- a/resources/qml/Widgets/SingleSettingExtruderSelectorBar.qml +++ b/resources/qml/Widgets/SingleSettingExtruderSelectorBar.qml @@ -61,6 +61,7 @@ Row extruder: model checked: extruder.index == selectedIndex iconScale: 0.8 + font: UM.Theme.getFont("tiny_emphasis") buttonSize: UM.Theme.getSize("small_button").width onClicked: extruder.enabled && onClickExtruder(extruder.index) } diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 6bf89a92fa..ad32573288 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -172,6 +172,26 @@ "size": 0.9, "weight": 700, "family": "Noto Sans" + }, + "tiny_emphasis": { + "size": 0.7, + "weight": 700, + "family": "Noto Sans" + }, + "tiny_emphasis_ja_JP": { + "size": 0.7, + "weight": 700, + "family": "Noto Sans" + }, + "tiny_emphasis_zh_CN": { + "size": 0.7, + "weight": 700, + "family": "Noto Sans" + }, + "tiny_emphasis_zh_TW": { + "size": 0.7, + "weight": 700, + "family": "Noto Sans" } }, From 8b5d25401713fd106f41bb79d3d79e1f783f8949 Mon Sep 17 00:00:00 2001 From: whoseyoung Date: Wed, 7 Dec 2022 10:26:02 +0800 Subject: [PATCH 074/124] update geeetech_GiantArmD200.def.json --- resources/definitions/geeetech_GiantArmD200.def.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/definitions/geeetech_GiantArmD200.def.json b/resources/definitions/geeetech_GiantArmD200.def.json index 27e7ae24ce..137bf8924e 100644 --- a/resources/definitions/geeetech_GiantArmD200.def.json +++ b/resources/definitions/geeetech_GiantArmD200.def.json @@ -11,8 +11,7 @@ }, "overrides": { - "machine_name": { "default_value": "Geeetech GiantArmD200" }, - "machine_width": { "default_value": 300 }, + "machine_name": { "default_value": "Geeetech GiantArmD200" }, "machine_depth": { "default_value": 180 }, "machine_height": {"default_value": 180 }, "machine_head_with_fans_polygon": { "default_value": [[-75, 35], [18, 35], [18, -18], [-75, -18]] }, From d8cf234a17507c46ecb913f0166f65135e033946 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Wed, 7 Dec 2022 12:25:33 +0100 Subject: [PATCH 075/124] Use different signal for triggering update to extrduderIds. **This is a hack**. Actually fixing this problem could take days. CURA-9793 --- cura/Settings/ExtruderManager.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/cura/Settings/ExtruderManager.py b/cura/Settings/ExtruderManager.py index aff1498a2a..dec4a74d27 100755 --- a/cura/Settings/ExtruderManager.py +++ b/cura/Settings/ExtruderManager.py @@ -46,17 +46,22 @@ class ExtruderManager(QObject): self._selected_object_extruders = [] # type: List[Union[str, "ExtruderStack"]] Selection.selectionChanged.connect(self.resetSelectedObjectExtruders) - Application.getInstance().globalContainerStackChanged.connect(self.emitExtrudersChanged) # When the machine is swapped we must update the active machine extruders + Application.getInstance().globalContainerStackChanged.connect(self.emitGlobalStackExtrudersChanged) # When the machine is swapped we must update the active machine extruders - extrudersChanged = pyqtSignal() + # Don't use this unless you are reading from ExtruderManager.extruderIds when receiving the signal + globalStackExtrudersChanged = pyqtSignal() + + # This signal actually emits before the global stacks extruders are updated, changing this behaviour breaks too many things + # Use globalStackExtrudersChanged = pyqtSignal() if you want a trigger when the extrduerIds property changes. + extrudersChanged = pyqtSignal(QVariant) """Signal to notify other components when the list of extruders for a machine definition changes.""" activeExtruderChanged = pyqtSignal() """Notify when the user switches the currently active extruder.""" - def emitExtrudersChanged(self): + def emitGlobalStackExtrudersChanged(self): # The emit function can't be directly connected to another signal. This wrapper function is required. - self.extrudersChanged.emit() + self.globalStackExtrudersChanged.emit() @pyqtProperty(str, notify = activeExtruderChanged) def activeExtruderStackId(self) -> Optional[str]: @@ -381,6 +386,8 @@ class ExtruderManager(QObject): extruders_changed = True self.fixSingleExtrusionMachineExtruderDefinition(global_stack) + if extruders_changed: + self.extrudersChanged.emit(global_stack_id) # After 3.4, all single-extrusion machines have their own extruder definition files instead of reusing # "fdmextruder". We need to check a machine here so its extruder definition is correct according to this. From 396057a56f4305ec711bb6ff918b1f6a4ab969fa Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Wed, 7 Dec 2022 16:14:17 +0100 Subject: [PATCH 076/124] Correct typo in name CURA-9793 --- resources/qml/ExtruderButton.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/ExtruderButton.qml b/resources/qml/ExtruderButton.qml index 3ad77660c6..9a760bafc9 100644 --- a/resources/qml/ExtruderButton.qml +++ b/resources/qml/ExtruderButton.qml @@ -12,7 +12,7 @@ UM.ToolbarButton id: base property var extruder - property var extrdurerNumberFont: UM.Theme.getFont("small_emphasis") + property var extruderNumberFont: UM.Theme.getFont("small_emphasis") toolItem: ExtruderIcon { From 0e5ad96207c8dab6efebd5e799460469c5621ea9 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Wed, 7 Dec 2022 16:15:09 +0100 Subject: [PATCH 077/124] Fix bad call to keys function on string. Also fix assigning currentIndex to correct Component. CURA-9793 --- resources/qml/MachineSettings/ComboBoxWithOptions.qml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/resources/qml/MachineSettings/ComboBoxWithOptions.qml b/resources/qml/MachineSettings/ComboBoxWithOptions.qml index 18c8745f17..2c82f07c6f 100644 --- a/resources/qml/MachineSettings/ComboBoxWithOptions.qml +++ b/resources/qml/MachineSettings/ComboBoxWithOptions.qml @@ -74,6 +74,12 @@ UM.TooltipArea return } + if (typeof propertyProvider.properties["options"] == "string") + { + return + } + + for (var i = 0; i < propertyProvider.properties["options"].keys().length; i++) { var key = propertyProvider.properties["options"].keys()[i] @@ -82,7 +88,7 @@ UM.TooltipArea if (propertyProvider.properties.value == key) { - currentIndex = i + comboBox.currentIndex = i } } } @@ -126,7 +132,7 @@ UM.TooltipArea onActivated: { var newValue = model.get(index).value - if (propertyProvider.properties.value != newValue) + if (propertyProvider.properties.value != newValue && newValue != undefined) { if (setValueFunction !== null) { @@ -134,6 +140,7 @@ UM.TooltipArea } else { + print("SETTING PROPERTY VALUE: " + newValue) propertyProvider.setPropertyValue("value", newValue) } forceUpdateOnChangeFunction() From f6012293907f8e930ebb3a8c65459381e8785fa5 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Wed, 7 Dec 2022 16:27:42 +0100 Subject: [PATCH 078/124] Move Validators to UM, so they can be used in UM components. Update all TextFieldWithUnit to use our FloatValidator. This component now has proper styling when the input is invalid. The DoubleValidator was flagging numbers with a "." in them as an incorrect input (I assume this is because the region was set to europe on the OS where "," is common). The workaround is to use our FloatValidator which validates both "." and "," CURA-9793 --- resources/qml/ColorDialog.qml | 8 ++++---- .../Recommended/RecommendedStrengthSelector.qml | 4 ++-- resources/qml/Validators/FloatValidator.qml | 12 ------------ resources/qml/Validators/HexColorValidator.qml | 9 --------- resources/qml/Validators/IntListValidator.qml | 9 --------- resources/qml/Validators/IntValidator.qml | 11 ----------- resources/qml/qmldir | 6 ------ 7 files changed, 6 insertions(+), 53 deletions(-) delete mode 100644 resources/qml/Validators/FloatValidator.qml delete mode 100644 resources/qml/Validators/HexColorValidator.qml delete mode 100644 resources/qml/Validators/IntListValidator.qml delete mode 100644 resources/qml/Validators/IntValidator.qml diff --git a/resources/qml/ColorDialog.qml b/resources/qml/ColorDialog.qml index 94416d77d2..36da26158d 100644 --- a/resources/qml/ColorDialog.qml +++ b/resources/qml/ColorDialog.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2022 Ultimaker B.V. +// Copyright (c) 2022 UltiMaker // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.15 @@ -6,8 +6,8 @@ import QtQuick.Controls 2.2 import QtQuick.Window 2.1 import QtQuick.Layouts 1.1 -import UM 1.5 as UM -import Cura 1.1 as Cura +import UM 1.7 as UM +import Cura 1.7 as Cura /* @@ -119,7 +119,7 @@ UM.Dialog text = `#${text}`; } } - validator: Cura.HexColorValidator {} + validator: UM.HexColorValidator {} } Rectangle diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml index 086f9a7728..4adca95102 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml @@ -81,7 +81,7 @@ RecommendedSettingSection width: parent.width settingName: "wall_thickness" updateAllExtruders: true - validator: Cura.FloatValidator {} + validator: UM.FloatValidator {} unitText: catalog.i18nc("@label", "mm") } } @@ -94,7 +94,7 @@ RecommendedSettingSection width: parent.width settingName: "top_bottom_thickness" updateAllExtruders: true - validator: Cura.FloatValidator {} + validator: UM.FloatValidator {} unitText: catalog.i18nc("@label", "mm") } } diff --git a/resources/qml/Validators/FloatValidator.qml b/resources/qml/Validators/FloatValidator.qml deleted file mode 100644 index 55f2fbae00..0000000000 --- a/resources/qml/Validators/FloatValidator.qml +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2022 UltiMaker -// Cura is released under the terms of the LGPLv3 or higher. - -import QtQuick 2.15 - -RegularExpressionValidator -{ - property int maxBeforeDecimal: 11 - property int maxAfterDecimal: 3 - - regularExpression: new RegExp("^-?[0-9]{0,%0}[.,]?[0-9]{0,%1}$".arg(maxBeforeDecimal).arg(maxAfterDecimal)) -} \ No newline at end of file diff --git a/resources/qml/Validators/HexColorValidator.qml b/resources/qml/Validators/HexColorValidator.qml deleted file mode 100644 index 4a15000b8a..0000000000 --- a/resources/qml/Validators/HexColorValidator.qml +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (c) 2022 UltiMaker -// Cura is released under the terms of the LGPLv3 or higher. - -import QtQuick 2.15 - -RegularExpressionValidator -{ - regularExpression: /^#([a-fA-F0-9]{0,6})$/ -} \ No newline at end of file diff --git a/resources/qml/Validators/IntListValidator.qml b/resources/qml/Validators/IntListValidator.qml deleted file mode 100644 index f0b9d790e2..0000000000 --- a/resources/qml/Validators/IntListValidator.qml +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (c) 2022 UltiMaker -// Cura is released under the terms of the LGPLv3 or higher. - -import QtQuick 2.15 - -RegularExpressionValidator -{ - regularExpression: new RegExp("^\[?(\s*-?[0-9]{0,11}\s*,)*(\s*-?[0-9]{0,11})\s*\]?$") -} \ No newline at end of file diff --git a/resources/qml/Validators/IntValidator.qml b/resources/qml/Validators/IntValidator.qml deleted file mode 100644 index 29b04ea94c..0000000000 --- a/resources/qml/Validators/IntValidator.qml +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) 2022 UltiMaker B.V. -// Cura is released under the terms of the LGPLv3 or higher. - -import QtQuick 2.15 - -RegularExpressionValidator -{ - property int maxNumbers: 12 - - regularExpression: new RegExp("^-?[0-9]{0,%0}$".arg(maxNumbers)) -} \ No newline at end of file diff --git a/resources/qml/qmldir b/resources/qml/qmldir index 109cbc0823..8fce82c858 100644 --- a/resources/qml/qmldir +++ b/resources/qml/qmldir @@ -19,12 +19,6 @@ SettingView 1.0 SettingView.qml ProfileMenu 1.0 ProfileMenu.qml PrintSelectorCard 1.0 PrintSelectorCard.qml -# Cura/Validators -FloatValidator 1.7 FloatValidator.qml -IntValidator 1.7 IntValidator -IntListValidator 1.7 IntListValidator -HexColorValidator 1.7 HexColorValidator.qml - # Cura/WelcomePages WizardPanel 1.0 WizardPanel.qml From 443252ae10765a0d33facc31a00414df85da78f8 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Wed, 7 Dec 2022 16:57:35 +0100 Subject: [PATCH 079/124] =?UTF-8?q?Use=20globalStackExtruderIds=20instead?= =?UTF-8?q?=20of=20extruderIds.=20extruderIds=20notifys=20change=20before?= =?UTF-8?q?=20the=20extruders=20change=20when=20doing=20a=20machine=20swap?= =?UTF-8?q?.=20Fixing=20this=20will=20take=20a=20long=20time=20so=20this?= =?UTF-8?q?=20is=20a=20workaround.=20If=20you=20are=20reading=20this=20?= =?UTF-8?q?=F0=9F=99=8F=20good=20luck=20fixing=20it=20=F0=9F=99=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit CURA-9793 --- cura/Settings/ExtruderManager.py | 7 +++++++ resources/qml/Widgets/SingleSettingComboBox.qml | 2 +- resources/qml/Widgets/SingleSettingSlider.qml | 2 +- resources/qml/Widgets/SingleSettingTextField.qml | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/cura/Settings/ExtruderManager.py b/cura/Settings/ExtruderManager.py index dec4a74d27..8d38c7d46e 100755 --- a/cura/Settings/ExtruderManager.py +++ b/cura/Settings/ExtruderManager.py @@ -63,6 +63,13 @@ class ExtruderManager(QObject): # The emit function can't be directly connected to another signal. This wrapper function is required. self.globalStackExtrudersChanged.emit() + @pyqtProperty("QVariantMap", notify = globalStackExtrudersChanged) + def globalStackExtruderIds(self) -> Dict[str, str]: + # The extruderIds property notifys changed before the extruders are changed on switching machines + # trying to fix this broke to many things. This is a workaround. Don't use this unless you need to read + # extruderIds directly after a machine update. + return self.extruderIds + @pyqtProperty(str, notify = activeExtruderChanged) def activeExtruderStackId(self) -> Optional[str]: """Gets the unique identifier of the currently active extruder stack. diff --git a/resources/qml/Widgets/SingleSettingComboBox.qml b/resources/qml/Widgets/SingleSettingComboBox.qml index 9d3f0402c3..95b2c5d86a 100644 --- a/resources/qml/Widgets/SingleSettingComboBox.qml +++ b/resources/qml/Widgets/SingleSettingComboBox.qml @@ -54,7 +54,7 @@ Cura.ComboBox { property UM.SettingPropertyProvider propertyProvider: UM.SettingPropertyProvider { id: propertyProvider - containerStackId: updateAllExtruders ? Cura.ExtruderManager.extruderIds[defaultExtruderIndex] : Cura.MachineManager.activeMachine.id + containerStackId: updateAllExtruders ? Cura.ExtruderManager.globalStackExtruderIds[defaultExtruderIndex] : Cura.MachineManager.activeMachine.id watchedProperties: ["value" , "options"] } diff --git a/resources/qml/Widgets/SingleSettingSlider.qml b/resources/qml/Widgets/SingleSettingSlider.qml index 24692f75fc..2dbb104032 100644 --- a/resources/qml/Widgets/SingleSettingSlider.qml +++ b/resources/qml/Widgets/SingleSettingSlider.qml @@ -34,7 +34,7 @@ RowLayout UM.SettingPropertyProvider { id: propertyProvider - containerStackId: updateAllExtruders ? Cura.ExtruderManager.extruderIds[defaultExtruderIndex] : Cura.MachineManager.activeMachine.id + containerStackId: updateAllExtruders ? Cura.ExtruderManager.globalStackExtruderIds[defaultExtruderIndex] : Cura.MachineManager.activeMachine.id watchedProperties: ["value"] storeIndex: 0 } diff --git a/resources/qml/Widgets/SingleSettingTextField.qml b/resources/qml/Widgets/SingleSettingTextField.qml index 4def7f4179..6d9586caa5 100644 --- a/resources/qml/Widgets/SingleSettingTextField.qml +++ b/resources/qml/Widgets/SingleSettingTextField.qml @@ -53,7 +53,7 @@ UM.TextField { id: propertyProvider watchedProperties: ["value", "validationState", "resolve"] - containerStackId: updateAllExtruders ? Cura.ExtruderManager.extruderIds[defaultExtruderIndex] : Cura.MachineManager.activeMachine.id + containerStackId: updateAllExtruders ? Cura.ExtruderManager.globalStackExtruderIds[defaultExtruderIndex] : Cura.MachineManager.activeMachine.id } Connections From d5bcd36ecd3b129a7d8013c28bf46290a43b2fd2 Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Wed, 7 Dec 2022 17:10:55 +0100 Subject: [PATCH 080/124] Fixed error in 0.8mm profiles for PC and CPE+ The 0.15mm mode was generated iso 0.2mm Relates to: PP-277 --- .../um_s3_aa0.8_CPEP_Draft_Print.inst.cfg | 22 ++++++++++++++ .../um_s3_aa0.8_CPEP_Fast_Print.inst.cfg | 29 ------------------- ...fg => um_s3_aa0.8_PC_Draft_Print.inst.cfg} | 7 ++--- .../um_s5_aa0.8_CPEP_Draft_Print.inst.cfg | 22 ++++++++++++++ .../um_s5_aa0.8_CPEP_Fast_Print.inst.cfg | 29 ------------------- ...fg => um_s5_aa0.8_PC_Draft_Print.inst.cfg} | 7 ++--- 6 files changed, 50 insertions(+), 66 deletions(-) create mode 100644 resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Draft_Print.inst.cfg delete mode 100644 resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Fast_Print.inst.cfg rename resources/quality/ultimaker_s3/{um_s3_aa0.8_PC_Fast_Print.inst.cfg => um_s3_aa0.8_PC_Draft_Print.inst.cfg} (74%) create mode 100644 resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Draft_Print.inst.cfg delete mode 100644 resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Fast_Print.inst.cfg rename resources/quality/ultimaker_s5/{um_s5_aa0.8_PC_Fast_Print.inst.cfg => um_s5_aa0.8_PC_Draft_Print.inst.cfg} (74%) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Draft_Print.inst.cfg new file mode 100644 index 0000000000..fb6220f2be --- /dev/null +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Draft_Print.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Fast - Experimental +definition = ultimaker_s3 + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +weight = -2 +material = generic_cpe_plus +variant = AA 0.8 +is_experimental = True + +[values] +brim_width = 14 +prime_tower_enable = True +retraction_hop = 0.1 +retraction_hop_enabled = False +skin_overlap = 0 +support_z_distance = =layer_height +top_bottom_thickness = 1.2 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 deleted file mode 100644 index a04f4ce184..0000000000 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Fast_Print.inst.cfg +++ /dev/null @@ -1,29 +0,0 @@ -[general] -version = 4 -name = Normal - Experimental -definition = ultimaker_s3 - -[metadata] -setting_version = 20 -type = quality -quality_type = fast -weight = -1 -material = generic_cpe_plus -variant = AA 0.8 -is_experimental = True - -[values] -brim_width = 14 -machine_nozzle_cool_down_speed = 0.9 -machine_nozzle_heat_up_speed = 1.4 -material_print_temperature = =default_material_print_temperature - 10 -prime_tower_enable = True -retraction_hop = 0.1 -retraction_hop_enabled = False -skin_overlap = 0 -speed_print = 50 -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) -support_z_distance = =layer_height -top_bottom_thickness = 1.2 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_Draft_Print.inst.cfg similarity index 74% rename from resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Fast_Print.inst.cfg rename to resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Draft_Print.inst.cfg index 82db443247..5711e294e7 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_Draft_Print.inst.cfg @@ -1,20 +1,19 @@ [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 -material_print_temperature = =default_material_print_temperature - 5 raft_airgap = 0.5 skin_overlap = 0 speed_print = 50 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Draft_Print.inst.cfg new file mode 100644 index 0000000000..91f0550074 --- /dev/null +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Draft_Print.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Fast - Experimental +definition = ultimaker_s5 + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +weight = -2 +material = generic_cpe_plus +variant = AA 0.8 +is_experimental = True + +[values] +brim_width = 14 +prime_tower_enable = True +retraction_hop = 0.1 +retraction_hop_enabled = False +skin_overlap = 0 +support_z_distance = =layer_height +top_bottom_thickness = 1.2 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 deleted file mode 100644 index e014c6ae90..0000000000 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Fast_Print.inst.cfg +++ /dev/null @@ -1,29 +0,0 @@ -[general] -version = 4 -name = Normal - Experimental -definition = ultimaker_s5 - -[metadata] -setting_version = 20 -type = quality -quality_type = fast -weight = -1 -material = generic_cpe_plus -variant = AA 0.8 -is_experimental = True - -[values] -brim_width = 14 -machine_nozzle_cool_down_speed = 0.9 -machine_nozzle_heat_up_speed = 1.4 -material_print_temperature = =default_material_print_temperature - 10 -prime_tower_enable = True -retraction_hop = 0.1 -retraction_hop_enabled = False -skin_overlap = 0 -speed_print = 50 -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) -support_z_distance = =layer_height -top_bottom_thickness = 1.2 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_Draft_Print.inst.cfg similarity index 74% rename from resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg rename to resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Draft_Print.inst.cfg index 3951bb8ccc..e006b759f6 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_Draft_Print.inst.cfg @@ -1,20 +1,19 @@ [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 -material_print_temperature = =default_material_print_temperature - 5 raft_airgap = 0.5 skin_overlap = 0 speed_print = 50 From 8012cb5360722161553e3469ca7bd2a8d9314c7a Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Wed, 7 Dec 2022 17:16:26 +0100 Subject: [PATCH 081/124] Signal are being emmitted before settings are updated. This is causing the combobox to update with the previous value. Only when using infill_pattern setting though. No idea what is causing this. This is a workaround for now. CURA-9793 --- .../qml/Widgets/SingleSettingComboBox.qml | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/resources/qml/Widgets/SingleSettingComboBox.qml b/resources/qml/Widgets/SingleSettingComboBox.qml index 95b2c5d86a..0055c00262 100644 --- a/resources/qml/Widgets/SingleSettingComboBox.qml +++ b/resources/qml/Widgets/SingleSettingComboBox.qml @@ -44,6 +44,10 @@ Cura.ComboBox { if (propertyProvider.properties.value == key) { + print("propertyProvider.properties.value: " + propertyProvider.properties.value) + print("key: " + key) + print("currentIndex: " + currentIndex) + print("i: " + i) // The combobox is cleared after each value change so the currentIndex must be set each time. currentIndex = i } @@ -51,6 +55,17 @@ Cura.ComboBox { } } + // Updates to the setting are delayed by interval. The signal onIsValueUsedChanged() is emitted early for some reason. + // This causes the selected value in the combobox to be updated to the previous value. (This issue is present with infill_pattern setting) + // This is a hack. If you see this in the future, try removing it and see if the combobox still works. + Timer + { + id: updateTimer + interval: 100 + repeat: false + onTriggered: comboboxModel.updateModel(false) + } + property UM.SettingPropertyProvider propertyProvider: UM.SettingPropertyProvider { id: propertyProvider @@ -61,8 +76,8 @@ Cura.ComboBox { Connections { target: propertyProvider - function onContainerStackChanged() { comboboxModel.updateModel() } - function onIsValueUsedChanged() { comboboxModel.updateModel() } + function onContainerStackChanged() { updateTimer.restart() } + function onIsValueUsedChanged() { updateTimer.restart() } } onCurrentIndexChanged: parseValueAndUpdateSetting() @@ -80,6 +95,7 @@ Cura.ComboBox { { if (updateAllExtruders) { + print("UPDATING ALL WITH VALUE: " + value) Cura.MachineManager.setSettingForAllExtruders(propertyProvider.key, "value", value) } else From ca0cd5069b781485088c10a1645676d7ea866e17 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Wed, 7 Dec 2022 17:30:12 +0100 Subject: [PATCH 082/124] Remove leftover print statements CURA-9793 --- resources/qml/MachineSettings/ComboBoxWithOptions.qml | 1 - resources/qml/Widgets/SingleSettingComboBox.qml | 5 ----- 2 files changed, 6 deletions(-) diff --git a/resources/qml/MachineSettings/ComboBoxWithOptions.qml b/resources/qml/MachineSettings/ComboBoxWithOptions.qml index 2c82f07c6f..33ec84aaa2 100644 --- a/resources/qml/MachineSettings/ComboBoxWithOptions.qml +++ b/resources/qml/MachineSettings/ComboBoxWithOptions.qml @@ -140,7 +140,6 @@ UM.TooltipArea } else { - print("SETTING PROPERTY VALUE: " + newValue) propertyProvider.setPropertyValue("value", newValue) } forceUpdateOnChangeFunction() diff --git a/resources/qml/Widgets/SingleSettingComboBox.qml b/resources/qml/Widgets/SingleSettingComboBox.qml index 0055c00262..7b4381b9b5 100644 --- a/resources/qml/Widgets/SingleSettingComboBox.qml +++ b/resources/qml/Widgets/SingleSettingComboBox.qml @@ -44,10 +44,6 @@ Cura.ComboBox { if (propertyProvider.properties.value == key) { - print("propertyProvider.properties.value: " + propertyProvider.properties.value) - print("key: " + key) - print("currentIndex: " + currentIndex) - print("i: " + i) // The combobox is cleared after each value change so the currentIndex must be set each time. currentIndex = i } @@ -95,7 +91,6 @@ Cura.ComboBox { { if (updateAllExtruders) { - print("UPDATING ALL WITH VALUE: " + value) Cura.MachineManager.setSettingForAllExtruders(propertyProvider.key, "value", value) } else From bcdfa808a8c7fa8011f63fff1d294005a20d6e70 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Wed, 7 Dec 2022 17:33:13 +0100 Subject: [PATCH 083/124] Switch to checking enabled extruder count for showing print with Component. This is because we want the SingleSettingExtruderBar to be hidden when there are 1 or less extruders, but also when there are 1 or less enabled extruders. CURA-9793 --- cura/Settings/ExtruderManager.py | 8 +++++++ .../RecommendedSupportSelector.qml | 22 +++---------------- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/cura/Settings/ExtruderManager.py b/cura/Settings/ExtruderManager.py index 8d38c7d46e..eea3055abe 100755 --- a/cura/Settings/ExtruderManager.py +++ b/cura/Settings/ExtruderManager.py @@ -7,6 +7,7 @@ from UM.Application import Application from UM.FlameProfiler import pyqtSlot import cura.CuraApplication # To get the global container stack to find the current machine. +from UM.Util import parseBool from cura.Settings.GlobalStack import GlobalStack from UM.Logger import Logger from UM.Scene.Iterator.DepthFirstIterator import DepthFirstIterator @@ -70,6 +71,13 @@ class ExtruderManager(QObject): # extruderIds directly after a machine update. return self.extruderIds + @pyqtProperty(int, notify = extrudersChanged) + def enabledExtruderCount(self) -> int: + global_container_stack = self._application.getGlobalContainerStack() + if global_container_stack: + return len([extruder for extruder in global_container_stack.extruderList if parseBool(extruder.getMetaDataEntry("enabled", "True"))]) + return 0 + @pyqtProperty(str, notify = activeExtruderChanged) def activeExtruderStackId(self) -> Optional[str]: """Gets the unique identifier of the currently active extruder stack. diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml index e9c4ff69cd..5176436b0c 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml @@ -34,22 +34,6 @@ RecommendedSettingSection storeIndex: 0 } - property UM.SettingPropertyProvider supportExtruderNr: UM.SettingPropertyProvider - { - containerStack: Cura.MachineManager.activeMachine - key: "support_extruder_nr" - watchedProperties: [ "value" ] - storeIndex: 0 - } - - property UM.SettingPropertyProvider machineExtruderCount: UM.SettingPropertyProvider - { - containerStack: Cura.MachineManager.activeMachine - key: "machine_extruder_count" - watchedProperties: ["value"] - storeIndex: 0 - } - contents: [ RecommendedSettingItem { @@ -69,9 +53,9 @@ RecommendedSettingSection settingName: catalog.i18nc("@action:label", "Print with") tooltipText: catalog.i18nc("@label", "The extruder train to use for printing the support. This is used in multi-extrusion.") // Hide this component when there is only one extruder - enabled: machineExtruderCount.properties.value > 1 - visible: machineExtruderCount.properties.value > 1 - isCompressed: enableSupportRow.isCompressed || machineExtruderCount.properties.value <= 1 + enabled: Cura.ExtruderManager.enabledExtruderCount > 1 + visible: Cura.ExtruderManager.enabledExtruderCount > 1 + isCompressed: enableSupportRow.isCompressed || Cura.ExtruderManager.enabledExtruderCount <= 1 settingControl: Cura.SingleSettingExtruderSelectorBar { From 91170e0aefa491bb6100c9caf494c653eace158b Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Thu, 8 Dec 2022 07:43:57 +0100 Subject: [PATCH 084/124] Apply suggestions from code review --- .../Recommended/RecommendedSupportSelector.qml | 2 +- resources/qml/Widgets/SingleSettingComboBox.qml | 3 ++- resources/qml/Widgets/SingleSettingSlider.qml | 10 ++++++++-- resources/qml/Widgets/SingleSettingTextField.qml | 10 ++++++++-- 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml index 5176436b0c..2ae6dfcb41 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2022 UltiMaker B.V. +// Copyright (c) 2022 UltiMaker // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 diff --git a/resources/qml/Widgets/SingleSettingComboBox.qml b/resources/qml/Widgets/SingleSettingComboBox.qml index 7b4381b9b5..0f2b4bbd08 100644 --- a/resources/qml/Widgets/SingleSettingComboBox.qml +++ b/resources/qml/Widgets/SingleSettingComboBox.qml @@ -22,7 +22,8 @@ Cura.ComboBox { // This is only used if updateAllExtruders == true property int defaultExtruderIndex: 0 - model: ListModel { + model: ListModel + { id: comboboxModel // The propertyProvider has not loaded the setting when this components onComplete triggers. Populating the model diff --git a/resources/qml/Widgets/SingleSettingSlider.qml b/resources/qml/Widgets/SingleSettingSlider.qml index 2dbb104032..98dfdc222b 100644 --- a/resources/qml/Widgets/SingleSettingSlider.qml +++ b/resources/qml/Widgets/SingleSettingSlider.qml @@ -62,8 +62,14 @@ RowLayout Connections { target: propertyProvider - function onContainerStackChanged() { updateTimer.restart() } - function onIsValueUsedChanged() { updateTimer.restart() } + function onContainerStackChanged() + { + comboboxModel.updateModel() + } + function onIsValueUsedChanged() + { + comboboxModel.updateModel() + } } // Updates to the setting are delayed by interval. This reduces lag by waiting a bit after a setting change to update the slider contents. diff --git a/resources/qml/Widgets/SingleSettingTextField.qml b/resources/qml/Widgets/SingleSettingTextField.qml index 6d9586caa5..10bf283a11 100644 --- a/resources/qml/Widgets/SingleSettingTextField.qml +++ b/resources/qml/Widgets/SingleSettingTextField.qml @@ -59,8 +59,14 @@ UM.TextField Connections { target: propertyProvider - function onContainerStackChanged() { updateTimer.restart() } - function onIsValueUsedChanged() { updateTimer.restart() } + function onContainerStackChanged() + { + updateTimer.restart() + } + function onIsValueUsedChanged() + { + updateTimer.restart() + } } // Restart update timer right after releasing a key. This stops lag while typing, but you still get warning and error From 9a03094bfd5af7ff6cddba726e13a75856885458 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Thu, 8 Dec 2022 09:34:16 +0100 Subject: [PATCH 085/124] Stop the text field from updating if the text has not changed. This was causing the custom mode text boxes to be updated instantly. 0.0 -delete-> 0. -instant update -> 0.0 This is because the recommended mode text fields would update to "0." see that as a change from "0.0" and update the property. This triggered an update in the Custom mode textfield. CURA-9793 --- resources/qml/Widgets/SingleSettingTextField.qml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/resources/qml/Widgets/SingleSettingTextField.qml b/resources/qml/Widgets/SingleSettingTextField.qml index 10bf283a11..1a8d7ae703 100644 --- a/resources/qml/Widgets/SingleSettingTextField.qml +++ b/resources/qml/Widgets/SingleSettingTextField.qml @@ -87,6 +87,12 @@ UM.TextField function parseValueUpdateSetting() { + if (propertyProvider.properties.value == text || parseInt(propertyProvide.properties.value) == parseInt(text)) + { + // Don't set the property value from the control. It already has the same value + return + } + if (propertyProvider && text != propertyProvider.properties.value) { updateSetting(text); From 435c67f97a5388a7795169caf806419c74eed462 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Thu, 8 Dec 2022 09:53:06 +0100 Subject: [PATCH 086/124] revert changes to functions CURA-9793 --- resources/qml/Widgets/SingleSettingSlider.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/qml/Widgets/SingleSettingSlider.qml b/resources/qml/Widgets/SingleSettingSlider.qml index 98dfdc222b..3c0cf24339 100644 --- a/resources/qml/Widgets/SingleSettingSlider.qml +++ b/resources/qml/Widgets/SingleSettingSlider.qml @@ -64,11 +64,11 @@ RowLayout target: propertyProvider function onContainerStackChanged() { - comboboxModel.updateModel() + updateTimer.restart() } function onIsValueUsedChanged() { - comboboxModel.updateModel() + updateTimer.restart() } } From 82fd34f1680893f3d8cafbe128ed4758f2fb8ff9 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Thu, 8 Dec 2022 09:56:36 +0100 Subject: [PATCH 087/124] Fix same property value check. CURA-9793 --- resources/qml/Widgets/SingleSettingTextField.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/Widgets/SingleSettingTextField.qml b/resources/qml/Widgets/SingleSettingTextField.qml index 1a8d7ae703..7dde652263 100644 --- a/resources/qml/Widgets/SingleSettingTextField.qml +++ b/resources/qml/Widgets/SingleSettingTextField.qml @@ -87,7 +87,7 @@ UM.TextField function parseValueUpdateSetting() { - if (propertyProvider.properties.value == text || parseInt(propertyProvide.properties.value) == parseInt(text)) + if (propertyProvider.properties.value == text || (parseFloat(propertyProvider.properties.value) == parseFloat(text) && !isNan(parseFloat(text)))) { // Don't set the property value from the control. It already has the same value return From 29c7f766becdea68bda036366f66e35c6882d14b Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Thu, 8 Dec 2022 10:25:07 +0100 Subject: [PATCH 088/124] There was an error was in the file naming which we need to uphold to prevent issues with ufp files. The file name is called 'Fast' while the quality type inside the files is 'Draft'. This will be fixed in PP-222 Relates to: PP-277 --- ..._Draft_Print.inst.cfg => um_s3_aa0.8_CPEP_Fast_Print.inst.cfg} | 0 ...PC_Draft_Print.inst.cfg => um_s3_aa0.8_PC_Fast_Print.inst.cfg} | 0 ..._Draft_Print.inst.cfg => um_s5_aa0.8_CPEP_Fast_Print.inst.cfg} | 0 ...PC_Draft_Print.inst.cfg => um_s5_aa0.8_PC_Fast_Print.inst.cfg} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename resources/quality/ultimaker_s3/{um_s3_aa0.8_CPEP_Draft_Print.inst.cfg => um_s3_aa0.8_CPEP_Fast_Print.inst.cfg} (100%) rename resources/quality/ultimaker_s3/{um_s3_aa0.8_PC_Draft_Print.inst.cfg => um_s3_aa0.8_PC_Fast_Print.inst.cfg} (100%) rename resources/quality/ultimaker_s5/{um_s5_aa0.8_CPEP_Draft_Print.inst.cfg => um_s5_aa0.8_CPEP_Fast_Print.inst.cfg} (100%) rename resources/quality/ultimaker_s5/{um_s5_aa0.8_PC_Draft_Print.inst.cfg => um_s5_aa0.8_PC_Fast_Print.inst.cfg} (100%) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Fast_Print.inst.cfg similarity index 100% rename from resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Draft_Print.inst.cfg rename to resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Fast_Print.inst.cfg diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Fast_Print.inst.cfg similarity index 100% rename from resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Draft_Print.inst.cfg rename to resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Fast_Print.inst.cfg diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Fast_Print.inst.cfg similarity index 100% rename from resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Draft_Print.inst.cfg rename to resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Fast_Print.inst.cfg diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg similarity index 100% rename from resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Draft_Print.inst.cfg rename to resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg From 4b0d07a477d0ba00a38075dde686975ced9dd222 Mon Sep 17 00:00:00 2001 From: Rijk van Manen Date: Thu, 8 Dec 2022 10:36:27 +0100 Subject: [PATCH 089/124] restore the correct setting PP-277 --- .../ultimaker_s3/um_s3_aa0.8_CPEP_Fast_Print.inst.cfg | 7 +++++++ .../ultimaker_s3/um_s3_aa0.8_PC_Fast_Print.inst.cfg | 1 + .../ultimaker_s5/um_s5_aa0.8_CPEP_Fast_Print.inst.cfg | 7 +++++++ .../ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg | 1 + 4 files changed, 16 insertions(+) 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 fb6220f2be..c7ccc69e5d 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 @@ -14,9 +14,16 @@ is_experimental = True [values] brim_width = 14 +machine_nozzle_cool_down_speed = 0.9 +machine_nozzle_heat_up_speed = 1.4 +material_print_temperature = =default_material_print_temperature - 10 prime_tower_enable = True retraction_hop = 0.1 retraction_hop_enabled = False skin_overlap = 0 +speed_print = 50 +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) support_z_distance = =layer_height top_bottom_thickness = 1.2 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 5711e294e7..d8330d1faf 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 @@ -14,6 +14,7 @@ is_experimental = True [values] brim_width = 14 +material_print_temperature = =default_material_print_temperature - 5 raft_airgap = 0.5 skin_overlap = 0 speed_print = 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 91f0550074..d3e6294151 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 @@ -14,9 +14,16 @@ is_experimental = True [values] brim_width = 14 +machine_nozzle_cool_down_speed = 0.9 +machine_nozzle_heat_up_speed = 1.4 +material_print_temperature = =default_material_print_temperature - 10 prime_tower_enable = True retraction_hop = 0.1 retraction_hop_enabled = False skin_overlap = 0 +speed_print = 50 +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) support_z_distance = =layer_height top_bottom_thickness = 1.2 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 e006b759f6..5a5b3290ee 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 @@ -14,6 +14,7 @@ is_experimental = True [values] brim_width = 14 +material_print_temperature = =default_material_print_temperature - 5 raft_airgap = 0.5 skin_overlap = 0 speed_print = 50 From e6f4055df544c77bb64a2da3b2e0cd69d03769c1 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Thu, 8 Dec 2022 13:11:14 +0100 Subject: [PATCH 090/124] Remove part of hack for fixing extrudersCHanged signal at the wrong time. Other things rely on the extruders changed signal so it is better to just emit it again at the correct time. CURA-9793 --- cura/Settings/ExtruderManager.py | 17 ++++------------- resources/qml/Widgets/SingleSettingComboBox.qml | 2 +- resources/qml/Widgets/SingleSettingSlider.qml | 2 +- .../qml/Widgets/SingleSettingTextField.qml | 2 +- 4 files changed, 7 insertions(+), 16 deletions(-) diff --git a/cura/Settings/ExtruderManager.py b/cura/Settings/ExtruderManager.py index eea3055abe..e83b053d89 100755 --- a/cura/Settings/ExtruderManager.py +++ b/cura/Settings/ExtruderManager.py @@ -49,11 +49,6 @@ class ExtruderManager(QObject): Selection.selectionChanged.connect(self.resetSelectedObjectExtruders) Application.getInstance().globalContainerStackChanged.connect(self.emitGlobalStackExtrudersChanged) # When the machine is swapped we must update the active machine extruders - # Don't use this unless you are reading from ExtruderManager.extruderIds when receiving the signal - globalStackExtrudersChanged = pyqtSignal() - - # This signal actually emits before the global stacks extruders are updated, changing this behaviour breaks too many things - # Use globalStackExtrudersChanged = pyqtSignal() if you want a trigger when the extrduerIds property changes. extrudersChanged = pyqtSignal(QVariant) """Signal to notify other components when the list of extruders for a machine definition changes.""" @@ -62,14 +57,10 @@ class ExtruderManager(QObject): def emitGlobalStackExtrudersChanged(self): # The emit function can't be directly connected to another signal. This wrapper function is required. - self.globalStackExtrudersChanged.emit() - - @pyqtProperty("QVariantMap", notify = globalStackExtrudersChanged) - def globalStackExtruderIds(self) -> Dict[str, str]: - # The extruderIds property notifys changed before the extruders are changed on switching machines - # trying to fix this broke to many things. This is a workaround. Don't use this unless you need to read - # extruderIds directly after a machine update. - return self.extruderIds + # The extrudersChanged signal is emitted early when changing machines. This triggers it a second time + # after the extruder have changed properly. This is important for any QML using ExtruderManager.extruderIds + # This is a hack, but other behaviour relys on the updating in this order. + self.extrudersChanged.emit(self._application.getGlobalContainerStack().getId()) @pyqtProperty(int, notify = extrudersChanged) def enabledExtruderCount(self) -> int: diff --git a/resources/qml/Widgets/SingleSettingComboBox.qml b/resources/qml/Widgets/SingleSettingComboBox.qml index 0f2b4bbd08..4807359484 100644 --- a/resources/qml/Widgets/SingleSettingComboBox.qml +++ b/resources/qml/Widgets/SingleSettingComboBox.qml @@ -66,7 +66,7 @@ Cura.ComboBox { property UM.SettingPropertyProvider propertyProvider: UM.SettingPropertyProvider { id: propertyProvider - containerStackId: updateAllExtruders ? Cura.ExtruderManager.globalStackExtruderIds[defaultExtruderIndex] : Cura.MachineManager.activeMachine.id + containerStackId: updateAllExtruders ? Cura.ExtruderManager.extruderIds[defaultExtruderIndex] : Cura.MachineManager.activeMachine.id watchedProperties: ["value" , "options"] } diff --git a/resources/qml/Widgets/SingleSettingSlider.qml b/resources/qml/Widgets/SingleSettingSlider.qml index 3c0cf24339..a941a348b8 100644 --- a/resources/qml/Widgets/SingleSettingSlider.qml +++ b/resources/qml/Widgets/SingleSettingSlider.qml @@ -34,7 +34,7 @@ RowLayout UM.SettingPropertyProvider { id: propertyProvider - containerStackId: updateAllExtruders ? Cura.ExtruderManager.globalStackExtruderIds[defaultExtruderIndex] : Cura.MachineManager.activeMachine.id + containerStackId: updateAllExtruders ? Cura.ExtruderManager.extruderIds[defaultExtruderIndex] : Cura.MachineManager.activeMachine.id watchedProperties: ["value"] storeIndex: 0 } diff --git a/resources/qml/Widgets/SingleSettingTextField.qml b/resources/qml/Widgets/SingleSettingTextField.qml index 7dde652263..d1dc3aab90 100644 --- a/resources/qml/Widgets/SingleSettingTextField.qml +++ b/resources/qml/Widgets/SingleSettingTextField.qml @@ -53,7 +53,7 @@ UM.TextField { id: propertyProvider watchedProperties: ["value", "validationState", "resolve"] - containerStackId: updateAllExtruders ? Cura.ExtruderManager.globalStackExtruderIds[defaultExtruderIndex] : Cura.MachineManager.activeMachine.id + containerStackId: updateAllExtruders ? Cura.ExtruderManager.extruderIds[defaultExtruderIndex] : Cura.MachineManager.activeMachine.id } Connections From aaab6339129e1f49182684a265b35671e698ad3e Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Thu, 8 Dec 2022 13:18:29 +0100 Subject: [PATCH 091/124] Move labels into `Slider` component CURA-9793 --- resources/qml/Widgets/SingleSettingSlider.qml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/resources/qml/Widgets/SingleSettingSlider.qml b/resources/qml/Widgets/SingleSettingSlider.qml index a941a348b8..1277e2ccda 100644 --- a/resources/qml/Widgets/SingleSettingSlider.qml +++ b/resources/qml/Widgets/SingleSettingSlider.qml @@ -6,16 +6,14 @@ import QtQuick.Controls 2.15 import UM 1.7 as UM import Cura 1.7 as Cura -import QtQuick.Layouts 1.3 // This silder allows changing of a single setting. Only the setting name has to be passed in to "settingName". // All of the setting updating logic is handled by this component. // This component allows you to choose values between minValue -> maxValue and rounds them to the nearest 10. // If the setting is limited to a single extruder or is settable with different values per extruder use "updateAllExtruders: true" -RowLayout +Item { height: childrenRect.height - spacing: UM.Theme.getSize("default_margin").width property alias settingName: propertyProvider.key property alias enabled: settingSlider.enabled @@ -39,12 +37,9 @@ RowLayout storeIndex: 0 } - UM.Label { Layout.fillWidth: false; text: minValue } - UM.Slider { id: settingSlider - Layout.fillWidth: true width: parent.width @@ -54,11 +49,15 @@ RowLayout value: parseInt(propertyProvider.properties.value) // When the slider is released trigger an update immediately. This forces the slider to snap to the rounded value. - onPressedChanged: if(!pressed) { roundSliderValueUpdateSetting() } + onPressedChanged: function(pressed) + { + if(!pressed) + { + roundSliderValueUpdateSetting(); + } + } } - UM.Label { Layout.fillWidth: false; text: maxValue } - Connections { target: propertyProvider From 450cdda8e0dd5911ea7103272908f62cfd901718 Mon Sep 17 00:00:00 2001 From: Joeydelarago Date: Thu, 8 Dec 2022 15:33:29 +0000 Subject: [PATCH 092/124] 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 e03b4e07f90cfa427f9533f45536397f70ce434c Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Thu, 8 Dec 2022 17:11:04 +0100 Subject: [PATCH 093/124] Simplify rounding Use sliders stepSize and snapMode properties CURA-9793 --- .../RecommendedStrengthSelector.qml | 1 - resources/qml/Widgets/SingleSettingSlider.qml | 46 ++++++------------- 2 files changed, 15 insertions(+), 32 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml index 4adca95102..57383e6018 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml @@ -38,7 +38,6 @@ RecommendedSettingSection height: UM.Theme.getSize("combobox").height width: parent.width settingName: "infill_sparse_density" - roundToNearestTen: true updateAllExtruders: true // disable slider when gradual support is enabled enabled: parseInt(infillSteps.properties.value) == 0 diff --git a/resources/qml/Widgets/SingleSettingSlider.qml b/resources/qml/Widgets/SingleSettingSlider.qml index 1277e2ccda..27e2be562c 100644 --- a/resources/qml/Widgets/SingleSettingSlider.qml +++ b/resources/qml/Widgets/SingleSettingSlider.qml @@ -11,24 +11,25 @@ import Cura 1.7 as Cura // All of the setting updating logic is handled by this component. // This component allows you to choose values between minValue -> maxValue and rounds them to the nearest 10. // If the setting is limited to a single extruder or is settable with different values per extruder use "updateAllExtruders: true" -Item +UM.Slider { - height: childrenRect.height + id: settingSlider property alias settingName: propertyProvider.key - property alias enabled: settingSlider.enabled // If true, all extruders will have "settingName" property updated. // The displayed value will be read from the extruder with index "defaultExtruderIndex" instead of the machine. property bool updateAllExtruders: false // This is only used if updateAllExtruders == true property int defaultExtruderIndex: 0 - - property bool roundToNearestTen: false - property int maxValue: 100 - property int minValue: 0 property int previousValue: -1 + // set range from 0 to 100 + from: 0; to: 100 + // set stepSize to 10 and set snapMode to snap on release snapMode is needed + // otherwise the used percentage and slider handle show different values + stepSize: 10; snapMode: Slider.SnapOnRelease + UM.SettingPropertyProvider { id: propertyProvider @@ -37,24 +38,15 @@ Item storeIndex: 0 } - UM.Slider + // set initial value from stack + value: parseInt(propertyProvider.properties.value) + + // When the slider is released trigger an update immediately. This forces the slider to snap to the rounded value. + onPressedChanged: function(pressed) { - id: settingSlider - - width: parent.width - - from: minValue; to: maxValue; stepSize: 1 - - // set initial value from stack - value: parseInt(propertyProvider.properties.value) - - // When the slider is released trigger an update immediately. This forces the slider to snap to the rounded value. - onPressedChanged: function(pressed) + if(!pressed) { - if(!pressed) - { - roundSliderValueUpdateSetting(); - } + updateSetting(settingSlider.value); } } @@ -85,14 +77,6 @@ Item settingSlider.value = value } - function roundSliderValueUpdateSetting() - { - // If the user interacts with the slider we round the value and update the setting. - const roundedSliderValue = roundToNearestTen ? Math.round(settingSlider.value / 10) * 10 : Math.round(settingSlider.value) - updateSetting(roundedSliderValue) - } - - function parseValueUpdateSetting(triggerUpdate) { // Only run when the setting value is updated by something other than the slider. 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 094/124] 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 095/124] 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 096/124] 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 + From f192df875b6948887aa85e7e3bf0324dea0eb9db Mon Sep 17 00:00:00 2001 From: whoseyoung Date: Sat, 10 Dec 2022 17:17:49 +0800 Subject: [PATCH 097/124] update official profiles for Geeetech printers --- resources/definitions/Geeetech_base.def.json | 126 ++++++++---------- .../definitions/geeetech_A10Pro.def.json | 5 +- resources/definitions/geeetech_A20.def.json | 5 +- .../definitions/geeetech_A30Pro.def.json | 5 +- resources/definitions/geeetech_E180.def.json | 5 +- .../geeetech_GiantArmD200.def.json | 10 +- .../definitions/geeetech_I3ProB.def.json | 7 +- .../definitions/geeetech_I3ProC.def.json | 2 +- .../definitions/geeetech_I3ProW.def.json | 7 +- .../definitions/geeetech_MeCreator.def.json | 7 +- .../definitions/geeetech_MeCreator2.def.json | 7 +- .../definitions/geeetech_MeDucer.def.json | 7 +- resources/definitions/geeetech_Mizar.def.json | 5 +- .../definitions/geeetech_MizarM.def.json | 2 +- .../definitions/geeetech_MizarPro.def.json | 5 +- .../definitions/geeetech_MizarS.def.json | 7 +- .../definitions/geeetech_Thunder.def.json | 71 +++++----- .../variants/geeetech_MeCreator2_0.2.inst.cfg | 2 +- 18 files changed, 160 insertions(+), 125 deletions(-) diff --git a/resources/definitions/Geeetech_base.def.json b/resources/definitions/Geeetech_base.def.json index 910d6a351d..bb30682803 100644 --- a/resources/definitions/Geeetech_base.def.json +++ b/resources/definitions/Geeetech_base.def.json @@ -14,22 +14,19 @@ "variants_name": "Nozzle Size", "preferred_variant_name": "0.4mm Nozzle", "preferred_quality_type": "standard", - "preferred_material": "generic_pla", - "machine_extruder_trains": { - "0": "Geeetech_base_extruder_0" - } + "preferred_material": "generic_pla" }, "overrides":{ "machine_name": { "default_value": "Geeetech Base Printer" }, - "machine_width": { "default_value": 300 }, - "machine_depth": { "default_value": 300 }, - "machine_height": {"default_value": 300 }, + "machine_width": { "default_value": 350 }, + "machine_depth": { "default_value": 350 }, + "machine_height": {"default_value": 350 }, "machine_head_with_fans_polygon": { "default_value": [[-40, 40], [40, 40], [40, -40], [-40, -40]] }, "gantry_height": { "value": 40 }, "machine_start_gcode": { "default_value": ";Geeetech Custom Start G-code\nM104 S{material_print_temperature_layer_0} ;Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ;Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ;Wait for Hotend Temperature\nG92 E0 ;Reset Extruder\nG28 ;Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ;ON Light\n;M106 P0 S383 ;ON MainFan 150% if need\n;M106 P1 S255 ;ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ;Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ;Draw the first line\nG92 E0 ;Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ;Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ;Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": ";Geeetech Custom end G-code\nG91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers\n\n\n" }, + "machine_end_gcode": { "default_value": ";Geeetech Custom end G-code\nG91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers\n\n\n" }, "machine_heated_bed": { "default_value": true }, "machine_max_feedrate_x": { "value": 500 }, @@ -48,73 +45,68 @@ "acceleration_print": { "value": 500 }, "acceleration_travel": { "value": 500 }, "acceleration_travel_layer_0": { "value": "acceleration_travel" }, - "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" }, - "line_width": {"value": "1.125*machine_nozzle_size if speed_infill<=100 else machine_nozzle_size"}, - "retraction_speed": {"default_value": 40 }, - "infill_pattern": {"value": "'lines' if infill_sparse_density > 50 else 'grid'" }, - "small_hole_max_size":{"value": "5 if speed_infill>=150 else 0" }, - "cool_min_layer_time":{"value": "1.3 if speed_infill>=200 else 5" }, - "material_print_temperature": {"default_value": 200,"value": "200 if speed_infill <=100 else 210 if speed_infill <= 150 else 220 if speed_infill <= 180 else 230", "maximum_value": "250" }, - "material_print_temperature_layer_0": {"value": "material_print_temperature + 5", "maximum_value_warning": 250 }, - "material_initial_print_temperature": {"value": "material_print_temperature - 5", "minimum_value_warning": "material_standby_temperature - 10" }, - "material_final_print_temperature": {"value": "material_print_temperature" }, - "material_bed_temperature": {"maximum_value_warning": 110 }, + "line_width": { "value": "1.125*machine_nozzle_size if speed_infill<=100 else machine_nozzle_size" }, + "retraction_speed": { "value": 40 }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'grid'" }, + "small_hole_max_size":{ "value": "5 if speed_infill>=150 else 0" }, + "cool_min_layer_time":{ "value": "1.3 if speed_infill>=200 else 5" }, + "material_print_temperature": { "value": "200 if speed_infill <=100 else 210 if speed_infill <= 150 else 220 if speed_infill <= 180 else 230", "maximum_value": "250" }, + "material_print_temperature_layer_0": { "value": "material_print_temperature + 5", "maximum_value_warning": 250 }, + "material_initial_print_temperature": { "value": "material_print_temperature - 5", "minimum_value_warning": "material_standby_temperature - 10" }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_bed_temperature": { "maximum_value_warning": 110 }, - "speed_wall": {"value": "60 if speed_print==60 else math.ceil(round(speed_print*0.90))"}, - "speed_wall_0": {"value": "30 if speed_print==60 else math.ceil(round(speed_print*0.75))"}, - "speed_wall_x": {"value": "60 if speed_print==60 else math.ceil(round(speed_print*0.90))"}, - "speed_topbottom": {"value": "speed_print"}, - "speed_travel": {"value": "200 if 120<=speed_print<=200 else speed_print if speed_print>200 else 120"}, - "speed_layer_0": {"value":"50 if speed_infill <= 150 else 75","maximum_value_warning": "100"}, - "speed_print_layer_0": {"value": "25 if speed_infill <= 150 else 35","maximum_value_warning": "60"}, - "speed_travel_layer_0": {"value": "speed_layer_0","maximum_value_warning": "150"}, - "skirt_brim_speed": {"value":"speed_print_layer_0","maximum_value_warning": "60"}, + "speed_wall": { "value": "60 if speed_print==60 else math.ceil(round(speed_print*0.90))" }, + "speed_wall_0": { "value": "30 if speed_print==60 else math.ceil(round(speed_print*0.75))" }, + "speed_wall_x": { "value": "60 if speed_print==60 else math.ceil(round(speed_print*0.90))" }, + "speed_topbottom": { "value": "speed_print" }, + "speed_travel": { "value": "200 if 120<=speed_print<=200 else speed_print if speed_print>200 else 120" }, + "speed_layer_0": { "value":"50 if speed_infill <= 150 else 75","maximum_value_warning": "100" }, + "speed_print_layer_0": { "value": "25 if speed_infill <= 150 else 35","maximum_value_warning": "60" }, + "speed_travel_layer_0": { "value": "speed_layer_0","maximum_value_warning": "150" }, + "skirt_brim_speed": { "value":"speed_print_layer_0","maximum_value_warning": "60" }, - "speed_support": {"value": "speed_print*0.5"}, - "speed_support_interface": {"value": "speed_support / 0.8"}, - "speed_support_roof": {"value": "speed_support_interface / 2"}, - "speed_support_bottom": {"value": "speed_support_roof"}, + "speed_support": { "value": "speed_print*0.5" }, + "speed_support_interface": { "value": "speed_support / 0.8" }, + "speed_support_roof": { "value": "speed_support_interface / 2" }, + "speed_support_bottom": { "value": "speed_support_roof" }, - "wall_transition_filter_deviation":{"value": 0.15 }, - "travel_avoid_supports": {"value": true }, - "retraction_hop": {"value": 0.5 }, - "retraction_combing": {"value": "'off' if retraction_hop_enabled else 'all'" }, - "retraction_combing_max_distance": {"value": 30 }, - "optimize_wall_printing_order": {"value": true }, - "z_seam_type": {"value": "'sharpest_corner'"}, - "z_seam_corner": {"value": "'z_seam_corner_inner'"}, + "wall_transition_filter_deviation":{ "value": 0.15 }, + "travel_avoid_supports": { "value": true }, + "retraction_hop": { "value": 0.5 }, + "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'all'" }, + "retraction_combing_max_distance": { "value": 30 }, + "optimize_wall_printing_order": { "value": true }, + "z_seam_type": { "value": "'sharpest_corner'" }, + "z_seam_corner": { "value": "'z_seam_corner_inner'" }, - "support_type": {"default_value": "'everywhere'" }, - "support_use_towers": {"value": false }, - "support_pattern": {"value": "'zigzag'" }, - "support_wall_count": {"value": 0 }, - "support_infill_rate": {"value": "0 if support_enable and support_structure == 'tree' else 20" }, - "support_brim_enable": {"value": true }, - "support_brim_width": {"value": 5 }, - "support_z_distance": {"value": "layer_height if layer_height >= 0.16 else layer_height*2" }, - "support_xy_distance": {"value": "wall_line_width_0 * 2" }, - "support_xy_distance_overhang": {"value": "wall_line_width_0" }, + "support_use_towers": { "value": false }, + "support_pattern": { "value": "'zigzag'" }, + "support_wall_count": { "value": 0 }, + "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" }, + "support_brim_enable": { "value": true }, + "support_brim_width": { "value": 5 }, + "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height*2" }, + "support_xy_distance": { "value": "wall_line_width_0 * 2" }, + "support_xy_distance_overhang": { "value": "wall_line_width_0" }, - "support_interface_height": {"value": "layer_height * 3" }, - "support_interface_density": {"value": 33.333 }, - "support_interface_skip_height": {"value": 0.2 }, - "support_interface_pattern": {"default_value": "zigzag" }, - "support_roof_pattern": {"default_value": "zigzag" }, - "support_bottom_pattern": {"default_value": "zigzag" }, + "support_interface_height": { "value": "layer_height * 3" }, + "support_interface_density": { "value": 33.333 }, + "support_interface_skip_height": { "value": 0.2 }, + "support_interface_pattern": { "value": "zigzag" }, - "minimum_support_area": {"value": 2 }, - "minimum_interface_area": {"value": 10 }, - "top_bottom_thickness": {"value": "layer_height_0 + layer_height * 3" }, - "wall_thickness": {"value": "line_width * 2" }, + "minimum_support_area": { "value": 2 }, + "minimum_interface_area": { "value": 10 }, + "top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3" }, + "wall_thickness": { "value": "line_width * 2" }, - "adhesion_type": {"value": "'skirt'" }, - "brim_replaces_support": {"value": false }, - "skirt_gap": {"value": 6 }, - "brim_line_count": {"default_value": 5 }, + "adhesion_type": { "value": "'skirt'" }, + "brim_replaces_support": { "value": false }, + "skirt_gap": { "value": 6 }, - "prime_tower_size": { "value": 30 }, - "prime_tower_min_volume":{ "value": 85, "maximum_value_warning":150 }, - "prime_tower_brim_enable":{ "value": true } + "prime_tower_size": { "value": 30 }, + "prime_tower_min_volume": { "value": 85, "maximum_value_warning":150 }, + "prime_tower_brim_enable": { "value": true } } } diff --git a/resources/definitions/geeetech_A10Pro.def.json b/resources/definitions/geeetech_A10Pro.def.json index bb93eb67b1..eb9616bf64 100644 --- a/resources/definitions/geeetech_A10Pro.def.json +++ b/resources/definitions/geeetech_A10Pro.def.json @@ -7,7 +7,10 @@ "visible": true, "has_materials": true, "has_variants": true, - "has_machine_quality": true + "has_machine_quality": true, + "machine_extruder_trains": { + "0": "Geeetech_base_extruder_0" + } }, "overrides": { diff --git a/resources/definitions/geeetech_A20.def.json b/resources/definitions/geeetech_A20.def.json index 0caa866b7b..0d38988d16 100644 --- a/resources/definitions/geeetech_A20.def.json +++ b/resources/definitions/geeetech_A20.def.json @@ -7,7 +7,10 @@ "visible": true, "has_materials": true, "has_variants": true, - "has_machine_quality": true + "has_machine_quality": true, + "machine_extruder_trains": { + "0": "Geeetech_base_extruder_0" + } }, "overrides": { diff --git a/resources/definitions/geeetech_A30Pro.def.json b/resources/definitions/geeetech_A30Pro.def.json index 5b428080fc..ebf23a0eef 100644 --- a/resources/definitions/geeetech_A30Pro.def.json +++ b/resources/definitions/geeetech_A30Pro.def.json @@ -7,7 +7,10 @@ "visible": true, "has_materials": true, "has_variants": true, - "has_machine_quality": true + "has_machine_quality": true, + "machine_extruder_trains": { + "0": "Geeetech_base_extruder_0" + } }, "overrides": { diff --git a/resources/definitions/geeetech_E180.def.json b/resources/definitions/geeetech_E180.def.json index 28e93ab57b..d61086259b 100644 --- a/resources/definitions/geeetech_E180.def.json +++ b/resources/definitions/geeetech_E180.def.json @@ -7,7 +7,10 @@ "visible": true, "has_materials": true, "has_variants": true, - "has_machine_quality": true + "has_machine_quality": true, + "machine_extruder_trains": { + "0": "Geeetech_base_extruder_0" + } }, "overrides": { diff --git a/resources/definitions/geeetech_GiantArmD200.def.json b/resources/definitions/geeetech_GiantArmD200.def.json index 137bf8924e..663b206ba7 100644 --- a/resources/definitions/geeetech_GiantArmD200.def.json +++ b/resources/definitions/geeetech_GiantArmD200.def.json @@ -7,16 +7,20 @@ "visible": true, "has_materials": true, "has_variants": true, - "has_machine_quality": true + "has_machine_quality": true, + "machine_extruder_trains": { + "0": "Geeetech_base_extruder_0" + } }, "overrides": { - "machine_name": { "default_value": "Geeetech GiantArmD200" }, + "machine_name": { "default_value": "Geeetech GiantArmD200" }, + "machine_width": { "default_value": 300 }, "machine_depth": { "default_value": 180 }, "machine_height": {"default_value": 180 }, "machine_head_with_fans_polygon": { "default_value": [[-75, 35], [18, 35], [18, -18], [-75, -18]] }, "gantry_height": { "value": 45 }, - "retraction_amount": { "default_value": 2 }, + "retraction_amount": { "value": 2 }, "machine_start_gcode": { "default_value": ";Geeetech GiantArmD200 Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y10 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y160.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y160.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y10 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y10 Z0.4 F3000.0 ; Scrape off nozzle residue" }, "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } diff --git a/resources/definitions/geeetech_I3ProB.def.json b/resources/definitions/geeetech_I3ProB.def.json index 25b7a6c987..399ec0df0a 100644 --- a/resources/definitions/geeetech_I3ProB.def.json +++ b/resources/definitions/geeetech_I3ProB.def.json @@ -7,7 +7,10 @@ "visible": true, "has_materials": true, "has_variants": true, - "has_machine_quality": true + "has_machine_quality": true, + "machine_extruder_trains": { + "0": "Geeetech_base_extruder_0" + } }, "overrides": { @@ -17,7 +20,7 @@ "machine_height": {"default_value": 180 }, "machine_head_with_fans_polygon": { "default_value": [[-75, 35], [18, 35], [18, -18], [-75, -18]] }, "gantry_height": { "value": 45 }, - "retraction_amount": { "default_value": 2 }, + "retraction_amount": { "value": 2 }, "machine_start_gcode": { "default_value": ";Geeetech I3ProB Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y10 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y180.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y180.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y10 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } diff --git a/resources/definitions/geeetech_I3ProC.def.json b/resources/definitions/geeetech_I3ProC.def.json index c7e5d01410..e4fdbff3ea 100644 --- a/resources/definitions/geeetech_I3ProC.def.json +++ b/resources/definitions/geeetech_I3ProC.def.json @@ -21,7 +21,7 @@ "machine_height": {"default_value": 180 }, "machine_head_with_fans_polygon": { "default_value": [[-75, 35], [18, 35], [18, -18], [-75, -18]] }, "gantry_height": { "value": 45 }, - "retraction_amount": { "default_value": 2 }, + "retraction_amount": { "value": 2 }, "brim_width":{ "value": 10 }, "prime_tower_position_x":{ "value": 170 }, "prime_tower_position_y":{ "value": 140 }, diff --git a/resources/definitions/geeetech_I3ProW.def.json b/resources/definitions/geeetech_I3ProW.def.json index 1db41552db..acb0bb10ad 100644 --- a/resources/definitions/geeetech_I3ProW.def.json +++ b/resources/definitions/geeetech_I3ProW.def.json @@ -7,7 +7,10 @@ "visible": true, "has_materials": true, "has_variants": true, - "has_machine_quality": true + "has_machine_quality": true, + "machine_extruder_trains": { + "0": "Geeetech_base_extruder_0" + } }, "overrides": { @@ -17,7 +20,7 @@ "machine_height": {"default_value": 180 }, "machine_head_with_fans_polygon": { "default_value": [[-75, 35], [18, 35], [18, -18], [-75, -18]] }, "gantry_height": { "value": 45 }, - "retraction_amount": { "default_value": 2 }, + "retraction_amount": { "value": 2 }, "machine_start_gcode": { "default_value": ";Geeetech I3ProW Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y10 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y180.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y180.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y10 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } diff --git a/resources/definitions/geeetech_MeCreator.def.json b/resources/definitions/geeetech_MeCreator.def.json index a35756f440..1f9ed2c6b9 100644 --- a/resources/definitions/geeetech_MeCreator.def.json +++ b/resources/definitions/geeetech_MeCreator.def.json @@ -7,7 +7,10 @@ "visible": true, "has_materials": true, "has_variants": true, - "has_machine_quality": true + "has_machine_quality": true, + "machine_extruder_trains": { + "0": "Geeetech_base_extruder_0" + } }, "overrides": { @@ -17,7 +20,7 @@ "machine_height": {"default_value": 125 }, "machine_head_with_fans_polygon": { "default_value": [[-75, 35], [18, 35], [18, -18], [-75, -18]] }, "gantry_height": { "value": 45 }, - "retraction_amount": { "default_value": 2 }, + "retraction_amount": { "value": 2 }, "machine_start_gcode": { "default_value": ";Geeetech MeCreator Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y10 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y130.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y130.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y10 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y10 Z0.4 F3000.0 ; Scrape off nozzle residue" }, "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } diff --git a/resources/definitions/geeetech_MeCreator2.def.json b/resources/definitions/geeetech_MeCreator2.def.json index c9bed615fa..3a856ca67a 100644 --- a/resources/definitions/geeetech_MeCreator2.def.json +++ b/resources/definitions/geeetech_MeCreator2.def.json @@ -7,7 +7,10 @@ "visible": true, "has_materials": true, "has_variants": true, - "has_machine_quality": true + "has_machine_quality": true, + "machine_extruder_trains": { + "0": "Geeetech_base_extruder_0" + } }, "overrides": { @@ -17,7 +20,7 @@ "machine_height": {"default_value": 160 }, "machine_head_with_fans_polygon": { "default_value": [[-75, 35], [18, 35], [18, -18], [-75, -18]] }, "gantry_height": { "value": 45 }, - "retraction_amount": { "default_value": 2 }, + "retraction_amount": { "value": 2 }, "machine_start_gcode": { "default_value": ";Geeetech MeCreator2 Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y10 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y140.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y140.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y10 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y10 Z0.4 F3000.0 ; Scrape off nozzle residue" }, "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } diff --git a/resources/definitions/geeetech_MeDucer.def.json b/resources/definitions/geeetech_MeDucer.def.json index c4b65bfe3b..ef17de75c3 100644 --- a/resources/definitions/geeetech_MeDucer.def.json +++ b/resources/definitions/geeetech_MeDucer.def.json @@ -7,7 +7,10 @@ "visible": true, "has_materials": true, "has_variants": true, - "has_machine_quality": true + "has_machine_quality": true, + "machine_extruder_trains": { + "0": "Geeetech_base_extruder_0" + } }, "overrides": { @@ -17,7 +20,7 @@ "machine_height": {"default_value": 150 }, "machine_head_with_fans_polygon": { "default_value": [[-75, 35], [18, 35], [18, -18], [-75, -18]] }, "gantry_height": { "value": 45 }, - "retraction_amount": { "default_value": 2 }, + "retraction_amount": { "value": 2 }, "machine_start_gcode": { "default_value": ";Geeetech MeDucer Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y10 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y130.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y130.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y10 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y10 Z0.4 F3000.0 ; Scrape off nozzle residue" }, "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } diff --git a/resources/definitions/geeetech_Mizar.def.json b/resources/definitions/geeetech_Mizar.def.json index 38fcb151e6..b9569c7649 100644 --- a/resources/definitions/geeetech_Mizar.def.json +++ b/resources/definitions/geeetech_Mizar.def.json @@ -7,7 +7,10 @@ "visible": true, "has_materials": true, "has_variants": true, - "has_machine_quality": true + "has_machine_quality": true, + "machine_extruder_trains": { + "0": "Geeetech_base_extruder_0" + } }, "overrides": { diff --git a/resources/definitions/geeetech_MizarM.def.json b/resources/definitions/geeetech_MizarM.def.json index 28bf7dfe76..3a8f31bf9b 100644 --- a/resources/definitions/geeetech_MizarM.def.json +++ b/resources/definitions/geeetech_MizarM.def.json @@ -20,7 +20,7 @@ "machine_depth": { "default_value": 255 }, "machine_height": {"default_value": 260 }, "machine_head_with_fans_polygon": { "default_value": [[-31, 31], [34, 31], [34, -40], [-31, -40]] }, - "gantry_height": { "value": 35 }, + "gantry_height": { "value": 35 }, "brim_width":{ "value": 10 }, "prime_tower_position_x":{ "value": 225 }, "prime_tower_position_y":{ "value": 195 }, diff --git a/resources/definitions/geeetech_MizarPro.def.json b/resources/definitions/geeetech_MizarPro.def.json index 0040fb3dd8..b91ef3e066 100644 --- a/resources/definitions/geeetech_MizarPro.def.json +++ b/resources/definitions/geeetech_MizarPro.def.json @@ -7,7 +7,10 @@ "visible": true, "has_materials": true, "has_variants": true, - "has_machine_quality": true + "has_machine_quality": true, + "machine_extruder_trains": { + "0": "Geeetech_base_extruder_0" + } }, "overrides": { diff --git a/resources/definitions/geeetech_MizarS.def.json b/resources/definitions/geeetech_MizarS.def.json index 8f097e2bde..f2d026aeb8 100644 --- a/resources/definitions/geeetech_MizarS.def.json +++ b/resources/definitions/geeetech_MizarS.def.json @@ -7,7 +7,10 @@ "visible": true, "has_materials": true, "has_variants": true, - "has_machine_quality": true + "has_machine_quality": true, + "machine_extruder_trains": { + "0": "Geeetech_base_extruder_0" + } }, "overrides": { @@ -19,6 +22,6 @@ "gantry_height": { "value": 35 }, "machine_start_gcode": { "default_value": ";Official open-source firmware for MizarS: https://github.com/Geeetech3D/Mizar-S \n\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } } } diff --git a/resources/definitions/geeetech_Thunder.def.json b/resources/definitions/geeetech_Thunder.def.json index 0261b5396a..141459dae8 100644 --- a/resources/definitions/geeetech_Thunder.def.json +++ b/resources/definitions/geeetech_Thunder.def.json @@ -7,7 +7,10 @@ "visible": true, "has_materials": true, "has_variants": true, - "has_machine_quality": true + "has_machine_quality": true, + "machine_extruder_trains": { + "0": "Geeetech_base_extruder_0" + } }, "overrides": { @@ -29,46 +32,46 @@ "machine_max_jerk_xy": { "value": 45 }, "machine_max_jerk_z": { "value": 0.8 }, "machine_max_jerk_e": { "value": 8 }, - "acceleration_print": { "value": 3500 }, + "acceleration_print": { "value": 3500 }, "acceleration_travel": { "value": 5000 }, - "line_width": {"value": "1.2*machine_nozzle_size if speed_infill>=200 else machine_nozzle_size"}, - "fill_outline_gaps": {"label": "Print Thin Walls", "value": false }, - "retraction_speed": { "default_value": 35 }, - "infill_sparse_density": {"label": "Infill Density","value": "15" }, - "small_hole_max_size":{"value": "8 if speed_infill>=200 else 0" }, - "cool_min_layer_time":{"value": "1.3 if speed_infill>=200 else 2.5" }, - "cool_fan_full_at_height": {"label": "Regular Fan Speed at Height","value": "layer_height_0 + layer_height" }, - "cool_fan_speed":{"maximum_value": "151","default_value": 100,"value": "151 if speed_infill>=200 else 100" }, - "cool_fan_speed_min":{"maximum_value": "151","default_value": 100,"value": "cool_fan_speed"}, - "cool_fan_speed_max":{"maximum_value": "151","default_value": 100,"value": "cool_fan_speed"}, + "line_width": { "value": "1.2*machine_nozzle_size if speed_infill>=200 else machine_nozzle_size" }, + "fill_outline_gaps": { "label": "Print Thin Walls", "value": false }, + "retraction_speed": { "value": 35 }, + "infill_sparse_density": { "label": "Infill Density","value": "15" }, + "small_hole_max_size":{ "value": "8 if speed_infill>=200 else 0" }, + "cool_min_layer_time":{ "value": "1.3 if speed_infill>=200 else 2.5" }, + "cool_fan_full_at_height": { "label": "Regular Fan Speed at Height","value": "layer_height_0 + layer_height" }, + "cool_fan_speed":{ "maximum_value": "151","value": "151 if speed_infill>=200 else 100" }, + "cool_fan_speed_min":{ "maximum_value": "151","value": "cool_fan_speed" }, + "cool_fan_speed_max":{ "maximum_value": "151","value": "cool_fan_speed" }, - "material_print_temperature": {"value": "200 if speed_infill <=150 else 205 if speed_infill <= 200 else 215 if speed_infill <= 260 else 220","maximum_value": "250" }, + "material_print_temperature": { "value": "200 if speed_infill <=150 else 205 if speed_infill <= 200 else 215 if speed_infill <= 260 else 220","maximum_value": "250" }, "material_print_temperature_layer_0": { "value": "material_print_temperature" }, - "material_initial_print_temperature": { "value": "material_print_temperature - 5 " }, - "material_flow_layer_0": { "default_value": 95 }, + "material_initial_print_temperature": { "value": "material_print_temperature - 5" }, + "material_flow_layer_0": { "value": 95 }, - "speed_print": { "default_value":250, "maximum_value_warning": "300" }, - "speed_infill": {"maximum_value_warning": "300"}, - "speed_wall": {"maximum_value_warning": "300"}, - "speed_wall_0": {"maximum_value_warning": "300"}, - "speed_wall_x": {"maximum_value_warning": "300"}, - "speed_topbottom": {"maximum_value_warning": "300"}, - "speed_roofing":{"maximum_value_warning": "300"}, - "speed_travel_layer_0": {"maximum_value_warning": "200"}, + "speed_print": { "value":250, "maximum_value_warning": "300" }, + "speed_infill": { "maximum_value_warning": "300" }, + "speed_wall": { "maximum_value_warning": "300" }, + "speed_wall_0": { "maximum_value_warning": "300" }, + "speed_wall_x": { "maximum_value_warning": "300" }, + "speed_topbottom": { "maximum_value_warning": "300" }, + "speed_roofing": { "maximum_value_warning": "300" }, + "speed_travel_layer_0": { "maximum_value_warning": "200" }, - "speed_support": {"maximum_value_warning": "200"}, - "speed_support_infill": {"maximum_value_warning": "200"}, - "speed_support_interface": {"maximum_value_warning": "200"}, - "speed_support_roof": {"maximum_value_warning": "200"}, - "speed_support_bottom": {"maximum_value_warning": "200"}, + "speed_support": { "maximum_value_warning": "200" }, + "speed_support_infill": { "maximum_value_warning": "200" }, + "speed_support_interface": { "maximum_value_warning": "200" }, + "speed_support_roof": { "maximum_value_warning": "200" }, + "speed_support_bottom": { "maximum_value_warning": "200" }, - "infill_before_walls": {"label": "Infill Before Walls", "value": false }, - "infill_wipe_dist": {"label": "Infill Wipe Distance", "value": 0.0 }, - "wall_0_wipe_dist": {"label": "Outer Wall Wipe Distance","value": 0.0 }, + "infill_before_walls": { "label": "Infill Before Walls", "value": false }, + "infill_wipe_dist": { "label": "Infill Wipe Distance", "value": 0.0 }, + "wall_0_wipe_dist": { "label": "Outer Wall Wipe Distance","value": 0.0 }, - "infill_overlap": {"label": "Infill Overlap Percentage", "value": 10.0 }, - "skin_overlap": {"label": "Skin Overlap Percentage", "value": 10.0 }, - "zig_zaggify_infill": {"label": "Connect Infill Lines","value": true } + "infill_overlap": { "label": "Infill Overlap Percentage", "value": 10.0 }, + "skin_overlap": { "label": "Skin Overlap Percentage", "value": 10.0 }, + "zig_zaggify_infill": { "label": "Connect Infill Lines","value": true } } } diff --git a/resources/variants/geeetech_MeCreator2_0.2.inst.cfg b/resources/variants/geeetech_MeCreator2_0.2.inst.cfg index ed4ccbb000..96c7308b11 100644 --- a/resources/variants/geeetech_MeCreator2_0.2.inst.cfg +++ b/resources/variants/geeetech_MeCreator2_0.2.inst.cfg @@ -1,7 +1,7 @@ [general] name = 0.2mm Nozzle version = 4 -definition = geeetech_MMeCreator2 +definition = geeetech_MeCreator2 [metadata] setting_version = 20 From 9f3490893aeeadbd58bfa6917535f1bd2f5ff256 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Sat, 10 Dec 2022 16:05:07 +0100 Subject: [PATCH 098/124] use master for clang-tidy-pr-comments --- .../workflows/printer-linter-pr-diagnose.yml | 90 +++++------ .github/workflows/printer-linter-pr-post.yml | 142 +++++++++--------- 2 files changed, 116 insertions(+), 116 deletions(-) diff --git a/.github/workflows/printer-linter-pr-diagnose.yml b/.github/workflows/printer-linter-pr-diagnose.yml index 881ea1df3e..54bbda4c1d 100644 --- a/.github/workflows/printer-linter-pr-diagnose.yml +++ b/.github/workflows/printer-linter-pr-diagnose.yml @@ -1,59 +1,59 @@ name: printer-linter-pr-diagnose on: - pull_request: - path: - - 'resources/**' + pull_request: + path: + - "resources/**" jobs: - printer-linter-diagnose: - name: Printer linter PR diagnose + printer-linter-diagnose: + name: Printer linter PR diagnose - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - fetch-depth: 2 + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 2 - - name: Setup Python and pip - uses: actions/setup-python@v4 - with: - python-version: 3.11.x - cache: 'pip' - cache-dependency-path: .github/workflows/requirements-printer-linter.txt + - name: Setup Python and pip + uses: actions/setup-python@v4 + with: + python-version: 3.11.x + cache: "pip" + cache-dependency-path: .github/workflows/requirements-printer-linter.txt - - uses: technote-space/get-diff-action@v6 - with: - PATTERNS: | - resources/+(extruders|definitions)/*.def.json - resources/+(intent|quality|variants)/**/*.inst.cfg + - uses: technote-space/get-diff-action@v6 + with: + PATTERNS: | + resources/+(extruders|definitions)/*.def.json + resources/+(intent|quality|variants)/**/*.inst.cfg - - name: Install Python requirements for runner - if: env.GIT_DIFF && !env.MATCHED_FILES - run: pip install -r .github/workflows/requirements-printer-linter.txt + - name: Install Python requirements for runner + if: env.GIT_DIFF && !env.MATCHED_FILES + run: pip install -r .github/workflows/requirements-printer-linter.txt - - name: Create results directory - run: mkdir printer-linter-result + - name: Create results directory + run: mkdir printer-linter-result - - name: Diagnose file(s) - if: env.GIT_DIFF && !env.MATCHED_FILES - run: python printer-linter/src/terminal.py --diagnose --report printer-linter-result/fixes.yml ${{ env.GIT_DIFF_FILTERED }} + - name: Diagnose file(s) + if: env.GIT_DIFF && !env.MATCHED_FILES + run: python printer-linter/src/terminal.py --diagnose --report printer-linter-result/fixes.yml ${{ env.GIT_DIFF_FILTERED }} - - name: Save PR metadata - run: | - echo ${{ github.event.number }} > printer-linter-result/pr-id.txt - echo ${{ github.event.pull_request.head.repo.full_name }} > printer-linter-result/pr-head-repo.txt - echo ${{ github.event.pull_request.head.ref }} > printer-linter-result/pr-head-ref.txt + - name: Save PR metadata + run: | + echo ${{ github.event.number }} > printer-linter-result/pr-id.txt + echo ${{ github.event.pull_request.head.repo.full_name }} > printer-linter-result/pr-head-repo.txt + echo ${{ github.event.pull_request.head.ref }} > printer-linter-result/pr-head-ref.txt - - uses: actions/upload-artifact@v2 - with: - name: printer-linter-result - path: printer-linter-result/ + - uses: actions/upload-artifact@v2 + with: + name: printer-linter-result + path: printer-linter-result/ - - name: Run clang-tidy-pr-comments action - uses: platisd/clang-tidy-pr-comments@fix_suggestions_for_multiline_comments - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - clang_tidy_fixes: result.yml - request_changes: true + - name: Run clang-tidy-pr-comments action + uses: platisd/clang-tidy-pr-comments@master + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + clang_tidy_fixes: result.yml + request_changes: true diff --git a/.github/workflows/printer-linter-pr-post.yml b/.github/workflows/printer-linter-pr-post.yml index 6a79714e59..f6c0924d1c 100644 --- a/.github/workflows/printer-linter-pr-post.yml +++ b/.github/workflows/printer-linter-pr-post.yml @@ -1,81 +1,81 @@ name: printer-linter-pr-post on: - workflow_run: - workflows: [ "printer-linter-pr-diagnose" ] - types: [ completed ] + workflow_run: + workflows: ["printer-linter-pr-diagnose"] + types: [completed] jobs: - clang-tidy-results: - # Trigger the job only if the previous (insecure) workflow completed successfully - if: ${{ github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success' }} - runs-on: ubuntu-latest - steps: - - name: Download analysis results - uses: actions/github-script@v3.1.0 - with: - script: | - let artifacts = await github.actions.listWorkflowRunArtifacts({ - owner: context.repo.owner, - repo: context.repo.repo, - run_id: ${{github.event.workflow_run.id }}, - }); - let matchArtifact = artifacts.data.artifacts.filter((artifact) => { - return artifact.name == "printer-linter-result" - })[0]; - let download = await github.actions.downloadArtifact({ - owner: context.repo.owner, - repo: context.repo.repo, - artifact_id: matchArtifact.id, - archive_format: "zip", - }); - let fs = require("fs"); - fs.writeFileSync("${{github.workspace}}/printer-linter-result.zip", Buffer.from(download.data)); + clang-tidy-results: + # Trigger the job only if the previous (insecure) workflow completed successfully + if: ${{ github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success' }} + runs-on: ubuntu-latest + steps: + - name: Download analysis results + uses: actions/github-script@v3.1.0 + with: + script: | + let artifacts = await github.actions.listWorkflowRunArtifacts({ + owner: context.repo.owner, + repo: context.repo.repo, + run_id: ${{github.event.workflow_run.id }}, + }); + let matchArtifact = artifacts.data.artifacts.filter((artifact) => { + return artifact.name == "printer-linter-result" + })[0]; + let download = await github.actions.downloadArtifact({ + owner: context.repo.owner, + repo: context.repo.repo, + artifact_id: matchArtifact.id, + archive_format: "zip", + }); + let fs = require("fs"); + fs.writeFileSync("${{github.workspace}}/printer-linter-result.zip", Buffer.from(download.data)); - - name: Set environment variables - run: | - mkdir printer-linter-result - unzip printer-linter-result.zip -d printer-linter-result - echo "pr_id=$(cat printer-linter-result/pr-id.txt)" >> $GITHUB_ENV - echo "pr_head_repo=$(cat printer-linter-result/pr-head-repo.txt)" >> $GITHUB_ENV - echo "pr_head_ref=$(cat printer-linter-result/pr-head-ref.txt)" >> $GITHUB_ENV + - name: Set environment variables + run: | + mkdir printer-linter-result + unzip printer-linter-result.zip -d printer-linter-result + echo "pr_id=$(cat printer-linter-result/pr-id.txt)" >> $GITHUB_ENV + echo "pr_head_repo=$(cat printer-linter-result/pr-head-repo.txt)" >> $GITHUB_ENV + echo "pr_head_ref=$(cat printer-linter-result/pr-head-ref.txt)" >> $GITHUB_ENV - - uses: actions/checkout@v3 - with: - repository: ${{ env.pr_head_repo }} - ref: ${{ env.pr_head_ref }} - persist-credentials: false + - uses: actions/checkout@v3 + with: + repository: ${{ env.pr_head_repo }} + ref: ${{ env.pr_head_ref }} + persist-credentials: false - - name: Redownload analysis results - uses: actions/github-script@v3.1.0 - with: - script: | - let artifacts = await github.actions.listWorkflowRunArtifacts({ - owner: context.repo.owner, - repo: context.repo.repo, - run_id: ${{github.event.workflow_run.id }}, - }); - let matchArtifact = artifacts.data.artifacts.filter((artifact) => { - return artifact.name == "printer-linter-result" - })[0]; - let download = await github.actions.downloadArtifact({ - owner: context.repo.owner, - repo: context.repo.repo, - artifact_id: matchArtifact.id, - archive_format: "zip", - }); - let fs = require("fs"); - fs.writeFileSync("${{github.workspace}}/printer-linter-result.zip", Buffer.from(download.data)); + - name: Redownload analysis results + uses: actions/github-script@v3.1.0 + with: + script: | + let artifacts = await github.actions.listWorkflowRunArtifacts({ + owner: context.repo.owner, + repo: context.repo.repo, + run_id: ${{github.event.workflow_run.id }}, + }); + let matchArtifact = artifacts.data.artifacts.filter((artifact) => { + return artifact.name == "printer-linter-result" + })[0]; + let download = await github.actions.downloadArtifact({ + owner: context.repo.owner, + repo: context.repo.repo, + artifact_id: matchArtifact.id, + archive_format: "zip", + }); + let fs = require("fs"); + fs.writeFileSync("${{github.workspace}}/printer-linter-result.zip", Buffer.from(download.data)); - - name: Extract analysis results - run: | - mkdir printer-linter-result - unzip printer-linter-result.zip -d printer-linter-result + - name: Extract analysis results + run: | + mkdir printer-linter-result + unzip printer-linter-result.zip -d printer-linter-result - - name: Run clang-tidy-pr-comments action - uses: platisd/clang-tidy-pr-comments@fix_suggestions_for_multiline_comments - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - clang_tidy_fixes: printer-linter-result/fixes.yml - pull_request_id: ${{ env.pr_id }} - request_changes: true + - name: Run clang-tidy-pr-comments action + uses: platisd/clang-tidy-pr-comments@master + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + clang_tidy_fixes: printer-linter-result/fixes.yml + pull_request_id: ${{ env.pr_id }} + request_changes: true From 1e6184448ce823e8a4513ef861fd34786e23d992 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Mon, 12 Dec 2022 11:44:21 +0100 Subject: [PATCH 099/124] Apply suggestions from code review Co-authored-by: Casper Lamboo Co-authored-by: Jelle Spijker --- cura/Settings/ExtruderManager.py | 1 + resources/qml/MachineSettings/ComboBoxWithOptions.qml | 8 ++++---- .../Recommended/RecommendedAdhesionSelector.qml | 7 ++++--- .../Recommended/RecommendedPrintSetup.qml | 6 ++++-- .../Recommended/RecommendedSettingItem.qml | 2 -- .../Recommended/RecommendedStrengthSelector.qml | 4 ++-- .../Recommended/RecommendedSupportSelector.qml | 1 - resources/qml/Toolbar.qml | 6 +++--- resources/qml/Widgets/SingleSettingComboBox.qml | 4 ++-- .../qml/Widgets/SingleSettingExtruderSelectorBar.qml | 4 ++-- resources/qml/Widgets/SingleSettingTextField.qml | 8 ++++---- 11 files changed, 26 insertions(+), 25 deletions(-) diff --git a/cura/Settings/ExtruderManager.py b/cura/Settings/ExtruderManager.py index e83b053d89..e465b6bb68 100755 --- a/cura/Settings/ExtruderManager.py +++ b/cura/Settings/ExtruderManager.py @@ -56,6 +56,7 @@ class ExtruderManager(QObject): """Notify when the user switches the currently active extruder.""" def emitGlobalStackExtrudersChanged(self): + # HACK # The emit function can't be directly connected to another signal. This wrapper function is required. # The extrudersChanged signal is emitted early when changing machines. This triggers it a second time # after the extruder have changed properly. This is important for any QML using ExtruderManager.extruderIds diff --git a/resources/qml/MachineSettings/ComboBoxWithOptions.qml b/resources/qml/MachineSettings/ComboBoxWithOptions.qml index 33ec84aaa2..7ba7c0f701 100644 --- a/resources/qml/MachineSettings/ComboBoxWithOptions.qml +++ b/resources/qml/MachineSettings/ComboBoxWithOptions.qml @@ -74,7 +74,7 @@ UM.TooltipArea return } - if (typeof propertyProvider.properties["options"] == "string") + if (typeof propertyProvider.properties["options"] === "string") { return } @@ -84,9 +84,9 @@ UM.TooltipArea { var key = propertyProvider.properties["options"].keys()[i] var value = propertyProvider.properties["options"][key] - append({ text: value, code: key}) + append({ text: value, code: key }) - if (propertyProvider.properties.value == key) + if (propertyProvider.properties.value === key) { comboBox.currentIndex = i } @@ -132,7 +132,7 @@ UM.TooltipArea onActivated: { var newValue = model.get(index).value - if (propertyProvider.properties.value != newValue && newValue != undefined) + if (propertyProvider.properties.value !== newValue && newValue !== undefined) { if (setValueFunction !== null) { diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml index 3d0c4ac82c..2183ef7d5e 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml @@ -14,8 +14,8 @@ RecommendedSettingSection title: catalog.i18nc("@label", "Adhesion") icon: UM.Theme.getIcon("Adhesion") - enableSectionSwitchVisible: platformAdhesionType.properties.enabled == "True" - enableSectionSwitchChecked: platformAdhesionType.properties.value != "skirt" && platformAdhesionType.properties.value != "none" + enableSectionSwitchVisible: platformAdhesionType.properties.enabled === "True" + enableSectionSwitchChecked: platformAdhesionType.properties.value !== "skirt" && platformAdhesionType.properties.value !== "none" enableSectionSwitchEnabled: recommendedPrintSetup.settingsEnabled tooltipText: catalog.i18nc("@label", "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards.") @@ -30,7 +30,8 @@ RecommendedSettingSection storeIndex: 0 } - function onEnableSectionChanged(state) { + function onEnableSectionChanged(state) + { curaRecommendedMode.setAdhesion(state) } } diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml index 179f2606f8..f78ae38dce 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml @@ -77,7 +77,8 @@ Item Item { height: UM.Theme.getSize("narrow_margin").height } //Spacer - Column { + Column + { id: settingColumn width: parent.width spacing: UM.Theme.getSize("thin_margin").height @@ -117,7 +118,8 @@ Item width: parent.width } - RecommendedAdhesionSelector { + RecommendedAdhesionSelector + { width: parent.width } } diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml index ca9869db68..e07bc3b643 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml @@ -41,7 +41,6 @@ Item onExited: base.hideTooltip() } - Loader { id: settingContainer @@ -86,7 +85,6 @@ Item NumberAnimation { property: "Layout.minimumHeight"; duration: 100; } // Animate section dissapearring as it closes NumberAnimation { property: "opacity"; duration: 100; } - } } } \ No newline at end of file diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml index 57383e6018..0e15397fd7 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2022 Ultimaker +// Copyright (c) 2022 UltiMaker // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.7 @@ -40,7 +40,7 @@ RecommendedSettingSection settingName: "infill_sparse_density" updateAllExtruders: true // disable slider when gradual support is enabled - enabled: parseInt(infillSteps.properties.value) == 0 + enabled: parseInt(infillSteps.properties.value) === 0 function updateSetting(value) { diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml index 2ae6dfcb41..44b3d28e24 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml @@ -59,7 +59,6 @@ RecommendedSettingSection settingControl: Cura.SingleSettingExtruderSelectorBar { - extruderSettingName: "support_extruder_nr" } }, diff --git a/resources/qml/Toolbar.qml b/resources/qml/Toolbar.qml index 894f280240..fd48ef7448 100644 --- a/resources/qml/Toolbar.qml +++ b/resources/qml/Toolbar.qml @@ -137,10 +137,10 @@ Item delegate: Cura.ExtruderButton { extruder: model - isTopElement: extrudersModel.getItem(0).id == model.id - isBottomElement: extrudersModel.getItem(extrudersModel.rowCount() - 1).id == model.id + isTopElement: extrudersModel.getItem(0).id === model.id + isBottomElement: extrudersModel.getItem(extrudersModel.rowCount() - 1).id === model.id text: catalog.i18ncp("@label %1 is filled in with the name of an extruder", "Print Selected Model with %1", "Print Selected Models with %1", UM.Selection.selectionCount).arg(extruder.name) - checked: Cura.ExtruderManager.selectedObjectExtruders.indexOf(extruder.id) != -1 + checked: Cura.ExtruderManager.selectedObjectExtruders.indexOf(extruder.id) !== -1 enabled: UM.Selection.hasSelection && extruder.stack.isEnabled font: UM.Theme.getFont("small_emphasis") diff --git a/resources/qml/Widgets/SingleSettingComboBox.qml b/resources/qml/Widgets/SingleSettingComboBox.qml index 4807359484..338e14b144 100644 --- a/resources/qml/Widgets/SingleSettingComboBox.qml +++ b/resources/qml/Widgets/SingleSettingComboBox.qml @@ -43,7 +43,7 @@ Cura.ComboBox { var value = propertyProvider.properties["options"][key] comboboxModel.append({ text: value, code: key}) - if (propertyProvider.properties.value == key) + if (propertyProvider.properties.value === key) { // The combobox is cleared after each value change so the currentIndex must be set each time. currentIndex = i @@ -81,7 +81,7 @@ Cura.ComboBox { function parseValueAndUpdateSetting() { - if (comboboxModel.get(currentIndex) && comboboxModel.get(currentIndex).code != propertyProvider.properties.value) + if (comboboxModel.get(currentIndex) && comboboxModel.get(currentIndex).code !== propertyProvider.properties.value) { updateSetting(comboboxModel.get(currentIndex).code) } diff --git a/resources/qml/Widgets/SingleSettingExtruderSelectorBar.qml b/resources/qml/Widgets/SingleSettingExtruderSelectorBar.qml index 80f77304c3..d753bb9167 100644 --- a/resources/qml/Widgets/SingleSettingExtruderSelectorBar.qml +++ b/resources/qml/Widgets/SingleSettingExtruderSelectorBar.qml @@ -56,10 +56,10 @@ Row Cura.ExtruderButton { - anchors.margins : 0 + anchors.margins: 0 padding: 0 extruder: model - checked: extruder.index == selectedIndex + checked: extruder.index === selectedIndex iconScale: 0.8 font: UM.Theme.getFont("tiny_emphasis") buttonSize: UM.Theme.getSize("small_button").width diff --git a/resources/qml/Widgets/SingleSettingTextField.qml b/resources/qml/Widgets/SingleSettingTextField.qml index d1dc3aab90..5bff7fdb5a 100644 --- a/resources/qml/Widgets/SingleSettingTextField.qml +++ b/resources/qml/Widgets/SingleSettingTextField.qml @@ -87,13 +87,13 @@ UM.TextField function parseValueUpdateSetting() { - if (propertyProvider.properties.value == text || (parseFloat(propertyProvider.properties.value) == parseFloat(text) && !isNan(parseFloat(text)))) + if (propertyProvider.properties.value === text || (parseFloat(propertyProvider.properties.value) === parseFloat(text))) { // Don't set the property value from the control. It already has the same value return } - if (propertyProvider && text != propertyProvider.properties.value) + if (propertyProvider && text !== propertyProvider.properties.value) { updateSetting(text); } @@ -119,7 +119,7 @@ UM.TextField State { name: "validationError" - when: propertyProvider.properties.validationState == "ValidatorState.Exception" || propertyProvider.properties.validationState == "ValidatorState.MinimumError" || propertyProvider.properties.validationState == "ValidatorState.MaximumError" + when: propertyProvider.properties.validationState === "ValidatorState.Exception" || propertyProvider.properties.validationState === "ValidatorState.MinimumError" || propertyProvider.properties.validationState === "ValidatorState.MaximumError" PropertyChanges { target: background @@ -130,7 +130,7 @@ UM.TextField State { name: "validationWarning" - when: propertyProvider.properties.validationState == "ValidatorState.MinimumWarning" || propertyProvider.properties.validationState == "ValidatorState.MaximumWarning" + when: propertyProvider.properties.validationState === "ValidatorState.MinimumWarning" || propertyProvider.properties.validationState === "ValidatorState.MaximumWarning" PropertyChanges { target: background From 7e8eca3b03516bc1b449a6064aaa4b711596582c Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Mon, 12 Dec 2022 11:58:22 +0100 Subject: [PATCH 100/124] Fix size of `ColorDialog` CURA-9997 --- resources/qml/ColorDialog.qml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/resources/qml/ColorDialog.qml b/resources/qml/ColorDialog.qml index e5216a3404..8ee1352e87 100644 --- a/resources/qml/ColorDialog.qml +++ b/resources/qml/ColorDialog.qml @@ -28,8 +28,11 @@ UM.Dialog // however with the current implementation of the dialog this is not possible, so instead we calculate // the size of the dialog ourselves. // Ugly workaround for windows having overlapping elements due to incorrect dialog width - minimumWidth: content.width + (Qt.platform.os == "windows" ? 4 * margin : 2 * margin) - minimumHeight: content.height + footer.height + (Qt.platform.os == "windows" ? 5 * margin : 3 * margin) + minimumWidth: content.width + (Qt.platform.os === "windows" ? 4 * margin : 2 * margin) + minimumHeight: { + const footerHeight = Math.max(okButton.height, cancelButton.height); + return content.height + footerHeight + (Qt.platform.os === "windows" ? 5 * margin : 3 * margin); + } property alias color: colorInput.text property var swatchColors: [ @@ -136,10 +139,12 @@ UM.Dialog rightButtons: [ Cura.TertiaryButton { + id: cancelButton text: catalog.i18nc("@action:button", "Cancel") onClicked: base.close() }, Cura.PrimaryButton { + id: okButton text: catalog.i18nc("@action:button", "OK") onClicked: base.accept() } From 532965fb46f78cfbce74338883fe156aaf5aece8 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Mon, 12 Dec 2022 13:09:59 +0100 Subject: [PATCH 101/124] Disable "Small Feature Max Length", "Small Feature Speed" and "Small Feature Initial Layer Speed" when "small hole size = 0" CURA-9987 --- resources/definitions/fdmprinter.def.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 7522227940..7f0edb21ba 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -8161,6 +8161,7 @@ "small_feature_max_length": { "label": "Small Feature Max Length", + "enabled": "small_hole_max_size > 0", "description": "Feature outlines that are shorter than this length will be printed using Small Feature Speed.", "unit": "mm", "type": "float", @@ -8174,6 +8175,7 @@ "small_feature_speed_factor": { "label": "Small Feature Speed", + "enabled": "small_hole_max_size > 0", "description": "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy.", "unit": "%", "type": "float", @@ -8186,6 +8188,7 @@ "small_feature_speed_factor_0": { "label": "Small Feature Initial Layer Speed", + "enabled": "small_hole_max_size > 0", "description": "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy.", "unit": "%", "type": "float", From c6cc9ee6ec1025b8b101d0339a0b6b4913034aeb Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Mon, 12 Dec 2022 14:05:39 +0100 Subject: [PATCH 102/124] Update validators for SettingTextField to use strings from our validators. You can't access the components directly from javascript without instantiating them so they are instantiated here first. CURA-9793 --- resources/qml/Settings/SettingTextField.qml | 23 +++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/resources/qml/Settings/SettingTextField.qml b/resources/qml/Settings/SettingTextField.qml index 4e72bca93e..366fd06517 100644 --- a/resources/qml/Settings/SettingTextField.qml +++ b/resources/qml/Settings/SettingTextField.qml @@ -4,7 +4,7 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 -import UM 1.5 as UM +import UM 1.7 as UM SettingItem { @@ -159,7 +159,26 @@ SettingItem // should be done as little as possible) clip: definition.type == "str" || definition.type == "[int]" - validator: RegularExpressionValidator { regularExpression: (definition.type == "[int]") ? /^\[?(\s*-?[0-9]{0,11}\s*,)*(\s*-?[0-9]{0,11})\s*\]?$/ : (definition.type == "int") ? /^-?[0-9]{0,12}$/ : (definition.type == "float") ? /^-?[0-9]{0,11}[.,]?[0-9]{0,3}$/ : /^.*$/ } // definition.type property from parent loader used to disallow fractional number entry + readonly property UM.IntValidator intValidator: UM.IntValidator {} + readonly property UM.FloatValidator floatValidator: UM.FloatValidator {} + readonly property UM.IntListValidator intListValidator: UM.IntListValidator {} + validator: RegularExpressionValidator + { + regularExpression: + { + switch (definition.type) + { + case "[int]": + return new RegExp(intListValidator.regexString) + case "int": + return new RegExp(intValidator.regexString) + case "float": + return new RegExp(floatValidator.regexString) + default: + return new RegExp("^.*$") + } + } + } Binding { From f52638ca756b84c26ec0a54f4a540e527e49092a Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Mon, 12 Dec 2022 14:06:30 +0100 Subject: [PATCH 103/124] Update extrudermanager in tests to mock Application. CURA-9793 --- tests/conftest.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index efe9141e29..377a525ba7 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -6,6 +6,7 @@ from unittest.mock import MagicMock, patch import pytest +from UM.Application import Application from UM.Qt.QtApplication import QtApplication # QtApplication import is required, even though it isn't used. from cura.CuraApplication import CuraApplication @@ -22,6 +23,12 @@ def application() -> CuraApplication: app = MagicMock() return app +@pytest.fixture() +def um_application() -> Application: + app = MagicMock() + app.getInstance = MagicMock(return_value=app) + return app + # Returns a MachineActionManager instance. @pytest.fixture() @@ -43,14 +50,15 @@ def container_registry(application, global_stack) -> ContainerRegistry: @pytest.fixture() -def extruder_manager(application, container_registry) -> ExtruderManager: +def extruder_manager(application, um_application, container_registry) -> ExtruderManager: if ExtruderManager.getInstance() is not None: # Reset the data ExtruderManager._ExtruderManager__instance = None with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=application)): with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): - manager = ExtruderManager() + with patch("UM.Application.Application.getInstance", um_application): + manager = ExtruderManager() return manager From 8780a2c4a0048db7f24b17b49266b12a6a64c3cd Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Mon, 12 Dec 2022 14:12:32 +0100 Subject: [PATCH 104/124] Move validators to top of file. CURA-9793 --- resources/qml/Settings/SettingTextField.qml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/resources/qml/Settings/SettingTextField.qml b/resources/qml/Settings/SettingTextField.qml index 366fd06517..d8e90e4951 100644 --- a/resources/qml/Settings/SettingTextField.qml +++ b/resources/qml/Settings/SettingTextField.qml @@ -14,6 +14,11 @@ SettingItem property string textBeforeEdit property bool textHasChanged property bool focusGainedByClick: false + + readonly property UM.IntValidator intValidator: UM.IntValidator {} + readonly property UM.FloatValidator floatValidator: UM.FloatValidator {} + readonly property UM.IntListValidator intListValidator: UM.IntListValidator {} + onFocusReceived: { textHasChanged = false; @@ -159,9 +164,6 @@ SettingItem // should be done as little as possible) clip: definition.type == "str" || definition.type == "[int]" - readonly property UM.IntValidator intValidator: UM.IntValidator {} - readonly property UM.FloatValidator floatValidator: UM.FloatValidator {} - readonly property UM.IntListValidator intListValidator: UM.IntListValidator {} validator: RegularExpressionValidator { regularExpression: From e05c70ae38956887837b88fa458ab51da8977fd8 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Mon, 12 Dec 2022 14:22:38 +0100 Subject: [PATCH 105/124] Refactor ComponentWithIcon to use contents instead of loader. CURA-9793 --- .../Recommended/RecommendedSettingItem.qml | 2 +- .../Recommended/RecommendedStrengthSelector.qml | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml index e07bc3b643..ceebc3808e 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml @@ -41,7 +41,7 @@ Item onExited: base.hideTooltip() } - Loader + Item { id: settingContainer height: childrenRect.height diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml index 0e15397fd7..75e8abd676 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml @@ -75,7 +75,8 @@ RecommendedSettingSection { Layout.fillWidth: true source: UM.Theme.getIcon("PrintWalls") - displayComponent: Cura.SingleSettingTextField + + Cura.SingleSettingTextField { width: parent.width settingName: "wall_thickness" @@ -88,7 +89,8 @@ RecommendedSettingSection { Layout.fillWidth: true source: UM.Theme.getIcon("PrintTopBottom") - displayComponent: Cura.SingleSettingTextField + + Cura.SingleSettingTextField { width: parent.width settingName: "top_bottom_thickness" From 205902ee68b7e43fb140ec7d2a410601eb610a6b Mon Sep 17 00:00:00 2001 From: Rijk van Manen Date: Mon, 12 Dec 2022 15:39:28 +0100 Subject: [PATCH 106/124] printer linter format PP-296 --- resources/definitions/ultimaker2.def.json | 173 ++++++++--------- .../definitions/ultimaker2_extended.def.json | 26 ++- .../ultimaker2_extended_olsson.def.json | 10 +- .../ultimaker2_extended_plus.def.json | 26 ++- resources/definitions/ultimaker2_go.def.json | 79 ++++---- .../definitions/ultimaker2_olsson.def.json | 9 +- .../definitions/ultimaker2_plus.def.json | 140 ++++++++------ .../ultimaker2_plus_connect.def.json | 166 ++++++++++------ resources/definitions/ultimaker3.def.json | 178 +++++++++++------- .../definitions/ultimaker3_extended.def.json | 51 ++--- .../definitions/ultimaker_original.def.json | 127 +++++++------ .../ultimaker_original_dual.def.json | 120 ++++++------ .../ultimaker_original_plus.def.json | 34 ++-- resources/definitions/ultimaker_s3.def.json | 129 +++++++------ resources/definitions/ultimaker_s5.def.json | 142 +++++++------- 15 files changed, 790 insertions(+), 620 deletions(-) diff --git a/resources/definitions/ultimaker2.def.json b/resources/definitions/ultimaker2.def.json index b28ce07770..f68d51dd6c 100644 --- a/resources/definitions/ultimaker2.def.json +++ b/resources/definitions/ultimaker2.def.json @@ -2,102 +2,105 @@ "version": 2, "name": "Ultimaker 2", "inherits": "ultimaker", - "metadata": { + "metadata": + { "visible": true, "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "weight": 3, "file_formats": "text/x-gcode", "platform": "ultimaker2_platform.obj", - "platform_texture": "Ultimaker2backplate.png", - "platform_offset": [9, 0, 0], - "has_materials": false, - "has_machine_quality": true, - "preferred_variant_name": "0.4 mm", - "machine_extruder_trains": - { - "0": "ultimaker2_extruder_0" - }, + "exclude_materials": [ + "generic_hips", + "generic_petg", + "structur3d_dap100silicone", + "ultimaker_petg_red", + "ultimaker_petg_blue", + "ultimaker_petg_grey", + "ultimaker_petg_black", + "ultimaker_petg_green", + "ultimaker_petg_white", + "ultimaker_petg_orange", + "ultimaker_petg_silver", + "ultimaker_petg_yellow", + "ultimaker_petg_transparent", + "ultimaker_petg_red_translucent", + "ultimaker_petg_blue_translucent", + "ultimaker_petg_green_translucent", + "ultimaker_petg_yellow_fluorescent" + ], "firmware_file": "MarlinUltimaker2.hex", - "exclude_materials": [ "generic_hips", "generic_petg", "structur3d_dap100silicone", "ultimaker_petg_red", "ultimaker_petg_blue", "ultimaker_petg_grey", "ultimaker_petg_black", "ultimaker_petg_green", "ultimaker_petg_white", "ultimaker_petg_orange", "ultimaker_petg_silver", "ultimaker_petg_yellow", "ultimaker_petg_transparent", "ultimaker_petg_red_translucent", "ultimaker_petg_blue_translucent", "ultimaker_petg_green_translucent", "ultimaker_petg_yellow_fluorescent"] + "has_machine_quality": true, + "has_materials": false, + "machine_extruder_trains": { "0": "ultimaker2_extruder_0" }, + "platform_offset": [ + 9, + 0, + 0 + ], + "platform_texture": "Ultimaker2backplate.png", + "preferred_variant_name": "0.4 mm", + "weight": 3 }, - "overrides": { - "machine_name": { "default_value": "Ultimaker 2" }, - "machine_start_gcode" : { - "value": "\"G0 F3000 Y50 ;avoid prime blob\" if machine_gcode_flavor == \"UltiGCode\" else \"G21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\nG28 Z0 ;move Z to bottom endstops\\nG28 X0 Y0 ;move X/Y to endstops\\nG1 X15 Y0 F4000 ;move X/Y to front of printer\\nG1 Z15.0 F9000 ;move the platform to 15mm\\nG92 E0 ;zero the extruded length\\nG1 F200 E10 ;extrude 10 mm of feed stock\\nG92 E0 ;zero the extruded length again\\nG1 Y50 F9000\\n;Put printing message on LCD screen\\nM117 Printing...\"" - }, - "machine_end_gcode" : { - "value": "\";Version _2.6 of the firmware can abort the print too early if the file ends\\n;too soon. However if the file hasn't ended yet because there are comments at\\n;the end of the file, it won't abort yet. Therefore we have to put at least 512\\n;bytes at the end of the g-code so that the file is not yet finished by the\\n;time that the motion planner gets flushed. With firmware version _3.3 this\\n;should be fixed, so this comment wouldn't be necessary any more. Now we have\\n;to pad this text to make precisely 512 bytes.\" if machine_gcode_flavor == \"UltiGCode\" else \"M104 S0 ;extruder heater off\\nM140 S0 ;heated bed heater off (if you have it)\\nG91 ;relative positioning\\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\\nM84 ;steppers off\\nG90 ;absolute positioning\\n;Version _2.6 of the firmware can abort the print too early if the file ends\\n;too soon. However if the file hasn't ended yet because there are comments at\\n;the end of the file, it won't abort yet. Therefore we have to put at least 512\\n;bytes at the end of the g-code so that the file is not yet finished by the\\n;time that the motion planner gets flushed. With firmware version _3.3 this\\n;should be fixed, so this comment wouldn't be necessary any more. Now we have\\n;to pad this text to make precisely 512 bytes.\"" - }, - "machine_width": { - "default_value": 223 - }, - "machine_depth": { - "default_value": 223 - }, - "machine_height": { - "default_value": 205 - }, - "machine_heated_bed": { - "default_value": true + "overrides": + { + "cool_fan_speed_0": { "value": 0 }, + "gantry_height": { "value": "48" }, + "layer_height_0": { "value": 0.3 }, + "machine_acceleration": { "default_value": 3000 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 223 }, + "machine_disallowed_areas": + { + "default_value": [ + [ + [-115, 112.5], + [-82, 112.5], + [-84, 102.5], + [-115, 102.5] + ], + [ + [115, 112.5], + [115, 102.5], + [110, 102.5], + [108, 112.5] + ], + [ + [-115, -112.5], + [-115, -104.5], + [-84, -104.5], + [-82, -112.5] + ], + [ + [115, -112.5], + [108, -112.5], + [110, -104.5], + [115, -104.5] + ] + ] }, + "machine_end_gcode": { "value": "\";Version _2.6 of the firmware can abort the print too early if the file ends\\n;too soon. However if the file hasn't ended yet because there are comments at\\n;the end of the file, it won't abort yet. Therefore we have to put at least 512\\n;bytes at the end of the g-code so that the file is not yet finished by the\\n;time that the motion planner gets flushed. With firmware version _3.3 this\\n;should be fixed, so this comment wouldn't be necessary any more. Now we have\\n;to pad this text to make precisely 512 bytes.\" if machine_gcode_flavor == \"UltiGCode\" else \"M104 S0 ;extruder heater off\\nM140 S0 ;heated bed heater off (if you have it)\\nG91 ;relative positioning\\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\\nM84 ;steppers off\\nG90 ;absolute positioning\\n;Version _2.6 of the firmware can abort the print too early if the file ends\\n;too soon. However if the file hasn't ended yet because there are comments at\\n;the end of the file, it won't abort yet. Therefore we have to put at least 512\\n;bytes at the end of the g-code so that the file is not yet finished by the\\n;time that the motion planner gets flushed. With firmware version _3.3 this\\n;should be fixed, so this comment wouldn't be necessary any more. Now we have\\n;to pad this text to make precisely 512 bytes.\"" }, + "machine_gcode_flavor": { "default_value": "UltiGCode" }, "machine_head_with_fans_polygon": { "default_value": [ - [ -42, 12 ], - [ -42, -32 ], - [ 62, 12 ], - [ 62, -32 ] + [-42, 12], + [-42, -32], + [62, 12], + [62, -32] ] }, - "machine_center_is_zero": { - "default_value": false - }, - "gantry_height": { - "value": "48" - }, - "machine_use_extruder_offset_to_offset_coords": { - "default_value": true - }, - "machine_gcode_flavor": { - "default_value": "UltiGCode" - }, - "machine_disallowed_areas": { - "default_value": [ - [[-115, 112.5], [ -82, 112.5], [ -84, 102.5], [-115, 102.5]], - [[ 115, 112.5], [ 115, 102.5], [ 110, 102.5], [ 108, 112.5]], - [[-115, -112.5], [-115, -104.5], [ -84, -104.5], [ -82, -112.5]], - [[ 115, -112.5], [ 108, -112.5], [ 110, -104.5], [ 115, -104.5]] - ]}, - "machine_nozzle_tip_outer_diameter": { - "default_value": 1 - }, - "machine_nozzle_head_distance": { - "default_value": 3 - }, - "machine_max_feedrate_x": { - "default_value": 300 - }, - "machine_max_feedrate_y": { - "default_value": 300 - }, - "machine_max_feedrate_z": { - "default_value": 40 - }, - "machine_acceleration": { - "default_value": 3000 - }, - "support_z_distance": { - "value": "0.1" - }, - "cool_fan_speed_0": { - "value": 0 - }, - "layer_height_0": { - "value": 0.3 - }, - "speed_slowdown_layers": { - "value": 2 - } + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 205 }, + "machine_max_feedrate_x": { "default_value": 300 }, + "machine_max_feedrate_y": { "default_value": 300 }, + "machine_max_feedrate_z": { "default_value": 40 }, + "machine_name": { "default_value": "Ultimaker 2" }, + "machine_nozzle_head_distance": { "default_value": 3 }, + "machine_nozzle_tip_outer_diameter": { "default_value": 1 }, + "machine_start_gcode": { "value": "\"G0 F3000 Y50 ;avoid prime blob\" if machine_gcode_flavor == \"UltiGCode\" else \"G21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\nG28 Z0 ;move Z to bottom endstops\\nG28 X0 Y0 ;move X/Y to endstops\\nG1 X15 Y0 F4000 ;move X/Y to front of printer\\nG1 Z15.0 F9000 ;move the platform to 15mm\\nG92 E0 ;zero the extruded length\\nG1 F200 E10 ;extrude 10 mm of feed stock\\nG92 E0 ;zero the extruded length again\\nG1 Y50 F9000\\n;Put printing message on LCD screen\\nM117 Printing...\"" }, + "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, + "machine_width": { "default_value": 223 }, + "speed_slowdown_layers": { "value": 2 }, + "support_z_distance": { "value": "0.1" } } -} +} \ No newline at end of file diff --git a/resources/definitions/ultimaker2_extended.def.json b/resources/definitions/ultimaker2_extended.def.json index 572634c602..92adfae7e4 100644 --- a/resources/definitions/ultimaker2_extended.def.json +++ b/resources/definitions/ultimaker2_extended.def.json @@ -2,25 +2,21 @@ "version": 2, "name": "Ultimaker 2 Extended", "inherits": "ultimaker2", - "metadata": { + "metadata": + { "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "quality_definition": "ultimaker2", - "weight": 3, "file_formats": "text/x-gcode", "platform": "ultimaker2_platform.obj", + "firmware_file": "MarlinUltimaker2extended.hex", + "machine_extruder_trains": { "0": "ultimaker2_extended_extruder_0" }, "platform_texture": "Ultimaker2Extendedbackplate.png", - "machine_extruder_trains": - { - "0": "ultimaker2_extended_extruder_0" - }, - "firmware_file": "MarlinUltimaker2extended.hex" + "quality_definition": "ultimaker2", + "weight": 3 }, - - "overrides": { - "machine_name": { "default_value": "Ultimaker 2 Extended" }, - "machine_height": { - "default_value": 305 - } + "overrides": + { + "machine_height": { "default_value": 305 }, + "machine_name": { "default_value": "Ultimaker 2 Extended" } } -} +} \ No newline at end of file diff --git a/resources/definitions/ultimaker2_extended_olsson.def.json b/resources/definitions/ultimaker2_extended_olsson.def.json index d2eb7f9a5d..f2afc8c6d0 100644 --- a/resources/definitions/ultimaker2_extended_olsson.def.json +++ b/resources/definitions/ultimaker2_extended_olsson.def.json @@ -2,11 +2,9 @@ "version": 2, "name": "Ultimaker 2 Extended with Olsson", "inherits": "ultimaker2_extended", - "metadata": { - "has_variants": true - }, - - "overrides": { + "metadata": { "has_variants": true }, + "overrides": + { "machine_name": { "default_value": "Ultimaker 2 Extended with Olsson" } } -} +} \ No newline at end of file diff --git a/resources/definitions/ultimaker2_extended_plus.def.json b/resources/definitions/ultimaker2_extended_plus.def.json index 0242115057..23f8a15f40 100644 --- a/resources/definitions/ultimaker2_extended_plus.def.json +++ b/resources/definitions/ultimaker2_extended_plus.def.json @@ -2,25 +2,21 @@ "version": 2, "name": "Ultimaker 2 Extended+", "inherits": "ultimaker2_plus", - "metadata": { + "metadata": + { "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "quality_definition": "ultimaker2_plus", - "weight": 2, "file_formats": "text/x-gcode", "platform": "ultimaker2_platform.obj", + "firmware_file": "MarlinUltimaker2extended-plus.hex", + "machine_extruder_trains": { "0": "ultimaker2_extended_plus_extruder_0" }, "platform_texture": "Ultimaker2ExtendedPlusbackplate.png", - "machine_extruder_trains": - { - "0": "ultimaker2_extended_plus_extruder_0" - }, - "firmware_file": "MarlinUltimaker2extended-plus.hex" + "quality_definition": "ultimaker2_plus", + "weight": 2 }, - - "overrides": { - "machine_name": { "default_value": "Ultimaker 2 Extended+" }, - "machine_height": { - "default_value": 305 - } + "overrides": + { + "machine_height": { "default_value": 305 }, + "machine_name": { "default_value": "Ultimaker 2 Extended+" } } -} +} \ No newline at end of file diff --git a/resources/definitions/ultimaker2_go.def.json b/resources/definitions/ultimaker2_go.def.json index 774d215bef..e7ba8d1358 100644 --- a/resources/definitions/ultimaker2_go.def.json +++ b/resources/definitions/ultimaker2_go.def.json @@ -1,44 +1,59 @@ { - "version": 2, + "version": 2, "name": "Ultimaker 2 Go", "inherits": "ultimaker2", - "metadata": { + "metadata": + { "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "quality_definition": "ultimaker2", - "weight": 3, "file_formats": "text/x-gcode", "platform": "ultimaker2go_platform.obj", + "firmware_file": "MarlinUltimaker2go.hex", + "machine_extruder_trains": { "0": "ultimaker2_go_extruder_0" }, + "platform_offset": [ + 0, + 0, + 0 + ], "platform_texture": "Ultimaker2Gobackplate.png", - "platform_offset": [0, 0, 0], - "machine_extruder_trains": - { - "0": "ultimaker2_go_extruder_0" - }, - "firmware_file": "MarlinUltimaker2go.hex" + "quality_definition": "ultimaker2", + "weight": 3 }, - - "overrides": { - "machine_name": { "default_value": "Ultimaker 2 Go" }, - "machine_width": { - "default_value": 120 - }, - "machine_depth": { - "default_value": 120 - }, - "machine_height": { - "default_value": 115 - }, - "machine_heated_bed": { - "default_value": false - }, - "machine_disallowed_areas": { + "overrides": + { + "machine_depth": { "default_value": 120 }, + "machine_disallowed_areas": + { "default_value": [ - [[-60, 60], [-33, 60], [-35, 52], [-60, 52]], - [[ 60, 60], [ 60, 52], [ 35, 52], [ 33, 60]], - [[-60, -60], [-60, -52], [-35, -52], [-33, -60]], - [[ 60, -60], [ 33, -60], [ 35, -52], [ 60, -52]] + [ + [-60, 60], + [-33, 60], + [-35, 52], + [-60, 52] + ], + [ + [60, 60], + [60, 52], + [35, 52], + [33, 60] + ], + [ + [-60, -60], + [-60, -52], + [-35, -52], + [-33, -60] + ], + [ + [60, -60], + [33, -60], + [35, -52], + [60, -52] + ] ] - } + }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 115 }, + "machine_name": { "default_value": "Ultimaker 2 Go" }, + "machine_width": { "default_value": 120 } } -} +} \ No newline at end of file diff --git a/resources/definitions/ultimaker2_olsson.def.json b/resources/definitions/ultimaker2_olsson.def.json index 2f8b877942..74c562988f 100644 --- a/resources/definitions/ultimaker2_olsson.def.json +++ b/resources/definitions/ultimaker2_olsson.def.json @@ -2,12 +2,13 @@ "version": 2, "name": "Ultimaker 2 with Olsson Block", "inherits": "ultimaker2", - "metadata": { + "metadata": + { "has_variants": true, "quality_definition": "ultimaker2" }, - - "overrides": { + "overrides": + { "machine_name": { "default_value": "Ultimaker 2 with Olsson Block" } } -} +} \ No newline at end of file diff --git a/resources/definitions/ultimaker2_plus.def.json b/resources/definitions/ultimaker2_plus.def.json index 0d4191383d..18b377813a 100644 --- a/resources/definitions/ultimaker2_plus.def.json +++ b/resources/definitions/ultimaker2_plus.def.json @@ -2,72 +2,104 @@ "version": 2, "name": "Ultimaker 2+", "inherits": "ultimaker2", - "metadata": { + "metadata": + { "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "weight": 1, "file_formats": "text/x-gcode", "platform": "ultimaker2_platform.obj", + "exclude_materials": [ + "generic_hips", + "generic_petg", + "generic_bam", + "ultimaker_bam", + "generic_pva", + "ultimaker_pva", + "generic_tough_pla", + "ultimaker_tough_pla_black", + "ultimaker_tough_pla_green", + "ultimaker_tough_pla_red", + "ultimaker_tough_pla_white", + "generic_cffcpe", + "generic_cffpa", + "generic_gffcpe", + "generic_gffpa", + "structur3d_dap100silicone", + "ultimaker_petg_red", + "ultimaker_petg_blue", + "ultimaker_petg_grey", + "ultimaker_petg_black", + "ultimaker_petg_green", + "ultimaker_petg_white", + "ultimaker_petg_orange", + "ultimaker_petg_silver", + "ultimaker_petg_yellow", + "ultimaker_petg_transparent", + "ultimaker_petg_red_translucent", + "ultimaker_petg_blue_translucent", + "ultimaker_petg_green_translucent", + "ultimaker_petg_yellow_fluorescent" + ], + "firmware_file": "MarlinUltimaker2plus.hex", + "first_start_actions": [], + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": { "0": "ultimaker2_plus_extruder_0" }, "platform_texture": "Ultimaker2Plusbackplate.png", "preferred_variant_name": "0.4 mm", - "has_variants": true, - "has_materials": true, - "has_machine_quality": true, - "exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "ultimaker_bam", "generic_pva", "ultimaker_pva", "generic_tough_pla", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", "generic_cffcpe", "generic_cffpa", "generic_gffcpe", "generic_gffpa", "structur3d_dap100silicone", "ultimaker_petg_red", "ultimaker_petg_blue", "ultimaker_petg_grey", "ultimaker_petg_black", "ultimaker_petg_green", "ultimaker_petg_white", "ultimaker_petg_orange", "ultimaker_petg_silver", "ultimaker_petg_yellow", "ultimaker_petg_transparent", "ultimaker_petg_red_translucent", "ultimaker_petg_blue_translucent", "ultimaker_petg_green_translucent", "ultimaker_petg_yellow_fluorescent"], - "first_start_actions": [], "supported_actions": [], - "machine_extruder_trains": - { - "0": "ultimaker2_plus_extruder_0" - }, - "firmware_file": "MarlinUltimaker2plus.hex" + "weight": 1 }, - - "overrides": { - "machine_name": { "default_value": "Ultimaker 2+" }, - "speed_infill": { - "value": "speed_print" - }, - "speed_wall_x": { - "value": "speed_wall" - }, - "layer_height_0": { - "value": "round(machine_nozzle_size / 1.5, 2)" - }, - "speed_support": { - "value": "speed_wall_0" - }, - "machine_height": { - "default_value": 205 - }, - "machine_show_variants": { - "default_value": true - }, - "gantry_height": { - "value": "52" - }, - "machine_nozzle_head_distance": { - "default_value": 5 - }, - "machine_heat_zone_length": { - "default_value": 20 + "overrides": + { + "gantry_height": { "value": "52" }, + "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" }, + "machine_disallowed_areas": + { + "default_value": [ + [ + [-115, 112.5], + [-78, 112.5], + [-80, 102.5], + [-115, 102.5] + ], + [ + [115, 112.5], + [115, 102.5], + [105, 102.5], + [103, 112.5] + ], + [ + [-115, -112.5], + [-115, -104.5], + [-84, -104.5], + [-82, -112.5] + ], + [ + [115, -112.5], + [108, -112.5], + [110, -104.5], + [115, -104.5] + ] + ] }, "machine_head_with_fans_polygon": { "default_value": [ - [ -44, 14 ], - [ -44, -34 ], - [ 64, 14 ], - [ 64, -34 ] + [-44, 14], + [-44, -34], + [64, 14], + [64, -34] ] }, - "machine_disallowed_areas": { - "default_value": [ - [[-115, 112.5], [ -78, 112.5], [ -80, 102.5], [-115, 102.5]], - [[ 115, 112.5], [ 115, 102.5], [ 105, 102.5], [ 103, 112.5]], - [[-115, -112.5], [-115, -104.5], [ -84, -104.5], [ -82, -112.5]], - [[ 115, -112.5], [ 108, -112.5], [ 110, -104.5], [ 115, -104.5]] - ] - } + "machine_heat_zone_length": { "default_value": 20 }, + "machine_height": { "default_value": 205 }, + "machine_name": { "default_value": "Ultimaker 2+" }, + "machine_nozzle_head_distance": { "default_value": 5 }, + "machine_show_variants": { "default_value": true }, + "speed_infill": { "value": "speed_print" }, + "speed_support": { "value": "speed_wall_0" }, + "speed_wall_x": { "value": "speed_wall" } } -} +} \ No newline at end of file diff --git a/resources/definitions/ultimaker2_plus_connect.def.json b/resources/definitions/ultimaker2_plus_connect.def.json index 5674b4f030..ac3c84546d 100644 --- a/resources/definitions/ultimaker2_plus_connect.def.json +++ b/resources/definitions/ultimaker2_plus_connect.def.json @@ -2,87 +2,131 @@ "version": 2, "name": "Ultimaker 2+ Connect", "inherits": "ultimaker2", - "metadata": { + "metadata": + { "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "weight": 1, "file_formats": "application/x-ufp;text/x-gcode", "platform": "ultimaker2_plus_connect_platform.obj", - "platform_texture": "Ultimaker2PlusConnectbackplate.png", - "platform_offset": [-1, -6, 0], - "preferred_variant_name": "0.4 mm", - "has_variants": true, - "has_materials": true, + "exclude_materials": [ + "generic_hips", + "generic_petg", + "generic_bam", + "ultimaker_bam", + "generic_pva", + "ultimaker_pva", + "generic_tough_pla", + "ultimaker_tough_pla_black", + "ultimaker_tough_pla_green", + "ultimaker_tough_pla_red", + "ultimaker_tough_pla_white", + "generic_cffcpe", + "generic_cffpa", + "generic_gffcpe", + "generic_gffpa", + "structur3d_dap100silicone" + ], + "first_start_actions": [], "has_machine_materials": true, "has_machine_quality": true, - "exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "ultimaker_bam", "generic_pva", "ultimaker_pva", "generic_tough_pla", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", "generic_cffcpe", "generic_cffpa", "generic_gffcpe", "generic_gffpa", "structur3d_dap100silicone" ], - "first_start_actions": [], + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": { "0": "ultimaker2_plus_connect_extruder_0" }, + "platform_offset": [ + -1, + -6, + 0 + ], + "platform_texture": "Ultimaker2PlusConnectbackplate.png", + "preferred_variant_name": "0.4 mm", "supported_actions": [], - "machine_extruder_trains": - { - "0": "ultimaker2_plus_connect_extruder_0" - }, + "supports_network_connection": true, "supports_usb_connection": false, - "supports_network_connection": true + "weight": 1 }, - - "overrides": { - "machine_name": { "default_value": "Ultimaker 2+ Connect" }, - "machine_gcode_flavor": { "default_value": "Griffin" }, - "machine_width": { "default_value": 223 }, - "machine_depth": { "default_value": 220 }, - "machine_height": { "default_value": 205 }, - "machine_show_variants": { "default_value": true }, + "overrides": + { "gantry_height": { "value": "52" }, - "machine_nozzle_head_distance": { "default_value": 5 }, - "machine_heat_zone_length": { "default_value": 20 }, + "infill_overlap": { "value": "0" }, + "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'grid'" }, + "infill_wipe_dist": { "value": "0" }, + "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" }, + "machine_depth": { "default_value": 220 }, + "machine_disallowed_areas": + { + "default_value": [ + [ + [-115, 112.5], + [-83, 112.5], + [-85, 104.0], + [-115, 104.0] + ], + [ + [115, 112.5], + [115, 104.0], + [104, 104.0], + [102, 112.5] + ], + [ + [-115, -112.5], + [-115, -104.0], + [-87, -104.0], + [-85, -112.5] + ], + [ + [115, -112.5], + [104, -112.5], + [106, -104.0], + [115, -104.0] + ] + ] + }, + "machine_end_gcode": { "value": "''" }, + "machine_gcode_flavor": { "default_value": "Griffin" }, "machine_head_with_fans_polygon": { "default_value": [ - [ -44, 14 ], - [ -44, -34 ], - [ 64, 14 ], - [ 64, -34 ] + [-44, 14], + [-44, -34], + [64, 14], + [64, -34] ] }, - "machine_disallowed_areas": - { - "default_value": [ - [[-115, 112.5], [ -83, 112.5], [ -85, 104.0], [-115, 104.0]], - [[ 115, 112.5], [ 115, 104.0], [ 104, 104.0], [ 102, 112.5]], - [[-115, -112.5], [-115, -104.0], [ -87, -104.0], [ -85, -112.5]], - [[ 115, -112.5], [ 104, -112.5], [ 106, -104.0], [ 115, -104.0]] - ] - }, - "infill_wipe_dist": { "value": "0" }, - "infill_overlap": { "value": "0" }, - "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'grid'" }, - "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" }, - "optimize_wall_printing_order": { "value": "True" }, - "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" }, - "speed_support": { "value": "speed_wall_0" }, - "material_initial_print_temperature": { - "value": "material_print_temperature", - "maximum_value": 260 - }, - "material_final_print_temperature": { - "value": "material_print_temperature", - "maximum_value": 260 - }, - "material_print_temperature_layer_0": { - "maximum_value": 260 - }, + "machine_heat_zone_length": { "default_value": 20 }, + "machine_height": { "default_value": 205 }, + "machine_name": { "default_value": "Ultimaker 2+ Connect" }, + "machine_nozzle_head_distance": { "default_value": 5 }, + "machine_show_variants": { "default_value": true }, "machine_start_gcode": { "value": "''" }, - "machine_end_gcode": { "value": "''" }, + "machine_width": { "default_value": 223 }, "material_bed_temperature": { "maximum_value": 110 }, "material_bed_temperature_layer_0": { "maximum_value": 110 }, + "material_final_print_temperature": + { + "maximum_value": 260, + "value": "material_print_temperature" + }, + "material_initial_print_temperature": + { + "maximum_value": 260, + "value": "material_print_temperature" + }, "material_print_temperature": { "maximum_value": 260 }, - "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 60" }, + "material_print_temperature_layer_0": { "maximum_value": 260 }, "meshfix_maximum_deviation": { "value": "(layer_height / 3) if magic_spiralize else (layer_height / 4)" }, + "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 60" }, "meshfix_maximum_travel_resolution": { "value": 0.5 }, - "prime_blob_enable": { "enabled": true, "default_value": true, "value": "resolveOrValue('print_sequence') != 'one_at_a_time'" }, + "optimize_wall_printing_order": { "value": "True" }, + "prime_blob_enable": + { + "default_value": true, + "enabled": true, + "value": "resolveOrValue('print_sequence') != 'one_at_a_time'" + }, "retraction_prime_speed": { "value": "15" }, - "retraction_speed": {"value": "45" }, - "speed_wall_x": { "value": "speed_wall" } + "retraction_speed": { "value": "45" }, + "speed_support": { "value": "speed_wall_0" }, + "speed_wall_x": { "value": "speed_wall" }, + "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" } } -} +} \ No newline at end of file diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index eb19058a98..11e99f8460 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -2,85 +2,54 @@ "version": 2, "name": "Ultimaker 3", "inherits": "ultimaker", - "metadata": { + "metadata": + { + "visible": true, "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "visible": true, "file_formats": "application/gzip;text/x-gcode", "platform": "ultimaker3_platform.obj", - "platform_texture": "Ultimaker3backplate.png", - "platform_offset": [0, 0, 0], + "bom_numbers": [ + 9066 + ], + "exclude_materials": [ + "generic_hips", + "generic_cffcpe", + "generic_cffpa", + "generic_gffcpe", + "generic_gffpa", + "structur3d_dap100silicone" + ], + "firmware_update_info": + { + "check_urls": [ "https://software.ultimaker.com/releases/firmware/9066/stable/um-update.swu.version" ], + "id": 9066, + "update_url": "https://ultimaker.com/firmware?utm_source=cura&utm_medium=software&utm_campaign=fw-update" + }, + "first_start_actions": [ "DiscoverUM3Action" ], "has_machine_quality": true, "has_materials": true, "has_variants": true, - "exclude_materials": [ "generic_hips", "generic_cffcpe", "generic_cffpa", "generic_gffcpe", "generic_gffpa", "structur3d_dap100silicone" ], - "preferred_variant_name": "AA 0.4", - "preferred_quality_type": "normal", - "variants_name": "Print core", "machine_extruder_trains": { "0": "ultimaker3_extruder_left", "1": "ultimaker3_extruder_right" }, - "first_start_actions": [ "DiscoverUM3Action" ], + "platform_offset": [ + 0, + 0, + 0 + ], + "platform_texture": "Ultimaker3backplate.png", + "preferred_quality_type": "normal", + "preferred_variant_name": "AA 0.4", "supported_actions": [ "DiscoverUM3Action" ], - "supports_usb_connection": false, "supports_network_connection": true, - "firmware_update_info": { - "id": 9066, - "check_urls": - [ - "https://software.ultimaker.com/releases/firmware/9066/stable/um-update.swu.version" - ], - "update_url": "https://ultimaker.com/firmware?utm_source=cura&utm_medium=software&utm_campaign=fw-update" - }, - "bom_numbers": [ - 9066 - ] + "supports_usb_connection": false, + "variants_name": "Print core" }, - - - - "overrides": { - "machine_name": { "default_value": "Ultimaker 3" }, - "machine_width": { "default_value": 233 }, - "machine_depth": { "default_value": 215 }, - "machine_height": { "default_value": 200 }, - "machine_heated_bed": { "default_value": true }, - "machine_nozzle_heat_up_speed": { "default_value": 1.4 }, - "machine_nozzle_cool_down_speed": { "default_value": 0.8 }, - "machine_head_with_fans_polygon": - { - "default_value": - [ - [ -41.9, -45.8 ], - [ -41.9, 33.9 ], - [ 59.9, 33.9 ], - [ 59.9, -45.8 ] - ] - }, - "machine_gcode_flavor": { "default_value": "Griffin" }, - "machine_max_feedrate_x": { "default_value": 300 }, - "machine_max_feedrate_y": { "default_value": 300 }, - "machine_max_feedrate_z": { "default_value": 40 }, - "machine_acceleration": { "default_value": 3000 }, - "gantry_height": { "value": "60" }, - "machine_disallowed_areas": { "default_value": [ - [[92.8, -53.4], [92.8, -97.5], [116.5, -97.5], [116.5, -53.4]], - [[73.8, 107.5], [73.8, 100.5], [116.5, 100.5], [116.5, 107.5]], - [[74.6, 107.5], [74.6, 100.5], [116.5, 100.5], [116.5, 107.5]], - [[74.9, -97.5], [74.9, -107.5], [116.5, -107.5], [116.5, -97.5]], - [[-116.5, -103.5], [-116.5, -107.5], [-100.9, -107.5], [-100.9, -103.5]], - [[-116.5, 105.8], [-96.9, 105.8], [-96.9, 107.5], [-116.5, 107.5]] - ]}, - "machine_extruder_count": { "default_value": 2 }, - "extruder_prime_pos_abs": { "default_value": true }, - "machine_start_gcode": { "default_value": "" }, - "machine_end_gcode": { "default_value": "G91 ;Relative movement\nG0 F15000 X8.0 Z0.5 E-4.5 ;Wiping+material retraction\nG0 F10000 Z1.5 E4.5 ;Compensation for the retraction\nG90 ;Disable relative movement" }, - "prime_tower_position_x": { "value": "machine_depth - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) - 30" }, - "prime_tower_wipe_enabled": { "default_value": false }, - - "prime_blob_enable": { "enabled": true, "default_value": true, "value": "resolveOrValue('print_sequence') != 'one_at_a_time'" }, + "overrides": + { "acceleration_enabled": { "value": true }, "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 3500)" }, "acceleration_print": { "value": "3500" }, @@ -93,22 +62,97 @@ "cool_fan_speed": { "value": "50" }, "cool_fan_speed_max": { "value": "100" }, "cool_min_speed": { "value": "5" }, + "default_material_print_temperature": { "value": "200" }, + "extruder_prime_pos_abs": { "default_value": true }, + "gantry_height": { "value": "60" }, "infill_overlap": { "value": "0" }, "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" }, "infill_wipe_dist": { "value": "0" }, "jerk_enabled": { "value": "True" }, "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, + "machine_acceleration": { "default_value": 3000 }, + "machine_depth": { "default_value": 215 }, + "machine_disallowed_areas": + { + "default_value": [ + [ + [92.8, -53.4], + [92.8, -97.5], + [116.5, -97.5], + [116.5, -53.4] + ], + [ + [73.8, 107.5], + [73.8, 100.5], + [116.5, 100.5], + [116.5, 107.5] + ], + [ + [74.6, 107.5], + [74.6, 100.5], + [116.5, 100.5], + [116.5, 107.5] + ], + [ + [74.9, -97.5], + [74.9, -107.5], + [116.5, -107.5], + [116.5, -97.5] + ], + [ + [-116.5, -103.5], + [-116.5, -107.5], + [-100.9, -107.5], + [-100.9, -103.5] + ], + [ + [-116.5, 105.8], + [-96.9, 105.8], + [-96.9, 107.5], + [-116.5, 107.5] + ] + ] + }, + "machine_end_gcode": { "default_value": "G91 ;Relative movement\nG0 F15000 X8.0 Z0.5 E-4.5 ;Wiping+material retraction\nG0 F10000 Z1.5 E4.5 ;Compensation for the retraction\nG90 ;Disable relative movement" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "Griffin" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-41.9, -45.8], + [-41.9, 33.9], + [59.9, 33.9], + [59.9, -45.8] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 200 }, + "machine_max_feedrate_x": { "default_value": 300 }, + "machine_max_feedrate_y": { "default_value": 300 }, + "machine_max_feedrate_z": { "default_value": 40 }, "machine_min_cool_heat_time_window": { "value": "15" }, - "default_material_print_temperature": { "value": "200" }, + "machine_name": { "default_value": "Ultimaker 3" }, + "machine_nozzle_cool_down_speed": { "default_value": 0.8 }, + "machine_nozzle_heat_up_speed": { "default_value": 1.4 }, + "machine_start_gcode": { "default_value": "" }, + "machine_width": { "default_value": 233 }, "material_bed_temperature": { "maximum_value": "115" }, "material_bed_temperature_layer_0": { "maximum_value": "115" }, "multiple_mesh_overlap": { "value": "0" }, "optimize_wall_printing_order": { "value": "True" }, + "prime_blob_enable": + { + "default_value": true, + "enabled": true, + "value": "resolveOrValue('print_sequence') != 'one_at_a_time'" + }, "prime_tower_enable": { "default_value": true }, + "prime_tower_position_x": { "value": "machine_depth - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) - 30" }, + "prime_tower_wipe_enabled": { "default_value": false }, "retraction_amount": { "value": "6.5" }, "retraction_hop": { "value": "2" }, - "retraction_hop_enabled": { "value": "extruders_enabled_count > 1" }, + "retraction_hop_enabled": { "value": "extruders_enabled_count > 1" }, "retraction_hop_only_when_collides": { "value": "True" }, "retraction_min_travel": { "value": "5" }, "retraction_prime_speed": { "value": "15" }, @@ -130,4 +174,4 @@ "wall_0_inset": { "value": "0" }, "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" } } -} +} \ No newline at end of file diff --git a/resources/definitions/ultimaker3_extended.def.json b/resources/definitions/ultimaker3_extended.def.json index 970d3a405d..5afbbce1da 100644 --- a/resources/definitions/ultimaker3_extended.def.json +++ b/resources/definitions/ultimaker3_extended.def.json @@ -2,42 +2,45 @@ "version": 2, "name": "Ultimaker 3 Extended", "inherits": "ultimaker3", - "metadata": { + "metadata": + { + "visible": true, "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "quality_definition": "ultimaker3", - "visible": true, "file_formats": "application/gzip;text/x-gcode", "platform": "ultimaker3_platform.obj", - "platform_texture": "Ultimaker3Extendedbackplate.png", - "platform_offset": [0, 0, 0], + "bom_numbers": [ + 9511 + ], + "firmware_update_info": + { + "check_urls": [ "https://software.ultimaker.com/releases/firmware/9066/stable/um-update.swu.version" ], + "id": 9511, + "update_url": "https://ultimaker.com/firmware?utm_source=cura&utm_medium=software&utm_campaign=fw-update" + }, + "first_start_actions": [ "DiscoverUM3Action" ], "has_machine_quality": true, "has_materials": true, "has_variants": true, - "preferred_variant_name": "AA 0.4", - "variants_name": "Print core", "machine_extruder_trains": { "0": "ultimaker3_extended_extruder_left", "1": "ultimaker3_extended_extruder_right" }, - "first_start_actions": [ "DiscoverUM3Action" ], + "platform_offset": [ + 0, + 0, + 0 + ], + "platform_texture": "Ultimaker3Extendedbackplate.png", + "preferred_variant_name": "AA 0.4", + "quality_definition": "ultimaker3", "supported_actions": [ "DiscoverUM3Action" ], - "firmware_update_info": { - "id": 9511, - "check_urls": - [ - "https://software.ultimaker.com/releases/firmware/9066/stable/um-update.swu.version" - ], - "update_url": "https://ultimaker.com/firmware?utm_source=cura&utm_medium=software&utm_campaign=fw-update" - }, - "bom_numbers": [ - 9511 - ] + "variants_name": "Print core" }, - - "overrides": { - "machine_name": { "default_value": "Ultimaker 3 Extended" }, - "machine_height": { "default_value": 300 } + "overrides": + { + "machine_height": { "default_value": 300 }, + "machine_name": { "default_value": "Ultimaker 3 Extended" } } -} +} \ No newline at end of file diff --git a/resources/definitions/ultimaker_original.def.json b/resources/definitions/ultimaker_original.def.json index e9afb3977e..c34dd4aadf 100644 --- a/resources/definitions/ultimaker_original.def.json +++ b/resources/definitions/ultimaker_original.def.json @@ -2,75 +2,84 @@ "version": 2, "name": "Ultimaker Original", "inherits": "ultimaker", - "metadata": { + "metadata": + { "visible": true, "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "weight": 4, "file_formats": "text/x-gcode", "platform": "ultimaker_platform.3mf", - "has_materials": true, - "has_machine_quality": true, - "exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "ultimaker_bam", "generic_pva", "ultimaker_pva", "generic_tough_pla", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", "generic_cffcpe", "generic_cffpa", "generic_gffcpe", "generic_gffpa", "structur3d_dap100silicone", "ultimaker_petg_blue", "ultimaker_petg_grey", "ultimaker_petg_black", "ultimaker_petg_green", "ultimaker_petg_white", "ultimaker_petg_orange", "ultimaker_petg_silver", "ultimaker_petg_yellow", "ultimaker_petg_transparent", "ultimaker_petg_red_translucent", "ultimaker_petg_blue_translucent", "ultimaker_petg_green_translucent", "ultimaker_petg_yellow_fluorescent", "ultimaker_petg_red" ], - "first_start_actions": ["UMOUpgradeSelection", "BedLevel"], - "supported_actions": ["UMOUpgradeSelection", "BedLevel"], - "machine_extruder_trains": - { - "0": "ultimaker_original_extruder_0" - }, + "exclude_materials": [ + "generic_hips", + "generic_petg", + "generic_bam", + "ultimaker_bam", + "generic_pva", + "ultimaker_pva", + "generic_tough_pla", + "ultimaker_tough_pla_black", + "ultimaker_tough_pla_green", + "ultimaker_tough_pla_red", + "ultimaker_tough_pla_white", + "generic_cffcpe", + "generic_cffpa", + "generic_gffcpe", + "generic_gffpa", + "structur3d_dap100silicone", + "ultimaker_petg_blue", + "ultimaker_petg_grey", + "ultimaker_petg_black", + "ultimaker_petg_green", + "ultimaker_petg_white", + "ultimaker_petg_orange", + "ultimaker_petg_silver", + "ultimaker_petg_yellow", + "ultimaker_petg_transparent", + "ultimaker_petg_red_translucent", + "ultimaker_petg_blue_translucent", + "ultimaker_petg_green_translucent", + "ultimaker_petg_yellow_fluorescent", + "ultimaker_petg_red" + ], "firmware_file": "MarlinUltimaker-{baudrate}.hex", - "firmware_hbk_file": "MarlinUltimaker-HBK-{baudrate}.hex" + "firmware_hbk_file": "MarlinUltimaker-HBK-{baudrate}.hex", + "first_start_actions": [ + "UMOUpgradeSelection", + "BedLevel" + ], + "has_machine_quality": true, + "has_materials": true, + "machine_extruder_trains": { "0": "ultimaker_original_extruder_0" }, + "supported_actions": [ + "UMOUpgradeSelection", + "BedLevel" + ], + "weight": 4 }, - - "overrides": { - "machine_name": { "default_value": "Ultimaker Original" }, - "machine_width": { - "default_value": 205 - }, - "machine_height": { - "default_value": 200 - }, - "machine_depth": { - "default_value": 205 - }, - "machine_center_is_zero": { - "default_value": false - }, + "overrides": + { + "cool_fan_speed_0": { "value": 0 }, + "gantry_height": { "value": "55" }, + "infill_before_walls": { "value": "False" }, + "layer_height_0": { "value": 0.3 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 205 }, + "machine_end_gcode": { "value": "'M104 S0 ;extruder heater off' + ('\\nM140 S0 ;heated bed heater off' if machine_heated_bed else '') + '\\nG91 ;relative positioning\\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\\nM84 ;steppers off\\nG90 ;absolute positioning'" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_head_with_fans_polygon": { "default_value": [ - [ -75, 35 ], - [ -75, -18 ], - [ 18, 35 ], - [ 18, -18 ] + [-75, 35], + [-75, -18], + [18, 35], + [18, -18] ] }, - "gantry_height": { - "value": "55" - }, - "machine_use_extruder_offset_to_offset_coords": { - "default_value": true - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 Y50 F9000\n;Put printing message on LCD screen\nM117 Printing..." - }, - "machine_end_gcode": { - "value": "'M104 S0 ;extruder heater off' + ('\\nM140 S0 ;heated bed heater off' if machine_heated_bed else '') + '\\nG91 ;relative positioning\\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\\nM84 ;steppers off\\nG90 ;absolute positioning'" - }, - "infill_before_walls": { - "value": "False" - }, - "cool_fan_speed_0": { - "value": 0 - }, - "layer_height_0": { - "value": 0.3 - }, - "speed_slowdown_layers": { - "value": 2 - } + "machine_height": { "default_value": 200 }, + "machine_name": { "default_value": "Ultimaker Original" }, + "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 Y50 F9000\n;Put printing message on LCD screen\nM117 Printing..." }, + "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, + "machine_width": { "default_value": 205 }, + "speed_slowdown_layers": { "value": 2 } } -} +} \ No newline at end of file diff --git a/resources/definitions/ultimaker_original_dual.def.json b/resources/definitions/ultimaker_original_dual.def.json index bda8a0ce12..59bc4fb8bb 100644 --- a/resources/definitions/ultimaker_original_dual.def.json +++ b/resources/definitions/ultimaker_original_dual.def.json @@ -2,74 +2,88 @@ "version": 2, "name": "Ultimaker Original Dual Extrusion", "inherits": "ultimaker", - "metadata": { + "metadata": + { "visible": true, "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "weight": 4, "file_formats": "text/x-gcode", "platform": "ultimaker_platform.3mf", - "has_materials": true, + "exclude_materials": [ + "generic_hips", + "generic_petg", + "generic_bam", + "ultimaker_bam", + "generic_pva", + "ultimaker_pva", + "generic_tough_pla", + "ultimaker_tough_pla_black", + "ultimaker_tough_pla_green", + "ultimaker_tough_pla_red", + "ultimaker_tough_pla_white", + "generic_cffcpe", + "generic_cffpa", + "generic_gffcpe", + "generic_gffpa", + "structur3d_dap100silicone", + "ultimaker_petg_blue", + "ultimaker_petg_grey", + "ultimaker_petg_black", + "ultimaker_petg_green", + "ultimaker_petg_white", + "ultimaker_petg_orange", + "ultimaker_petg_silver", + "ultimaker_petg_yellow", + "ultimaker_petg_transparent", + "ultimaker_petg_red_translucent", + "ultimaker_petg_blue_translucent", + "ultimaker_petg_green_translucent", + "ultimaker_petg_yellow_fluorescent", + "ultimaker_petg_red" + ], + "firmware_file": "MarlinUltimaker-{baudrate}-dual.hex", + "firmware_hbk_file": "MarlinUltimaker-HBK-{baudrate}-dual.hex", + "first_start_actions": [ + "UMOUpgradeSelection", + "BedLevel" + ], "has_machine_quality": true, - "quality_definition": "ultimaker_original", - "exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "ultimaker_bam", "generic_pva", "ultimaker_pva", "generic_tough_pla", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", "generic_cffcpe", "generic_cffpa", "generic_gffcpe", "generic_gffpa", "structur3d_dap100silicone", "ultimaker_petg_blue", "ultimaker_petg_grey", "ultimaker_petg_black", "ultimaker_petg_green", "ultimaker_petg_white", "ultimaker_petg_orange", "ultimaker_petg_silver", "ultimaker_petg_yellow", "ultimaker_petg_transparent", "ultimaker_petg_red_translucent", "ultimaker_petg_blue_translucent", "ultimaker_petg_green_translucent", "ultimaker_petg_yellow_fluorescent", "ultimaker_petg_red" ], + "has_materials": true, "machine_extruder_trains": { "0": "ultimaker_original_dual_1st", "1": "ultimaker_original_dual_2nd" }, - "firmware_file": "MarlinUltimaker-{baudrate}-dual.hex", - "firmware_hbk_file": "MarlinUltimaker-HBK-{baudrate}-dual.hex", - "first_start_actions": ["UMOUpgradeSelection", "BedLevel"], - "supported_actions": ["UMOUpgradeSelection", "BedLevel"] + "quality_definition": "ultimaker_original", + "supported_actions": [ + "UMOUpgradeSelection", + "BedLevel" + ], + "weight": 4 }, - - "overrides": { - "machine_name": { "default_value": "Ultimaker Original" }, - "machine_width": { - "default_value": 205 - }, - "machine_height": { - "default_value": 200 - }, - "machine_depth": { - "default_value": 195 - }, - "machine_center_is_zero": { - "default_value": false - }, + "overrides": + { + "gantry_height": { "value": "55" }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 195 }, + "machine_end_gcode": { "default_value": "M104 T0 S0 ;1st extruder heater off\nM104 T1 S0 ;2nd extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_head_with_fans_polygon": { "default_value": [ - [ -75, 35 ], - [ -75, -18 ], - [ 18, 35 ], - [ 18, -18 ] + [-75, 35], + [-75, -18], + [18, 35], + [18, -18] ] }, - "gantry_height": { - "value": "55" - }, - "machine_use_extruder_offset_to_offset_coords": { - "default_value": true - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nT1 ;Switch to the 2nd extruder\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F200 E-{switch_extruder_retraction_amount}\nT0 ;Switch to the 1st extruder\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." - }, - "machine_end_gcode": { - "default_value": "M104 T0 S0 ;1st extruder heater off\nM104 T1 S0 ;2nd extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning" - }, - "machine_extruder_count": { - "default_value": 2 - }, - "prime_tower_position_x": { - "value": "195" - }, - "prime_tower_position_y": { - "value": "149" - } + "machine_height": { "default_value": 200 }, + "machine_name": { "default_value": "Ultimaker Original" }, + "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nT1 ;Switch to the 2nd extruder\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F200 E-{switch_extruder_retraction_amount}\nT0 ;Switch to the 1st extruder\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." }, + "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, + "machine_width": { "default_value": 205 }, + "prime_tower_position_x": { "value": "195" }, + "prime_tower_position_y": { "value": "149" } } -} +} \ No newline at end of file diff --git a/resources/definitions/ultimaker_original_plus.def.json b/resources/definitions/ultimaker_original_plus.def.json index 949e2e8d0d..26924a8ba6 100644 --- a/resources/definitions/ultimaker_original_plus.def.json +++ b/resources/definitions/ultimaker_original_plus.def.json @@ -2,31 +2,25 @@ "version": 2, "name": "Ultimaker Original+", "inherits": "ultimaker_original", - "metadata": { + "metadata": + { "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "weight": 4, "file_formats": "text/x-gcode", "platform": "ultimaker2_platform.obj", + "firmware_file": "MarlinUltimaker-UMOP-{baudrate}.hex", + "firmware_hbk_file": "MarlinUltimaker-UMOP-{baudrate}.hex", + "first_start_actions": [ "BedLevel" ], + "machine_extruder_trains": { "0": "ultimaker_original_plus_extruder_0" }, "platform_texture": "UltimakerPlusbackplate.png", "quality_definition": "ultimaker_original", - "first_start_actions": ["BedLevel"], - "supported_actions": ["BedLevel"], - "machine_extruder_trains": - { - "0": "ultimaker_original_plus_extruder_0" - }, - "firmware_file": "MarlinUltimaker-UMOP-{baudrate}.hex", - "firmware_hbk_file": "MarlinUltimaker-UMOP-{baudrate}.hex" + "supported_actions": [ "BedLevel" ], + "weight": 4 }, - - "overrides": { - "machine_name": { "default_value": "Ultimaker Original+" }, - "machine_heated_bed": { - "default_value": true - }, - "machine_max_feedrate_z": { - "default_value": 30 - } + "overrides": + { + "machine_heated_bed": { "default_value": true }, + "machine_max_feedrate_z": { "default_value": 30 }, + "machine_name": { "default_value": "Ultimaker Original+" } } -} +} \ No newline at end of file diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json index ce94981307..ecd9e8e09c 100644 --- a/resources/definitions/ultimaker_s3.def.json +++ b/resources/definitions/ultimaker_s3.def.json @@ -2,78 +2,53 @@ "version": 2, "name": "Ultimaker S3", "inherits": "ultimaker", - "metadata": { + "metadata": + { + "visible": true, "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "visible": true, "file_formats": "application/x-ufp;text/x-gcode", "platform": "ultimaker_s3_platform.obj", - "platform_texture": "UltimakerS3backplate.png", - "platform_offset": [0, 0, 0], + "bom_numbers": [213482, 213483], + "exclude_materials": [ + "generic_hips", + "generic_petg", + "structur3d_dap100silicone" + ], + "firmware_update_info": + { + "check_urls": [ "https://software.ultimaker.com/releases/firmware/213482/stable/um-update.swu.version" ], + "id": 213482, + "update_url": "https://ultimaker.com/firmware?utm_source=cura&utm_medium=software&utm_campaign=fw-update" + }, + "first_start_actions": [ "DiscoverUM3Action" ], "has_machine_quality": true, "has_materials": true, "has_variant_buildplates": false, "has_variants": true, - "exclude_materials": [ "generic_hips", "generic_petg", "structur3d_dap100silicone" ], - "preferred_variant_name": "AA 0.4", - "preferred_quality_type": "normal", - "variants_name": "Print core", - "nozzle_offsetting_for_disallowed_areas": false, "machine_extruder_trains": { "0": "ultimaker_s3_extruder_left", "1": "ultimaker_s3_extruder_right" }, - "first_start_actions": [ "DiscoverUM3Action" ], + "nozzle_offsetting_for_disallowed_areas": false, + "platform_offset": [ + 0, + 0, + 0 + ], + "platform_texture": "UltimakerS3backplate.png", + "preferred_quality_type": "normal", + "preferred_variant_name": "AA 0.4", "supported_actions": [ "DiscoverUM3Action" ], - "supports_usb_connection": false, "supports_material_export": true, - "weight": -1, - "firmware_update_info": { - "id": 213482, - "check_urls": ["https://software.ultimaker.com/releases/firmware/213482/stable/um-update.swu.version"], - "update_url": "https://ultimaker.com/firmware?utm_source=cura&utm_medium=software&utm_campaign=fw-update" - }, - "bom_numbers": [ - 213482, 213483 - ] + "supports_usb_connection": false, + "variants_name": "Print core", + "weight": -1 }, - - "overrides": { - "machine_name": { "default_value": "Ultimaker S3" }, - "machine_width": { "default_value": 230 }, - "machine_depth": { "default_value": 190 }, - "machine_height": { "default_value": 200 }, - "machine_heated_bed": { "default_value": true }, - "machine_nozzle_heat_up_speed": { "default_value": 1.4 }, - "machine_nozzle_cool_down_speed": { "default_value": 0.8 }, - "machine_head_with_fans_polygon": - { - "default_value": - [ - [ -41.4, -45.8 ], - [ -41.4, 36.0 ], - [ 63.3, 36.0 ], - [ 63.3, -45.8 ] - ] - }, - "machine_gcode_flavor": { "default_value": "Griffin" }, - "machine_max_feedrate_x": { "default_value": 300 }, - "machine_max_feedrate_y": { "default_value": 300 }, - "machine_max_feedrate_z": { "default_value": 40 }, - "machine_acceleration": { "default_value": 3000 }, - "gantry_height": { "value": "55" }, - "machine_extruder_count": { "default_value": 2 }, - "extruder_prime_pos_abs": { "default_value": true }, - "machine_start_gcode": { "default_value": "" }, - "machine_end_gcode": { "default_value": "" }, - "prime_blob_enable": { "enabled": true, "default_value": false }, + "overrides": + { "acceleration_enabled": { "value": true }, - "speed_travel": - { - "maximum_value": "150", - "value": "150" - }, "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 3500)" }, "acceleration_print": { "value": "3500" }, "acceleration_support": { "value": "math.ceil(acceleration_print * 2000 / 3500)" }, @@ -85,30 +60,66 @@ "cool_fan_speed": { "value": "50" }, "cool_fan_speed_max": { "value": "100" }, "cool_min_speed": { "value": "5" }, + "default_material_print_temperature": { "value": "200" }, + "extruder_prime_pos_abs": { "default_value": true }, + "gantry_height": { "value": "55" }, "infill_overlap": { "value": "0" }, "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" }, "infill_wipe_dist": { "value": "0" }, "jerk_enabled": { "value": "True" }, "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, + "machine_acceleration": { "default_value": 3000 }, + "machine_depth": { "default_value": 190 }, + "machine_end_gcode": { "default_value": "" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "Griffin" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-41.4, -45.8], + [-41.4, 36.0], + [63.3, 36.0], + [63.3, -45.8] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 200 }, + "machine_max_feedrate_x": { "default_value": 300 }, + "machine_max_feedrate_y": { "default_value": 300 }, + "machine_max_feedrate_z": { "default_value": 40 }, "machine_min_cool_heat_time_window": { "value": "15" }, - "default_material_print_temperature": { "value": "200" }, + "machine_name": { "default_value": "Ultimaker S3" }, + "machine_nozzle_cool_down_speed": { "default_value": 0.8 }, + "machine_nozzle_heat_up_speed": { "default_value": 1.4 }, + "machine_start_gcode": { "default_value": "" }, + "machine_width": { "default_value": 230 }, "multiple_mesh_overlap": { "value": "0" }, "optimize_wall_printing_order": { "value": "True" }, + "prime_blob_enable": + { + "default_value": false, + "enabled": true + }, "prime_tower_enable": { "value": "True" }, "retraction_amount": { "value": "6.5" }, "retraction_hop": { "value": "2" }, - "retraction_hop_enabled": { "value": "extruders_enabled_count > 1" }, + "retraction_hop_enabled": { "value": "extruders_enabled_count > 1" }, "retraction_hop_only_when_collides": { "value": "True" }, "retraction_min_travel": { "value": "5" }, "retraction_prime_speed": { "value": "15" }, - "retraction_speed": {"value": "45" }, + "retraction_speed": { "value": "45" }, "skin_overlap": { "value": "10" }, "speed_prime_tower": { "value": "speed_topbottom" }, "speed_print": { "value": "35" }, "speed_support": { "value": "speed_wall_0" }, "speed_support_interface": { "value": "speed_topbottom" }, "speed_topbottom": { "value": "math.ceil(speed_print * 20 / 35)" }, + "speed_travel": + { + "maximum_value": "150", + "value": "150" + }, "speed_wall": { "value": "math.ceil(speed_print * 30 / 35)" }, "speed_wall_0": { "value": "math.ceil(speed_wall * 20 / 30)" }, "speed_wall_x": { "value": "speed_wall" }, @@ -120,4 +131,4 @@ "wall_0_inset": { "value": "0" }, "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" } } -} +} \ No newline at end of file diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index a77148c2c4..7f54455742 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -2,80 +2,53 @@ "version": 2, "name": "Ultimaker S5", "inherits": "ultimaker", - "metadata": { + "metadata": + { + "visible": true, "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "visible": true, "file_formats": "application/x-ufp;text/x-gcode", "platform": "ultimaker_s5_platform.obj", - "platform_texture": "UltimakerS5backplate.png", - "platform_offset": [0, -30, -10], + "bom_numbers": [ + 9051, + 214475, + 214476 + ], + "firmware_update_info": + { + "check_urls": [ "https://software.ultimaker.com/releases/firmware/9051/stable/um-update.swu.version" ], + "id": 9051, + "update_url": "https://ultimaker.com/firmware?utm_source=cura&utm_medium=software&utm_campaign=fw-update" + }, + "first_start_actions": [ "DiscoverUM3Action" ], "has_machine_quality": true, "has_materials": true, "has_variant_buildplates": true, "has_variants": true, - "preferred_variant_name": "AA 0.4", - "preferred_variant_buildplate_name": "Glass", - "preferred_quality_type": "normal", - "variants_name": "Print core", - "nozzle_offsetting_for_disallowed_areas": false, "machine_extruder_trains": { "0": "ultimaker_s5_extruder_left", "1": "ultimaker_s5_extruder_right" }, - "first_start_actions": [ "DiscoverUM3Action" ], + "nozzle_offsetting_for_disallowed_areas": false, + "platform_offset": [ + 0, + -30, + -10 + ], + "platform_texture": "UltimakerS5backplate.png", + "preferred_quality_type": "normal", + "preferred_variant_buildplate_name": "Glass", + "preferred_variant_name": "AA 0.4", "supported_actions": [ "DiscoverUM3Action" ], - "supports_usb_connection": false, - "supports_network_connection": true, "supports_material_export": true, - "weight": -2, - "firmware_update_info": { - "id": 9051, - "check_urls": ["https://software.ultimaker.com/releases/firmware/9051/stable/um-update.swu.version"], - "update_url": "https://ultimaker.com/firmware?utm_source=cura&utm_medium=software&utm_campaign=fw-update" - }, - "bom_numbers": [ - 9051, 214475, 214476 - ] + "supports_network_connection": true, + "supports_usb_connection": false, + "variants_name": "Print core", + "weight": -2 }, - - "overrides": { - "machine_name": { "default_value": "Ultimaker S5" }, - "machine_width": { "default_value": 330 }, - "machine_depth": { "default_value": 240 }, - "machine_height": { "default_value": 300 }, - "machine_heated_bed": { "default_value": true }, - "machine_heated_build_volume": { "default_value": true }, - "machine_nozzle_heat_up_speed": { "default_value": 1.4 }, - "machine_nozzle_cool_down_speed": { "default_value": 0.8 }, - "machine_head_with_fans_polygon": - { - "default_value": - [ - [ -41.4, -45.8 ], - [ -41.4, 36.0 ], - [ 63.3, 36.0 ], - [ 63.3, -45.8 ] - ] - }, - "machine_gcode_flavor": { "default_value": "Griffin" }, - "machine_max_feedrate_x": { "default_value": 300 }, - "machine_max_feedrate_y": { "default_value": 300 }, - "machine_max_feedrate_z": { "default_value": 40 }, - "machine_acceleration": { "default_value": 3000 }, - "gantry_height": { "value": "55" }, - "machine_extruder_count": { "default_value": 2 }, - "extruder_prime_pos_abs": { "default_value": true }, - "machine_start_gcode": { "default_value": "" }, - "machine_end_gcode": { "default_value": "" }, - "prime_blob_enable": { "enabled": true, "default_value": false }, - - "speed_travel": - { - "maximum_value": "150", - "value": "150" - }, + "overrides": + { "acceleration_enabled": { "value": true }, "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 3500)" }, "acceleration_print": { "value": "3500" }, @@ -85,33 +58,72 @@ "acceleration_wall": { "value": "math.ceil(acceleration_print * 1500 / 3500)" }, "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 1000 / 1000)" }, "brim_width": { "value": "3" }, + "build_volume_temperature": { "maximum_value": 50 }, "cool_fan_speed": { "value": "50" }, "cool_fan_speed_max": { "value": "100" }, "cool_min_speed": { "value": "5" }, + "default_material_print_temperature": { "value": "200" }, + "extruder_prime_pos_abs": { "default_value": true }, + "gantry_height": { "value": "55" }, "infill_overlap": { "value": "0" }, "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" }, "infill_wipe_dist": { "value": "0" }, "jerk_enabled": { "value": "True" }, "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, + "machine_acceleration": { "default_value": 3000 }, + "machine_depth": { "default_value": 240 }, + "machine_end_gcode": { "default_value": "" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "Griffin" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-41.4, -45.8], + [-41.4, 36.0], + [63.3, 36.0], + [63.3, -45.8] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_heated_build_volume": { "default_value": true }, + "machine_height": { "default_value": 300 }, + "machine_max_feedrate_x": { "default_value": 300 }, + "machine_max_feedrate_y": { "default_value": 300 }, + "machine_max_feedrate_z": { "default_value": 40 }, "machine_min_cool_heat_time_window": { "value": "15" }, - "default_material_print_temperature": { "value": "200" }, + "machine_name": { "default_value": "Ultimaker S5" }, + "machine_nozzle_cool_down_speed": { "default_value": 0.8 }, + "machine_nozzle_heat_up_speed": { "default_value": 1.4 }, + "machine_start_gcode": { "default_value": "" }, + "machine_width": { "default_value": 330 }, "multiple_mesh_overlap": { "value": "0" }, + "optimize_wall_printing_order": { "value": "True" }, + "prime_blob_enable": + { + "default_value": false, + "enabled": true + }, "prime_tower_enable": { "value": "True" }, "retraction_amount": { "value": "6.5" }, - "retraction_combing": { "value": "'no_outer_surfaces'"}, + "retraction_combing": { "value": "'no_outer_surfaces'" }, "retraction_hop": { "value": "2" }, - "retraction_hop_enabled": { "value": "extruders_enabled_count > 1" }, + "retraction_hop_enabled": { "value": "extruders_enabled_count > 1" }, "retraction_hop_only_when_collides": { "value": "True" }, "retraction_min_travel": { "value": "5" }, "retraction_prime_speed": { "value": "15" }, - "retraction_speed": {"value": "45" }, + "retraction_speed": { "value": "45" }, "skin_overlap": { "value": "10" }, "speed_prime_tower": { "value": "speed_topbottom" }, "speed_print": { "value": "35" }, "speed_support": { "value": "speed_wall_0" }, "speed_support_interface": { "value": "speed_topbottom" }, "speed_topbottom": { "value": "math.ceil(speed_print * 20 / 35)" }, + "speed_travel": + { + "maximum_value": "150", + "value": "150" + }, "speed_wall": { "value": "math.ceil(speed_print * 30 / 35)" }, "speed_wall_0": { "value": "math.ceil(speed_wall * 20 / 30)" }, "speed_wall_x": { "value": "speed_wall" }, @@ -121,8 +133,6 @@ "top_bottom_thickness": { "value": "1" }, "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, "wall_0_inset": { "value": "0" }, - "optimize_wall_printing_order": { "value": "True" }, - "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" }, - "build_volume_temperature": { "maximum_value": 50 } + "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" } } -} +} \ No newline at end of file From d4e4901ae5ce8799f7898bd0bb09a92f271ec353 Mon Sep 17 00:00:00 2001 From: whoseyoung Date: Tue, 13 Dec 2022 14:46:24 +0800 Subject: [PATCH 107/124] fixed known bugs --- .../Geeetech_Base_Dual_Extruder.def.json | 117 ++++++++++++++++++ .../Geeetech_Base_Multi_Extruder.def.json | 117 ++++++++++++++++++ ...=> Geeetech_Base_Single_Extruder.def.json} | 18 +-- resources/definitions/geeetech_A10M.def.json | 19 ++- .../definitions/geeetech_A10Pro.def.json | 16 +-- resources/definitions/geeetech_A10T.def.json | 19 ++- resources/definitions/geeetech_A20.def.json | 14 +-- resources/definitions/geeetech_A20M.def.json | 19 ++- resources/definitions/geeetech_A20T.def.json | 19 ++- resources/definitions/geeetech_A30M.def.json | 19 ++- .../definitions/geeetech_A30Pro.def.json | 12 +- resources/definitions/geeetech_A30T.def.json | 19 ++- resources/definitions/geeetech_E180.def.json | 14 +-- .../geeetech_GiantArmD200.def.json | 14 +-- .../definitions/geeetech_I3ProB.def.json | 14 +-- .../definitions/geeetech_I3ProC.def.json | 19 ++- .../definitions/geeetech_I3ProW.def.json | 14 +-- .../definitions/geeetech_MeCreator.def.json | 14 +-- .../definitions/geeetech_MeCreator2.def.json | 14 +-- .../definitions/geeetech_MeDucer.def.json | 14 +-- resources/definitions/geeetech_Mizar.def.json | 14 +-- .../definitions/geeetech_MizarM.def.json | 17 +-- .../definitions/geeetech_MizarMax.def.json | 13 +- .../definitions/geeetech_MizarPro.def.json | 14 +-- .../definitions/geeetech_MizarS.def.json | 16 +-- .../definitions/geeetech_Thunder.def.json | 19 ++- .../Geeetech_Dual_Extruder_0.def.json | 2 +- .../Geeetech_Dual_Extruder_1.def.json | 2 +- .../Geeetech_Multi_Extruder_0.def.json | 2 +- .../Geeetech_Multi_Extruder_1.def.json | 2 +- .../Geeetech_Multi_Extruder_2.def.json | 2 +- ...json => Geeetech_Single_Extruder.def.json} | 2 +- .../geeetech_quality_0.2_ABS_super.inst.cfg} | 2 +- .../geeetech_quality_0.2_ABS_ultra.inst.cfg} | 2 +- .../geeetech_quality_0.2_PETG_super.inst.cfg} | 2 +- .../geeetech_quality_0.2_PETG_ultra.inst.cfg} | 2 +- .../geeetech_quality_0.2_PLA_super.inst.cfg} | 2 +- .../geeetech_quality_0.2_PLA_ultra.inst.cfg} | 2 +- ...eeetech_quality_0.3_ABS_adaptive.inst.cfg} | 2 +- .../geeetech_quality_0.3_ABS_low.inst.cfg} | 2 +- ...eeetech_quality_0.3_ABS_standard.inst.cfg} | 2 +- .../geeetech_quality_0.3_ABS_super.inst.cfg} | 2 +- ...eetech_quality_0.3_PETG_adaptive.inst.cfg} | 2 +- .../geeetech_quality_0.3_PETG_low.inst.cfg} | 2 +- ...eetech_quality_0.3_PETG_standard.inst.cfg} | 2 +- .../geeetech_quality_0.3_PETG_super.inst.cfg} | 2 +- ...eeetech_quality_0.3_PLA_adaptive.inst.cfg} | 2 +- .../geeetech_quality_0.3_PLA_low.inst.cfg} | 2 +- ...eeetech_quality_0.3_PLA_standard.inst.cfg} | 2 +- .../geeetech_quality_0.3_PLA_super.inst.cfg} | 2 +- ...eeetech_quality_0.3_TPU_adaptive.inst.cfg} | 2 +- ...eeetech_quality_0.3_TPU_standard.inst.cfg} | 2 +- .../geeetech_quality_0.3_TPU_super.inst.cfg} | 2 +- ...eeetech_quality_0.4_ABS_adaptive.inst.cfg} | 2 +- .../geeetech_quality_0.4_ABS_low.inst.cfg} | 2 +- ...eeetech_quality_0.4_ABS_standard.inst.cfg} | 2 +- .../geeetech_quality_0.4_ABS_super.inst.cfg} | 2 +- ...eetech_quality_0.4_PETG_adaptive.inst.cfg} | 2 +- .../geeetech_quality_0.4_PETG_low.inst.cfg} | 2 +- ...eetech_quality_0.4_PETG_standard.inst.cfg} | 2 +- .../geeetech_quality_0.4_PETG_super.inst.cfg} | 2 +- ...eeetech_quality_0.4_PLA_adaptive.inst.cfg} | 2 +- .../geeetech_quality_0.4_PLA_low.inst.cfg} | 2 +- ...eeetech_quality_0.4_PLA_standard.inst.cfg} | 2 +- .../geeetech_quality_0.4_PLA_super.inst.cfg} | 2 +- ...eeetech_quality_0.4_TPU_adaptive.inst.cfg} | 2 +- ...eeetech_quality_0.4_TPU_standard.inst.cfg} | 2 +- .../geeetech_quality_0.4_TPU_super.inst.cfg} | 2 +- ...eeetech_quality_0.5_ABS_adaptive.inst.cfg} | 2 +- .../geeetech_quality_0.5_ABS_low.inst.cfg} | 2 +- ...eeetech_quality_0.5_ABS_standard.inst.cfg} | 2 +- .../geeetech_quality_0.5_ABS_super.inst.cfg} | 2 +- ...eetech_quality_0.5_PETG_adaptive.inst.cfg} | 2 +- .../geeetech_quality_0.5_PETG_low.inst.cfg} | 2 +- ...eetech_quality_0.5_PETG_standard.inst.cfg} | 2 +- .../geeetech_quality_0.5_PETG_super.inst.cfg} | 2 +- ...eeetech_quality_0.5_PLA_adaptive.inst.cfg} | 2 +- .../geeetech_quality_0.5_PLA_low.inst.cfg} | 2 +- ...eeetech_quality_0.5_PLA_standard.inst.cfg} | 2 +- .../geeetech_quality_0.5_PLA_super.inst.cfg} | 2 +- ...eeetech_quality_0.5_TPU_adaptive.inst.cfg} | 2 +- ...eeetech_quality_0.5_TPU_standard.inst.cfg} | 2 +- .../geeetech_quality_0.5_TPU_super.inst.cfg} | 2 +- ...eeetech_quality_0.6_ABS_standard.inst.cfg} | 2 +- ...eetech_quality_0.6_PETG_standard.inst.cfg} | 2 +- .../geeetech_quality_0.6_PLA_draft.inst.cfg} | 2 +- .../geeetech_quality_0.6_PLA_low.inst.cfg} | 2 +- ...eeetech_quality_0.6_PLA_standard.inst.cfg} | 2 +- ...eeetech_quality_0.6_TPU_standard.inst.cfg} | 2 +- .../geeetech_quality_0.8_ABS_draft.inst.cfg} | 2 +- .../geeetech_quality_0.8_PETG_draft.inst.cfg} | 2 +- .../geeetech_quality_0.8_PLA_draft.inst.cfg} | 2 +- .../geeetech_quality_0.8_TPU_draft.inst.cfg} | 2 +- .../geeetech_quality_1.0_ABS_draft.inst.cfg} | 2 +- .../geeetech_quality_1.0_PETG_draft.inst.cfg} | 2 +- .../geeetech_quality_1.0_PLA_draft.inst.cfg} | 2 +- .../geeetech_quality_1.0_TPU_draft.inst.cfg} | 2 +- ...geeetech_quality_global_adaptive.inst.cfg} | 2 +- .../geeetech_quality_global_draft.inst.cfg} | 2 +- .../geeetech_quality_global_low.inst.cfg} | 2 +- ...geeetech_quality_global_standard.inst.cfg} | 2 +- .../geeetech_quality_global_super.inst.cfg} | 2 +- .../geeetech_quality_global_ultra.inst.cfg} | 2 +- .../geeetech_A10Pro_0.2.inst.cfg | 0 .../geeetech_A10Pro_0.3.inst.cfg | 0 .../geeetech_A10Pro_0.4.inst.cfg | 0 .../geeetech_A10Pro_0.5.inst.cfg | 0 .../geeetech_A10Pro_0.6.inst.cfg | 0 .../geeetech_A10Pro_0.8.inst.cfg | 0 .../geeetech_A10Pro_1.0.inst.cfg | 0 .../geeetech_A20_0.2.inst.cfg | 0 .../geeetech_A20_0.3.inst.cfg | 0 .../geeetech_A20_0.4.inst.cfg | 0 .../geeetech_A20_0.5.inst.cfg | 0 .../geeetech_A20_0.6.inst.cfg | 0 .../geeetech_A20_0.8.inst.cfg | 0 .../geeetech_A20_1.0.inst.cfg | 0 .../geeetech_A30Pro_0.2.inst.cfg | 0 .../geeetech_A30Pro_0.3.inst.cfg | 0 .../geeetech_A30Pro_0.4.inst.cfg | 0 .../geeetech_A30Pro_0.5.inst.cfg | 0 .../geeetech_A30Pro_0.6.inst.cfg | 0 .../geeetech_A30Pro_0.8.inst.cfg | 0 .../geeetech_A30Pro_1.0.inst.cfg | 0 .../geeetech_E180_0.2.inst.cfg | 0 .../geeetech_E180_0.3.inst.cfg | 0 .../geeetech_E180_0.4.inst.cfg | 0 .../geeetech_E180_0.5.inst.cfg | 0 .../geeetech_E180_0.6.inst.cfg | 0 .../geeetech_E180_0.8.inst.cfg | 0 .../geeetech_E180_1.0.inst.cfg | 0 .../geeetech_GiantArmD200_0.2.inst.cfg | 0 .../geeetech_GiantArmD200_0.3.inst.cfg | 0 .../geeetech_GiantArmD200_0.4.inst.cfg | 0 .../geeetech_GiantArmD200_0.5.inst.cfg | 0 .../geeetech_GiantArmD200_0.6.inst.cfg | 0 .../geeetech_GiantArmD200_0.8.inst.cfg | 0 .../geeetech_GiantArmD200_1.0.inst.cfg | 0 .../geeetech_I3ProB_0.2.inst.cfg | 0 .../geeetech_I3ProB_0.3.inst.cfg | 0 .../geeetech_I3ProB_0.4.inst.cfg | 0 .../geeetech_I3ProB_0.5.inst.cfg | 0 .../geeetech_I3ProB_0.6.inst.cfg | 0 .../geeetech_I3ProB_0.8.inst.cfg | 0 .../geeetech_I3ProB_1.0.inst.cfg | 0 .../geeetech_I3ProW_0.2.inst.cfg | 0 .../geeetech_I3ProW_0.3.inst.cfg | 0 .../geeetech_I3ProW_0.4.inst.cfg | 0 .../geeetech_I3ProW_0.5.inst.cfg | 0 .../geeetech_I3ProW_0.6.inst.cfg | 0 .../geeetech_I3ProW_0.8.inst.cfg | 0 .../geeetech_I3ProW_1.0.inst.cfg | 0 .../geeetech_MeCreator2_0.2.inst.cfg | 0 .../geeetech_MeCreator2_0.3.inst.cfg | 0 .../geeetech_MeCreator2_0.4.inst.cfg | 0 .../geeetech_MeCreator2_0.5.inst.cfg | 0 .../geeetech_MeCreator2_0.6.inst.cfg | 0 .../geeetech_MeCreator2_0.8.inst.cfg | 0 .../geeetech_MeCreator2_1.0.inst.cfg | 0 .../geeetech_MeCreator_0.2.inst.cfg | 0 .../geeetech_MeCreator_0.3.inst.cfg | 0 .../geeetech_MeCreator_0.4.inst.cfg | 0 .../geeetech_MeCreator_0.5.inst.cfg | 0 .../geeetech_MeCreator_0.6.inst.cfg | 0 .../geeetech_MeCreator_0.8.inst.cfg | 0 .../geeetech_MeCreator_1.0.inst.cfg | 0 .../geeetech_MeDucer_0.2.inst.cfg | 0 .../geeetech_MeDucer_0.3.inst.cfg | 0 .../geeetech_MeDucer_0.4.inst.cfg | 0 .../geeetech_MeDucer_0.5.inst.cfg | 0 .../geeetech_MeDucer_0.6.inst.cfg | 0 .../geeetech_MeDucer_0.8.inst.cfg | 0 .../geeetech_MeDucer_1.0.inst.cfg | 0 .../geeetech_MizarMax_0.2.inst.cfg | 0 .../geeetech_MizarMax_0.3.inst.cfg | 0 .../geeetech_MizarMax_0.4.inst.cfg | 0 .../geeetech_MizarMax_0.5.inst.cfg | 0 .../geeetech_MizarMax_0.6.inst.cfg | 0 .../geeetech_MizarMax_0.8.inst.cfg | 0 .../geeetech_MizarMax_1.0.inst.cfg | 0 .../geeetech_MizarPro_0.2.inst.cfg | 0 .../geeetech_MizarPro_0.3.inst.cfg | 0 .../geeetech_MizarPro_0.4.inst.cfg | 0 .../geeetech_MizarPro_0.5.inst.cfg | 0 .../geeetech_MizarPro_0.6.inst.cfg | 0 .../geeetech_MizarPro_0.8.inst.cfg | 0 .../geeetech_MizarPro_1.0.inst.cfg | 0 .../geeetech_MizarS_0.2.inst.cfg | 0 .../geeetech_MizarS_0.3.inst.cfg | 0 .../geeetech_MizarS_0.4.inst.cfg | 0 .../geeetech_MizarS_0.5.inst.cfg | 0 .../geeetech_MizarS_0.6.inst.cfg | 0 .../geeetech_MizarS_0.8.inst.cfg | 0 .../geeetech_MizarS_1.0.inst.cfg | 0 .../geeetech_Mizar_0.2.inst.cfg | 0 .../geeetech_Mizar_0.3.inst.cfg | 0 .../geeetech_Mizar_0.4.inst.cfg | 0 .../geeetech_Mizar_0.5.inst.cfg | 0 .../geeetech_Mizar_0.6.inst.cfg | 0 .../geeetech_Mizar_0.8.inst.cfg | 0 .../geeetech_Mizar_1.0.inst.cfg | 0 .../geeetech_Thunder_0.2.inst.cfg | 0 .../geeetech_Thunder_0.3.inst.cfg | 0 .../geeetech_Thunder_0.4.inst.cfg | 0 .../geeetech_Thunder_0.5.inst.cfg | 0 .../geeetech_Thunder_0.6.inst.cfg | 0 .../geeetech_Thunder_0.8.inst.cfg | 0 .../geeetech_Thunder_1.0.inst.cfg | 0 208 files changed, 454 insertions(+), 318 deletions(-) create mode 100644 resources/definitions/Geeetech_Base_Dual_Extruder.def.json create mode 100644 resources/definitions/Geeetech_Base_Multi_Extruder.def.json rename resources/definitions/{Geeetech_base.def.json => Geeetech_Base_Single_Extruder.def.json} (94%) rename resources/extruders/{Geeetech_base_extruder_0.def.json => Geeetech_Single_Extruder.def.json} (83%) rename resources/quality/geeetech/{base/Geeetech_base_0.2_ABS_super.inst.cfg => geeetech_quality/geeetech_quality_0.2_ABS_super.inst.cfg} (82%) rename resources/quality/geeetech/{base/Geeetech_base_0.2_ABS_ultra.inst.cfg => geeetech_quality/geeetech_quality_0.2_ABS_ultra.inst.cfg} (82%) rename resources/quality/geeetech/{base/Geeetech_base_0.2_PETG_super.inst.cfg => geeetech_quality/geeetech_quality_0.2_PETG_super.inst.cfg} (85%) rename resources/quality/geeetech/{base/Geeetech_base_0.2_PETG_ultra.inst.cfg => geeetech_quality/geeetech_quality_0.2_PETG_ultra.inst.cfg} (85%) rename resources/quality/geeetech/{base/Geeetech_base_0.2_PLA_super.inst.cfg => geeetech_quality/geeetech_quality_0.2_PLA_super.inst.cfg} (79%) rename resources/quality/geeetech/{base/Geeetech_base_0.2_PLA_ultra.inst.cfg => geeetech_quality/geeetech_quality_0.2_PLA_ultra.inst.cfg} (79%) rename resources/quality/geeetech/{base/Geeetech_base_0.3_ABS_adaptive.inst.cfg => geeetech_quality/geeetech_quality_0.3_ABS_adaptive.inst.cfg} (82%) rename resources/quality/geeetech/{base/Geeetech_base_0.3_ABS_low.inst.cfg => geeetech_quality/geeetech_quality_0.3_ABS_low.inst.cfg} (81%) rename resources/quality/geeetech/{base/Geeetech_base_0.3_ABS_standard.inst.cfg => geeetech_quality/geeetech_quality_0.3_ABS_standard.inst.cfg} (82%) rename resources/quality/geeetech/{base/Geeetech_base_0.3_ABS_super.inst.cfg => geeetech_quality/geeetech_quality_0.3_ABS_super.inst.cfg} (82%) rename resources/quality/geeetech/{base/Geeetech_base_0.3_PETG_adaptive.inst.cfg => geeetech_quality/geeetech_quality_0.3_PETG_adaptive.inst.cfg} (85%) rename resources/quality/geeetech/{base/Geeetech_base_0.3_PETG_low.inst.cfg => geeetech_quality/geeetech_quality_0.3_PETG_low.inst.cfg} (85%) rename resources/quality/geeetech/{base/Geeetech_base_0.3_PETG_standard.inst.cfg => geeetech_quality/geeetech_quality_0.3_PETG_standard.inst.cfg} (85%) rename resources/quality/geeetech/{base/Geeetech_base_0.3_PETG_super.inst.cfg => geeetech_quality/geeetech_quality_0.3_PETG_super.inst.cfg} (85%) rename resources/quality/geeetech/{base/Geeetech_base_0.3_PLA_adaptive.inst.cfg => geeetech_quality/geeetech_quality_0.3_PLA_adaptive.inst.cfg} (80%) rename resources/quality/geeetech/{base/Geeetech_base_0.3_PLA_low.inst.cfg => geeetech_quality/geeetech_quality_0.3_PLA_low.inst.cfg} (79%) rename resources/quality/geeetech/{base/Geeetech_base_0.3_PLA_standard.inst.cfg => geeetech_quality/geeetech_quality_0.3_PLA_standard.inst.cfg} (80%) rename resources/quality/geeetech/{base/Geeetech_base_0.3_PLA_super.inst.cfg => geeetech_quality/geeetech_quality_0.3_PLA_super.inst.cfg} (79%) rename resources/quality/geeetech/{base/Geeetech_base_0.3_TPU_adaptive.inst.cfg => geeetech_quality/geeetech_quality_0.3_TPU_adaptive.inst.cfg} (80%) rename resources/quality/geeetech/{base/Geeetech_base_0.3_TPU_standard.inst.cfg => geeetech_quality/geeetech_quality_0.3_TPU_standard.inst.cfg} (80%) rename resources/quality/geeetech/{base/Geeetech_base_0.3_TPU_super.inst.cfg => geeetech_quality/geeetech_quality_0.3_TPU_super.inst.cfg} (79%) rename resources/quality/geeetech/{base/Geeetech_base_0.4_ABS_adaptive.inst.cfg => geeetech_quality/geeetech_quality_0.4_ABS_adaptive.inst.cfg} (82%) rename resources/quality/geeetech/{base/Geeetech_base_0.4_ABS_low.inst.cfg => geeetech_quality/geeetech_quality_0.4_ABS_low.inst.cfg} (81%) rename resources/quality/geeetech/{base/Geeetech_base_0.4_ABS_standard.inst.cfg => geeetech_quality/geeetech_quality_0.4_ABS_standard.inst.cfg} (82%) rename resources/quality/geeetech/{base/Geeetech_base_0.4_ABS_super.inst.cfg => geeetech_quality/geeetech_quality_0.4_ABS_super.inst.cfg} (82%) rename resources/quality/geeetech/{base/Geeetech_base_0.4_PETG_adaptive.inst.cfg => geeetech_quality/geeetech_quality_0.4_PETG_adaptive.inst.cfg} (85%) rename resources/quality/geeetech/{base/Geeetech_base_0.4_PETG_low.inst.cfg => geeetech_quality/geeetech_quality_0.4_PETG_low.inst.cfg} (85%) rename resources/quality/geeetech/{base/Geeetech_base_0.4_PETG_standard.inst.cfg => geeetech_quality/geeetech_quality_0.4_PETG_standard.inst.cfg} (85%) rename resources/quality/geeetech/{base/Geeetech_base_0.4_PETG_super.inst.cfg => geeetech_quality/geeetech_quality_0.4_PETG_super.inst.cfg} (85%) rename resources/quality/geeetech/{base/Geeetech_base_0.4_PLA_adaptive.inst.cfg => geeetech_quality/geeetech_quality_0.4_PLA_adaptive.inst.cfg} (80%) rename resources/quality/geeetech/{base/Geeetech_base_0.4_PLA_low.inst.cfg => geeetech_quality/geeetech_quality_0.4_PLA_low.inst.cfg} (79%) rename resources/quality/geeetech/{base/Geeetech_base_0.4_PLA_standard.inst.cfg => geeetech_quality/geeetech_quality_0.4_PLA_standard.inst.cfg} (80%) rename resources/quality/geeetech/{base/Geeetech_base_0.4_PLA_super.inst.cfg => geeetech_quality/geeetech_quality_0.4_PLA_super.inst.cfg} (79%) rename resources/quality/geeetech/{base/Geeetech_base_0.4_TPU_adaptive.inst.cfg => geeetech_quality/geeetech_quality_0.4_TPU_adaptive.inst.cfg} (80%) rename resources/quality/geeetech/{base/Geeetech_base_0.4_TPU_standard.inst.cfg => geeetech_quality/geeetech_quality_0.4_TPU_standard.inst.cfg} (80%) rename resources/quality/geeetech/{base/Geeetech_base_0.4_TPU_super.inst.cfg => geeetech_quality/geeetech_quality_0.4_TPU_super.inst.cfg} (79%) rename resources/quality/geeetech/{base/Geeetech_base_0.5_ABS_adaptive.inst.cfg => geeetech_quality/geeetech_quality_0.5_ABS_adaptive.inst.cfg} (82%) rename resources/quality/geeetech/{base/Geeetech_base_0.5_ABS_low.inst.cfg => geeetech_quality/geeetech_quality_0.5_ABS_low.inst.cfg} (81%) rename resources/quality/geeetech/{base/Geeetech_base_0.5_ABS_standard.inst.cfg => geeetech_quality/geeetech_quality_0.5_ABS_standard.inst.cfg} (82%) rename resources/quality/geeetech/{base/Geeetech_base_0.5_ABS_super.inst.cfg => geeetech_quality/geeetech_quality_0.5_ABS_super.inst.cfg} (82%) rename resources/quality/geeetech/{base/Geeetech_base_0.5_PETG_adaptive.inst.cfg => geeetech_quality/geeetech_quality_0.5_PETG_adaptive.inst.cfg} (85%) rename resources/quality/geeetech/{base/Geeetech_base_0.5_PETG_low.inst.cfg => geeetech_quality/geeetech_quality_0.5_PETG_low.inst.cfg} (85%) rename resources/quality/geeetech/{base/Geeetech_base_0.5_PETG_standard.inst.cfg => geeetech_quality/geeetech_quality_0.5_PETG_standard.inst.cfg} (85%) rename resources/quality/geeetech/{base/Geeetech_base_0.5_PETG_super.inst.cfg => geeetech_quality/geeetech_quality_0.5_PETG_super.inst.cfg} (85%) rename resources/quality/geeetech/{base/Geeetech_base_0.5_PLA_adaptive.inst.cfg => geeetech_quality/geeetech_quality_0.5_PLA_adaptive.inst.cfg} (80%) rename resources/quality/geeetech/{base/Geeetech_base_0.5_PLA_low.inst.cfg => geeetech_quality/geeetech_quality_0.5_PLA_low.inst.cfg} (79%) rename resources/quality/geeetech/{base/Geeetech_base_0.5_PLA_standard.inst.cfg => geeetech_quality/geeetech_quality_0.5_PLA_standard.inst.cfg} (80%) rename resources/quality/geeetech/{base/Geeetech_base_0.5_PLA_super.inst.cfg => geeetech_quality/geeetech_quality_0.5_PLA_super.inst.cfg} (79%) rename resources/quality/geeetech/{base/Geeetech_base_0.5_TPU_adaptive.inst.cfg => geeetech_quality/geeetech_quality_0.5_TPU_adaptive.inst.cfg} (80%) rename resources/quality/geeetech/{base/Geeetech_base_0.5_TPU_standard.inst.cfg => geeetech_quality/geeetech_quality_0.5_TPU_standard.inst.cfg} (80%) rename resources/quality/geeetech/{base/Geeetech_base_0.5_TPU_super.inst.cfg => geeetech_quality/geeetech_quality_0.5_TPU_super.inst.cfg} (79%) rename resources/quality/geeetech/{base/Geeetech_base_0.6_ABS_standard.inst.cfg => geeetech_quality/geeetech_quality_0.6_ABS_standard.inst.cfg} (82%) rename resources/quality/geeetech/{base/Geeetech_base_0.6_PETG_standard.inst.cfg => geeetech_quality/geeetech_quality_0.6_PETG_standard.inst.cfg} (85%) rename resources/quality/geeetech/{base/Geeetech_base_0.6_PLA_draft.inst.cfg => geeetech_quality/geeetech_quality_0.6_PLA_draft.inst.cfg} (79%) rename resources/quality/geeetech/{base/Geeetech_base_0.6_PLA_low.inst.cfg => geeetech_quality/geeetech_quality_0.6_PLA_low.inst.cfg} (79%) rename resources/quality/geeetech/{base/Geeetech_base_0.6_PLA_standard.inst.cfg => geeetech_quality/geeetech_quality_0.6_PLA_standard.inst.cfg} (80%) rename resources/quality/geeetech/{base/Geeetech_base_0.6_TPU_standard.inst.cfg => geeetech_quality/geeetech_quality_0.6_TPU_standard.inst.cfg} (80%) rename resources/quality/geeetech/{base/Geeetech_base_0.8_ABS_draft.inst.cfg => geeetech_quality/geeetech_quality_0.8_ABS_draft.inst.cfg} (82%) rename resources/quality/geeetech/{base/Geeetech_base_0.8_PETG_draft.inst.cfg => geeetech_quality/geeetech_quality_0.8_PETG_draft.inst.cfg} (85%) rename resources/quality/geeetech/{base/Geeetech_base_0.8_PLA_draft.inst.cfg => geeetech_quality/geeetech_quality_0.8_PLA_draft.inst.cfg} (79%) rename resources/quality/geeetech/{base/Geeetech_base_0.8_TPU_draft.inst.cfg => geeetech_quality/geeetech_quality_0.8_TPU_draft.inst.cfg} (79%) rename resources/quality/geeetech/{base/Geeetech_base_1.0_ABS_draft.inst.cfg => geeetech_quality/geeetech_quality_1.0_ABS_draft.inst.cfg} (82%) rename resources/quality/geeetech/{base/Geeetech_base_1.0_PETG_draft.inst.cfg => geeetech_quality/geeetech_quality_1.0_PETG_draft.inst.cfg} (85%) rename resources/quality/geeetech/{base/Geeetech_base_1.0_PLA_draft.inst.cfg => geeetech_quality/geeetech_quality_1.0_PLA_draft.inst.cfg} (79%) rename resources/quality/geeetech/{base/Geeetech_base_1.0_TPU_draft.inst.cfg => geeetech_quality/geeetech_quality_1.0_TPU_draft.inst.cfg} (79%) rename resources/quality/geeetech/{base/Geeetech_base_global_adaptive.inst.cfg => geeetech_quality/geeetech_quality_global_adaptive.inst.cfg} (89%) rename resources/quality/geeetech/{base/Geeetech_base_global_draft.inst.cfg => geeetech_quality/geeetech_quality_global_draft.inst.cfg} (88%) rename resources/quality/geeetech/{base/Geeetech_base_global_low.inst.cfg => geeetech_quality/geeetech_quality_global_low.inst.cfg} (88%) rename resources/quality/geeetech/{base/Geeetech_base_global_standard.inst.cfg => geeetech_quality/geeetech_quality_global_standard.inst.cfg} (88%) rename resources/quality/geeetech/{base/Geeetech_base_global_super.inst.cfg => geeetech_quality/geeetech_quality_global_super.inst.cfg} (88%) rename resources/quality/geeetech/{base/Geeetech_base_global_ultra.inst.cfg => geeetech_quality/geeetech_quality_global_ultra.inst.cfg} (88%) rename resources/variants/{ => geeetech_variants}/geeetech_A10Pro_0.2.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_A10Pro_0.3.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_A10Pro_0.4.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_A10Pro_0.5.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_A10Pro_0.6.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_A10Pro_0.8.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_A10Pro_1.0.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_A20_0.2.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_A20_0.3.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_A20_0.4.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_A20_0.5.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_A20_0.6.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_A20_0.8.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_A20_1.0.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_A30Pro_0.2.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_A30Pro_0.3.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_A30Pro_0.4.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_A30Pro_0.5.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_A30Pro_0.6.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_A30Pro_0.8.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_A30Pro_1.0.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_E180_0.2.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_E180_0.3.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_E180_0.4.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_E180_0.5.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_E180_0.6.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_E180_0.8.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_E180_1.0.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_GiantArmD200_0.2.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_GiantArmD200_0.3.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_GiantArmD200_0.4.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_GiantArmD200_0.5.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_GiantArmD200_0.6.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_GiantArmD200_0.8.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_GiantArmD200_1.0.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_I3ProB_0.2.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_I3ProB_0.3.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_I3ProB_0.4.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_I3ProB_0.5.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_I3ProB_0.6.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_I3ProB_0.8.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_I3ProB_1.0.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_I3ProW_0.2.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_I3ProW_0.3.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_I3ProW_0.4.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_I3ProW_0.5.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_I3ProW_0.6.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_I3ProW_0.8.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_I3ProW_1.0.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MeCreator2_0.2.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MeCreator2_0.3.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MeCreator2_0.4.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MeCreator2_0.5.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MeCreator2_0.6.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MeCreator2_0.8.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MeCreator2_1.0.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MeCreator_0.2.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MeCreator_0.3.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MeCreator_0.4.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MeCreator_0.5.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MeCreator_0.6.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MeCreator_0.8.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MeCreator_1.0.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MeDucer_0.2.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MeDucer_0.3.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MeDucer_0.4.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MeDucer_0.5.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MeDucer_0.6.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MeDucer_0.8.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MeDucer_1.0.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MizarMax_0.2.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MizarMax_0.3.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MizarMax_0.4.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MizarMax_0.5.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MizarMax_0.6.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MizarMax_0.8.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MizarMax_1.0.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MizarPro_0.2.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MizarPro_0.3.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MizarPro_0.4.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MizarPro_0.5.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MizarPro_0.6.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MizarPro_0.8.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MizarPro_1.0.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MizarS_0.2.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MizarS_0.3.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MizarS_0.4.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MizarS_0.5.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MizarS_0.6.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MizarS_0.8.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MizarS_1.0.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_Mizar_0.2.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_Mizar_0.3.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_Mizar_0.4.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_Mizar_0.5.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_Mizar_0.6.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_Mizar_0.8.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_Mizar_1.0.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_Thunder_0.2.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_Thunder_0.3.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_Thunder_0.4.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_Thunder_0.5.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_Thunder_0.6.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_Thunder_0.8.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_Thunder_1.0.inst.cfg (100%) diff --git a/resources/definitions/Geeetech_Base_Dual_Extruder.def.json b/resources/definitions/Geeetech_Base_Dual_Extruder.def.json new file mode 100644 index 0000000000..ddaeb46dbb --- /dev/null +++ b/resources/definitions/Geeetech_Base_Dual_Extruder.def.json @@ -0,0 +1,117 @@ +{ + "version": 2, + "name": "Geeetech Base Dual-Extruder Printer", + "inherits": "fdmprinter", + "metadata": { + "visible": false, + "author": "Teddy.Hu", + "manufacturer": "Geeetech", + "file_formats": "text/x-gcode", + "first_start_actions": ["MachineSettingsAction"], + "has_materials": true, + "has_variants": false, + "has_machine_quality": true, + "variants_name": "Nozzle Size", + "preferred_variant_name": "0.4mm Nozzle", + "preferred_quality_type": "standard", + "preferred_material": "generic_pla", + "quality_definition": "Geeetech_Base_Single_Extruder", + "machine_extruder_trains": { + "0": "Geeetech_Dual_Extruder_0", "1": "Geeetech_Dual_Extruder_1" + } + }, + + "overrides":{ + "machine_name": { "default_value": "Geeetech Base Dual-Extruder Printer" }, + "machine_width": { "default_value": 350 }, + "machine_depth": { "default_value": 350 }, + "machine_height": {"default_value": 350 }, + "machine_head_with_fans_polygon": { "default_value": [[-40, 40], [40, 40], [40, -40], [-40, -40]] }, + "gantry_height": { "value": 40 }, + + "machine_start_gcode": { "default_value": ";Geeetech Custom Start G-code\nM104 S{material_print_temperature_layer_0} ;Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ;Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ;Wait for Hotend Temperature\nG92 E0 ;Reset Extruder\nG28 ;Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ;ON Light\n;M106 P0 S383 ;ON MainFan 150% if need\n;M106 P1 S255 ;ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ;Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ;Draw the first line\nG92 E0 ;Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ;Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ;Scrape off nozzle residue" }, + "machine_end_gcode": { "default_value": ";Geeetech Custom end G-code\nG91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers\n\n\n" }, + "machine_heated_bed": { "default_value": true }, + "machine_extruder_count": { "default_value": 2 }, + + "machine_max_feedrate_x": { "value": 500 }, + "machine_max_feedrate_y": { "value": 500 }, + "machine_max_feedrate_z": { "value": 10 }, + "machine_max_feedrate_e": { "value": 40 }, + "machine_max_acceleration_x": { "value": 500 }, + "machine_max_acceleration_y": { "value": 500 }, + "machine_max_acceleration_z": { "value": 111 }, + "machine_max_acceleration_e": { "value": 1000 }, + "machine_acceleration": { "value": 500 }, + "machine_max_jerk_xy": { "value": 10 }, + "machine_max_jerk_z": { "value": 0.3 }, + "machine_max_jerk_e": { "value": 4.9 }, + + "acceleration_print": { "value": 500 }, + "acceleration_travel": { "value": 500 }, + "acceleration_travel_layer_0": { "value": "acceleration_travel" }, + + "line_width": { "value": "1.125*machine_nozzle_size if speed_infill<=100 else machine_nozzle_size" }, + "retraction_speed": { "value": 35 }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'grid'" }, + "small_hole_max_size":{ "value": "5 if speed_infill>=150 else 0" }, + "cool_min_layer_time":{ "value": "1.3 if speed_infill>=200 else 5" }, + "material_print_temperature": { "value": "200 if speed_infill <=100 else 210 if speed_infill <= 150 else 220 if speed_infill <= 180 else 230", "maximum_value": "250" }, + "material_print_temperature_layer_0": { "value": "material_print_temperature + 5", "maximum_value_warning": 250 }, + "material_initial_print_temperature": { "value": "material_print_temperature - 5", "minimum_value_warning": "material_standby_temperature - 10" }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_bed_temperature": { "maximum_value_warning": 110 }, + + "speed_wall": { "value": "60 if speed_print==60 else math.ceil(round(speed_print*0.90))" }, + "speed_wall_0": { "value": "30 if speed_print==60 else math.ceil(round(speed_print*0.75))" }, + "speed_wall_x": { "value": "60 if speed_print==60 else math.ceil(round(speed_print*0.90))" }, + "speed_topbottom": { "value": "speed_print" }, + "speed_travel": { "value": "200 if 120<=speed_print<=200 else speed_print if speed_print>200 else 120" }, + "speed_layer_0": { "value":"50 if speed_infill <= 150 else 75","maximum_value_warning": "100" }, + "speed_print_layer_0": { "value": "25 if speed_infill <= 150 else 35","maximum_value_warning": "60" }, + "speed_travel_layer_0": { "value": "speed_layer_0","maximum_value_warning": "150" }, + "skirt_brim_speed": { "value":"speed_print_layer_0","maximum_value_warning": "60" }, + + "speed_support": { "value": "speed_print*0.5" }, + "speed_support_interface": { "value": "speed_support / 0.8" }, + "speed_support_roof": { "value": "speed_support_interface / 2" }, + "speed_support_bottom": { "value": "speed_support_roof" }, + + "wall_transition_filter_deviation":{ "value": 0.15 }, + "travel_avoid_supports": { "value": true }, + "retraction_hop": { "value": 0.5 }, + "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'all'" }, + "retraction_combing_max_distance": { "value": 30 }, + "optimize_wall_printing_order": { "value": true }, + "z_seam_type": { "value": "'sharpest_corner'" }, + "z_seam_corner": { "value": "'z_seam_corner_inner'" }, + + "support_use_towers": { "value": false }, + "support_pattern": { "value": "'zigzag'" }, + "support_wall_count": { "value": 0 }, + "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" }, + "support_brim_enable": { "value": true }, + "support_brim_width": { "value": 5 }, + "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height*2" }, + "support_xy_distance": { "value": "wall_line_width_0 * 2" }, + "support_xy_distance_overhang": { "value": "wall_line_width_0" }, + + "support_interface_height": { "value": "layer_height * 3" }, + "support_interface_density": { "value": 33.333 }, + "support_interface_skip_height": { "value": 0.2 }, + "support_interface_pattern": { "value": "zigzag" }, + + "minimum_support_area": { "value": 2 }, + "minimum_interface_area": { "value": 10 }, + "top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3" }, + "wall_thickness": { "value": "line_width * 2" }, + + "adhesion_type": { "value": "'skirt'" }, + "brim_replaces_support": { "value": false }, + "skirt_gap": { "value": 6 }, + + "prime_tower_size": { "value": 30 }, + "prime_tower_min_volume": { "value": 85, "maximum_value_warning":150 }, + "prime_tower_brim_enable": { "value": true } + } +} diff --git a/resources/definitions/Geeetech_Base_Multi_Extruder.def.json b/resources/definitions/Geeetech_Base_Multi_Extruder.def.json new file mode 100644 index 0000000000..35fc613eef --- /dev/null +++ b/resources/definitions/Geeetech_Base_Multi_Extruder.def.json @@ -0,0 +1,117 @@ +{ + "version": 2, + "name": "Geeetech Base Multi-Extruder Printer", + "inherits": "fdmprinter", + "metadata": { + "visible": false, + "author": "Teddy.Hu", + "manufacturer": "Geeetech", + "file_formats": "text/x-gcode", + "first_start_actions": ["MachineSettingsAction"], + "has_materials": true, + "has_variants": false, + "has_machine_quality": true, + "variants_name": "Nozzle Size", + "preferred_variant_name": "0.4mm Nozzle", + "preferred_quality_type": "standard", + "preferred_material": "generic_pla", + "quality_definition": "Geeetech_Base_Single_Extruder", + "machine_extruder_trains": { + "0": "Geeetech_Multi_Extruder_0", "1": "Geeetech_Multi_Extruder_1", "2": "Geeetech_Multi_Extruder_2" + } + }, + + "overrides":{ + "machine_name": { "default_value": "Geeetech Base Multi-Extruder Printer" }, + "machine_width": { "default_value": 350 }, + "machine_depth": { "default_value": 350 }, + "machine_height": {"default_value": 350 }, + "machine_head_with_fans_polygon": { "default_value": [[-40, 40], [40, 40], [40, -40], [-40, -40]] }, + "gantry_height": { "value": 40 }, + + "machine_start_gcode": { "default_value": ";Geeetech Custom Start G-code\nM104 S{material_print_temperature_layer_0} ;Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ;Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ;Wait for Hotend Temperature\nG92 E0 ;Reset Extruder\nG28 ;Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ;ON Light\n;M106 P0 S383 ;ON MainFan 150% if need\n;M106 P1 S255 ;ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ;Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ;Draw the first line\nG92 E0 ;Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ;Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ;Scrape off nozzle residue" }, + "machine_end_gcode": { "default_value": ";Geeetech Custom end G-code\nG91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers\n\n\n" }, + "machine_heated_bed": { "default_value": true }, + "machine_extruder_count": { "default_value": 3 }, + + "machine_max_feedrate_x": { "value": 500 }, + "machine_max_feedrate_y": { "value": 500 }, + "machine_max_feedrate_z": { "value": 10 }, + "machine_max_feedrate_e": { "value": 40 }, + "machine_max_acceleration_x": { "value": 500 }, + "machine_max_acceleration_y": { "value": 500 }, + "machine_max_acceleration_z": { "value": 111 }, + "machine_max_acceleration_e": { "value": 1000 }, + "machine_acceleration": { "value": 500 }, + "machine_max_jerk_xy": { "value": 10 }, + "machine_max_jerk_z": { "value": 0.3 }, + "machine_max_jerk_e": { "value": 4.9 }, + + "acceleration_print": { "value": 500 }, + "acceleration_travel": { "value": 500 }, + "acceleration_travel_layer_0": { "value": "acceleration_travel" }, + + "line_width": { "value": "1.125*machine_nozzle_size if speed_infill<=100 else machine_nozzle_size" }, + "retraction_speed": { "value": 35 }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'grid'" }, + "small_hole_max_size":{ "value": "5 if speed_infill>=150 else 0" }, + "cool_min_layer_time":{ "value": "1.3 if speed_infill>=200 else 5" }, + "material_print_temperature": { "value": "200 if speed_infill <=100 else 210 if speed_infill <= 150 else 220 if speed_infill <= 180 else 230", "maximum_value": "250" }, + "material_print_temperature_layer_0": { "value": "material_print_temperature + 5", "maximum_value_warning": 250 }, + "material_initial_print_temperature": { "value": "material_print_temperature - 5", "minimum_value_warning": "material_standby_temperature - 10" }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_bed_temperature": { "maximum_value_warning": 110 }, + + "speed_wall": { "value": "60 if speed_print==60 else math.ceil(round(speed_print*0.90))" }, + "speed_wall_0": { "value": "30 if speed_print==60 else math.ceil(round(speed_print*0.75))" }, + "speed_wall_x": { "value": "60 if speed_print==60 else math.ceil(round(speed_print*0.90))" }, + "speed_topbottom": { "value": "speed_print" }, + "speed_travel": { "value": "200 if 120<=speed_print<=200 else speed_print if speed_print>200 else 120" }, + "speed_layer_0": { "value":"50 if speed_infill <= 150 else 75","maximum_value_warning": "100" }, + "speed_print_layer_0": { "value": "25 if speed_infill <= 150 else 35","maximum_value_warning": "60" }, + "speed_travel_layer_0": { "value": "speed_layer_0","maximum_value_warning": "150" }, + "skirt_brim_speed": { "value":"speed_print_layer_0","maximum_value_warning": "60" }, + + "speed_support": { "value": "speed_print*0.5" }, + "speed_support_interface": { "value": "speed_support / 0.8" }, + "speed_support_roof": { "value": "speed_support_interface / 2" }, + "speed_support_bottom": { "value": "speed_support_roof" }, + + "wall_transition_filter_deviation":{ "value": 0.15 }, + "travel_avoid_supports": { "value": true }, + "retraction_hop": { "value": 0.5 }, + "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'all'" }, + "retraction_combing_max_distance": { "value": 30 }, + "optimize_wall_printing_order": { "value": true }, + "z_seam_type": { "value": "'sharpest_corner'" }, + "z_seam_corner": { "value": "'z_seam_corner_inner'" }, + + "support_use_towers": { "value": false }, + "support_pattern": { "value": "'zigzag'" }, + "support_wall_count": { "value": 0 }, + "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" }, + "support_brim_enable": { "value": true }, + "support_brim_width": { "value": 5 }, + "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height*2" }, + "support_xy_distance": { "value": "wall_line_width_0 * 2" }, + "support_xy_distance_overhang": { "value": "wall_line_width_0" }, + + "support_interface_height": { "value": "layer_height * 3" }, + "support_interface_density": { "value": 33.333 }, + "support_interface_skip_height": { "value": 0.2 }, + "support_interface_pattern": { "value": "zigzag" }, + + "minimum_support_area": { "value": 2 }, + "minimum_interface_area": { "value": 10 }, + "top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3" }, + "wall_thickness": { "value": "line_width * 2" }, + + "adhesion_type": { "value": "'skirt'" }, + "brim_replaces_support": { "value": false }, + "skirt_gap": { "value": 6 }, + + "prime_tower_size": { "value": 30 }, + "prime_tower_min_volume": { "value": 85, "maximum_value_warning":150 }, + "prime_tower_brim_enable": { "value": true } + } +} diff --git a/resources/definitions/Geeetech_base.def.json b/resources/definitions/Geeetech_Base_Single_Extruder.def.json similarity index 94% rename from resources/definitions/Geeetech_base.def.json rename to resources/definitions/Geeetech_Base_Single_Extruder.def.json index bb30682803..ecefa15408 100644 --- a/resources/definitions/Geeetech_base.def.json +++ b/resources/definitions/Geeetech_Base_Single_Extruder.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "Geeetech Base Printer", + "name": "Geeetech Base Single Extruder Printer", "inherits": "fdmprinter", "metadata": { "visible": false, @@ -9,16 +9,20 @@ "file_formats": "text/x-gcode", "first_start_actions": ["MachineSettingsAction"], "has_materials": true, - "has_variants": false, + "has_variants": true, "has_machine_quality": true, "variants_name": "Nozzle Size", "preferred_variant_name": "0.4mm Nozzle", "preferred_quality_type": "standard", - "preferred_material": "generic_pla" + "preferred_material": "generic_pla", + "quality_definition": "Geeetech_Base_Single_Extruder", + "machine_extruder_trains": { + "0": "Geeetech_Single_Extruder" + } }, "overrides":{ - "machine_name": { "default_value": "Geeetech Base Printer" }, + "machine_name": { "default_value": "Geeetech Base Single Extruder Printer" }, "machine_width": { "default_value": 350 }, "machine_depth": { "default_value": 350 }, "machine_height": {"default_value": 350 }, @@ -103,10 +107,6 @@ "adhesion_type": { "value": "'skirt'" }, "brim_replaces_support": { "value": false }, - "skirt_gap": { "value": 6 }, - - "prime_tower_size": { "value": 30 }, - "prime_tower_min_volume": { "value": 85, "maximum_value_warning":150 }, - "prime_tower_brim_enable": { "value": true } + "skirt_gap": { "value": 6 } } } diff --git a/resources/definitions/geeetech_A10M.def.json b/resources/definitions/geeetech_A10M.def.json index 752db2dfa1..98ee8d7992 100644 --- a/resources/definitions/geeetech_A10M.def.json +++ b/resources/definitions/geeetech_A10M.def.json @@ -1,18 +1,14 @@ { "version": 2, "name": "Geeetech A10M", - "inherits": "Geeetech_base", + "inherits": "Geeetech_Base_Dual_Extruder", "metadata": { - "quality_definition": "Geeetech_base", - "visible": true, - "has_materials": true, - "has_variants": false, - "has_machine_quality": true, + "visible": true, "preferred_material": "Geeetech_PLA_Cyan", - "machine_extruder_trains": { - "0": "Geeetech_Dual_Extruder_0", "1": "Geeetech_Dual_Extruder_1" - } - }, + "machine_extruder_trains": { + "0": "Geeetech_Dual_Extruder_0", "1": "Geeetech_Dual_Extruder_1" + } + }, "overrides": { "machine_name": { "default_value": "Geeetech A10M" }, @@ -26,7 +22,6 @@ "prime_tower_position_y":{ "value": 160 }, "machine_start_gcode": { "default_value": ";Geeetech A10M Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, - "machine_extruder_count": { "default_value": 2 } + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } } } diff --git a/resources/definitions/geeetech_A10Pro.def.json b/resources/definitions/geeetech_A10Pro.def.json index eb9616bf64..b52e76cf98 100644 --- a/resources/definitions/geeetech_A10Pro.def.json +++ b/resources/definitions/geeetech_A10Pro.def.json @@ -1,17 +1,13 @@ { "version": 2, "name": "Geeetech A10Pro", - "inherits": "Geeetech_base", + "inherits": "Geeetech_Base_Single_Extruder", "metadata": { - "quality_definition": "Geeetech_base", - "visible": true, - "has_materials": true, - "has_variants": true, - "has_machine_quality": true, - "machine_extruder_trains": { - "0": "Geeetech_base_extruder_0" - } - }, + "visible": true, + "machine_extruder_trains": { + "0": "Geeetech_Single_Extruder" + } + }, "overrides": { "machine_name": { "default_value": "Geeetech A10Pro" }, diff --git a/resources/definitions/geeetech_A10T.def.json b/resources/definitions/geeetech_A10T.def.json index 8ce9b67bd7..ef08b7308f 100644 --- a/resources/definitions/geeetech_A10T.def.json +++ b/resources/definitions/geeetech_A10T.def.json @@ -1,18 +1,14 @@ { "version": 2, "name": "Geeetech A10T", - "inherits": "Geeetech_base", + "inherits": "Geeetech_Base_Multi_Extruder", "metadata": { - "quality_definition": "Geeetech_base", - "visible": true, - "has_materials": true, - "has_variants": false, - "has_machine_quality": true, + "visible": true, "preferred_material": "Geeetech_PLA_Magenta", - "machine_extruder_trains": { - "0": "Geeetech_Multi_Extruder_0", "1": "Geeetech_Multi_Extruder_1", "2": "Geeetech_Multi_Extruder_2" - } - }, + "machine_extruder_trains": { + "0": "Geeetech_Multi_Extruder_0", "1": "Geeetech_Multi_Extruder_1", "2": "Geeetech_Multi_Extruder_2" + } + }, "overrides": { "machine_name": { "default_value": "Geeetech A10T" }, @@ -26,7 +22,6 @@ "prime_tower_position_y":{ "value": 160 }, "machine_start_gcode": { "default_value": ";Geeetech A10T Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, - "machine_extruder_count": { "default_value": 3 } + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } } } diff --git a/resources/definitions/geeetech_A20.def.json b/resources/definitions/geeetech_A20.def.json index 0d38988d16..ffab8249cd 100644 --- a/resources/definitions/geeetech_A20.def.json +++ b/resources/definitions/geeetech_A20.def.json @@ -1,17 +1,13 @@ { "version": 2, "name": "Geeetech A20", - "inherits": "Geeetech_base", + "inherits": "Geeetech_Base_Single_Extruder", "metadata": { - "quality_definition": "Geeetech_base", - "visible": true, - "has_materials": true, - "has_variants": true, - "has_machine_quality": true, - "machine_extruder_trains": { - "0": "Geeetech_base_extruder_0" + "visible": true, + "machine_extruder_trains": { + "0": "Geeetech_Single_Extruder" } - }, + }, "overrides": { "machine_name": { "default_value": "Geeetech A20" }, diff --git a/resources/definitions/geeetech_A20M.def.json b/resources/definitions/geeetech_A20M.def.json index f7770a87d0..24facca7f8 100644 --- a/resources/definitions/geeetech_A20M.def.json +++ b/resources/definitions/geeetech_A20M.def.json @@ -1,18 +1,14 @@ { "version": 2, "name": "Geeetech A20M", - "inherits": "Geeetech_base", + "inherits": "Geeetech_Base_Dual_Extruder", "metadata": { - "quality_definition": "Geeetech_base", - "visible": true, - "has_materials": true, - "has_variants": false, - "has_machine_quality": true, + "visible": true, "preferred_material": "Geeetech_PLA_Yellow", - "machine_extruder_trains": { - "0": "Geeetech_Dual_Extruder_0", "1": "Geeetech_Dual_Extruder_1" - } - }, + "machine_extruder_trains": { + "0": "Geeetech_Dual_Extruder_0", "1": "Geeetech_Dual_Extruder_1" + } + }, "overrides": { "machine_name": { "default_value": "Geeetech A20M" }, @@ -26,7 +22,6 @@ "prime_tower_position_y":{ "value": 190 }, "machine_start_gcode": { "default_value": ";Geeetech A20M Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, - "machine_extruder_count": { "default_value": 2 } + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } } } diff --git a/resources/definitions/geeetech_A20T.def.json b/resources/definitions/geeetech_A20T.def.json index 2771499554..a404e72f69 100644 --- a/resources/definitions/geeetech_A20T.def.json +++ b/resources/definitions/geeetech_A20T.def.json @@ -1,18 +1,14 @@ { "version": 2, "name": "Geeetech A20T", - "inherits": "Geeetech_base", + "inherits": "Geeetech_Base_Multi_Extruder", "metadata": { - "quality_definition": "Geeetech_base", - "visible": true, - "has_materials": true, - "has_variants": false, - "has_machine_quality": true, + "visible": true, "preferred_material": "Geeetech_PLA_Red", - "machine_extruder_trains": { - "0": "Geeetech_Multi_Extruder_0", "1": "Geeetech_Multi_Extruder_1", "2": "Geeetech_Multi_Extruder_2" - } - }, + "machine_extruder_trains": { + "0": "Geeetech_Multi_Extruder_0", "1": "Geeetech_Multi_Extruder_1", "2": "Geeetech_Multi_Extruder_2" + } + }, "overrides": { "machine_name": { "default_value": "Geeetech A20T" }, @@ -26,7 +22,6 @@ "prime_tower_position_y":{ "value": 190 }, "machine_start_gcode": { "default_value": ";Geeetech A20T Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, - "machine_extruder_count": { "default_value": 3 } + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } } } diff --git a/resources/definitions/geeetech_A30M.def.json b/resources/definitions/geeetech_A30M.def.json index 225f3f5d59..ff7845b329 100644 --- a/resources/definitions/geeetech_A30M.def.json +++ b/resources/definitions/geeetech_A30M.def.json @@ -1,18 +1,14 @@ { "version": 2, "name": "Geeetech A30M", - "inherits": "Geeetech_base", + "inherits": "Geeetech_Base_Dual_Extruder", "metadata": { - "quality_definition": "Geeetech_base", - "visible": true, - "has_materials": true, - "has_variants": false, - "has_machine_quality": true, + "visible": true, "preferred_material": "Geeetech_PLA_Green", - "machine_extruder_trains": { - "0": "Geeetech_Dual_Extruder_0", "1": "Geeetech_Dual_Extruder_1" - } - }, + "machine_extruder_trains": { + "0": "Geeetech_Dual_Extruder_0", "1": "Geeetech_Dual_Extruder_1" + } + }, "overrides": { "machine_name": { "default_value": "Geeetech A30M" }, @@ -26,7 +22,6 @@ "prime_tower_position_y":{ "value": 260 }, "machine_start_gcode": { "default_value": ";Geeetech A30M Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, - "machine_extruder_count": { "default_value": 2 } + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } } } diff --git a/resources/definitions/geeetech_A30Pro.def.json b/resources/definitions/geeetech_A30Pro.def.json index ebf23a0eef..0b5c82c1e8 100644 --- a/resources/definitions/geeetech_A30Pro.def.json +++ b/resources/definitions/geeetech_A30Pro.def.json @@ -1,17 +1,13 @@ { "version": 2, "name": "Geeetech A30Pro", - "inherits": "Geeetech_base", + "inherits": "Geeetech_Base_Single_Extruder", "metadata": { - "quality_definition": "Geeetech_base", "visible": true, - "has_materials": true, - "has_variants": true, - "has_machine_quality": true, - "machine_extruder_trains": { - "0": "Geeetech_base_extruder_0" + "machine_extruder_trains": { + "0": "Geeetech_Single_Extruder" } - }, + }, "overrides": { "machine_name": { "default_value": "Geeetech A30Pro" }, diff --git a/resources/definitions/geeetech_A30T.def.json b/resources/definitions/geeetech_A30T.def.json index 7c44017a5f..186fc08e2a 100644 --- a/resources/definitions/geeetech_A30T.def.json +++ b/resources/definitions/geeetech_A30T.def.json @@ -1,18 +1,14 @@ { "version": 2, "name": "Geeetech A30T", - "inherits": "Geeetech_base", + "inherits": "Geeetech_Base_Multi_Extruder", "metadata": { - "quality_definition": "Geeetech_base", - "visible": true, - "has_materials": true, - "has_variants": false, - "has_machine_quality": true, + "visible": true, "preferred_material": "Geeetech_PLA_Blue", - "machine_extruder_trains": { - "0": "Geeetech_Multi_Extruder_0", "1": "Geeetech_Multi_Extruder_1", "2": "Geeetech_Multi_Extruder_2" - } - }, + "machine_extruder_trains": { + "0": "Geeetech_Multi_Extruder_0", "1": "Geeetech_Multi_Extruder_1", "2": "Geeetech_Multi_Extruder_2" + } + }, "overrides": { "machine_name": { "default_value": "Geeetech A30T" }, @@ -26,7 +22,6 @@ "prime_tower_position_y":{ "value": 260 }, "machine_start_gcode": { "default_value": ";Geeetech A30T Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, - "machine_extruder_count": { "default_value": 3 } + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } } } diff --git a/resources/definitions/geeetech_E180.def.json b/resources/definitions/geeetech_E180.def.json index d61086259b..a2839d7fed 100644 --- a/resources/definitions/geeetech_E180.def.json +++ b/resources/definitions/geeetech_E180.def.json @@ -1,17 +1,13 @@ { "version": 2, "name": "Geeetech E180", - "inherits": "Geeetech_base", + "inherits": "Geeetech_Base_Single_Extruder", "metadata": { - "quality_definition": "Geeetech_base", - "visible": true, - "has_materials": true, - "has_variants": true, - "has_machine_quality": true, - "machine_extruder_trains": { - "0": "Geeetech_base_extruder_0" + "visible": true, + "machine_extruder_trains": { + "0": "Geeetech_Single_Extruder" } - }, + }, "overrides": { "machine_name": { "default_value": "Geeetech E180" }, diff --git a/resources/definitions/geeetech_GiantArmD200.def.json b/resources/definitions/geeetech_GiantArmD200.def.json index 663b206ba7..027b8b8973 100644 --- a/resources/definitions/geeetech_GiantArmD200.def.json +++ b/resources/definitions/geeetech_GiantArmD200.def.json @@ -1,17 +1,13 @@ { "version": 2, "name": "Geeetech GiantArmD200", - "inherits": "Geeetech_base", + "inherits": "Geeetech_Base_Single_Extruder", "metadata": { - "quality_definition": "Geeetech_base", - "visible": true, - "has_materials": true, - "has_variants": true, - "has_machine_quality": true, - "machine_extruder_trains": { - "0": "Geeetech_base_extruder_0" + "visible": true, + "machine_extruder_trains": { + "0": "Geeetech_Single_Extruder" } - }, + }, "overrides": { "machine_name": { "default_value": "Geeetech GiantArmD200" }, diff --git a/resources/definitions/geeetech_I3ProB.def.json b/resources/definitions/geeetech_I3ProB.def.json index 399ec0df0a..1cc17f55ec 100644 --- a/resources/definitions/geeetech_I3ProB.def.json +++ b/resources/definitions/geeetech_I3ProB.def.json @@ -1,17 +1,13 @@ { "version": 2, "name": "Geeetech I3ProB", - "inherits": "Geeetech_base", + "inherits": "Geeetech_Base_Single_Extruder", "metadata": { - "quality_definition": "Geeetech_base", - "visible": true, - "has_materials": true, - "has_variants": true, - "has_machine_quality": true, - "machine_extruder_trains": { - "0": "Geeetech_base_extruder_0" + "visible": true, + "machine_extruder_trains": { + "0": "Geeetech_Single_Extruder" } - }, + }, "overrides": { "machine_name": { "default_value": "Geeetech I3ProB" }, diff --git a/resources/definitions/geeetech_I3ProC.def.json b/resources/definitions/geeetech_I3ProC.def.json index e4fdbff3ea..87d4b5391f 100644 --- a/resources/definitions/geeetech_I3ProC.def.json +++ b/resources/definitions/geeetech_I3ProC.def.json @@ -1,18 +1,14 @@ { "version": 2, "name": "Geeetech I3ProC", - "inherits": "Geeetech_base", + "inherits": "Geeetech_Base_Dual_Extruder", "metadata": { - "quality_definition": "Geeetech_base", - "visible": true, - "has_materials": true, - "has_variants": false, - "has_machine_quality": true, + "visible": true, "preferred_material": "Geeetech_PLA_Black", - "machine_extruder_trains": { - "0": "Geeetech_Dual_Extruder_0", "1": "Geeetech_Dual_Extruder_1" - } - }, + "machine_extruder_trains": { + "0": "Geeetech_Dual_Extruder_0", "1": "Geeetech_Dual_Extruder_1" + } + }, "overrides": { "machine_name": { "default_value": "Geeetech I3ProC" }, @@ -27,7 +23,6 @@ "prime_tower_position_y":{ "value": 140 }, "machine_start_gcode": { "default_value": ";Geeetech I3ProC Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y10 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y180.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y180.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y10 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, - "machine_extruder_count": { "default_value": 2 } + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } } } diff --git a/resources/definitions/geeetech_I3ProW.def.json b/resources/definitions/geeetech_I3ProW.def.json index acb0bb10ad..fdc6f866bb 100644 --- a/resources/definitions/geeetech_I3ProW.def.json +++ b/resources/definitions/geeetech_I3ProW.def.json @@ -1,17 +1,13 @@ { "version": 2, "name": "Geeetech I3ProW", - "inherits": "Geeetech_base", + "inherits": "Geeetech_Base_Single_Extruder", "metadata": { - "quality_definition": "Geeetech_base", - "visible": true, - "has_materials": true, - "has_variants": true, - "has_machine_quality": true, - "machine_extruder_trains": { - "0": "Geeetech_base_extruder_0" + "visible": true, + "machine_extruder_trains": { + "0": "Geeetech_Single_Extruder" } - }, + }, "overrides": { "machine_name": { "default_value": "Geeetech I3ProW" }, diff --git a/resources/definitions/geeetech_MeCreator.def.json b/resources/definitions/geeetech_MeCreator.def.json index 1f9ed2c6b9..c0d22e539c 100644 --- a/resources/definitions/geeetech_MeCreator.def.json +++ b/resources/definitions/geeetech_MeCreator.def.json @@ -1,17 +1,13 @@ { "version": 2, "name": "Geeetech MeCreator", - "inherits": "Geeetech_base", + "inherits": "Geeetech_Base_Single_Extruder", "metadata": { - "quality_definition": "Geeetech_base", - "visible": true, - "has_materials": true, - "has_variants": true, - "has_machine_quality": true, - "machine_extruder_trains": { - "0": "Geeetech_base_extruder_0" + "visible": true, + "machine_extruder_trains": { + "0": "Geeetech_Single_Extruder" } - }, + }, "overrides": { "machine_name": { "default_value": "Geeetech MeCreator" }, diff --git a/resources/definitions/geeetech_MeCreator2.def.json b/resources/definitions/geeetech_MeCreator2.def.json index 3a856ca67a..d9a5016093 100644 --- a/resources/definitions/geeetech_MeCreator2.def.json +++ b/resources/definitions/geeetech_MeCreator2.def.json @@ -1,17 +1,13 @@ { "version": 2, "name": "Geeetech MeCreator2", - "inherits": "Geeetech_base", + "inherits": "Geeetech_Base_Single_Extruder", "metadata": { - "quality_definition": "Geeetech_base", - "visible": true, - "has_materials": true, - "has_variants": true, - "has_machine_quality": true, - "machine_extruder_trains": { - "0": "Geeetech_base_extruder_0" + "visible": true, + "machine_extruder_trains": { + "0": "Geeetech_Single_Extruder" } - }, + }, "overrides": { "machine_name": { "default_value": "Geeetech MeCreator2" }, diff --git a/resources/definitions/geeetech_MeDucer.def.json b/resources/definitions/geeetech_MeDucer.def.json index ef17de75c3..879f0cbfcd 100644 --- a/resources/definitions/geeetech_MeDucer.def.json +++ b/resources/definitions/geeetech_MeDucer.def.json @@ -1,17 +1,13 @@ { "version": 2, "name": "Geeetech MeDucer", - "inherits": "Geeetech_base", + "inherits": "Geeetech_Base_Single_Extruder", "metadata": { - "quality_definition": "Geeetech_base", - "visible": true, - "has_materials": true, - "has_variants": true, - "has_machine_quality": true, - "machine_extruder_trains": { - "0": "Geeetech_base_extruder_0" + "visible": true, + "machine_extruder_trains": { + "0": "Geeetech_Single_Extruder" } - }, + }, "overrides": { "machine_name": { "default_value": "Geeetech MeDucer" }, diff --git a/resources/definitions/geeetech_Mizar.def.json b/resources/definitions/geeetech_Mizar.def.json index b9569c7649..ef7e4e17cd 100644 --- a/resources/definitions/geeetech_Mizar.def.json +++ b/resources/definitions/geeetech_Mizar.def.json @@ -1,17 +1,13 @@ { "version": 2, "name": "Geeetech Mizar", - "inherits": "Geeetech_base", + "inherits": "Geeetech_Base_Single_Extruder", "metadata": { - "quality_definition": "Geeetech_base", - "visible": true, - "has_materials": true, - "has_variants": true, - "has_machine_quality": true, - "machine_extruder_trains": { - "0": "Geeetech_base_extruder_0" + "visible": true, + "machine_extruder_trains": { + "0": "Geeetech_Single_Extruder" } - }, + }, "overrides": { "machine_name": { "default_value": "Geeetech Mizar" }, diff --git a/resources/definitions/geeetech_MizarM.def.json b/resources/definitions/geeetech_MizarM.def.json index 3a8f31bf9b..ac9c2e4bd0 100644 --- a/resources/definitions/geeetech_MizarM.def.json +++ b/resources/definitions/geeetech_MizarM.def.json @@ -1,18 +1,14 @@ { "version": 2, "name": "Geeetech MizarM", - "inherits": "Geeetech_base", + "inherits": "Geeetech_Base_Dual_Extruder", "metadata": { - "quality_definition": "Geeetech_base", - "visible": true, - "has_materials": true, - "has_variants": false, - "has_machine_quality": true, + "visible": true, "preferred_material": "Geeetech_PLA_Magenta", - "machine_extruder_trains": { - "0": "Geeetech_Dual_Extruder_0", "1": "Geeetech_Dual_Extruder_1" - } - }, + "machine_extruder_trains": { + "0": "Geeetech_Dual_Extruder_0", "1": "Geeetech_Dual_Extruder_1" + } + }, "overrides": { "machine_name": { "default_value": "Geeetech MizarM" }, @@ -27,7 +23,6 @@ "machine_start_gcode": { "default_value": ";Official open-source firmware for MizarM: https://github.com/Geeetech3D/Mizar-M \n\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, - "machine_extruder_count": { "default_value": 2 }, "material_standby_temperature": {"value": 200 } } } diff --git a/resources/definitions/geeetech_MizarMax.def.json b/resources/definitions/geeetech_MizarMax.def.json index 4856ac5065..315318a6a7 100644 --- a/resources/definitions/geeetech_MizarMax.def.json +++ b/resources/definitions/geeetech_MizarMax.def.json @@ -1,14 +1,13 @@ { "version": 2, "name": "Geeetech MizarMax", - "inherits": "Geeetech_base", + "inherits": "Geeetech_Base_Single_Extruder", "metadata": { - "quality_definition": "Geeetech_base", - "visible": true, - "has_materials": true, - "has_variants": true, - "has_machine_quality": true - }, + "visible": true, + "machine_extruder_trains": { + "0": "Geeetech_Single_Extruder" + } + }, "overrides": { "machine_name": { "default_value": "Geeetech MizarMax" }, diff --git a/resources/definitions/geeetech_MizarPro.def.json b/resources/definitions/geeetech_MizarPro.def.json index b91ef3e066..683552127a 100644 --- a/resources/definitions/geeetech_MizarPro.def.json +++ b/resources/definitions/geeetech_MizarPro.def.json @@ -1,17 +1,13 @@ { "version": 2, "name": "Geeetech MizarPro", - "inherits": "Geeetech_base", + "inherits": "Geeetech_Base_Single_Extruder", "metadata": { - "quality_definition": "Geeetech_base", - "visible": true, - "has_materials": true, - "has_variants": true, - "has_machine_quality": true, - "machine_extruder_trains": { - "0": "Geeetech_base_extruder_0" + "visible": true, + "machine_extruder_trains": { + "0": "Geeetech_Single_Extruder" } - }, + }, "overrides": { "machine_name": { "default_value": "Geeetech MizarPro" }, diff --git a/resources/definitions/geeetech_MizarS.def.json b/resources/definitions/geeetech_MizarS.def.json index f2d026aeb8..ef4195413e 100644 --- a/resources/definitions/geeetech_MizarS.def.json +++ b/resources/definitions/geeetech_MizarS.def.json @@ -1,17 +1,13 @@ { "version": 2, "name": "Geeetech MizarS", - "inherits": "Geeetech_base", + "inherits": "Geeetech_Base_Single_Extruder", "metadata": { - "quality_definition": "Geeetech_base", - "visible": true, - "has_materials": true, - "has_variants": true, - "has_machine_quality": true, - "machine_extruder_trains": { - "0": "Geeetech_base_extruder_0" - } - }, + "visible": true, + "machine_extruder_trains": { + "0": "Geeetech_Single_Extruder" + } + }, "overrides": { "machine_name": { "default_value": "Geeetech MizarS" }, diff --git a/resources/definitions/geeetech_Thunder.def.json b/resources/definitions/geeetech_Thunder.def.json index 141459dae8..0bb7383d5c 100644 --- a/resources/definitions/geeetech_Thunder.def.json +++ b/resources/definitions/geeetech_Thunder.def.json @@ -1,17 +1,13 @@ { "version": 2, "name": "Geeetech Thunder", - "inherits": "Geeetech_base", + "inherits": "Geeetech_Base_Single_Extruder", "metadata": { - "quality_definition": "Geeetech_base", - "visible": true, - "has_materials": true, - "has_variants": true, - "has_machine_quality": true, - "machine_extruder_trains": { - "0": "Geeetech_base_extruder_0" - } - }, + "visible": true, + "machine_extruder_trains": { + "0": "Geeetech_Single_Extruder" + } + }, "overrides": { "machine_name": { "default_value": "Geeetech Thunder" }, @@ -47,8 +43,7 @@ "cool_fan_speed_max":{ "maximum_value": "151","value": "cool_fan_speed" }, "material_print_temperature": { "value": "200 if speed_infill <=150 else 205 if speed_infill <= 200 else 215 if speed_infill <= 260 else 220","maximum_value": "250" }, - "material_print_temperature_layer_0": { "value": "material_print_temperature" }, - "material_initial_print_temperature": { "value": "material_print_temperature - 5" }, + "material_print_temperature_layer_0": { "value": "material_print_temperature","maximum_value_warning": 300 }, "material_flow_layer_0": { "value": 95 }, "speed_print": { "value":250, "maximum_value_warning": "300" }, diff --git a/resources/extruders/Geeetech_Dual_Extruder_0.def.json b/resources/extruders/Geeetech_Dual_Extruder_0.def.json index 643e764759..80c158541c 100644 --- a/resources/extruders/Geeetech_Dual_Extruder_0.def.json +++ b/resources/extruders/Geeetech_Dual_Extruder_0.def.json @@ -3,7 +3,7 @@ "name": "E0", "inherits": "fdmextruder", "metadata": { - "machine": "Geeetech_base", + "machine": "Geeetech_Base_Dual_Extruder", "position": "0" }, diff --git a/resources/extruders/Geeetech_Dual_Extruder_1.def.json b/resources/extruders/Geeetech_Dual_Extruder_1.def.json index e16bba320e..523a5012be 100644 --- a/resources/extruders/Geeetech_Dual_Extruder_1.def.json +++ b/resources/extruders/Geeetech_Dual_Extruder_1.def.json @@ -3,7 +3,7 @@ "name": "E1", "inherits": "fdmextruder", "metadata": { - "machine": "Geeetech_base", + "machine": "Geeetech_Base_Dual_Extruder", "position": "1" }, diff --git a/resources/extruders/Geeetech_Multi_Extruder_0.def.json b/resources/extruders/Geeetech_Multi_Extruder_0.def.json index b76d15a243..11d9c1863f 100644 --- a/resources/extruders/Geeetech_Multi_Extruder_0.def.json +++ b/resources/extruders/Geeetech_Multi_Extruder_0.def.json @@ -3,7 +3,7 @@ "name": "E0", "inherits": "fdmextruder", "metadata": { - "machine": "Geeetech_base", + "machine": "Geeetech_Base_Multi_Extruder", "position": "0" }, diff --git a/resources/extruders/Geeetech_Multi_Extruder_1.def.json b/resources/extruders/Geeetech_Multi_Extruder_1.def.json index bafd632c2d..bd8f0a2a50 100644 --- a/resources/extruders/Geeetech_Multi_Extruder_1.def.json +++ b/resources/extruders/Geeetech_Multi_Extruder_1.def.json @@ -3,7 +3,7 @@ "name": "E1", "inherits": "fdmextruder", "metadata": { - "machine": "Geeetech_base", + "machine": "Geeetech_Base_Multi_Extruder", "position": "1" }, diff --git a/resources/extruders/Geeetech_Multi_Extruder_2.def.json b/resources/extruders/Geeetech_Multi_Extruder_2.def.json index de8d8e7cf4..2dd7890602 100644 --- a/resources/extruders/Geeetech_Multi_Extruder_2.def.json +++ b/resources/extruders/Geeetech_Multi_Extruder_2.def.json @@ -3,7 +3,7 @@ "name": "E2", "inherits": "fdmextruder", "metadata": { - "machine": "Geeetech_base", + "machine": "Geeetech_Base_Multi_Extruder", "position": "2" }, diff --git a/resources/extruders/Geeetech_base_extruder_0.def.json b/resources/extruders/Geeetech_Single_Extruder.def.json similarity index 83% rename from resources/extruders/Geeetech_base_extruder_0.def.json rename to resources/extruders/Geeetech_Single_Extruder.def.json index 92ce300264..79477f3fa7 100644 --- a/resources/extruders/Geeetech_base_extruder_0.def.json +++ b/resources/extruders/Geeetech_Single_Extruder.def.json @@ -3,7 +3,7 @@ "name": "Extruder 1", "inherits": "fdmextruder", "metadata": { - "machine": "Geeetech_base", + "machine": "Geeetech_Base_Single_Extruder", "position": "0" }, diff --git a/resources/quality/geeetech/base/Geeetech_base_0.2_ABS_super.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.2_ABS_super.inst.cfg similarity index 82% rename from resources/quality/geeetech/base/Geeetech_base_0.2_ABS_super.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.2_ABS_super.inst.cfg index 01b80df9a8..23d68a1f19 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.2_ABS_super.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.2_ABS_super.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Super Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.2_ABS_ultra.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.2_ABS_ultra.inst.cfg similarity index 82% rename from resources/quality/geeetech/base/Geeetech_base_0.2_ABS_ultra.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.2_ABS_ultra.inst.cfg index 7550335d32..b6a5db63e2 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.2_ABS_ultra.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.2_ABS_ultra.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Ultra Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.2_PETG_super.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.2_PETG_super.inst.cfg similarity index 85% rename from resources/quality/geeetech/base/Geeetech_base_0.2_PETG_super.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.2_PETG_super.inst.cfg index b08ceb3356..db0c9bdcfa 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.2_PETG_super.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.2_PETG_super.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Super Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.2_PETG_ultra.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.2_PETG_ultra.inst.cfg similarity index 85% rename from resources/quality/geeetech/base/Geeetech_base_0.2_PETG_ultra.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.2_PETG_ultra.inst.cfg index f4ec88b0d5..fd2669f02a 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.2_PETG_ultra.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.2_PETG_ultra.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Ultra Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.2_PLA_super.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.2_PLA_super.inst.cfg similarity index 79% rename from resources/quality/geeetech/base/Geeetech_base_0.2_PLA_super.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.2_PLA_super.inst.cfg index 5f509567b6..0527d47d34 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.2_PLA_super.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.2_PLA_super.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Super Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.2_PLA_ultra.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.2_PLA_ultra.inst.cfg similarity index 79% rename from resources/quality/geeetech/base/Geeetech_base_0.2_PLA_ultra.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.2_PLA_ultra.inst.cfg index 2de66cde6a..c9d5ffeced 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.2_PLA_ultra.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.2_PLA_ultra.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Ultra Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.3_ABS_adaptive.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_ABS_adaptive.inst.cfg similarity index 82% rename from resources/quality/geeetech/base/Geeetech_base_0.3_ABS_adaptive.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_ABS_adaptive.inst.cfg index 0e8245c33f..d2e51f1123 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.3_ABS_adaptive.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_ABS_adaptive.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Dynamic Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.3_ABS_low.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_ABS_low.inst.cfg similarity index 81% rename from resources/quality/geeetech/base/Geeetech_base_0.3_ABS_low.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_ABS_low.inst.cfg index 073be69795..ce1b00f4bf 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.3_ABS_low.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_ABS_low.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Low Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.3_ABS_standard.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_ABS_standard.inst.cfg similarity index 82% rename from resources/quality/geeetech/base/Geeetech_base_0.3_ABS_standard.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_ABS_standard.inst.cfg index 39d893ac2e..bb44eab4b9 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.3_ABS_standard.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_ABS_standard.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Standard Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.3_ABS_super.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_ABS_super.inst.cfg similarity index 82% rename from resources/quality/geeetech/base/Geeetech_base_0.3_ABS_super.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_ABS_super.inst.cfg index 10796f5202..4c1f8631bf 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.3_ABS_super.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_ABS_super.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Super Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.3_PETG_adaptive.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PETG_adaptive.inst.cfg similarity index 85% rename from resources/quality/geeetech/base/Geeetech_base_0.3_PETG_adaptive.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PETG_adaptive.inst.cfg index 6b72e53635..36ca672c2a 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.3_PETG_adaptive.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PETG_adaptive.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Dynamic Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.3_PETG_low.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PETG_low.inst.cfg similarity index 85% rename from resources/quality/geeetech/base/Geeetech_base_0.3_PETG_low.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PETG_low.inst.cfg index cf35907ca2..95851f3b69 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.3_PETG_low.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PETG_low.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Low Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.3_PETG_standard.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PETG_standard.inst.cfg similarity index 85% rename from resources/quality/geeetech/base/Geeetech_base_0.3_PETG_standard.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PETG_standard.inst.cfg index bb678ce041..0352cbaa00 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.3_PETG_standard.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PETG_standard.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Standard Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.3_PETG_super.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PETG_super.inst.cfg similarity index 85% rename from resources/quality/geeetech/base/Geeetech_base_0.3_PETG_super.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PETG_super.inst.cfg index ada5f7a390..2fdbe1ad66 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.3_PETG_super.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PETG_super.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Super Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.3_PLA_adaptive.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PLA_adaptive.inst.cfg similarity index 80% rename from resources/quality/geeetech/base/Geeetech_base_0.3_PLA_adaptive.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PLA_adaptive.inst.cfg index bf95f6a9a8..a7df86a624 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.3_PLA_adaptive.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PLA_adaptive.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Dynamic Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.3_PLA_low.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PLA_low.inst.cfg similarity index 79% rename from resources/quality/geeetech/base/Geeetech_base_0.3_PLA_low.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PLA_low.inst.cfg index 3eee9d53f1..c39d03abac 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.3_PLA_low.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PLA_low.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Low Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.3_PLA_standard.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PLA_standard.inst.cfg similarity index 80% rename from resources/quality/geeetech/base/Geeetech_base_0.3_PLA_standard.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PLA_standard.inst.cfg index a11f13a986..ce024f494f 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.3_PLA_standard.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PLA_standard.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Standard Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.3_PLA_super.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PLA_super.inst.cfg similarity index 79% rename from resources/quality/geeetech/base/Geeetech_base_0.3_PLA_super.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PLA_super.inst.cfg index 8db81a0c0e..13438f4b7d 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.3_PLA_super.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PLA_super.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Super Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.3_TPU_adaptive.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_TPU_adaptive.inst.cfg similarity index 80% rename from resources/quality/geeetech/base/Geeetech_base_0.3_TPU_adaptive.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_TPU_adaptive.inst.cfg index c7c06d090b..69488d9dbe 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.3_TPU_adaptive.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_TPU_adaptive.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Dynamic Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.3_TPU_standard.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_TPU_standard.inst.cfg similarity index 80% rename from resources/quality/geeetech/base/Geeetech_base_0.3_TPU_standard.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_TPU_standard.inst.cfg index a3ef7db048..d09a702a35 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.3_TPU_standard.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_TPU_standard.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Standard Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.3_TPU_super.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_TPU_super.inst.cfg similarity index 79% rename from resources/quality/geeetech/base/Geeetech_base_0.3_TPU_super.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_TPU_super.inst.cfg index dbf2ca78ba..b8bdc47ac4 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.3_TPU_super.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_TPU_super.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Super Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.4_ABS_adaptive.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_ABS_adaptive.inst.cfg similarity index 82% rename from resources/quality/geeetech/base/Geeetech_base_0.4_ABS_adaptive.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_ABS_adaptive.inst.cfg index 6fc3222d99..08b6311697 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.4_ABS_adaptive.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_ABS_adaptive.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Dynamic Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.4_ABS_low.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_ABS_low.inst.cfg similarity index 81% rename from resources/quality/geeetech/base/Geeetech_base_0.4_ABS_low.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_ABS_low.inst.cfg index f8b743a19a..cadd36431c 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.4_ABS_low.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_ABS_low.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Low Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.4_ABS_standard.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_ABS_standard.inst.cfg similarity index 82% rename from resources/quality/geeetech/base/Geeetech_base_0.4_ABS_standard.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_ABS_standard.inst.cfg index 5a17bbca91..d380982a96 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.4_ABS_standard.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_ABS_standard.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Standard Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.4_ABS_super.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_ABS_super.inst.cfg similarity index 82% rename from resources/quality/geeetech/base/Geeetech_base_0.4_ABS_super.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_ABS_super.inst.cfg index aecdd7022b..145a600020 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.4_ABS_super.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_ABS_super.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Super Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.4_PETG_adaptive.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PETG_adaptive.inst.cfg similarity index 85% rename from resources/quality/geeetech/base/Geeetech_base_0.4_PETG_adaptive.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PETG_adaptive.inst.cfg index 51765854d5..c6d1c8e846 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.4_PETG_adaptive.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PETG_adaptive.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Dynamic Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.4_PETG_low.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PETG_low.inst.cfg similarity index 85% rename from resources/quality/geeetech/base/Geeetech_base_0.4_PETG_low.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PETG_low.inst.cfg index 62de9a4d69..bcf24a02f6 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.4_PETG_low.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PETG_low.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Low Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.4_PETG_standard.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PETG_standard.inst.cfg similarity index 85% rename from resources/quality/geeetech/base/Geeetech_base_0.4_PETG_standard.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PETG_standard.inst.cfg index 19ca63f536..3058020223 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.4_PETG_standard.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PETG_standard.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Standard Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.4_PETG_super.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PETG_super.inst.cfg similarity index 85% rename from resources/quality/geeetech/base/Geeetech_base_0.4_PETG_super.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PETG_super.inst.cfg index d3fbf0e8f4..99bd835435 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.4_PETG_super.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PETG_super.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Super Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.4_PLA_adaptive.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PLA_adaptive.inst.cfg similarity index 80% rename from resources/quality/geeetech/base/Geeetech_base_0.4_PLA_adaptive.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PLA_adaptive.inst.cfg index 43bf6c9de6..29706a0afa 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.4_PLA_adaptive.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PLA_adaptive.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Dynamic Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.4_PLA_low.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PLA_low.inst.cfg similarity index 79% rename from resources/quality/geeetech/base/Geeetech_base_0.4_PLA_low.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PLA_low.inst.cfg index 4f686cbe78..f73d8500ce 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.4_PLA_low.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PLA_low.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Low Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.4_PLA_standard.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PLA_standard.inst.cfg similarity index 80% rename from resources/quality/geeetech/base/Geeetech_base_0.4_PLA_standard.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PLA_standard.inst.cfg index d434d498a4..236ac49c26 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.4_PLA_standard.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PLA_standard.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Standard Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.4_PLA_super.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PLA_super.inst.cfg similarity index 79% rename from resources/quality/geeetech/base/Geeetech_base_0.4_PLA_super.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PLA_super.inst.cfg index 2fcb4ff8e1..494b688365 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.4_PLA_super.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PLA_super.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Super Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.4_TPU_adaptive.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_TPU_adaptive.inst.cfg similarity index 80% rename from resources/quality/geeetech/base/Geeetech_base_0.4_TPU_adaptive.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_TPU_adaptive.inst.cfg index f03817c70a..19b76d25a4 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.4_TPU_adaptive.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_TPU_adaptive.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Dynamic Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.4_TPU_standard.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_TPU_standard.inst.cfg similarity index 80% rename from resources/quality/geeetech/base/Geeetech_base_0.4_TPU_standard.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_TPU_standard.inst.cfg index 3af1b80ed4..a138c2febb 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.4_TPU_standard.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_TPU_standard.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Standard Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.4_TPU_super.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_TPU_super.inst.cfg similarity index 79% rename from resources/quality/geeetech/base/Geeetech_base_0.4_TPU_super.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_TPU_super.inst.cfg index 4b27e8e13c..6fc524679d 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.4_TPU_super.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_TPU_super.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Super Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.5_ABS_adaptive.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_ABS_adaptive.inst.cfg similarity index 82% rename from resources/quality/geeetech/base/Geeetech_base_0.5_ABS_adaptive.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_ABS_adaptive.inst.cfg index 92d3aa871e..7c85b80f12 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.5_ABS_adaptive.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_ABS_adaptive.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Dynamic Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.5_ABS_low.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_ABS_low.inst.cfg similarity index 81% rename from resources/quality/geeetech/base/Geeetech_base_0.5_ABS_low.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_ABS_low.inst.cfg index 25c9737ea9..18847dde16 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.5_ABS_low.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_ABS_low.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Low Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.5_ABS_standard.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_ABS_standard.inst.cfg similarity index 82% rename from resources/quality/geeetech/base/Geeetech_base_0.5_ABS_standard.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_ABS_standard.inst.cfg index f5f31773aa..2673fbc457 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.5_ABS_standard.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_ABS_standard.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Standard Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.5_ABS_super.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_ABS_super.inst.cfg similarity index 82% rename from resources/quality/geeetech/base/Geeetech_base_0.5_ABS_super.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_ABS_super.inst.cfg index bdbb44b782..dcac153cae 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.5_ABS_super.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_ABS_super.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Super Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.5_PETG_adaptive.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PETG_adaptive.inst.cfg similarity index 85% rename from resources/quality/geeetech/base/Geeetech_base_0.5_PETG_adaptive.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PETG_adaptive.inst.cfg index a7edf563b0..6bcaadd27d 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.5_PETG_adaptive.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PETG_adaptive.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Dynamic Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.5_PETG_low.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PETG_low.inst.cfg similarity index 85% rename from resources/quality/geeetech/base/Geeetech_base_0.5_PETG_low.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PETG_low.inst.cfg index e5030ebe4e..96e94064ca 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.5_PETG_low.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PETG_low.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Low Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.5_PETG_standard.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PETG_standard.inst.cfg similarity index 85% rename from resources/quality/geeetech/base/Geeetech_base_0.5_PETG_standard.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PETG_standard.inst.cfg index bfad08010a..74e1b40b2c 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.5_PETG_standard.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PETG_standard.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Standard Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.5_PETG_super.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PETG_super.inst.cfg similarity index 85% rename from resources/quality/geeetech/base/Geeetech_base_0.5_PETG_super.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PETG_super.inst.cfg index 62cdd9091f..d9631f34c0 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.5_PETG_super.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PETG_super.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Super Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.5_PLA_adaptive.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PLA_adaptive.inst.cfg similarity index 80% rename from resources/quality/geeetech/base/Geeetech_base_0.5_PLA_adaptive.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PLA_adaptive.inst.cfg index 81e518d267..c234c8052d 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.5_PLA_adaptive.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PLA_adaptive.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Dynamic Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.5_PLA_low.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PLA_low.inst.cfg similarity index 79% rename from resources/quality/geeetech/base/Geeetech_base_0.5_PLA_low.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PLA_low.inst.cfg index 3ee1663092..eb889c34db 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.5_PLA_low.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PLA_low.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Low Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.5_PLA_standard.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PLA_standard.inst.cfg similarity index 80% rename from resources/quality/geeetech/base/Geeetech_base_0.5_PLA_standard.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PLA_standard.inst.cfg index 9ecff4cde8..e52f6c4e30 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.5_PLA_standard.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PLA_standard.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Standard Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.5_PLA_super.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PLA_super.inst.cfg similarity index 79% rename from resources/quality/geeetech/base/Geeetech_base_0.5_PLA_super.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PLA_super.inst.cfg index 1b0a6908da..a282aea68e 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.5_PLA_super.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PLA_super.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Super Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.5_TPU_adaptive.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_TPU_adaptive.inst.cfg similarity index 80% rename from resources/quality/geeetech/base/Geeetech_base_0.5_TPU_adaptive.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_TPU_adaptive.inst.cfg index 288e9511a4..00e0c97c9b 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.5_TPU_adaptive.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_TPU_adaptive.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Dynamic Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.5_TPU_standard.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_TPU_standard.inst.cfg similarity index 80% rename from resources/quality/geeetech/base/Geeetech_base_0.5_TPU_standard.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_TPU_standard.inst.cfg index fd22b36d3e..24dd29ef1e 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.5_TPU_standard.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_TPU_standard.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Standard Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.5_TPU_super.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_TPU_super.inst.cfg similarity index 79% rename from resources/quality/geeetech/base/Geeetech_base_0.5_TPU_super.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_TPU_super.inst.cfg index 28a4f0513f..e16ba9d3cc 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.5_TPU_super.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_TPU_super.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Super Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.6_ABS_standard.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.6_ABS_standard.inst.cfg similarity index 82% rename from resources/quality/geeetech/base/Geeetech_base_0.6_ABS_standard.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.6_ABS_standard.inst.cfg index 9b4587f8c7..a8284fbadc 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.6_ABS_standard.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.6_ABS_standard.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Standard Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.6_PETG_standard.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.6_PETG_standard.inst.cfg similarity index 85% rename from resources/quality/geeetech/base/Geeetech_base_0.6_PETG_standard.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.6_PETG_standard.inst.cfg index a84ff6726a..288322cd80 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.6_PETG_standard.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.6_PETG_standard.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Standard Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.6_PLA_draft.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.6_PLA_draft.inst.cfg similarity index 79% rename from resources/quality/geeetech/base/Geeetech_base_0.6_PLA_draft.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.6_PLA_draft.inst.cfg index 10f291f23a..4ad555530e 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.6_PLA_draft.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.6_PLA_draft.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Draft Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.6_PLA_low.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.6_PLA_low.inst.cfg similarity index 79% rename from resources/quality/geeetech/base/Geeetech_base_0.6_PLA_low.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.6_PLA_low.inst.cfg index 2b54a3aab7..e3f82cf489 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.6_PLA_low.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.6_PLA_low.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Low Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.6_PLA_standard.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.6_PLA_standard.inst.cfg similarity index 80% rename from resources/quality/geeetech/base/Geeetech_base_0.6_PLA_standard.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.6_PLA_standard.inst.cfg index 3da51149fb..dcac59be4d 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.6_PLA_standard.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.6_PLA_standard.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Standard Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.6_TPU_standard.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.6_TPU_standard.inst.cfg similarity index 80% rename from resources/quality/geeetech/base/Geeetech_base_0.6_TPU_standard.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.6_TPU_standard.inst.cfg index b4cd165c86..5cf65de53b 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.6_TPU_standard.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.6_TPU_standard.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Standard Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.8_ABS_draft.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.8_ABS_draft.inst.cfg similarity index 82% rename from resources/quality/geeetech/base/Geeetech_base_0.8_ABS_draft.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.8_ABS_draft.inst.cfg index 2fe8a1cbc9..1befe8746d 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.8_ABS_draft.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.8_ABS_draft.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Draft Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.8_PETG_draft.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.8_PETG_draft.inst.cfg similarity index 85% rename from resources/quality/geeetech/base/Geeetech_base_0.8_PETG_draft.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.8_PETG_draft.inst.cfg index 1d12e5116d..1869e13f58 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.8_PETG_draft.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.8_PETG_draft.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Draft Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.8_PLA_draft.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.8_PLA_draft.inst.cfg similarity index 79% rename from resources/quality/geeetech/base/Geeetech_base_0.8_PLA_draft.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.8_PLA_draft.inst.cfg index 7029bc3b41..c2e0ae6af5 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.8_PLA_draft.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.8_PLA_draft.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Draft Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.8_TPU_draft.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.8_TPU_draft.inst.cfg similarity index 79% rename from resources/quality/geeetech/base/Geeetech_base_0.8_TPU_draft.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.8_TPU_draft.inst.cfg index 894a96bf0e..f5917efef8 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.8_TPU_draft.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.8_TPU_draft.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Draft Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_1.0_ABS_draft.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_1.0_ABS_draft.inst.cfg similarity index 82% rename from resources/quality/geeetech/base/Geeetech_base_1.0_ABS_draft.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_1.0_ABS_draft.inst.cfg index c89a05de6b..050e3f4f61 100644 --- a/resources/quality/geeetech/base/Geeetech_base_1.0_ABS_draft.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_1.0_ABS_draft.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Draft Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_1.0_PETG_draft.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_1.0_PETG_draft.inst.cfg similarity index 85% rename from resources/quality/geeetech/base/Geeetech_base_1.0_PETG_draft.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_1.0_PETG_draft.inst.cfg index 72c56b76ee..50b9f58b67 100644 --- a/resources/quality/geeetech/base/Geeetech_base_1.0_PETG_draft.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_1.0_PETG_draft.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Draft Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_1.0_PLA_draft.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_1.0_PLA_draft.inst.cfg similarity index 79% rename from resources/quality/geeetech/base/Geeetech_base_1.0_PLA_draft.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_1.0_PLA_draft.inst.cfg index 6208a26582..6df137e69f 100644 --- a/resources/quality/geeetech/base/Geeetech_base_1.0_PLA_draft.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_1.0_PLA_draft.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Draft Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_1.0_TPU_draft.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_1.0_TPU_draft.inst.cfg similarity index 79% rename from resources/quality/geeetech/base/Geeetech_base_1.0_TPU_draft.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_1.0_TPU_draft.inst.cfg index 02b1566db0..992cc49a15 100644 --- a/resources/quality/geeetech/base/Geeetech_base_1.0_TPU_draft.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_1.0_TPU_draft.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Draft Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_global_adaptive.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_global_adaptive.inst.cfg similarity index 89% rename from resources/quality/geeetech/base/Geeetech_base_global_adaptive.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_global_adaptive.inst.cfg index 3a5f42d1d5..d028674295 100644 --- a/resources/quality/geeetech/base/Geeetech_base_global_adaptive.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_global_adaptive.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Dynamic Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_global_draft.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_global_draft.inst.cfg similarity index 88% rename from resources/quality/geeetech/base/Geeetech_base_global_draft.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_global_draft.inst.cfg index ec6a8f4e33..07ebd2ee1b 100644 --- a/resources/quality/geeetech/base/Geeetech_base_global_draft.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_global_draft.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Draft Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_global_low.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_global_low.inst.cfg similarity index 88% rename from resources/quality/geeetech/base/Geeetech_base_global_low.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_global_low.inst.cfg index 910a75b8c9..914683e719 100644 --- a/resources/quality/geeetech/base/Geeetech_base_global_low.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_global_low.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Low Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_global_standard.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_global_standard.inst.cfg similarity index 88% rename from resources/quality/geeetech/base/Geeetech_base_global_standard.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_global_standard.inst.cfg index b1e56d70c5..2f956a84cc 100644 --- a/resources/quality/geeetech/base/Geeetech_base_global_standard.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_global_standard.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Standard Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_global_super.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_global_super.inst.cfg similarity index 88% rename from resources/quality/geeetech/base/Geeetech_base_global_super.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_global_super.inst.cfg index 80be22c1bf..881986b6a5 100644 --- a/resources/quality/geeetech/base/Geeetech_base_global_super.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_global_super.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Super Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_global_ultra.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_global_ultra.inst.cfg similarity index 88% rename from resources/quality/geeetech/base/Geeetech_base_global_ultra.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_global_ultra.inst.cfg index e8106f71a6..1741b76338 100644 --- a/resources/quality/geeetech/base/Geeetech_base_global_ultra.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_global_ultra.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Ultra Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/variants/geeetech_A10Pro_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_A10Pro_0.2.inst.cfg similarity index 100% rename from resources/variants/geeetech_A10Pro_0.2.inst.cfg rename to resources/variants/geeetech_variants/geeetech_A10Pro_0.2.inst.cfg diff --git a/resources/variants/geeetech_A10Pro_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_A10Pro_0.3.inst.cfg similarity index 100% rename from resources/variants/geeetech_A10Pro_0.3.inst.cfg rename to resources/variants/geeetech_variants/geeetech_A10Pro_0.3.inst.cfg diff --git a/resources/variants/geeetech_A10Pro_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_A10Pro_0.4.inst.cfg similarity index 100% rename from resources/variants/geeetech_A10Pro_0.4.inst.cfg rename to resources/variants/geeetech_variants/geeetech_A10Pro_0.4.inst.cfg diff --git a/resources/variants/geeetech_A10Pro_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_A10Pro_0.5.inst.cfg similarity index 100% rename from resources/variants/geeetech_A10Pro_0.5.inst.cfg rename to resources/variants/geeetech_variants/geeetech_A10Pro_0.5.inst.cfg diff --git a/resources/variants/geeetech_A10Pro_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_A10Pro_0.6.inst.cfg similarity index 100% rename from resources/variants/geeetech_A10Pro_0.6.inst.cfg rename to resources/variants/geeetech_variants/geeetech_A10Pro_0.6.inst.cfg diff --git a/resources/variants/geeetech_A10Pro_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_A10Pro_0.8.inst.cfg similarity index 100% rename from resources/variants/geeetech_A10Pro_0.8.inst.cfg rename to resources/variants/geeetech_variants/geeetech_A10Pro_0.8.inst.cfg diff --git a/resources/variants/geeetech_A10Pro_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_A10Pro_1.0.inst.cfg similarity index 100% rename from resources/variants/geeetech_A10Pro_1.0.inst.cfg rename to resources/variants/geeetech_variants/geeetech_A10Pro_1.0.inst.cfg diff --git a/resources/variants/geeetech_A20_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_A20_0.2.inst.cfg similarity index 100% rename from resources/variants/geeetech_A20_0.2.inst.cfg rename to resources/variants/geeetech_variants/geeetech_A20_0.2.inst.cfg diff --git a/resources/variants/geeetech_A20_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_A20_0.3.inst.cfg similarity index 100% rename from resources/variants/geeetech_A20_0.3.inst.cfg rename to resources/variants/geeetech_variants/geeetech_A20_0.3.inst.cfg diff --git a/resources/variants/geeetech_A20_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_A20_0.4.inst.cfg similarity index 100% rename from resources/variants/geeetech_A20_0.4.inst.cfg rename to resources/variants/geeetech_variants/geeetech_A20_0.4.inst.cfg diff --git a/resources/variants/geeetech_A20_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_A20_0.5.inst.cfg similarity index 100% rename from resources/variants/geeetech_A20_0.5.inst.cfg rename to resources/variants/geeetech_variants/geeetech_A20_0.5.inst.cfg diff --git a/resources/variants/geeetech_A20_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_A20_0.6.inst.cfg similarity index 100% rename from resources/variants/geeetech_A20_0.6.inst.cfg rename to resources/variants/geeetech_variants/geeetech_A20_0.6.inst.cfg diff --git a/resources/variants/geeetech_A20_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_A20_0.8.inst.cfg similarity index 100% rename from resources/variants/geeetech_A20_0.8.inst.cfg rename to resources/variants/geeetech_variants/geeetech_A20_0.8.inst.cfg diff --git a/resources/variants/geeetech_A20_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_A20_1.0.inst.cfg similarity index 100% rename from resources/variants/geeetech_A20_1.0.inst.cfg rename to resources/variants/geeetech_variants/geeetech_A20_1.0.inst.cfg diff --git a/resources/variants/geeetech_A30Pro_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_A30Pro_0.2.inst.cfg similarity index 100% rename from resources/variants/geeetech_A30Pro_0.2.inst.cfg rename to resources/variants/geeetech_variants/geeetech_A30Pro_0.2.inst.cfg diff --git a/resources/variants/geeetech_A30Pro_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_A30Pro_0.3.inst.cfg similarity index 100% rename from resources/variants/geeetech_A30Pro_0.3.inst.cfg rename to resources/variants/geeetech_variants/geeetech_A30Pro_0.3.inst.cfg diff --git a/resources/variants/geeetech_A30Pro_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_A30Pro_0.4.inst.cfg similarity index 100% rename from resources/variants/geeetech_A30Pro_0.4.inst.cfg rename to resources/variants/geeetech_variants/geeetech_A30Pro_0.4.inst.cfg diff --git a/resources/variants/geeetech_A30Pro_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_A30Pro_0.5.inst.cfg similarity index 100% rename from resources/variants/geeetech_A30Pro_0.5.inst.cfg rename to resources/variants/geeetech_variants/geeetech_A30Pro_0.5.inst.cfg diff --git a/resources/variants/geeetech_A30Pro_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_A30Pro_0.6.inst.cfg similarity index 100% rename from resources/variants/geeetech_A30Pro_0.6.inst.cfg rename to resources/variants/geeetech_variants/geeetech_A30Pro_0.6.inst.cfg diff --git a/resources/variants/geeetech_A30Pro_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_A30Pro_0.8.inst.cfg similarity index 100% rename from resources/variants/geeetech_A30Pro_0.8.inst.cfg rename to resources/variants/geeetech_variants/geeetech_A30Pro_0.8.inst.cfg diff --git a/resources/variants/geeetech_A30Pro_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_A30Pro_1.0.inst.cfg similarity index 100% rename from resources/variants/geeetech_A30Pro_1.0.inst.cfg rename to resources/variants/geeetech_variants/geeetech_A30Pro_1.0.inst.cfg diff --git a/resources/variants/geeetech_E180_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_E180_0.2.inst.cfg similarity index 100% rename from resources/variants/geeetech_E180_0.2.inst.cfg rename to resources/variants/geeetech_variants/geeetech_E180_0.2.inst.cfg diff --git a/resources/variants/geeetech_E180_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_E180_0.3.inst.cfg similarity index 100% rename from resources/variants/geeetech_E180_0.3.inst.cfg rename to resources/variants/geeetech_variants/geeetech_E180_0.3.inst.cfg diff --git a/resources/variants/geeetech_E180_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_E180_0.4.inst.cfg similarity index 100% rename from resources/variants/geeetech_E180_0.4.inst.cfg rename to resources/variants/geeetech_variants/geeetech_E180_0.4.inst.cfg diff --git a/resources/variants/geeetech_E180_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_E180_0.5.inst.cfg similarity index 100% rename from resources/variants/geeetech_E180_0.5.inst.cfg rename to resources/variants/geeetech_variants/geeetech_E180_0.5.inst.cfg diff --git a/resources/variants/geeetech_E180_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_E180_0.6.inst.cfg similarity index 100% rename from resources/variants/geeetech_E180_0.6.inst.cfg rename to resources/variants/geeetech_variants/geeetech_E180_0.6.inst.cfg diff --git a/resources/variants/geeetech_E180_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_E180_0.8.inst.cfg similarity index 100% rename from resources/variants/geeetech_E180_0.8.inst.cfg rename to resources/variants/geeetech_variants/geeetech_E180_0.8.inst.cfg diff --git a/resources/variants/geeetech_E180_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_E180_1.0.inst.cfg similarity index 100% rename from resources/variants/geeetech_E180_1.0.inst.cfg rename to resources/variants/geeetech_variants/geeetech_E180_1.0.inst.cfg diff --git a/resources/variants/geeetech_GiantArmD200_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.2.inst.cfg similarity index 100% rename from resources/variants/geeetech_GiantArmD200_0.2.inst.cfg rename to resources/variants/geeetech_variants/geeetech_GiantArmD200_0.2.inst.cfg diff --git a/resources/variants/geeetech_GiantArmD200_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.3.inst.cfg similarity index 100% rename from resources/variants/geeetech_GiantArmD200_0.3.inst.cfg rename to resources/variants/geeetech_variants/geeetech_GiantArmD200_0.3.inst.cfg diff --git a/resources/variants/geeetech_GiantArmD200_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.4.inst.cfg similarity index 100% rename from resources/variants/geeetech_GiantArmD200_0.4.inst.cfg rename to resources/variants/geeetech_variants/geeetech_GiantArmD200_0.4.inst.cfg diff --git a/resources/variants/geeetech_GiantArmD200_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.5.inst.cfg similarity index 100% rename from resources/variants/geeetech_GiantArmD200_0.5.inst.cfg rename to resources/variants/geeetech_variants/geeetech_GiantArmD200_0.5.inst.cfg diff --git a/resources/variants/geeetech_GiantArmD200_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.6.inst.cfg similarity index 100% rename from resources/variants/geeetech_GiantArmD200_0.6.inst.cfg rename to resources/variants/geeetech_variants/geeetech_GiantArmD200_0.6.inst.cfg diff --git a/resources/variants/geeetech_GiantArmD200_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.8.inst.cfg similarity index 100% rename from resources/variants/geeetech_GiantArmD200_0.8.inst.cfg rename to resources/variants/geeetech_variants/geeetech_GiantArmD200_0.8.inst.cfg diff --git a/resources/variants/geeetech_GiantArmD200_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_GiantArmD200_1.0.inst.cfg similarity index 100% rename from resources/variants/geeetech_GiantArmD200_1.0.inst.cfg rename to resources/variants/geeetech_variants/geeetech_GiantArmD200_1.0.inst.cfg diff --git a/resources/variants/geeetech_I3ProB_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProB_0.2.inst.cfg similarity index 100% rename from resources/variants/geeetech_I3ProB_0.2.inst.cfg rename to resources/variants/geeetech_variants/geeetech_I3ProB_0.2.inst.cfg diff --git a/resources/variants/geeetech_I3ProB_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProB_0.3.inst.cfg similarity index 100% rename from resources/variants/geeetech_I3ProB_0.3.inst.cfg rename to resources/variants/geeetech_variants/geeetech_I3ProB_0.3.inst.cfg diff --git a/resources/variants/geeetech_I3ProB_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProB_0.4.inst.cfg similarity index 100% rename from resources/variants/geeetech_I3ProB_0.4.inst.cfg rename to resources/variants/geeetech_variants/geeetech_I3ProB_0.4.inst.cfg diff --git a/resources/variants/geeetech_I3ProB_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProB_0.5.inst.cfg similarity index 100% rename from resources/variants/geeetech_I3ProB_0.5.inst.cfg rename to resources/variants/geeetech_variants/geeetech_I3ProB_0.5.inst.cfg diff --git a/resources/variants/geeetech_I3ProB_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProB_0.6.inst.cfg similarity index 100% rename from resources/variants/geeetech_I3ProB_0.6.inst.cfg rename to resources/variants/geeetech_variants/geeetech_I3ProB_0.6.inst.cfg diff --git a/resources/variants/geeetech_I3ProB_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProB_0.8.inst.cfg similarity index 100% rename from resources/variants/geeetech_I3ProB_0.8.inst.cfg rename to resources/variants/geeetech_variants/geeetech_I3ProB_0.8.inst.cfg diff --git a/resources/variants/geeetech_I3ProB_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProB_1.0.inst.cfg similarity index 100% rename from resources/variants/geeetech_I3ProB_1.0.inst.cfg rename to resources/variants/geeetech_variants/geeetech_I3ProB_1.0.inst.cfg diff --git a/resources/variants/geeetech_I3ProW_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProW_0.2.inst.cfg similarity index 100% rename from resources/variants/geeetech_I3ProW_0.2.inst.cfg rename to resources/variants/geeetech_variants/geeetech_I3ProW_0.2.inst.cfg diff --git a/resources/variants/geeetech_I3ProW_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProW_0.3.inst.cfg similarity index 100% rename from resources/variants/geeetech_I3ProW_0.3.inst.cfg rename to resources/variants/geeetech_variants/geeetech_I3ProW_0.3.inst.cfg diff --git a/resources/variants/geeetech_I3ProW_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProW_0.4.inst.cfg similarity index 100% rename from resources/variants/geeetech_I3ProW_0.4.inst.cfg rename to resources/variants/geeetech_variants/geeetech_I3ProW_0.4.inst.cfg diff --git a/resources/variants/geeetech_I3ProW_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProW_0.5.inst.cfg similarity index 100% rename from resources/variants/geeetech_I3ProW_0.5.inst.cfg rename to resources/variants/geeetech_variants/geeetech_I3ProW_0.5.inst.cfg diff --git a/resources/variants/geeetech_I3ProW_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProW_0.6.inst.cfg similarity index 100% rename from resources/variants/geeetech_I3ProW_0.6.inst.cfg rename to resources/variants/geeetech_variants/geeetech_I3ProW_0.6.inst.cfg diff --git a/resources/variants/geeetech_I3ProW_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProW_0.8.inst.cfg similarity index 100% rename from resources/variants/geeetech_I3ProW_0.8.inst.cfg rename to resources/variants/geeetech_variants/geeetech_I3ProW_0.8.inst.cfg diff --git a/resources/variants/geeetech_I3ProW_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProW_1.0.inst.cfg similarity index 100% rename from resources/variants/geeetech_I3ProW_1.0.inst.cfg rename to resources/variants/geeetech_variants/geeetech_I3ProW_1.0.inst.cfg diff --git a/resources/variants/geeetech_MeCreator2_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator2_0.2.inst.cfg similarity index 100% rename from resources/variants/geeetech_MeCreator2_0.2.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MeCreator2_0.2.inst.cfg diff --git a/resources/variants/geeetech_MeCreator2_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator2_0.3.inst.cfg similarity index 100% rename from resources/variants/geeetech_MeCreator2_0.3.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MeCreator2_0.3.inst.cfg diff --git a/resources/variants/geeetech_MeCreator2_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator2_0.4.inst.cfg similarity index 100% rename from resources/variants/geeetech_MeCreator2_0.4.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MeCreator2_0.4.inst.cfg diff --git a/resources/variants/geeetech_MeCreator2_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator2_0.5.inst.cfg similarity index 100% rename from resources/variants/geeetech_MeCreator2_0.5.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MeCreator2_0.5.inst.cfg diff --git a/resources/variants/geeetech_MeCreator2_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator2_0.6.inst.cfg similarity index 100% rename from resources/variants/geeetech_MeCreator2_0.6.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MeCreator2_0.6.inst.cfg diff --git a/resources/variants/geeetech_MeCreator2_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator2_0.8.inst.cfg similarity index 100% rename from resources/variants/geeetech_MeCreator2_0.8.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MeCreator2_0.8.inst.cfg diff --git a/resources/variants/geeetech_MeCreator2_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator2_1.0.inst.cfg similarity index 100% rename from resources/variants/geeetech_MeCreator2_1.0.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MeCreator2_1.0.inst.cfg diff --git a/resources/variants/geeetech_MeCreator_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator_0.2.inst.cfg similarity index 100% rename from resources/variants/geeetech_MeCreator_0.2.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MeCreator_0.2.inst.cfg diff --git a/resources/variants/geeetech_MeCreator_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator_0.3.inst.cfg similarity index 100% rename from resources/variants/geeetech_MeCreator_0.3.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MeCreator_0.3.inst.cfg diff --git a/resources/variants/geeetech_MeCreator_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator_0.4.inst.cfg similarity index 100% rename from resources/variants/geeetech_MeCreator_0.4.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MeCreator_0.4.inst.cfg diff --git a/resources/variants/geeetech_MeCreator_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator_0.5.inst.cfg similarity index 100% rename from resources/variants/geeetech_MeCreator_0.5.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MeCreator_0.5.inst.cfg diff --git a/resources/variants/geeetech_MeCreator_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator_0.6.inst.cfg similarity index 100% rename from resources/variants/geeetech_MeCreator_0.6.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MeCreator_0.6.inst.cfg diff --git a/resources/variants/geeetech_MeCreator_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator_0.8.inst.cfg similarity index 100% rename from resources/variants/geeetech_MeCreator_0.8.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MeCreator_0.8.inst.cfg diff --git a/resources/variants/geeetech_MeCreator_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator_1.0.inst.cfg similarity index 100% rename from resources/variants/geeetech_MeCreator_1.0.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MeCreator_1.0.inst.cfg diff --git a/resources/variants/geeetech_MeDucer_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeDucer_0.2.inst.cfg similarity index 100% rename from resources/variants/geeetech_MeDucer_0.2.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MeDucer_0.2.inst.cfg diff --git a/resources/variants/geeetech_MeDucer_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeDucer_0.3.inst.cfg similarity index 100% rename from resources/variants/geeetech_MeDucer_0.3.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MeDucer_0.3.inst.cfg diff --git a/resources/variants/geeetech_MeDucer_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeDucer_0.4.inst.cfg similarity index 100% rename from resources/variants/geeetech_MeDucer_0.4.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MeDucer_0.4.inst.cfg diff --git a/resources/variants/geeetech_MeDucer_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeDucer_0.5.inst.cfg similarity index 100% rename from resources/variants/geeetech_MeDucer_0.5.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MeDucer_0.5.inst.cfg diff --git a/resources/variants/geeetech_MeDucer_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeDucer_0.6.inst.cfg similarity index 100% rename from resources/variants/geeetech_MeDucer_0.6.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MeDucer_0.6.inst.cfg diff --git a/resources/variants/geeetech_MeDucer_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeDucer_0.8.inst.cfg similarity index 100% rename from resources/variants/geeetech_MeDucer_0.8.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MeDucer_0.8.inst.cfg diff --git a/resources/variants/geeetech_MeDucer_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeDucer_1.0.inst.cfg similarity index 100% rename from resources/variants/geeetech_MeDucer_1.0.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MeDucer_1.0.inst.cfg diff --git a/resources/variants/geeetech_MizarMax_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarMax_0.2.inst.cfg similarity index 100% rename from resources/variants/geeetech_MizarMax_0.2.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MizarMax_0.2.inst.cfg diff --git a/resources/variants/geeetech_MizarMax_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarMax_0.3.inst.cfg similarity index 100% rename from resources/variants/geeetech_MizarMax_0.3.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MizarMax_0.3.inst.cfg diff --git a/resources/variants/geeetech_MizarMax_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarMax_0.4.inst.cfg similarity index 100% rename from resources/variants/geeetech_MizarMax_0.4.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MizarMax_0.4.inst.cfg diff --git a/resources/variants/geeetech_MizarMax_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarMax_0.5.inst.cfg similarity index 100% rename from resources/variants/geeetech_MizarMax_0.5.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MizarMax_0.5.inst.cfg diff --git a/resources/variants/geeetech_MizarMax_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarMax_0.6.inst.cfg similarity index 100% rename from resources/variants/geeetech_MizarMax_0.6.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MizarMax_0.6.inst.cfg diff --git a/resources/variants/geeetech_MizarMax_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarMax_0.8.inst.cfg similarity index 100% rename from resources/variants/geeetech_MizarMax_0.8.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MizarMax_0.8.inst.cfg diff --git a/resources/variants/geeetech_MizarMax_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarMax_1.0.inst.cfg similarity index 100% rename from resources/variants/geeetech_MizarMax_1.0.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MizarMax_1.0.inst.cfg diff --git a/resources/variants/geeetech_MizarPro_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarPro_0.2.inst.cfg similarity index 100% rename from resources/variants/geeetech_MizarPro_0.2.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MizarPro_0.2.inst.cfg diff --git a/resources/variants/geeetech_MizarPro_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarPro_0.3.inst.cfg similarity index 100% rename from resources/variants/geeetech_MizarPro_0.3.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MizarPro_0.3.inst.cfg diff --git a/resources/variants/geeetech_MizarPro_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarPro_0.4.inst.cfg similarity index 100% rename from resources/variants/geeetech_MizarPro_0.4.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MizarPro_0.4.inst.cfg diff --git a/resources/variants/geeetech_MizarPro_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarPro_0.5.inst.cfg similarity index 100% rename from resources/variants/geeetech_MizarPro_0.5.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MizarPro_0.5.inst.cfg diff --git a/resources/variants/geeetech_MizarPro_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarPro_0.6.inst.cfg similarity index 100% rename from resources/variants/geeetech_MizarPro_0.6.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MizarPro_0.6.inst.cfg diff --git a/resources/variants/geeetech_MizarPro_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarPro_0.8.inst.cfg similarity index 100% rename from resources/variants/geeetech_MizarPro_0.8.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MizarPro_0.8.inst.cfg diff --git a/resources/variants/geeetech_MizarPro_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarPro_1.0.inst.cfg similarity index 100% rename from resources/variants/geeetech_MizarPro_1.0.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MizarPro_1.0.inst.cfg diff --git a/resources/variants/geeetech_MizarS_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarS_0.2.inst.cfg similarity index 100% rename from resources/variants/geeetech_MizarS_0.2.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MizarS_0.2.inst.cfg diff --git a/resources/variants/geeetech_MizarS_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarS_0.3.inst.cfg similarity index 100% rename from resources/variants/geeetech_MizarS_0.3.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MizarS_0.3.inst.cfg diff --git a/resources/variants/geeetech_MizarS_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarS_0.4.inst.cfg similarity index 100% rename from resources/variants/geeetech_MizarS_0.4.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MizarS_0.4.inst.cfg diff --git a/resources/variants/geeetech_MizarS_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarS_0.5.inst.cfg similarity index 100% rename from resources/variants/geeetech_MizarS_0.5.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MizarS_0.5.inst.cfg diff --git a/resources/variants/geeetech_MizarS_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarS_0.6.inst.cfg similarity index 100% rename from resources/variants/geeetech_MizarS_0.6.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MizarS_0.6.inst.cfg diff --git a/resources/variants/geeetech_MizarS_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarS_0.8.inst.cfg similarity index 100% rename from resources/variants/geeetech_MizarS_0.8.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MizarS_0.8.inst.cfg diff --git a/resources/variants/geeetech_MizarS_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarS_1.0.inst.cfg similarity index 100% rename from resources/variants/geeetech_MizarS_1.0.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MizarS_1.0.inst.cfg diff --git a/resources/variants/geeetech_Mizar_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_Mizar_0.2.inst.cfg similarity index 100% rename from resources/variants/geeetech_Mizar_0.2.inst.cfg rename to resources/variants/geeetech_variants/geeetech_Mizar_0.2.inst.cfg diff --git a/resources/variants/geeetech_Mizar_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_Mizar_0.3.inst.cfg similarity index 100% rename from resources/variants/geeetech_Mizar_0.3.inst.cfg rename to resources/variants/geeetech_variants/geeetech_Mizar_0.3.inst.cfg diff --git a/resources/variants/geeetech_Mizar_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_Mizar_0.4.inst.cfg similarity index 100% rename from resources/variants/geeetech_Mizar_0.4.inst.cfg rename to resources/variants/geeetech_variants/geeetech_Mizar_0.4.inst.cfg diff --git a/resources/variants/geeetech_Mizar_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_Mizar_0.5.inst.cfg similarity index 100% rename from resources/variants/geeetech_Mizar_0.5.inst.cfg rename to resources/variants/geeetech_variants/geeetech_Mizar_0.5.inst.cfg diff --git a/resources/variants/geeetech_Mizar_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_Mizar_0.6.inst.cfg similarity index 100% rename from resources/variants/geeetech_Mizar_0.6.inst.cfg rename to resources/variants/geeetech_variants/geeetech_Mizar_0.6.inst.cfg diff --git a/resources/variants/geeetech_Mizar_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_Mizar_0.8.inst.cfg similarity index 100% rename from resources/variants/geeetech_Mizar_0.8.inst.cfg rename to resources/variants/geeetech_variants/geeetech_Mizar_0.8.inst.cfg diff --git a/resources/variants/geeetech_Mizar_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_Mizar_1.0.inst.cfg similarity index 100% rename from resources/variants/geeetech_Mizar_1.0.inst.cfg rename to resources/variants/geeetech_variants/geeetech_Mizar_1.0.inst.cfg diff --git a/resources/variants/geeetech_Thunder_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_Thunder_0.2.inst.cfg similarity index 100% rename from resources/variants/geeetech_Thunder_0.2.inst.cfg rename to resources/variants/geeetech_variants/geeetech_Thunder_0.2.inst.cfg diff --git a/resources/variants/geeetech_Thunder_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_Thunder_0.3.inst.cfg similarity index 100% rename from resources/variants/geeetech_Thunder_0.3.inst.cfg rename to resources/variants/geeetech_variants/geeetech_Thunder_0.3.inst.cfg diff --git a/resources/variants/geeetech_Thunder_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_Thunder_0.4.inst.cfg similarity index 100% rename from resources/variants/geeetech_Thunder_0.4.inst.cfg rename to resources/variants/geeetech_variants/geeetech_Thunder_0.4.inst.cfg diff --git a/resources/variants/geeetech_Thunder_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_Thunder_0.5.inst.cfg similarity index 100% rename from resources/variants/geeetech_Thunder_0.5.inst.cfg rename to resources/variants/geeetech_variants/geeetech_Thunder_0.5.inst.cfg diff --git a/resources/variants/geeetech_Thunder_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_Thunder_0.6.inst.cfg similarity index 100% rename from resources/variants/geeetech_Thunder_0.6.inst.cfg rename to resources/variants/geeetech_variants/geeetech_Thunder_0.6.inst.cfg diff --git a/resources/variants/geeetech_Thunder_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_Thunder_0.8.inst.cfg similarity index 100% rename from resources/variants/geeetech_Thunder_0.8.inst.cfg rename to resources/variants/geeetech_variants/geeetech_Thunder_0.8.inst.cfg diff --git a/resources/variants/geeetech_Thunder_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_Thunder_1.0.inst.cfg similarity index 100% rename from resources/variants/geeetech_Thunder_1.0.inst.cfg rename to resources/variants/geeetech_variants/geeetech_Thunder_1.0.inst.cfg From 996aba5662531cdc9712579f8169b78efcc981ce Mon Sep 17 00:00:00 2001 From: whoseyoung Date: Tue, 13 Dec 2022 15:27:09 +0800 Subject: [PATCH 108/124] resubmit to improve it --- .../geeetech_quality/geeetech_quality_0.2_ABS_super.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.2_ABS_ultra.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.2_PETG_super.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.2_PETG_ultra.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.2_PLA_super.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.2_PLA_ultra.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.3_ABS_adaptive.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.3_ABS_low.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.3_ABS_standard.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.3_ABS_super.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.3_PETG_adaptive.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.3_PETG_low.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.3_PETG_standard.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.3_PETG_super.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.3_PLA_adaptive.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.3_PLA_low.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.3_PLA_standard.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.3_PLA_super.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.3_TPU_adaptive.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.3_TPU_standard.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.3_TPU_super.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.4_ABS_adaptive.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.4_ABS_low.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.4_ABS_standard.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.4_ABS_super.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.4_PETG_adaptive.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.4_PETG_low.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.4_PETG_standard.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.4_PETG_super.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.4_PLA_adaptive.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.4_PLA_low.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.4_PLA_standard.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.4_PLA_super.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.4_TPU_adaptive.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.4_TPU_standard.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.4_TPU_super.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.5_ABS_adaptive.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.5_ABS_low.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.5_ABS_standard.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.5_ABS_super.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.5_PETG_adaptive.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.5_PETG_low.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.5_PETG_standard.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.5_PETG_super.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.5_PLA_adaptive.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.5_PLA_low.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.5_PLA_standard.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.5_PLA_super.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.5_TPU_adaptive.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.5_TPU_standard.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.5_TPU_super.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.6_ABS_standard.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.6_PETG_standard.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.6_PLA_draft.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.6_PLA_low.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.6_PLA_standard.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.6_TPU_standard.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.8_ABS_draft.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.8_PETG_draft.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.8_PLA_draft.inst.cfg | 0 .../geeetech_quality/geeetech_quality_0.8_TPU_draft.inst.cfg | 0 .../geeetech_quality/geeetech_quality_1.0_ABS_draft.inst.cfg | 0 .../geeetech_quality/geeetech_quality_1.0_PETG_draft.inst.cfg | 0 .../geeetech_quality/geeetech_quality_1.0_PLA_draft.inst.cfg | 0 .../geeetech_quality/geeetech_quality_1.0_TPU_draft.inst.cfg | 0 .../geeetech_quality/geeetech_quality_global_adaptive.inst.cfg | 0 .../geeetech_quality/geeetech_quality_global_draft.inst.cfg | 0 .../geeetech_quality/geeetech_quality_global_low.inst.cfg | 0 .../geeetech_quality/geeetech_quality_global_standard.inst.cfg | 0 .../geeetech_quality/geeetech_quality_global_super.inst.cfg | 0 .../geeetech_quality/geeetech_quality_global_ultra.inst.cfg | 0 71 files changed, 0 insertions(+), 0 deletions(-) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.2_ABS_super.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.2_ABS_ultra.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.2_PETG_super.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.2_PETG_ultra.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.2_PLA_super.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.2_PLA_ultra.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.3_ABS_adaptive.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.3_ABS_low.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.3_ABS_standard.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.3_ABS_super.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.3_PETG_adaptive.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.3_PETG_low.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.3_PETG_standard.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.3_PETG_super.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.3_PLA_adaptive.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.3_PLA_low.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.3_PLA_standard.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.3_PLA_super.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.3_TPU_adaptive.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.3_TPU_standard.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.3_TPU_super.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.4_ABS_adaptive.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.4_ABS_low.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.4_ABS_standard.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.4_ABS_super.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.4_PETG_adaptive.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.4_PETG_low.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.4_PETG_standard.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.4_PETG_super.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.4_PLA_adaptive.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.4_PLA_low.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.4_PLA_standard.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.4_PLA_super.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.4_TPU_adaptive.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.4_TPU_standard.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.4_TPU_super.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.5_ABS_adaptive.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.5_ABS_low.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.5_ABS_standard.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.5_ABS_super.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.5_PETG_adaptive.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.5_PETG_low.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.5_PETG_standard.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.5_PETG_super.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.5_PLA_adaptive.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.5_PLA_low.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.5_PLA_standard.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.5_PLA_super.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.5_TPU_adaptive.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.5_TPU_standard.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.5_TPU_super.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.6_ABS_standard.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.6_PETG_standard.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.6_PLA_draft.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.6_PLA_low.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.6_PLA_standard.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.6_TPU_standard.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.8_ABS_draft.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.8_PETG_draft.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.8_PLA_draft.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_0.8_TPU_draft.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_1.0_ABS_draft.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_1.0_PETG_draft.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_1.0_PLA_draft.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_1.0_TPU_draft.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_global_adaptive.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_global_draft.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_global_low.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_global_standard.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_global_super.inst.cfg (100%) rename resources/quality/{geeetech => }/geeetech_quality/geeetech_quality_global_ultra.inst.cfg (100%) diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.2_ABS_super.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.2_ABS_super.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.2_ABS_super.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.2_ABS_super.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.2_ABS_ultra.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.2_ABS_ultra.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.2_ABS_ultra.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.2_ABS_ultra.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.2_PETG_super.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.2_PETG_super.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.2_PETG_super.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.2_PETG_super.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.2_PETG_ultra.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.2_PETG_ultra.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.2_PETG_ultra.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.2_PETG_ultra.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.2_PLA_super.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.2_PLA_super.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.2_PLA_super.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.2_PLA_super.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.2_PLA_ultra.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.2_PLA_ultra.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.2_PLA_ultra.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.2_PLA_ultra.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_ABS_adaptive.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.3_ABS_adaptive.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_ABS_adaptive.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.3_ABS_adaptive.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_ABS_low.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.3_ABS_low.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_ABS_low.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.3_ABS_low.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_ABS_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.3_ABS_standard.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_ABS_standard.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.3_ABS_standard.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_ABS_super.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.3_ABS_super.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_ABS_super.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.3_ABS_super.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PETG_adaptive.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.3_PETG_adaptive.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PETG_adaptive.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.3_PETG_adaptive.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PETG_low.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.3_PETG_low.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PETG_low.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.3_PETG_low.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PETG_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.3_PETG_standard.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PETG_standard.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.3_PETG_standard.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PETG_super.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.3_PETG_super.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PETG_super.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.3_PETG_super.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PLA_adaptive.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.3_PLA_adaptive.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PLA_adaptive.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.3_PLA_adaptive.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PLA_low.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.3_PLA_low.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PLA_low.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.3_PLA_low.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PLA_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.3_PLA_standard.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PLA_standard.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.3_PLA_standard.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PLA_super.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.3_PLA_super.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PLA_super.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.3_PLA_super.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_TPU_adaptive.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.3_TPU_adaptive.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_TPU_adaptive.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.3_TPU_adaptive.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_TPU_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.3_TPU_standard.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_TPU_standard.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.3_TPU_standard.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_TPU_super.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.3_TPU_super.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_TPU_super.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.3_TPU_super.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_ABS_adaptive.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.4_ABS_adaptive.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_ABS_adaptive.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.4_ABS_adaptive.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_ABS_low.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.4_ABS_low.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_ABS_low.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.4_ABS_low.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_ABS_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.4_ABS_standard.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_ABS_standard.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.4_ABS_standard.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_ABS_super.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.4_ABS_super.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_ABS_super.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.4_ABS_super.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PETG_adaptive.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.4_PETG_adaptive.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PETG_adaptive.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.4_PETG_adaptive.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PETG_low.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.4_PETG_low.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PETG_low.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.4_PETG_low.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PETG_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.4_PETG_standard.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PETG_standard.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.4_PETG_standard.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PETG_super.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.4_PETG_super.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PETG_super.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.4_PETG_super.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PLA_adaptive.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.4_PLA_adaptive.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PLA_adaptive.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.4_PLA_adaptive.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PLA_low.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.4_PLA_low.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PLA_low.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.4_PLA_low.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PLA_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.4_PLA_standard.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PLA_standard.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.4_PLA_standard.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PLA_super.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.4_PLA_super.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PLA_super.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.4_PLA_super.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_TPU_adaptive.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.4_TPU_adaptive.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_TPU_adaptive.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.4_TPU_adaptive.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_TPU_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.4_TPU_standard.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_TPU_standard.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.4_TPU_standard.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_TPU_super.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.4_TPU_super.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_TPU_super.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.4_TPU_super.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_ABS_adaptive.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.5_ABS_adaptive.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_ABS_adaptive.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.5_ABS_adaptive.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_ABS_low.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.5_ABS_low.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_ABS_low.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.5_ABS_low.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_ABS_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.5_ABS_standard.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_ABS_standard.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.5_ABS_standard.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_ABS_super.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.5_ABS_super.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_ABS_super.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.5_ABS_super.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PETG_adaptive.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.5_PETG_adaptive.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PETG_adaptive.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.5_PETG_adaptive.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PETG_low.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.5_PETG_low.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PETG_low.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.5_PETG_low.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PETG_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.5_PETG_standard.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PETG_standard.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.5_PETG_standard.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PETG_super.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.5_PETG_super.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PETG_super.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.5_PETG_super.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PLA_adaptive.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.5_PLA_adaptive.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PLA_adaptive.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.5_PLA_adaptive.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PLA_low.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.5_PLA_low.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PLA_low.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.5_PLA_low.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PLA_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.5_PLA_standard.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PLA_standard.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.5_PLA_standard.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PLA_super.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.5_PLA_super.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PLA_super.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.5_PLA_super.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_TPU_adaptive.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.5_TPU_adaptive.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_TPU_adaptive.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.5_TPU_adaptive.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_TPU_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.5_TPU_standard.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_TPU_standard.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.5_TPU_standard.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_TPU_super.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.5_TPU_super.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_TPU_super.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.5_TPU_super.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.6_ABS_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.6_ABS_standard.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.6_ABS_standard.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.6_ABS_standard.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.6_PETG_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.6_PETG_standard.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.6_PETG_standard.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.6_PETG_standard.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.6_PLA_draft.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.6_PLA_draft.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.6_PLA_draft.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.6_PLA_draft.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.6_PLA_low.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.6_PLA_low.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.6_PLA_low.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.6_PLA_low.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.6_PLA_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.6_PLA_standard.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.6_PLA_standard.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.6_PLA_standard.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.6_TPU_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.6_TPU_standard.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.6_TPU_standard.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.6_TPU_standard.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.8_ABS_draft.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.8_ABS_draft.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.8_ABS_draft.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.8_ABS_draft.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.8_PETG_draft.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.8_PETG_draft.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.8_PETG_draft.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.8_PETG_draft.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.8_PLA_draft.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.8_PLA_draft.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.8_PLA_draft.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.8_PLA_draft.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.8_TPU_draft.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.8_TPU_draft.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_0.8_TPU_draft.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_0.8_TPU_draft.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_1.0_ABS_draft.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_1.0_ABS_draft.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_1.0_ABS_draft.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_1.0_ABS_draft.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_1.0_PETG_draft.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_1.0_PETG_draft.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_1.0_PETG_draft.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_1.0_PETG_draft.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_1.0_PLA_draft.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_1.0_PLA_draft.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_1.0_PLA_draft.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_1.0_PLA_draft.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_1.0_TPU_draft.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_1.0_TPU_draft.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_1.0_TPU_draft.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_1.0_TPU_draft.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_global_adaptive.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_global_adaptive.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_global_adaptive.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_global_adaptive.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_global_draft.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_global_draft.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_global_draft.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_global_draft.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_global_low.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_global_low.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_global_low.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_global_low.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_global_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_global_standard.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_global_standard.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_global_standard.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_global_super.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_global_super.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_global_super.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_global_super.inst.cfg diff --git a/resources/quality/geeetech/geeetech_quality/geeetech_quality_global_ultra.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_global_ultra.inst.cfg similarity index 100% rename from resources/quality/geeetech/geeetech_quality/geeetech_quality_global_ultra.inst.cfg rename to resources/quality/geeetech_quality/geeetech_quality_global_ultra.inst.cfg From 7a671eaa03b15ab194cf019e6c7015a3e5b8bbdf Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Tue, 13 Dec 2022 10:17:18 +0100 Subject: [PATCH 109/124] Change preffered quality from normal (0.1mm) to fast (0.15mm) (#13974) Change preferred quality from normal (0.1mm) to fast (0.15mm) to increase the default productivity. Added a default layer height of 0.15mm in unsupported modes. This also applies some linter suggestions Co-authored-by: pkuiper-ultimaker Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- resources/definitions/ultimaker.def.json | 10 +--------- resources/definitions/ultimaker3.def.json | 2 +- resources/definitions/ultimaker_s3.def.json | 2 +- resources/definitions/ultimaker_s5.def.json | 2 +- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index f05ee97441..ce198ea9ad 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -49,18 +49,10 @@ "value": "20" }, "jerk_print_layer_0": { "value": "max(20, jerk_wall_0)" }, - "jerk_roofing": { "minimum_value_warning": 20 }, - "jerk_support": { "minimum_value_warning": 20 }, - "jerk_support_infill": { "minimum_value_warning": 20 }, - "jerk_support_interface": { "minimum_value_warning": 20 }, - "jerk_topbottom": { "minimum_value_warning": 20 }, "jerk_travel": { "value": "jerk_print" }, "jerk_travel_enabled": { "value": false }, - "jerk_wall": { "minimum_value_warning": 20 }, - "jerk_wall_0": { "minimum_value_warning": 20 }, + "layer_height": { "value": 0.15 }, "layer_height_0": { "value": "max(0.2, layer_height)" }, - "line_width": { "value": "machine_nozzle_size" }, - "machine_max_feedrate_e": { "default_value": 45 }, "material_bed_temperature": { "maximum_value_warning": "125", diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index 11e99f8460..106f482b48 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -41,7 +41,7 @@ 0 ], "platform_texture": "Ultimaker3backplate.png", - "preferred_quality_type": "normal", + "preferred_quality_type": "fast", "preferred_variant_name": "AA 0.4", "supported_actions": [ "DiscoverUM3Action" ], "supports_network_connection": true, diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json index ecd9e8e09c..3505c9b0a9 100644 --- a/resources/definitions/ultimaker_s3.def.json +++ b/resources/definitions/ultimaker_s3.def.json @@ -38,7 +38,7 @@ 0 ], "platform_texture": "UltimakerS3backplate.png", - "preferred_quality_type": "normal", + "preferred_quality_type": "fast", "preferred_variant_name": "AA 0.4", "supported_actions": [ "DiscoverUM3Action" ], "supports_material_export": true, diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index 7f54455742..2796d5351a 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -37,7 +37,7 @@ -10 ], "platform_texture": "UltimakerS5backplate.png", - "preferred_quality_type": "normal", + "preferred_quality_type": "fast", "preferred_variant_buildplate_name": "Glass", "preferred_variant_name": "AA 0.4", "supported_actions": [ "DiscoverUM3Action" ], From 811708766443620f43e18a81b02dccb0b538bf76 Mon Sep 17 00:00:00 2001 From: jelle Spijker Date: Tue, 13 Dec 2022 11:30:13 +0100 Subject: [PATCH 110/124] Revert "Fix multiline printer-linter PR suggestions" This reverts commit 7820cc98 --- .../workflows/printer-linter-pr-diagnose.yml | 2 +- .github/workflows/printer-linter-pr-post.yml | 2 +- .../src/printerlinter/linters/defintion.py | 17 ++++++++++++----- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.github/workflows/printer-linter-pr-diagnose.yml b/.github/workflows/printer-linter-pr-diagnose.yml index 54bbda4c1d..0dac8ba7e7 100644 --- a/.github/workflows/printer-linter-pr-diagnose.yml +++ b/.github/workflows/printer-linter-pr-diagnose.yml @@ -52,7 +52,7 @@ jobs: path: printer-linter-result/ - name: Run clang-tidy-pr-comments action - uses: platisd/clang-tidy-pr-comments@master + uses: platisd/clang-tidy-pr-comments@bc0bb7da034a8317d54e7fe1e819159002f4cc40 with: github_token: ${{ secrets.GITHUB_TOKEN }} clang_tidy_fixes: result.yml diff --git a/.github/workflows/printer-linter-pr-post.yml b/.github/workflows/printer-linter-pr-post.yml index f6c0924d1c..81dbf96469 100644 --- a/.github/workflows/printer-linter-pr-post.yml +++ b/.github/workflows/printer-linter-pr-post.yml @@ -73,7 +73,7 @@ jobs: unzip printer-linter-result.zip -d printer-linter-result - name: Run clang-tidy-pr-comments action - uses: platisd/clang-tidy-pr-comments@master + uses: platisd/clang-tidy-pr-comments@bc0bb7da034a8317d54e7fe1e819159002f4cc40 with: github_token: ${{ secrets.GITHUB_TOKEN }} clang_tidy_fixes: printer-linter-result/fixes.yml diff --git a/printer-linter/src/printerlinter/linters/defintion.py b/printer-linter/src/printerlinter/linters/defintion.py index b0201976be..d684cd98e9 100644 --- a/printer-linter/src/printerlinter/linters/defintion.py +++ b/printer-linter/src/printerlinter/linters/defintion.py @@ -45,17 +45,24 @@ class Definition(Linter): if is_redefined: redefined = re.compile(r'.*(\"' + key + r'\"[\s\:\S]*?)\{[\s\S]*?\},?') found = redefined.search(self._content) + # TODO: Figure out a way to support multiline fixes in the PR review GH Action, for now suggest no fix to ensure no ill-formed json are created + # see: https://github.com/platisd/clang-tidy-pr-comments/issues/37 + if len(found.group().splitlines()) > 1: + replacements = [] + else: + replacements = [Replacement( + file = self._file, + offset = found.span(1)[0], + length = len(found.group()), + replacement_text = "")] + yield Diagnostic( file = self._file, diagnostic_name = "diagnostic-definition-redundant-override", message = f"Overriding {key} with the same value ({value}) as defined in parent definition: {definition['inherits']}", level = "Warning", offset = found.span(0)[0], - replacements = [Replacement( - file = self._file, - offset = found.span(1)[0], - length = len(found.group()), - replacement_text = "")] + replacements = replacements ) def _loadDefinitionFiles(self, definition_file) -> None: From 564fefa1c732dfd3aad8faffb44b545f62a1cfca Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Tue, 13 Dec 2022 11:46:06 +0100 Subject: [PATCH 111/124] Fix updating value with "," instead of "." in reccomended mode Fixed by correctly parsing dot in `SingleSettingTextField`. CURA-9793 --- resources/qml/Widgets/SingleSettingTextField.qml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/resources/qml/Widgets/SingleSettingTextField.qml b/resources/qml/Widgets/SingleSettingTextField.qml index 5bff7fdb5a..12d24d285d 100644 --- a/resources/qml/Widgets/SingleSettingTextField.qml +++ b/resources/qml/Widgets/SingleSettingTextField.qml @@ -87,15 +87,17 @@ UM.TextField function parseValueUpdateSetting() { - if (propertyProvider.properties.value === text || (parseFloat(propertyProvider.properties.value) === parseFloat(text))) + // User convenience. We use dots for decimal values + const modified_text = text.replace(",", "."); + if (propertyProvider.properties.value === modified_text || (parseFloat(propertyProvider.properties.value) === parseFloat(modified_text))) { // Don't set the property value from the control. It already has the same value return } - if (propertyProvider && text !== propertyProvider.properties.value) + if (propertyProvider && modified_text !== propertyProvider.properties.value) { - updateSetting(text); + updateSetting(modified_text); } } @@ -138,7 +140,7 @@ UM.TextField color: UM.Theme.getColor("setting_validation_warning_background") } }, - State + State { name: "disabled" when: !control.enabled From 6f1abe434086ea96ef504704ef3aaaa9968fcc5a Mon Sep 17 00:00:00 2001 From: jelle Spijker Date: Tue, 13 Dec 2022 11:46:13 +0100 Subject: [PATCH 112/124] fixup! Change preffered quality from normal (0.1mm) to fast (0.15mm) (#13974) --- resources/definitions/ultimaker.def.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index ce198ea9ad..0a5c389a73 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -53,6 +53,8 @@ "jerk_travel_enabled": { "value": false }, "layer_height": { "value": 0.15 }, "layer_height_0": { "value": "max(0.2, layer_height)" }, + "line_width": { "value": "machine_nozzle_size" }, + "machine_max_feedrate_e": { "default_value": 45 }, "material_bed_temperature": { "maximum_value_warning": "125", From 027507ed6066a76f7fe3de5ce5d482eb8d816941 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Tue, 13 Dec 2022 11:48:12 +0100 Subject: [PATCH 113/124] Revert "Fix multiline printer-linter PR suggestions" This reverts commit 7820cc98 --- resources/definitions/ultimaker.def.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index 0a5c389a73..f05ee97441 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -49,9 +49,15 @@ "value": "20" }, "jerk_print_layer_0": { "value": "max(20, jerk_wall_0)" }, + "jerk_roofing": { "minimum_value_warning": 20 }, + "jerk_support": { "minimum_value_warning": 20 }, + "jerk_support_infill": { "minimum_value_warning": 20 }, + "jerk_support_interface": { "minimum_value_warning": 20 }, + "jerk_topbottom": { "minimum_value_warning": 20 }, "jerk_travel": { "value": "jerk_print" }, "jerk_travel_enabled": { "value": false }, - "layer_height": { "value": 0.15 }, + "jerk_wall": { "minimum_value_warning": 20 }, + "jerk_wall_0": { "minimum_value_warning": 20 }, "layer_height_0": { "value": "max(0.2, layer_height)" }, "line_width": { "value": "machine_nozzle_size" }, "machine_max_feedrate_e": { "default_value": 45 }, From cea7bb83c8383762f265bf0720c0d8e28efe5f0c Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Tue, 13 Dec 2022 11:52:39 +0100 Subject: [PATCH 114/124] Revert "Fix multiline printer-linter PR suggestions" This reverts commit 7820cc98 --- resources/definitions/ultimaker.def.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index f05ee97441..c5f9d5ca90 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -58,6 +58,7 @@ "jerk_travel_enabled": { "value": false }, "jerk_wall": { "minimum_value_warning": 20 }, "jerk_wall_0": { "minimum_value_warning": 20 }, + "layer_height": { "value": 0.15 }, "layer_height_0": { "value": "max(0.2, layer_height)" }, "line_width": { "value": "machine_nozzle_size" }, "machine_max_feedrate_e": { "default_value": 45 }, From 6109b4b9da593d0dd114b3bb1ce81bd42cd04392 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Tue, 13 Dec 2022 14:36:14 +0100 Subject: [PATCH 115/124] distinguish between (default_)value and other properties --- .../src/printerlinter/linters/defintion.py | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/printer-linter/src/printerlinter/linters/defintion.py b/printer-linter/src/printerlinter/linters/defintion.py index d684cd98e9..e27d8a7679 100644 --- a/printer-linter/src/printerlinter/linters/defintion.py +++ b/printer-linter/src/printerlinter/linters/defintion.py @@ -41,7 +41,7 @@ class Definition(Linter): definition = self._definitions[definition_name] if "overrides" in definition and definition_name not in ("fdmprinter", "fdmextruder"): for key, value_dict in definition["overrides"].items(): - is_redefined, value, parent = self._isDefinedInParent(key, value_dict, definition['inherits']) + is_redefined, child_key, child_value, parent = self._isDefinedInParent(key, value_dict, definition['inherits']) if is_redefined: redefined = re.compile(r'.*(\"' + key + r'\"[\s\:\S]*?)\{[\s\S]*?\},?') found = redefined.search(self._content) @@ -59,7 +59,7 @@ class Definition(Linter): yield Diagnostic( file = self._file, diagnostic_name = "diagnostic-definition-redundant-override", - message = f"Overriding {key} with the same value ({value}) as defined in parent definition: {definition['inherits']}", + message = f"Overriding {key} with the same value ({child_key}: {child_value}) as defined in parent definition: {definition['inherits']}", level = "Warning", offset = found.span(0)[0], replacements = replacements @@ -92,28 +92,31 @@ class Definition(Linter): is_number = False else: is_number = self._definitions[self.base_def]["overrides"][key]["type"] in ("float", "int") - for value in value_dict.values(): + for child_key, child_value in value_dict.items(): if key in parent: - check_values = [cv for cv in [parent[key].get("default_value", None), parent[key].get("value", None)] if cv is not None] + if child_key in ("default_value", "value"): + check_values = [cv for cv in [parent[key].get("default_value", None), parent[key].get("value", None)] if cv is not None] + else: + check_values = [parent[key].get(child_key, None)] for check_value in check_values: - if is_number: + if is_number and child_key in ("default_value", "value"): try: - v = str(float(value)) + v = str(float(child_value)) except: - v = value + v = child_value try: cv = str(float(check_value)) except: cv = check_value else: - v = value + v = child_value cv = check_value if v == cv: - return True, value, parent + return True, child_key, child_value, parent if "inherits" in parent: return self._isDefinedInParent(key, value_dict, parent["inherits"]) - return False, None, None + return False, None, None, None def _loadBasePrinterSettings(self): """ TODO @Jelle please explain why this """ From 83603ec8fab50440403f231c70dd0ddd64e110f9 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Tue, 13 Dec 2022 14:36:27 +0100 Subject: [PATCH 116/124] Center extruder icon in recommended settings CURA-9793 --- resources/qml/ExtruderIcon.qml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/resources/qml/ExtruderIcon.qml b/resources/qml/ExtruderIcon.qml index c59521cdc3..93c5adf55a 100644 --- a/resources/qml/ExtruderIcon.qml +++ b/resources/qml/ExtruderIcon.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2021 Ultimaker B.V. +// Copyright (c) 2022 UltiMaker // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.11 @@ -12,7 +12,7 @@ Item property color materialColor property alias textColor: extruderNumberText.color property bool extruderEnabled: true - property var iconSize: UM.Theme.getSize("extruder_icon").width + property int iconSize: UM.Theme.getSize("extruder_icon").width property string iconVariant: "medium" property alias font: extruderNumberText.font @@ -36,7 +36,6 @@ Item } UM.ColorImage { - id: mainIcon anchors.fill: parent width: iconSize height: iconSize @@ -48,12 +47,14 @@ Item UM.Label { id: extruderNumberText - anchors.centerIn: parent - text: index + 1 + anchors.verticalCenter: parent.verticalCenter + anchors.left: parent.left + anchors.right: parent.right + horizontalAlignment: Text.AlignHCenter + text: (index + 1).toString() font: UM.Theme.getFont("small_emphasis") width: contentWidth height: contentHeight - horizontalAlignment: Text.AlignHCenter } } } From b553c9f31aaabf588ba80925cad869efc9d8a923 Mon Sep 17 00:00:00 2001 From: Remco Burema <41987080+rburema@users.noreply.github.com> Date: Tue, 13 Dec 2022 14:43:57 +0100 Subject: [PATCH 117/124] Revert "[CURA-9548] The engine now operates on the area _before_ the offset." --- resources/definitions/ultimaker.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index c5f9d5ca90..58396c4d28 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -76,7 +76,7 @@ }, "meshfix_maximum_deviation": { "value": "machine_nozzle_size / 10" }, "meshfix_maximum_resolution": { "value": "max(speed_wall_0 / 75, 0.5)" }, - "minimum_support_area": { "value": "4.0" }, + "minimum_support_area": { "value": "(2 + support_offset)**2" }, "raft_base_speed": { "value": "raft_speed" }, "raft_base_thickness": { "value": "min(machine_nozzle_size * 0.75, 0.3)" }, "raft_interface_fan_speed": { "value": "(raft_base_fan_speed + raft_surface_fan_speed) / 2" }, From 6a10b8b8b779ba94a3c191982c57f9621b4c4f39 Mon Sep 17 00:00:00 2001 From: jellespijker Date: Tue, 13 Dec 2022 15:22:03 +0000 Subject: [PATCH 118/124] Applied printer-linter format --- .../um_s3_aa0.8_CPEP_Fast_Print.inst.cfg | 13 +++++++------ .../ultimaker_s3/um_s3_aa0.8_PC_Fast_Print.inst.cfg | 13 +++++++------ .../um_s5_aa0.8_CPEP_Fast_Print.inst.cfg | 13 +++++++------ .../ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg | 13 +++++++------ 4 files changed, 28 insertions(+), 24 deletions(-) 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 c7ccc69e5d..3a58d31e34 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,16 +1,16 @@ [general] -version = 4 -name = Fast - Experimental definition = ultimaker_s3 +name = Fast - Experimental +version = 4 [metadata] +is_experimental = True +material = generic_cpe_plus +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_cpe_plus variant = AA 0.8 -is_experimental = True +weight = -2 [values] brim_width = 14 @@ -27,3 +27,4 @@ speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 35 / 40) support_z_distance = =layer_height top_bottom_thickness = 1.2 + 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 d8330d1faf..2e986643f5 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,16 +1,16 @@ [general] -version = 4 -name = Fast - Experimental definition = ultimaker_s3 +name = Fast - Experimental +version = 4 [metadata] +is_experimental = True +material = generic_pc +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_pc variant = AA 0.8 -is_experimental = True +weight = -2 [values] brim_width = 14 @@ -21,3 +21,4 @@ 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 * 30 / 40) + 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 d3e6294151..c37ab61582 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,16 +1,16 @@ [general] -version = 4 -name = Fast - Experimental definition = ultimaker_s5 +name = Fast - Experimental +version = 4 [metadata] +is_experimental = True +material = generic_cpe_plus +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_cpe_plus variant = AA 0.8 -is_experimental = True +weight = -2 [values] brim_width = 14 @@ -27,3 +27,4 @@ speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 35 / 40) support_z_distance = =layer_height top_bottom_thickness = 1.2 + 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 5a5b3290ee..2a5fa59681 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,16 +1,16 @@ [general] -version = 4 -name = Fast - Experimental definition = ultimaker_s5 +name = Fast - Experimental +version = 4 [metadata] +is_experimental = True +material = generic_pc +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_pc variant = AA 0.8 -is_experimental = True +weight = -2 [values] brim_width = 14 @@ -21,3 +21,4 @@ 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 * 30 / 40) + From 2c7bd7883a4b725ac6ae2429e55ef27c6e486da7 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Tue, 13 Dec 2022 17:05:51 +0100 Subject: [PATCH 119/124] Make recommended mode-window scrollable CURA-9793 --- .../PrintSetupSelectorContents.qml | 4 +++ .../Recommended/RecommendedPrintSetup.qml | 27 ++++++++++++------- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml b/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml index 9d3da51356..52a22c6c76 100644 --- a/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml +++ b/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml @@ -67,6 +67,10 @@ Item top: parent.top } visible: currentModeIndex == PrintSetupSelectorContents.Mode.Recommended + height: { + const height = base.height - (customPrintSetup.mapToItem(null, 0, 0).y + buttonRow.height + UM.Theme.getSize("default_margin").height); + return Math.min(implicitHeight, height); + } function onModeChanged() { diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml index f78ae38dce..80e171bed4 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml @@ -2,34 +2,41 @@ //Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 +import QtQuick.Controls 2.15 import QtQuick.Layouts 1.1 import UM 1.6 as UM import Cura 1.6 as Cura import ".." -Item +ScrollView { id: recommendedPrintSetup - height: childrenRect.height + 2 * padding + implicitHeight: settingsColumn.height + 2 * padding property bool settingsEnabled: Cura.ExtruderManager.activeExtruderStackId || extrudersEnabledCount.properties.value == 1 - property real padding: UM.Theme.getSize("default_margin").width + + padding: UM.Theme.getSize("default_margin").width function onModeChanged() {} - Column - { - spacing: UM.Theme.getSize("default_margin").height - + ScrollBar.vertical: UM.ScrollBar { + id: scroll anchors { - left: parent.left - right: parent.right top: parent.top - margins: parent.padding + right: parent.right + bottom: parent.bottom } + } + + Column + { + id: settingsColumn + spacing: UM.Theme.getSize("default_margin").height + + width: recommendedPrintSetup.width - 2 * recommendedPrintSetup.padding - (scroll.visible ? scroll.width : 0) // TODO property real firstColumnWidth: Math.round(width / 3) From 5c098e3f028c9ededa51f7cc3ec201240219b3ca Mon Sep 17 00:00:00 2001 From: jellespijker Date: Tue, 13 Dec 2022 19:42:33 +0000 Subject: [PATCH 120/124] Applied printer-linter format --- .../Geeetech_Base_Dual_Extruder.def.json | 213 +++++++++-------- .../Geeetech_Base_Multi_Extruder.def.json | 214 ++++++++++-------- .../Geeetech_Base_Single_Extruder.def.json | 198 +++++++++------- resources/definitions/geeetech_A10M.def.json | 64 +++--- .../definitions/geeetech_A10Pro.def.json | 38 ++-- resources/definitions/geeetech_A10T.def.json | 65 +++--- resources/definitions/geeetech_A20.def.json | 52 +++-- resources/definitions/geeetech_A20M.def.json | 64 +++--- resources/definitions/geeetech_A20T.def.json | 65 +++--- resources/definitions/geeetech_A30M.def.json | 52 +++-- .../definitions/geeetech_A30Pro.def.json | 38 ++-- resources/definitions/geeetech_A30T.def.json | 53 +++-- resources/definitions/geeetech_E180.def.json | 42 ++-- .../geeetech_GiantArmD200.def.json | 42 ++-- .../definitions/geeetech_I3ProB.def.json | 42 ++-- .../definitions/geeetech_I3ProC.def.json | 54 +++-- .../definitions/geeetech_I3ProW.def.json | 42 ++-- .../definitions/geeetech_MeCreator.def.json | 42 ++-- .../definitions/geeetech_MeCreator2.def.json | 42 ++-- .../definitions/geeetech_MeDucer.def.json | 42 ++-- resources/definitions/geeetech_Mizar.def.json | 40 ++-- .../definitions/geeetech_MizarM.def.json | 54 +++-- .../definitions/geeetech_MizarMax.def.json | 40 ++-- .../definitions/geeetech_MizarPro.def.json | 40 ++-- .../definitions/geeetech_MizarS.def.json | 40 ++-- .../definitions/geeetech_Thunder.def.json | 174 +++++++++----- .../Geeetech_Dual_Extruder_0.def.json | 17 +- .../Geeetech_Dual_Extruder_1.def.json | 17 +- .../Geeetech_Multi_Extruder_0.def.json | 17 +- .../Geeetech_Multi_Extruder_1.def.json | 17 +- .../Geeetech_Multi_Extruder_2.def.json | 17 +- .../Geeetech_Single_Extruder.def.json | 11 +- .../geeetech_quality_0.2_ABS_super.inst.cfg | 9 +- .../geeetech_quality_0.2_ABS_ultra.inst.cfg | 9 +- .../geeetech_quality_0.2_PETG_super.inst.cfg | 9 +- .../geeetech_quality_0.2_PETG_ultra.inst.cfg | 10 +- .../geeetech_quality_0.2_PLA_super.inst.cfg | 9 +- .../geeetech_quality_0.2_PLA_ultra.inst.cfg | 9 +- ...geeetech_quality_0.3_ABS_adaptive.inst.cfg | 9 +- .../geeetech_quality_0.3_ABS_low.inst.cfg | 9 +- ...geeetech_quality_0.3_ABS_standard.inst.cfg | 9 +- .../geeetech_quality_0.3_ABS_super.inst.cfg | 9 +- ...eeetech_quality_0.3_PETG_adaptive.inst.cfg | 10 +- .../geeetech_quality_0.3_PETG_low.inst.cfg | 10 +- ...eeetech_quality_0.3_PETG_standard.inst.cfg | 10 +- .../geeetech_quality_0.3_PETG_super.inst.cfg | 10 +- ...geeetech_quality_0.3_PLA_adaptive.inst.cfg | 9 +- .../geeetech_quality_0.3_PLA_low.inst.cfg | 9 +- ...geeetech_quality_0.3_PLA_standard.inst.cfg | 9 +- .../geeetech_quality_0.3_PLA_super.inst.cfg | 9 +- ...geeetech_quality_0.3_TPU_adaptive.inst.cfg | 9 +- ...geeetech_quality_0.3_TPU_standard.inst.cfg | 9 +- .../geeetech_quality_0.3_TPU_super.inst.cfg | 9 +- ...geeetech_quality_0.4_ABS_adaptive.inst.cfg | 9 +- .../geeetech_quality_0.4_ABS_low.inst.cfg | 9 +- ...geeetech_quality_0.4_ABS_standard.inst.cfg | 9 +- .../geeetech_quality_0.4_ABS_super.inst.cfg | 9 +- ...eeetech_quality_0.4_PETG_adaptive.inst.cfg | 10 +- .../geeetech_quality_0.4_PETG_low.inst.cfg | 10 +- ...eeetech_quality_0.4_PETG_standard.inst.cfg | 10 +- .../geeetech_quality_0.4_PETG_super.inst.cfg | 10 +- ...geeetech_quality_0.4_PLA_adaptive.inst.cfg | 9 +- .../geeetech_quality_0.4_PLA_low.inst.cfg | 9 +- ...geeetech_quality_0.4_PLA_standard.inst.cfg | 9 +- .../geeetech_quality_0.4_PLA_super.inst.cfg | 9 +- ...geeetech_quality_0.4_TPU_adaptive.inst.cfg | 9 +- ...geeetech_quality_0.4_TPU_standard.inst.cfg | 9 +- .../geeetech_quality_0.4_TPU_super.inst.cfg | 9 +- ...geeetech_quality_0.5_ABS_adaptive.inst.cfg | 9 +- .../geeetech_quality_0.5_ABS_low.inst.cfg | 9 +- ...geeetech_quality_0.5_ABS_standard.inst.cfg | 9 +- .../geeetech_quality_0.5_ABS_super.inst.cfg | 9 +- ...eeetech_quality_0.5_PETG_adaptive.inst.cfg | 10 +- .../geeetech_quality_0.5_PETG_low.inst.cfg | 10 +- ...eeetech_quality_0.5_PETG_standard.inst.cfg | 10 +- .../geeetech_quality_0.5_PETG_super.inst.cfg | 10 +- ...geeetech_quality_0.5_PLA_adaptive.inst.cfg | 9 +- .../geeetech_quality_0.5_PLA_low.inst.cfg | 9 +- ...geeetech_quality_0.5_PLA_standard.inst.cfg | 9 +- .../geeetech_quality_0.5_PLA_super.inst.cfg | 9 +- ...geeetech_quality_0.5_TPU_adaptive.inst.cfg | 9 +- ...geeetech_quality_0.5_TPU_standard.inst.cfg | 9 +- .../geeetech_quality_0.5_TPU_super.inst.cfg | 9 +- ...geeetech_quality_0.6_ABS_standard.inst.cfg | 9 +- ...eeetech_quality_0.6_PETG_standard.inst.cfg | 10 +- .../geeetech_quality_0.6_PLA_draft.inst.cfg | 9 +- .../geeetech_quality_0.6_PLA_low.inst.cfg | 9 +- ...geeetech_quality_0.6_PLA_standard.inst.cfg | 9 +- ...geeetech_quality_0.6_TPU_standard.inst.cfg | 9 +- .../geeetech_quality_0.8_ABS_draft.inst.cfg | 9 +- .../geeetech_quality_0.8_PETG_draft.inst.cfg | 10 +- .../geeetech_quality_0.8_PLA_draft.inst.cfg | 9 +- .../geeetech_quality_0.8_TPU_draft.inst.cfg | 9 +- .../geeetech_quality_1.0_ABS_draft.inst.cfg | 9 +- .../geeetech_quality_1.0_PETG_draft.inst.cfg | 10 +- .../geeetech_quality_1.0_PLA_draft.inst.cfg | 9 +- .../geeetech_quality_1.0_TPU_draft.inst.cfg | 9 +- .../geeetech_quality_global_adaptive.inst.cfg | 13 +- .../geeetech_quality_global_draft.inst.cfg | 11 +- .../geeetech_quality_global_low.inst.cfg | 11 +- .../geeetech_quality_global_standard.inst.cfg | 11 +- .../geeetech_quality_global_super.inst.cfg | 11 +- .../geeetech_quality_global_ultra.inst.cfg | 11 +- .../geeetech_A10Pro_0.2.inst.cfg | 5 +- .../geeetech_A10Pro_0.3.inst.cfg | 5 +- .../geeetech_A10Pro_0.4.inst.cfg | 5 +- .../geeetech_A10Pro_0.5.inst.cfg | 5 +- .../geeetech_A10Pro_0.6.inst.cfg | 5 +- .../geeetech_A10Pro_0.8.inst.cfg | 5 +- .../geeetech_A10Pro_1.0.inst.cfg | 5 +- .../geeetech_A20_0.2.inst.cfg | 5 +- .../geeetech_A20_0.3.inst.cfg | 5 +- .../geeetech_A20_0.4.inst.cfg | 5 +- .../geeetech_A20_0.5.inst.cfg | 5 +- .../geeetech_A20_0.6.inst.cfg | 5 +- .../geeetech_A20_0.8.inst.cfg | 5 +- .../geeetech_A20_1.0.inst.cfg | 5 +- .../geeetech_A30Pro_0.2.inst.cfg | 5 +- .../geeetech_A30Pro_0.3.inst.cfg | 5 +- .../geeetech_A30Pro_0.4.inst.cfg | 5 +- .../geeetech_A30Pro_0.5.inst.cfg | 5 +- .../geeetech_A30Pro_0.6.inst.cfg | 5 +- .../geeetech_A30Pro_0.8.inst.cfg | 5 +- .../geeetech_A30Pro_1.0.inst.cfg | 5 +- .../geeetech_E180_0.2.inst.cfg | 5 +- .../geeetech_E180_0.3.inst.cfg | 5 +- .../geeetech_E180_0.4.inst.cfg | 5 +- .../geeetech_E180_0.5.inst.cfg | 5 +- .../geeetech_E180_0.6.inst.cfg | 5 +- .../geeetech_E180_0.8.inst.cfg | 5 +- .../geeetech_E180_1.0.inst.cfg | 5 +- .../geeetech_GiantArmD200_0.2.inst.cfg | 5 +- .../geeetech_GiantArmD200_0.3.inst.cfg | 5 +- .../geeetech_GiantArmD200_0.4.inst.cfg | 5 +- .../geeetech_GiantArmD200_0.5.inst.cfg | 5 +- .../geeetech_GiantArmD200_0.6.inst.cfg | 5 +- .../geeetech_GiantArmD200_0.8.inst.cfg | 5 +- .../geeetech_GiantArmD200_1.0.inst.cfg | 5 +- .../geeetech_I3ProB_0.2.inst.cfg | 5 +- .../geeetech_I3ProB_0.3.inst.cfg | 5 +- .../geeetech_I3ProB_0.4.inst.cfg | 5 +- .../geeetech_I3ProB_0.5.inst.cfg | 5 +- .../geeetech_I3ProB_0.6.inst.cfg | 5 +- .../geeetech_I3ProB_0.8.inst.cfg | 5 +- .../geeetech_I3ProB_1.0.inst.cfg | 5 +- .../geeetech_I3ProW_0.2.inst.cfg | 5 +- .../geeetech_I3ProW_0.3.inst.cfg | 5 +- .../geeetech_I3ProW_0.4.inst.cfg | 5 +- .../geeetech_I3ProW_0.5.inst.cfg | 5 +- .../geeetech_I3ProW_0.6.inst.cfg | 5 +- .../geeetech_I3ProW_0.8.inst.cfg | 5 +- .../geeetech_I3ProW_1.0.inst.cfg | 5 +- .../geeetech_MeCreator2_0.2.inst.cfg | 5 +- .../geeetech_MeCreator2_0.3.inst.cfg | 5 +- .../geeetech_MeCreator2_0.4.inst.cfg | 5 +- .../geeetech_MeCreator2_0.5.inst.cfg | 5 +- .../geeetech_MeCreator2_0.6.inst.cfg | 5 +- .../geeetech_MeCreator2_0.8.inst.cfg | 5 +- .../geeetech_MeCreator2_1.0.inst.cfg | 5 +- .../geeetech_MeCreator_0.2.inst.cfg | 5 +- .../geeetech_MeCreator_0.3.inst.cfg | 5 +- .../geeetech_MeCreator_0.4.inst.cfg | 5 +- .../geeetech_MeCreator_0.5.inst.cfg | 5 +- .../geeetech_MeCreator_0.6.inst.cfg | 5 +- .../geeetech_MeCreator_0.8.inst.cfg | 5 +- .../geeetech_MeCreator_1.0.inst.cfg | 5 +- .../geeetech_MeDucer_0.2.inst.cfg | 5 +- .../geeetech_MeDucer_0.3.inst.cfg | 5 +- .../geeetech_MeDucer_0.4.inst.cfg | 5 +- .../geeetech_MeDucer_0.5.inst.cfg | 5 +- .../geeetech_MeDucer_0.6.inst.cfg | 5 +- .../geeetech_MeDucer_0.8.inst.cfg | 5 +- .../geeetech_MeDucer_1.0.inst.cfg | 5 +- .../geeetech_MizarMax_0.2.inst.cfg | 5 +- .../geeetech_MizarMax_0.3.inst.cfg | 5 +- .../geeetech_MizarMax_0.4.inst.cfg | 5 +- .../geeetech_MizarMax_0.5.inst.cfg | 5 +- .../geeetech_MizarMax_0.6.inst.cfg | 5 +- .../geeetech_MizarMax_0.8.inst.cfg | 5 +- .../geeetech_MizarMax_1.0.inst.cfg | 5 +- .../geeetech_MizarPro_0.2.inst.cfg | 5 +- .../geeetech_MizarPro_0.3.inst.cfg | 5 +- .../geeetech_MizarPro_0.4.inst.cfg | 5 +- .../geeetech_MizarPro_0.5.inst.cfg | 5 +- .../geeetech_MizarPro_0.6.inst.cfg | 5 +- .../geeetech_MizarPro_0.8.inst.cfg | 5 +- .../geeetech_MizarPro_1.0.inst.cfg | 5 +- .../geeetech_MizarS_0.2.inst.cfg | 5 +- .../geeetech_MizarS_0.3.inst.cfg | 5 +- .../geeetech_MizarS_0.4.inst.cfg | 5 +- .../geeetech_MizarS_0.5.inst.cfg | 5 +- .../geeetech_MizarS_0.6.inst.cfg | 5 +- .../geeetech_MizarS_0.8.inst.cfg | 5 +- .../geeetech_MizarS_1.0.inst.cfg | 5 +- .../geeetech_Mizar_0.2.inst.cfg | 5 +- .../geeetech_Mizar_0.3.inst.cfg | 5 +- .../geeetech_Mizar_0.4.inst.cfg | 5 +- .../geeetech_Mizar_0.5.inst.cfg | 5 +- .../geeetech_Mizar_0.6.inst.cfg | 5 +- .../geeetech_Mizar_0.8.inst.cfg | 5 +- .../geeetech_Mizar_1.0.inst.cfg | 5 +- .../geeetech_Thunder_0.2.inst.cfg | 5 +- .../geeetech_Thunder_0.3.inst.cfg | 5 +- .../geeetech_Thunder_0.4.inst.cfg | 5 +- .../geeetech_Thunder_0.5.inst.cfg | 5 +- .../geeetech_Thunder_0.6.inst.cfg | 5 +- .../geeetech_Thunder_0.8.inst.cfg | 5 +- .../geeetech_Thunder_1.0.inst.cfg | 5 +- 208 files changed, 1820 insertions(+), 1322 deletions(-) diff --git a/resources/definitions/Geeetech_Base_Dual_Extruder.def.json b/resources/definitions/Geeetech_Base_Dual_Extruder.def.json index ddaeb46dbb..92dc13d7a9 100644 --- a/resources/definitions/Geeetech_Base_Dual_Extruder.def.json +++ b/resources/definitions/Geeetech_Base_Dual_Extruder.def.json @@ -2,116 +2,147 @@ "version": 2, "name": "Geeetech Base Dual-Extruder Printer", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": false, "author": "Teddy.Hu", "manufacturer": "Geeetech", "file_formats": "text/x-gcode", - "first_start_actions": ["MachineSettingsAction"], + "first_start_actions": [ "MachineSettingsAction" ], + "has_machine_quality": true, "has_materials": true, "has_variants": false, - "has_machine_quality": true, - "variants_name": "Nozzle Size", - "preferred_variant_name": "0.4mm Nozzle", - "preferred_quality_type": "standard", + "machine_extruder_trains": + { + "0": "Geeetech_Dual_Extruder_0", + "1": "Geeetech_Dual_Extruder_1" + }, "preferred_material": "generic_pla", + "preferred_quality_type": "standard", + "preferred_variant_name": "0.4mm Nozzle", "quality_definition": "Geeetech_Base_Single_Extruder", - "machine_extruder_trains": { - "0": "Geeetech_Dual_Extruder_0", "1": "Geeetech_Dual_Extruder_1" - } - }, - - "overrides":{ - "machine_name": { "default_value": "Geeetech Base Dual-Extruder Printer" }, - "machine_width": { "default_value": 350 }, - "machine_depth": { "default_value": 350 }, - "machine_height": {"default_value": 350 }, - "machine_head_with_fans_polygon": { "default_value": [[-40, 40], [40, 40], [40, -40], [-40, -40]] }, + "variants_name": "Nozzle Size" + }, + "overrides": + { + "acceleration_print": { "value": 500 }, + "acceleration_travel": { "value": 500 }, + "acceleration_travel_layer_0": { "value": "acceleration_travel" }, + "adhesion_type": { "value": "'skirt'" }, + "brim_replaces_support": { "value": false }, + "cool_min_layer_time": { "value": "1.3 if speed_infill>=200 else 5" }, "gantry_height": { "value": 40 }, - - "machine_start_gcode": { "default_value": ";Geeetech Custom Start G-code\nM104 S{material_print_temperature_layer_0} ;Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ;Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ;Wait for Hotend Temperature\nG92 E0 ;Reset Extruder\nG28 ;Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ;ON Light\n;M106 P0 S383 ;ON MainFan 150% if need\n;M106 P1 S255 ;ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ;Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ;Draw the first line\nG92 E0 ;Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ;Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ;Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": ";Geeetech Custom end G-code\nG91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers\n\n\n" }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'grid'" }, + "line_width": { "value": "1.125*machine_nozzle_size if speed_infill<=100 else machine_nozzle_size" }, + "machine_acceleration": { "value": 500 }, + "machine_depth": { "default_value": 350 }, + "machine_end_gcode": { "default_value": ";Geeetech Custom end G-code\nG91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers\n\n\n" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-40, 40], + [40, 40], + [40, -40], + [-40, -40] + ] + }, "machine_heated_bed": { "default_value": true }, - "machine_extruder_count": { "default_value": 2 }, - - "machine_max_feedrate_x": { "value": 500 }, - "machine_max_feedrate_y": { "value": 500 }, - "machine_max_feedrate_z": { "value": 10 }, - "machine_max_feedrate_e": { "value": 40 }, + "machine_height": { "default_value": 350 }, + "machine_max_acceleration_e": { "value": 1000 }, "machine_max_acceleration_x": { "value": 500 }, "machine_max_acceleration_y": { "value": 500 }, "machine_max_acceleration_z": { "value": 111 }, - "machine_max_acceleration_e": { "value": 1000 }, - "machine_acceleration": { "value": 500 }, + "machine_max_feedrate_e": { "value": 40 }, + "machine_max_feedrate_x": { "value": 500 }, + "machine_max_feedrate_y": { "value": 500 }, + "machine_max_feedrate_z": { "value": 10 }, + "machine_max_jerk_e": { "value": 4.9 }, "machine_max_jerk_xy": { "value": 10 }, "machine_max_jerk_z": { "value": 0.3 }, - "machine_max_jerk_e": { "value": 4.9 }, - - "acceleration_print": { "value": 500 }, - "acceleration_travel": { "value": 500 }, - "acceleration_travel_layer_0": { "value": "acceleration_travel" }, - - "line_width": { "value": "1.125*machine_nozzle_size if speed_infill<=100 else machine_nozzle_size" }, - "retraction_speed": { "value": 35 }, - "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'grid'" }, - "small_hole_max_size":{ "value": "5 if speed_infill>=150 else 0" }, - "cool_min_layer_time":{ "value": "1.3 if speed_infill>=200 else 5" }, - "material_print_temperature": { "value": "200 if speed_infill <=100 else 210 if speed_infill <= 150 else 220 if speed_infill <= 180 else 230", "maximum_value": "250" }, - "material_print_temperature_layer_0": { "value": "material_print_temperature + 5", "maximum_value_warning": 250 }, - "material_initial_print_temperature": { "value": "material_print_temperature - 5", "minimum_value_warning": "material_standby_temperature - 10" }, - "material_final_print_temperature": { "value": "material_print_temperature" }, + "machine_name": { "default_value": "Geeetech Base Dual-Extruder Printer" }, + "machine_start_gcode": { "default_value": ";Geeetech Custom Start G-code\nM104 S{material_print_temperature_layer_0} ;Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ;Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ;Wait for Hotend Temperature\nG92 E0 ;Reset Extruder\nG28 ;Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ;ON Light\n;M106 P0 S383 ;ON MainFan 150% if need\n;M106 P1 S255 ;ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ;Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ;Draw the first line\nG92 E0 ;Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ;Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ;Scrape off nozzle residue" }, + "machine_width": { "default_value": 350 }, "material_bed_temperature": { "maximum_value_warning": 110 }, - - "speed_wall": { "value": "60 if speed_print==60 else math.ceil(round(speed_print*0.90))" }, - "speed_wall_0": { "value": "30 if speed_print==60 else math.ceil(round(speed_print*0.75))" }, - "speed_wall_x": { "value": "60 if speed_print==60 else math.ceil(round(speed_print*0.90))" }, - "speed_topbottom": { "value": "speed_print" }, - "speed_travel": { "value": "200 if 120<=speed_print<=200 else speed_print if speed_print>200 else 120" }, - "speed_layer_0": { "value":"50 if speed_infill <= 150 else 75","maximum_value_warning": "100" }, - "speed_print_layer_0": { "value": "25 if speed_infill <= 150 else 35","maximum_value_warning": "60" }, - "speed_travel_layer_0": { "value": "speed_layer_0","maximum_value_warning": "150" }, - "skirt_brim_speed": { "value":"speed_print_layer_0","maximum_value_warning": "60" }, - - "speed_support": { "value": "speed_print*0.5" }, - "speed_support_interface": { "value": "speed_support / 0.8" }, - "speed_support_roof": { "value": "speed_support_interface / 2" }, - "speed_support_bottom": { "value": "speed_support_roof" }, - - "wall_transition_filter_deviation":{ "value": 0.15 }, - "travel_avoid_supports": { "value": true }, - "retraction_hop": { "value": 0.5 }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_initial_print_temperature": + { + "minimum_value_warning": "material_standby_temperature - 10", + "value": "material_print_temperature - 5" + }, + "material_print_temperature": + { + "maximum_value": "250", + "value": "200 if speed_infill <=100 else 210 if speed_infill <= 150 else 220 if speed_infill <= 180 else 230" + }, + "material_print_temperature_layer_0": + { + "maximum_value_warning": 250, + "value": "material_print_temperature + 5" + }, + "minimum_interface_area": { "value": 10 }, + "minimum_support_area": { "value": 2 }, + "optimize_wall_printing_order": { "value": true }, + "prime_tower_brim_enable": { "value": true }, + "prime_tower_min_volume": + { + "maximum_value_warning": 150, + "value": 85 + }, + "prime_tower_size": { "value": 30 }, "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'all'" }, "retraction_combing_max_distance": { "value": 30 }, - "optimize_wall_printing_order": { "value": true }, - "z_seam_type": { "value": "'sharpest_corner'" }, - "z_seam_corner": { "value": "'z_seam_corner_inner'" }, - - "support_use_towers": { "value": false }, - "support_pattern": { "value": "'zigzag'" }, - "support_wall_count": { "value": 0 }, + "retraction_hop": { "value": 0.5 }, + "retraction_speed": { "value": 35 }, + "skirt_brim_speed": + { + "maximum_value_warning": "60", + "value": "speed_print_layer_0" + }, + "skirt_gap": { "value": 6 }, + "small_hole_max_size": { "value": "5 if speed_infill>=150 else 0" }, + "speed_layer_0": + { + "maximum_value_warning": "100", + "value": "50 if speed_infill <= 150 else 75" + }, + "speed_print_layer_0": + { + "maximum_value_warning": "60", + "value": "25 if speed_infill <= 150 else 35" + }, + "speed_support": { "value": "speed_print*0.5" }, + "speed_support_bottom": { "value": "speed_support_roof" }, + "speed_support_interface": { "value": "speed_support / 0.8" }, + "speed_support_roof": { "value": "speed_support_interface / 2" }, + "speed_topbottom": { "value": "speed_print" }, + "speed_travel": { "value": "200 if 120<=speed_print<=200 else speed_print if speed_print>200 else 120" }, + "speed_travel_layer_0": + { + "maximum_value_warning": "150", + "value": "speed_layer_0" + }, + "speed_wall": { "value": "60 if speed_print==60 else math.ceil(round(speed_print*0.90))" }, + "speed_wall_0": { "value": "30 if speed_print==60 else math.ceil(round(speed_print*0.75))" }, + "speed_wall_x": { "value": "60 if speed_print==60 else math.ceil(round(speed_print*0.90))" }, + "support_brim_enable": { "value": true }, + "support_brim_width": { "value": 5 }, "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" }, - "support_brim_enable": { "value": true }, - "support_brim_width": { "value": 5 }, - "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height*2" }, + "support_interface_density": { "value": 33.333 }, + "support_interface_height": { "value": "layer_height * 3" }, + "support_interface_pattern": { "value": "zigzag" }, + "support_interface_skip_height": { "value": 0.2 }, + "support_pattern": { "value": "'zigzag'" }, + "support_use_towers": { "value": false }, + "support_wall_count": { "value": 0 }, "support_xy_distance": { "value": "wall_line_width_0 * 2" }, "support_xy_distance_overhang": { "value": "wall_line_width_0" }, - - "support_interface_height": { "value": "layer_height * 3" }, - "support_interface_density": { "value": 33.333 }, - "support_interface_skip_height": { "value": 0.2 }, - "support_interface_pattern": { "value": "zigzag" }, - - "minimum_support_area": { "value": 2 }, - "minimum_interface_area": { "value": 10 }, - "top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3" }, + "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height*2" }, + "top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3" }, + "travel_avoid_supports": { "value": true }, "wall_thickness": { "value": "line_width * 2" }, - - "adhesion_type": { "value": "'skirt'" }, - "brim_replaces_support": { "value": false }, - "skirt_gap": { "value": 6 }, - - "prime_tower_size": { "value": 30 }, - "prime_tower_min_volume": { "value": 85, "maximum_value_warning":150 }, - "prime_tower_brim_enable": { "value": true } - } -} + "wall_transition_filter_deviation": { "value": 0.15 }, + "z_seam_corner": { "value": "'z_seam_corner_inner'" }, + "z_seam_type": { "value": "'sharpest_corner'" } + } +} \ No newline at end of file diff --git a/resources/definitions/Geeetech_Base_Multi_Extruder.def.json b/resources/definitions/Geeetech_Base_Multi_Extruder.def.json index 35fc613eef..bb26709719 100644 --- a/resources/definitions/Geeetech_Base_Multi_Extruder.def.json +++ b/resources/definitions/Geeetech_Base_Multi_Extruder.def.json @@ -2,116 +2,148 @@ "version": 2, "name": "Geeetech Base Multi-Extruder Printer", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": false, "author": "Teddy.Hu", "manufacturer": "Geeetech", "file_formats": "text/x-gcode", - "first_start_actions": ["MachineSettingsAction"], + "first_start_actions": [ "MachineSettingsAction" ], + "has_machine_quality": true, "has_materials": true, "has_variants": false, - "has_machine_quality": true, - "variants_name": "Nozzle Size", - "preferred_variant_name": "0.4mm Nozzle", - "preferred_quality_type": "standard", + "machine_extruder_trains": + { + "0": "Geeetech_Multi_Extruder_0", + "1": "Geeetech_Multi_Extruder_1", + "2": "Geeetech_Multi_Extruder_2" + }, "preferred_material": "generic_pla", + "preferred_quality_type": "standard", + "preferred_variant_name": "0.4mm Nozzle", "quality_definition": "Geeetech_Base_Single_Extruder", - "machine_extruder_trains": { - "0": "Geeetech_Multi_Extruder_0", "1": "Geeetech_Multi_Extruder_1", "2": "Geeetech_Multi_Extruder_2" - } - }, - - "overrides":{ - "machine_name": { "default_value": "Geeetech Base Multi-Extruder Printer" }, - "machine_width": { "default_value": 350 }, - "machine_depth": { "default_value": 350 }, - "machine_height": {"default_value": 350 }, - "machine_head_with_fans_polygon": { "default_value": [[-40, 40], [40, 40], [40, -40], [-40, -40]] }, + "variants_name": "Nozzle Size" + }, + "overrides": + { + "acceleration_print": { "value": 500 }, + "acceleration_travel": { "value": 500 }, + "acceleration_travel_layer_0": { "value": "acceleration_travel" }, + "adhesion_type": { "value": "'skirt'" }, + "brim_replaces_support": { "value": false }, + "cool_min_layer_time": { "value": "1.3 if speed_infill>=200 else 5" }, "gantry_height": { "value": 40 }, - - "machine_start_gcode": { "default_value": ";Geeetech Custom Start G-code\nM104 S{material_print_temperature_layer_0} ;Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ;Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ;Wait for Hotend Temperature\nG92 E0 ;Reset Extruder\nG28 ;Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ;ON Light\n;M106 P0 S383 ;ON MainFan 150% if need\n;M106 P1 S255 ;ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ;Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ;Draw the first line\nG92 E0 ;Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ;Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ;Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": ";Geeetech Custom end G-code\nG91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers\n\n\n" }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'grid'" }, + "line_width": { "value": "1.125*machine_nozzle_size if speed_infill<=100 else machine_nozzle_size" }, + "machine_acceleration": { "value": 500 }, + "machine_depth": { "default_value": 350 }, + "machine_end_gcode": { "default_value": ";Geeetech Custom end G-code\nG91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers\n\n\n" }, + "machine_extruder_count": { "default_value": 3 }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-40, 40], + [40, 40], + [40, -40], + [-40, -40] + ] + }, "machine_heated_bed": { "default_value": true }, - "machine_extruder_count": { "default_value": 3 }, - - "machine_max_feedrate_x": { "value": 500 }, - "machine_max_feedrate_y": { "value": 500 }, - "machine_max_feedrate_z": { "value": 10 }, - "machine_max_feedrate_e": { "value": 40 }, + "machine_height": { "default_value": 350 }, + "machine_max_acceleration_e": { "value": 1000 }, "machine_max_acceleration_x": { "value": 500 }, "machine_max_acceleration_y": { "value": 500 }, "machine_max_acceleration_z": { "value": 111 }, - "machine_max_acceleration_e": { "value": 1000 }, - "machine_acceleration": { "value": 500 }, + "machine_max_feedrate_e": { "value": 40 }, + "machine_max_feedrate_x": { "value": 500 }, + "machine_max_feedrate_y": { "value": 500 }, + "machine_max_feedrate_z": { "value": 10 }, + "machine_max_jerk_e": { "value": 4.9 }, "machine_max_jerk_xy": { "value": 10 }, "machine_max_jerk_z": { "value": 0.3 }, - "machine_max_jerk_e": { "value": 4.9 }, - - "acceleration_print": { "value": 500 }, - "acceleration_travel": { "value": 500 }, - "acceleration_travel_layer_0": { "value": "acceleration_travel" }, - - "line_width": { "value": "1.125*machine_nozzle_size if speed_infill<=100 else machine_nozzle_size" }, - "retraction_speed": { "value": 35 }, - "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'grid'" }, - "small_hole_max_size":{ "value": "5 if speed_infill>=150 else 0" }, - "cool_min_layer_time":{ "value": "1.3 if speed_infill>=200 else 5" }, - "material_print_temperature": { "value": "200 if speed_infill <=100 else 210 if speed_infill <= 150 else 220 if speed_infill <= 180 else 230", "maximum_value": "250" }, - "material_print_temperature_layer_0": { "value": "material_print_temperature + 5", "maximum_value_warning": 250 }, - "material_initial_print_temperature": { "value": "material_print_temperature - 5", "minimum_value_warning": "material_standby_temperature - 10" }, - "material_final_print_temperature": { "value": "material_print_temperature" }, + "machine_name": { "default_value": "Geeetech Base Multi-Extruder Printer" }, + "machine_start_gcode": { "default_value": ";Geeetech Custom Start G-code\nM104 S{material_print_temperature_layer_0} ;Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ;Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ;Wait for Hotend Temperature\nG92 E0 ;Reset Extruder\nG28 ;Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ;ON Light\n;M106 P0 S383 ;ON MainFan 150% if need\n;M106 P1 S255 ;ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ;Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ;Draw the first line\nG92 E0 ;Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ;Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ;Scrape off nozzle residue" }, + "machine_width": { "default_value": 350 }, "material_bed_temperature": { "maximum_value_warning": 110 }, - - "speed_wall": { "value": "60 if speed_print==60 else math.ceil(round(speed_print*0.90))" }, - "speed_wall_0": { "value": "30 if speed_print==60 else math.ceil(round(speed_print*0.75))" }, - "speed_wall_x": { "value": "60 if speed_print==60 else math.ceil(round(speed_print*0.90))" }, - "speed_topbottom": { "value": "speed_print" }, - "speed_travel": { "value": "200 if 120<=speed_print<=200 else speed_print if speed_print>200 else 120" }, - "speed_layer_0": { "value":"50 if speed_infill <= 150 else 75","maximum_value_warning": "100" }, - "speed_print_layer_0": { "value": "25 if speed_infill <= 150 else 35","maximum_value_warning": "60" }, - "speed_travel_layer_0": { "value": "speed_layer_0","maximum_value_warning": "150" }, - "skirt_brim_speed": { "value":"speed_print_layer_0","maximum_value_warning": "60" }, - - "speed_support": { "value": "speed_print*0.5" }, - "speed_support_interface": { "value": "speed_support / 0.8" }, - "speed_support_roof": { "value": "speed_support_interface / 2" }, - "speed_support_bottom": { "value": "speed_support_roof" }, - - "wall_transition_filter_deviation":{ "value": 0.15 }, - "travel_avoid_supports": { "value": true }, - "retraction_hop": { "value": 0.5 }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_initial_print_temperature": + { + "minimum_value_warning": "material_standby_temperature - 10", + "value": "material_print_temperature - 5" + }, + "material_print_temperature": + { + "maximum_value": "250", + "value": "200 if speed_infill <=100 else 210 if speed_infill <= 150 else 220 if speed_infill <= 180 else 230" + }, + "material_print_temperature_layer_0": + { + "maximum_value_warning": 250, + "value": "material_print_temperature + 5" + }, + "minimum_interface_area": { "value": 10 }, + "minimum_support_area": { "value": 2 }, + "optimize_wall_printing_order": { "value": true }, + "prime_tower_brim_enable": { "value": true }, + "prime_tower_min_volume": + { + "maximum_value_warning": 150, + "value": 85 + }, + "prime_tower_size": { "value": 30 }, "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'all'" }, "retraction_combing_max_distance": { "value": 30 }, - "optimize_wall_printing_order": { "value": true }, - "z_seam_type": { "value": "'sharpest_corner'" }, - "z_seam_corner": { "value": "'z_seam_corner_inner'" }, - - "support_use_towers": { "value": false }, - "support_pattern": { "value": "'zigzag'" }, - "support_wall_count": { "value": 0 }, + "retraction_hop": { "value": 0.5 }, + "retraction_speed": { "value": 35 }, + "skirt_brim_speed": + { + "maximum_value_warning": "60", + "value": "speed_print_layer_0" + }, + "skirt_gap": { "value": 6 }, + "small_hole_max_size": { "value": "5 if speed_infill>=150 else 0" }, + "speed_layer_0": + { + "maximum_value_warning": "100", + "value": "50 if speed_infill <= 150 else 75" + }, + "speed_print_layer_0": + { + "maximum_value_warning": "60", + "value": "25 if speed_infill <= 150 else 35" + }, + "speed_support": { "value": "speed_print*0.5" }, + "speed_support_bottom": { "value": "speed_support_roof" }, + "speed_support_interface": { "value": "speed_support / 0.8" }, + "speed_support_roof": { "value": "speed_support_interface / 2" }, + "speed_topbottom": { "value": "speed_print" }, + "speed_travel": { "value": "200 if 120<=speed_print<=200 else speed_print if speed_print>200 else 120" }, + "speed_travel_layer_0": + { + "maximum_value_warning": "150", + "value": "speed_layer_0" + }, + "speed_wall": { "value": "60 if speed_print==60 else math.ceil(round(speed_print*0.90))" }, + "speed_wall_0": { "value": "30 if speed_print==60 else math.ceil(round(speed_print*0.75))" }, + "speed_wall_x": { "value": "60 if speed_print==60 else math.ceil(round(speed_print*0.90))" }, + "support_brim_enable": { "value": true }, + "support_brim_width": { "value": 5 }, "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" }, - "support_brim_enable": { "value": true }, - "support_brim_width": { "value": 5 }, - "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height*2" }, + "support_interface_density": { "value": 33.333 }, + "support_interface_height": { "value": "layer_height * 3" }, + "support_interface_pattern": { "value": "zigzag" }, + "support_interface_skip_height": { "value": 0.2 }, + "support_pattern": { "value": "'zigzag'" }, + "support_use_towers": { "value": false }, + "support_wall_count": { "value": 0 }, "support_xy_distance": { "value": "wall_line_width_0 * 2" }, "support_xy_distance_overhang": { "value": "wall_line_width_0" }, - - "support_interface_height": { "value": "layer_height * 3" }, - "support_interface_density": { "value": 33.333 }, - "support_interface_skip_height": { "value": 0.2 }, - "support_interface_pattern": { "value": "zigzag" }, - - "minimum_support_area": { "value": 2 }, - "minimum_interface_area": { "value": 10 }, - "top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3" }, + "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height*2" }, + "top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3" }, + "travel_avoid_supports": { "value": true }, "wall_thickness": { "value": "line_width * 2" }, - - "adhesion_type": { "value": "'skirt'" }, - "brim_replaces_support": { "value": false }, - "skirt_gap": { "value": 6 }, - - "prime_tower_size": { "value": 30 }, - "prime_tower_min_volume": { "value": 85, "maximum_value_warning":150 }, - "prime_tower_brim_enable": { "value": true } - } -} + "wall_transition_filter_deviation": { "value": 0.15 }, + "z_seam_corner": { "value": "'z_seam_corner_inner'" }, + "z_seam_type": { "value": "'sharpest_corner'" } + } +} \ No newline at end of file diff --git a/resources/definitions/Geeetech_Base_Single_Extruder.def.json b/resources/definitions/Geeetech_Base_Single_Extruder.def.json index ecefa15408..5a168c0b69 100644 --- a/resources/definitions/Geeetech_Base_Single_Extruder.def.json +++ b/resources/definitions/Geeetech_Base_Single_Extruder.def.json @@ -2,111 +2,135 @@ "version": 2, "name": "Geeetech Base Single Extruder Printer", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": false, "author": "Teddy.Hu", "manufacturer": "Geeetech", "file_formats": "text/x-gcode", - "first_start_actions": ["MachineSettingsAction"], + "first_start_actions": [ "MachineSettingsAction" ], + "has_machine_quality": true, "has_materials": true, "has_variants": true, - "has_machine_quality": true, - "variants_name": "Nozzle Size", - "preferred_variant_name": "0.4mm Nozzle", - "preferred_quality_type": "standard", + "machine_extruder_trains": { "0": "Geeetech_Single_Extruder" }, "preferred_material": "generic_pla", - "quality_definition": "Geeetech_Base_Single_Extruder", - "machine_extruder_trains": { - "0": "Geeetech_Single_Extruder" - } - }, - - "overrides":{ - "machine_name": { "default_value": "Geeetech Base Single Extruder Printer" }, - "machine_width": { "default_value": 350 }, - "machine_depth": { "default_value": 350 }, - "machine_height": {"default_value": 350 }, - "machine_head_with_fans_polygon": { "default_value": [[-40, 40], [40, 40], [40, -40], [-40, -40]] }, + "preferred_quality_type": "standard", + "preferred_variant_name": "0.4mm Nozzle", + "quality_definition": "Geeetech_Base_Single_Extruder", + "variants_name": "Nozzle Size" + }, + "overrides": + { + "acceleration_print": { "value": 500 }, + "acceleration_travel": { "value": 500 }, + "acceleration_travel_layer_0": { "value": "acceleration_travel" }, + "adhesion_type": { "value": "'skirt'" }, + "brim_replaces_support": { "value": false }, + "cool_min_layer_time": { "value": "1.3 if speed_infill>=200 else 5" }, "gantry_height": { "value": 40 }, - - "machine_start_gcode": { "default_value": ";Geeetech Custom Start G-code\nM104 S{material_print_temperature_layer_0} ;Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ;Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ;Wait for Hotend Temperature\nG92 E0 ;Reset Extruder\nG28 ;Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ;ON Light\n;M106 P0 S383 ;ON MainFan 150% if need\n;M106 P1 S255 ;ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ;Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ;Draw the first line\nG92 E0 ;Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ;Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ;Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": ";Geeetech Custom end G-code\nG91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers\n\n\n" }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'grid'" }, + "line_width": { "value": "1.125*machine_nozzle_size if speed_infill<=100 else machine_nozzle_size" }, + "machine_acceleration": { "value": 500 }, + "machine_depth": { "default_value": 350 }, + "machine_end_gcode": { "default_value": ";Geeetech Custom end G-code\nG91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers\n\n\n" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-40, 40], + [40, 40], + [40, -40], + [-40, -40] + ] + }, "machine_heated_bed": { "default_value": true }, - - "machine_max_feedrate_x": { "value": 500 }, - "machine_max_feedrate_y": { "value": 500 }, - "machine_max_feedrate_z": { "value": 10 }, - "machine_max_feedrate_e": { "value": 40 }, + "machine_height": { "default_value": 350 }, + "machine_max_acceleration_e": { "value": 1000 }, "machine_max_acceleration_x": { "value": 500 }, "machine_max_acceleration_y": { "value": 500 }, "machine_max_acceleration_z": { "value": 111 }, - "machine_max_acceleration_e": { "value": 1000 }, - "machine_acceleration": { "value": 500 }, + "machine_max_feedrate_e": { "value": 40 }, + "machine_max_feedrate_x": { "value": 500 }, + "machine_max_feedrate_y": { "value": 500 }, + "machine_max_feedrate_z": { "value": 10 }, + "machine_max_jerk_e": { "value": 4.9 }, "machine_max_jerk_xy": { "value": 10 }, "machine_max_jerk_z": { "value": 0.3 }, - "machine_max_jerk_e": { "value": 4.9 }, - - "acceleration_print": { "value": 500 }, - "acceleration_travel": { "value": 500 }, - "acceleration_travel_layer_0": { "value": "acceleration_travel" }, - - "line_width": { "value": "1.125*machine_nozzle_size if speed_infill<=100 else machine_nozzle_size" }, - "retraction_speed": { "value": 40 }, - "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'grid'" }, - "small_hole_max_size":{ "value": "5 if speed_infill>=150 else 0" }, - "cool_min_layer_time":{ "value": "1.3 if speed_infill>=200 else 5" }, - "material_print_temperature": { "value": "200 if speed_infill <=100 else 210 if speed_infill <= 150 else 220 if speed_infill <= 180 else 230", "maximum_value": "250" }, - "material_print_temperature_layer_0": { "value": "material_print_temperature + 5", "maximum_value_warning": 250 }, - "material_initial_print_temperature": { "value": "material_print_temperature - 5", "minimum_value_warning": "material_standby_temperature - 10" }, - "material_final_print_temperature": { "value": "material_print_temperature" }, + "machine_name": { "default_value": "Geeetech Base Single Extruder Printer" }, + "machine_start_gcode": { "default_value": ";Geeetech Custom Start G-code\nM104 S{material_print_temperature_layer_0} ;Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ;Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ;Wait for Hotend Temperature\nG92 E0 ;Reset Extruder\nG28 ;Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ;ON Light\n;M106 P0 S383 ;ON MainFan 150% if need\n;M106 P1 S255 ;ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ;Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ;Draw the first line\nG92 E0 ;Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ;Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ;Scrape off nozzle residue" }, + "machine_width": { "default_value": 350 }, "material_bed_temperature": { "maximum_value_warning": 110 }, - - "speed_wall": { "value": "60 if speed_print==60 else math.ceil(round(speed_print*0.90))" }, - "speed_wall_0": { "value": "30 if speed_print==60 else math.ceil(round(speed_print*0.75))" }, - "speed_wall_x": { "value": "60 if speed_print==60 else math.ceil(round(speed_print*0.90))" }, - "speed_topbottom": { "value": "speed_print" }, - "speed_travel": { "value": "200 if 120<=speed_print<=200 else speed_print if speed_print>200 else 120" }, - "speed_layer_0": { "value":"50 if speed_infill <= 150 else 75","maximum_value_warning": "100" }, - "speed_print_layer_0": { "value": "25 if speed_infill <= 150 else 35","maximum_value_warning": "60" }, - "speed_travel_layer_0": { "value": "speed_layer_0","maximum_value_warning": "150" }, - "skirt_brim_speed": { "value":"speed_print_layer_0","maximum_value_warning": "60" }, - - "speed_support": { "value": "speed_print*0.5" }, - "speed_support_interface": { "value": "speed_support / 0.8" }, - "speed_support_roof": { "value": "speed_support_interface / 2" }, - "speed_support_bottom": { "value": "speed_support_roof" }, - - "wall_transition_filter_deviation":{ "value": 0.15 }, - "travel_avoid_supports": { "value": true }, - "retraction_hop": { "value": 0.5 }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_initial_print_temperature": + { + "minimum_value_warning": "material_standby_temperature - 10", + "value": "material_print_temperature - 5" + }, + "material_print_temperature": + { + "maximum_value": "250", + "value": "200 if speed_infill <=100 else 210 if speed_infill <= 150 else 220 if speed_infill <= 180 else 230" + }, + "material_print_temperature_layer_0": + { + "maximum_value_warning": 250, + "value": "material_print_temperature + 5" + }, + "minimum_interface_area": { "value": 10 }, + "minimum_support_area": { "value": 2 }, + "optimize_wall_printing_order": { "value": true }, "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'all'" }, "retraction_combing_max_distance": { "value": 30 }, - "optimize_wall_printing_order": { "value": true }, - "z_seam_type": { "value": "'sharpest_corner'" }, - "z_seam_corner": { "value": "'z_seam_corner_inner'" }, - - "support_use_towers": { "value": false }, - "support_pattern": { "value": "'zigzag'" }, - "support_wall_count": { "value": 0 }, + "retraction_hop": { "value": 0.5 }, + "retraction_speed": { "value": 40 }, + "skirt_brim_speed": + { + "maximum_value_warning": "60", + "value": "speed_print_layer_0" + }, + "skirt_gap": { "value": 6 }, + "small_hole_max_size": { "value": "5 if speed_infill>=150 else 0" }, + "speed_layer_0": + { + "maximum_value_warning": "100", + "value": "50 if speed_infill <= 150 else 75" + }, + "speed_print_layer_0": + { + "maximum_value_warning": "60", + "value": "25 if speed_infill <= 150 else 35" + }, + "speed_support": { "value": "speed_print*0.5" }, + "speed_support_bottom": { "value": "speed_support_roof" }, + "speed_support_interface": { "value": "speed_support / 0.8" }, + "speed_support_roof": { "value": "speed_support_interface / 2" }, + "speed_topbottom": { "value": "speed_print" }, + "speed_travel": { "value": "200 if 120<=speed_print<=200 else speed_print if speed_print>200 else 120" }, + "speed_travel_layer_0": + { + "maximum_value_warning": "150", + "value": "speed_layer_0" + }, + "speed_wall": { "value": "60 if speed_print==60 else math.ceil(round(speed_print*0.90))" }, + "speed_wall_0": { "value": "30 if speed_print==60 else math.ceil(round(speed_print*0.75))" }, + "speed_wall_x": { "value": "60 if speed_print==60 else math.ceil(round(speed_print*0.90))" }, + "support_brim_enable": { "value": true }, + "support_brim_width": { "value": 5 }, "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" }, - "support_brim_enable": { "value": true }, - "support_brim_width": { "value": 5 }, - "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height*2" }, + "support_interface_density": { "value": 33.333 }, + "support_interface_height": { "value": "layer_height * 3" }, + "support_interface_pattern": { "value": "zigzag" }, + "support_interface_skip_height": { "value": 0.2 }, + "support_pattern": { "value": "'zigzag'" }, + "support_use_towers": { "value": false }, + "support_wall_count": { "value": 0 }, "support_xy_distance": { "value": "wall_line_width_0 * 2" }, "support_xy_distance_overhang": { "value": "wall_line_width_0" }, - - "support_interface_height": { "value": "layer_height * 3" }, - "support_interface_density": { "value": 33.333 }, - "support_interface_skip_height": { "value": 0.2 }, - "support_interface_pattern": { "value": "zigzag" }, - - "minimum_support_area": { "value": 2 }, - "minimum_interface_area": { "value": 10 }, - "top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3" }, + "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height*2" }, + "top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3" }, + "travel_avoid_supports": { "value": true }, "wall_thickness": { "value": "line_width * 2" }, - - "adhesion_type": { "value": "'skirt'" }, - "brim_replaces_support": { "value": false }, - "skirt_gap": { "value": 6 } - } -} + "wall_transition_filter_deviation": { "value": 0.15 }, + "z_seam_corner": { "value": "'z_seam_corner_inner'" }, + "z_seam_type": { "value": "'sharpest_corner'" } + } +} \ No newline at end of file diff --git a/resources/definitions/geeetech_A10M.def.json b/resources/definitions/geeetech_A10M.def.json index 98ee8d7992..d47756011e 100644 --- a/resources/definitions/geeetech_A10M.def.json +++ b/resources/definitions/geeetech_A10M.def.json @@ -1,27 +1,37 @@ -{ - "version": 2, - "name": "Geeetech A10M", - "inherits": "Geeetech_Base_Dual_Extruder", - "metadata": { - "visible": true, - "preferred_material": "Geeetech_PLA_Cyan", - "machine_extruder_trains": { - "0": "Geeetech_Dual_Extruder_0", "1": "Geeetech_Dual_Extruder_1" - } - }, - - "overrides": { - "machine_name": { "default_value": "Geeetech A10M" }, - "machine_width": { "default_value": 220 }, - "machine_depth": { "default_value": 220 }, - "machine_height": {"default_value": 260 }, - "machine_head_with_fans_polygon": { "default_value": [[-31, 31], [34, 31], [34, -40], [-31, -40]] }, - "gantry_height": { "value": 28 }, - "brim_width":{ "value": 10 }, - "prime_tower_position_x":{ "value": 190 }, - "prime_tower_position_y":{ "value": 160 }, - - "machine_start_gcode": { "default_value": ";Geeetech A10M Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } - } -} +{ + "version": 2, + "name": "Geeetech A10M", + "inherits": "Geeetech_Base_Dual_Extruder", + "metadata": + { + "visible": true, + "machine_extruder_trains": + { + "0": "Geeetech_Dual_Extruder_0", + "1": "Geeetech_Dual_Extruder_1" + }, + "preferred_material": "Geeetech_PLA_Cyan" + }, + "overrides": + { + "brim_width": { "value": 10 }, + "gantry_height": { "value": 28 }, + "machine_depth": { "default_value": 220 }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-31, 31], + [34, 31], + [34, -40], + [-31, -40] + ] + }, + "machine_height": { "default_value": 260 }, + "machine_name": { "default_value": "Geeetech A10M" }, + "machine_start_gcode": { "default_value": ";Geeetech A10M Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_width": { "default_value": 220 }, + "prime_tower_position_x": { "value": 190 }, + "prime_tower_position_y": { "value": 160 } + } +} \ No newline at end of file diff --git a/resources/definitions/geeetech_A10Pro.def.json b/resources/definitions/geeetech_A10Pro.def.json index b52e76cf98..c383d30814 100644 --- a/resources/definitions/geeetech_A10Pro.def.json +++ b/resources/definitions/geeetech_A10Pro.def.json @@ -2,22 +2,28 @@ "version": 2, "name": "Geeetech A10Pro", "inherits": "Geeetech_Base_Single_Extruder", - "metadata": { - "visible": true, - "machine_extruder_trains": { - "0": "Geeetech_Single_Extruder" - } + "metadata": + { + "visible": true, + "machine_extruder_trains": { "0": "Geeetech_Single_Extruder" } }, - - "overrides": { - "machine_name": { "default_value": "Geeetech A10Pro" }, - "machine_width": { "default_value": 220 }, + "overrides": + { + "gantry_height": { "value": 28 }, "machine_depth": { "default_value": 220 }, - "machine_height": {"default_value": 260 }, - "machine_head_with_fans_polygon": { "default_value": [[-31, 31], [34, 31], [34, -40], [-31, -40]] }, - "gantry_height": { "value": 28 }, - + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-31, 31], + [34, 31], + [34, -40], + [-31, -40] + ] + }, + "machine_height": { "default_value": 260 }, + "machine_name": { "default_value": "Geeetech A10Pro" }, "machine_start_gcode": { "default_value": ";Geeetech A10Pro Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } - } -} + "machine_width": { "default_value": 220 } + } +} \ No newline at end of file diff --git a/resources/definitions/geeetech_A10T.def.json b/resources/definitions/geeetech_A10T.def.json index ef08b7308f..df2444fe50 100644 --- a/resources/definitions/geeetech_A10T.def.json +++ b/resources/definitions/geeetech_A10T.def.json @@ -1,27 +1,38 @@ -{ - "version": 2, - "name": "Geeetech A10T", - "inherits": "Geeetech_Base_Multi_Extruder", - "metadata": { - "visible": true, - "preferred_material": "Geeetech_PLA_Magenta", - "machine_extruder_trains": { - "0": "Geeetech_Multi_Extruder_0", "1": "Geeetech_Multi_Extruder_1", "2": "Geeetech_Multi_Extruder_2" - } - }, - - "overrides": { - "machine_name": { "default_value": "Geeetech A10T" }, - "machine_width": { "default_value": 220 }, - "machine_depth": { "default_value": 220 }, - "machine_height": {"default_value": 260 }, - "machine_head_with_fans_polygon": { "default_value": [[-31, 31], [34, 31], [34, -40], [-31, -40]] }, - "gantry_height": { "value": 28 }, - "brim_width":{ "value": 10 }, - "prime_tower_position_x":{ "value": 190 }, - "prime_tower_position_y":{ "value": 160 }, - - "machine_start_gcode": { "default_value": ";Geeetech A10T Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } - } -} +{ + "version": 2, + "name": "Geeetech A10T", + "inherits": "Geeetech_Base_Multi_Extruder", + "metadata": + { + "visible": true, + "machine_extruder_trains": + { + "0": "Geeetech_Multi_Extruder_0", + "1": "Geeetech_Multi_Extruder_1", + "2": "Geeetech_Multi_Extruder_2" + }, + "preferred_material": "Geeetech_PLA_Magenta" + }, + "overrides": + { + "brim_width": { "value": 10 }, + "gantry_height": { "value": 28 }, + "machine_depth": { "default_value": 220 }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-31, 31], + [34, 31], + [34, -40], + [-31, -40] + ] + }, + "machine_height": { "default_value": 260 }, + "machine_name": { "default_value": "Geeetech A10T" }, + "machine_start_gcode": { "default_value": ";Geeetech A10T Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_width": { "default_value": 220 }, + "prime_tower_position_x": { "value": 190 }, + "prime_tower_position_y": { "value": 160 } + } +} \ No newline at end of file diff --git a/resources/definitions/geeetech_A20.def.json b/resources/definitions/geeetech_A20.def.json index ffab8249cd..68a41ad8b8 100644 --- a/resources/definitions/geeetech_A20.def.json +++ b/resources/definitions/geeetech_A20.def.json @@ -1,23 +1,29 @@ -{ - "version": 2, - "name": "Geeetech A20", - "inherits": "Geeetech_Base_Single_Extruder", - "metadata": { - "visible": true, - "machine_extruder_trains": { - "0": "Geeetech_Single_Extruder" - } - }, - - "overrides": { - "machine_name": { "default_value": "Geeetech A20" }, - "machine_width": { "default_value": 250 }, - "machine_depth": { "default_value": 250 }, - "machine_height": {"default_value": 250 }, - "machine_head_with_fans_polygon": { "default_value": [[-31, 31], [34, 31], [34, -40], [-31, -40]] }, - "gantry_height": { "value": 35 }, - - "machine_start_gcode": { "default_value": ";Geeetech A20 Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } - } -} +{ + "version": 2, + "name": "Geeetech A20", + "inherits": "Geeetech_Base_Single_Extruder", + "metadata": + { + "visible": true, + "machine_extruder_trains": { "0": "Geeetech_Single_Extruder" } + }, + "overrides": + { + "gantry_height": { "value": 35 }, + "machine_depth": { "default_value": 250 }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-31, 31], + [34, 31], + [34, -40], + [-31, -40] + ] + }, + "machine_height": { "default_value": 250 }, + "machine_name": { "default_value": "Geeetech A20" }, + "machine_start_gcode": { "default_value": ";Geeetech A20 Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_width": { "default_value": 250 } + } +} \ No newline at end of file diff --git a/resources/definitions/geeetech_A20M.def.json b/resources/definitions/geeetech_A20M.def.json index 24facca7f8..5b7cf30dfe 100644 --- a/resources/definitions/geeetech_A20M.def.json +++ b/resources/definitions/geeetech_A20M.def.json @@ -1,27 +1,37 @@ -{ - "version": 2, - "name": "Geeetech A20M", - "inherits": "Geeetech_Base_Dual_Extruder", - "metadata": { - "visible": true, - "preferred_material": "Geeetech_PLA_Yellow", - "machine_extruder_trains": { - "0": "Geeetech_Dual_Extruder_0", "1": "Geeetech_Dual_Extruder_1" - } - }, - - "overrides": { - "machine_name": { "default_value": "Geeetech A20M" }, - "machine_width": { "default_value": 250 }, - "machine_depth": { "default_value": 250 }, - "machine_height": {"default_value": 250 }, - "machine_head_with_fans_polygon": { "default_value": [[-31, 31], [34, 31], [34, -40], [-31, -40]] }, - "gantry_height": { "value": 35 }, - "brim_width":{ "value": 10 }, - "prime_tower_position_x":{ "value": 220 }, - "prime_tower_position_y":{ "value": 190 }, - - "machine_start_gcode": { "default_value": ";Geeetech A20M Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } - } -} +{ + "version": 2, + "name": "Geeetech A20M", + "inherits": "Geeetech_Base_Dual_Extruder", + "metadata": + { + "visible": true, + "machine_extruder_trains": + { + "0": "Geeetech_Dual_Extruder_0", + "1": "Geeetech_Dual_Extruder_1" + }, + "preferred_material": "Geeetech_PLA_Yellow" + }, + "overrides": + { + "brim_width": { "value": 10 }, + "gantry_height": { "value": 35 }, + "machine_depth": { "default_value": 250 }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-31, 31], + [34, 31], + [34, -40], + [-31, -40] + ] + }, + "machine_height": { "default_value": 250 }, + "machine_name": { "default_value": "Geeetech A20M" }, + "machine_start_gcode": { "default_value": ";Geeetech A20M Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_width": { "default_value": 250 }, + "prime_tower_position_x": { "value": 220 }, + "prime_tower_position_y": { "value": 190 } + } +} \ No newline at end of file diff --git a/resources/definitions/geeetech_A20T.def.json b/resources/definitions/geeetech_A20T.def.json index a404e72f69..5191bac751 100644 --- a/resources/definitions/geeetech_A20T.def.json +++ b/resources/definitions/geeetech_A20T.def.json @@ -1,27 +1,38 @@ -{ - "version": 2, - "name": "Geeetech A20T", - "inherits": "Geeetech_Base_Multi_Extruder", - "metadata": { - "visible": true, - "preferred_material": "Geeetech_PLA_Red", - "machine_extruder_trains": { - "0": "Geeetech_Multi_Extruder_0", "1": "Geeetech_Multi_Extruder_1", "2": "Geeetech_Multi_Extruder_2" - } - }, - - "overrides": { - "machine_name": { "default_value": "Geeetech A20T" }, - "machine_width": { "default_value": 250 }, - "machine_depth": { "default_value": 250 }, - "machine_height": {"default_value": 250 }, - "machine_head_with_fans_polygon": { "default_value": [[-31, 31], [34, 31], [34, -40], [-31, -40]] }, - "gantry_height": { "value": 35 }, - "brim_width":{ "value": 10 }, - "prime_tower_position_x":{ "value": 220 }, - "prime_tower_position_y":{ "value": 190 }, - - "machine_start_gcode": { "default_value": ";Geeetech A20T Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } - } -} +{ + "version": 2, + "name": "Geeetech A20T", + "inherits": "Geeetech_Base_Multi_Extruder", + "metadata": + { + "visible": true, + "machine_extruder_trains": + { + "0": "Geeetech_Multi_Extruder_0", + "1": "Geeetech_Multi_Extruder_1", + "2": "Geeetech_Multi_Extruder_2" + }, + "preferred_material": "Geeetech_PLA_Red" + }, + "overrides": + { + "brim_width": { "value": 10 }, + "gantry_height": { "value": 35 }, + "machine_depth": { "default_value": 250 }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-31, 31], + [34, 31], + [34, -40], + [-31, -40] + ] + }, + "machine_height": { "default_value": 250 }, + "machine_name": { "default_value": "Geeetech A20T" }, + "machine_start_gcode": { "default_value": ";Geeetech A20T Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_width": { "default_value": 250 }, + "prime_tower_position_x": { "value": 220 }, + "prime_tower_position_y": { "value": 190 } + } +} \ No newline at end of file diff --git a/resources/definitions/geeetech_A30M.def.json b/resources/definitions/geeetech_A30M.def.json index ff7845b329..8b6e6a703b 100644 --- a/resources/definitions/geeetech_A30M.def.json +++ b/resources/definitions/geeetech_A30M.def.json @@ -2,26 +2,36 @@ "version": 2, "name": "Geeetech A30M", "inherits": "Geeetech_Base_Dual_Extruder", - "metadata": { - "visible": true, - "preferred_material": "Geeetech_PLA_Green", - "machine_extruder_trains": { - "0": "Geeetech_Dual_Extruder_0", "1": "Geeetech_Dual_Extruder_1" - } - }, - - "overrides": { - "machine_name": { "default_value": "Geeetech A30M" }, - "machine_width": { "default_value": 320 }, + "metadata": + { + "visible": true, + "machine_extruder_trains": + { + "0": "Geeetech_Dual_Extruder_0", + "1": "Geeetech_Dual_Extruder_1" + }, + "preferred_material": "Geeetech_PLA_Green" + }, + "overrides": + { + "brim_width": { "value": 10 }, + "gantry_height": { "value": 35 }, "machine_depth": { "default_value": 320 }, - "machine_height": {"default_value": 420 }, - "machine_head_with_fans_polygon": { "default_value": [[-75, 35], [18, 35], [18, -18], [-75, -18]] }, - "gantry_height": { "value": 35 }, - "brim_width":{ "value": 10 }, - "prime_tower_position_x":{ "value": 290 }, - "prime_tower_position_y":{ "value": 260 }, - + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-75, 35], + [18, 35], + [18, -18], + [-75, -18] + ] + }, + "machine_height": { "default_value": 420 }, + "machine_name": { "default_value": "Geeetech A30M" }, "machine_start_gcode": { "default_value": ";Geeetech A30M Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } - } -} + "machine_width": { "default_value": 320 }, + "prime_tower_position_x": { "value": 290 }, + "prime_tower_position_y": { "value": 260 } + } +} \ No newline at end of file diff --git a/resources/definitions/geeetech_A30Pro.def.json b/resources/definitions/geeetech_A30Pro.def.json index 0b5c82c1e8..38b2510933 100644 --- a/resources/definitions/geeetech_A30Pro.def.json +++ b/resources/definitions/geeetech_A30Pro.def.json @@ -2,22 +2,28 @@ "version": 2, "name": "Geeetech A30Pro", "inherits": "Geeetech_Base_Single_Extruder", - "metadata": { + "metadata": + { "visible": true, - "machine_extruder_trains": { - "0": "Geeetech_Single_Extruder" - } - }, - - "overrides": { - "machine_name": { "default_value": "Geeetech A30Pro" }, - "machine_width": { "default_value": 320 }, + "machine_extruder_trains": { "0": "Geeetech_Single_Extruder" } + }, + "overrides": + { + "gantry_height": { "value": 35 }, "machine_depth": { "default_value": 320 }, - "machine_height": {"default_value": 420 }, - "machine_head_with_fans_polygon": { "default_value": [[-75, 35], [18, 35], [18, -18], [-75, -18]] }, - "gantry_height": { "value": 35 }, - + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-75, 35], + [18, 35], + [18, -18], + [-75, -18] + ] + }, + "machine_height": { "default_value": 420 }, + "machine_name": { "default_value": "Geeetech A30Pro" }, "machine_start_gcode": { "default_value": ";Geeetech A30Pro Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } - } -} + "machine_width": { "default_value": 320 } + } +} \ No newline at end of file diff --git a/resources/definitions/geeetech_A30T.def.json b/resources/definitions/geeetech_A30T.def.json index 186fc08e2a..610ee35fa4 100644 --- a/resources/definitions/geeetech_A30T.def.json +++ b/resources/definitions/geeetech_A30T.def.json @@ -2,26 +2,37 @@ "version": 2, "name": "Geeetech A30T", "inherits": "Geeetech_Base_Multi_Extruder", - "metadata": { - "visible": true, - "preferred_material": "Geeetech_PLA_Blue", - "machine_extruder_trains": { - "0": "Geeetech_Multi_Extruder_0", "1": "Geeetech_Multi_Extruder_1", "2": "Geeetech_Multi_Extruder_2" - } - }, - - "overrides": { - "machine_name": { "default_value": "Geeetech A30T" }, - "machine_width": { "default_value": 320 }, + "metadata": + { + "visible": true, + "machine_extruder_trains": + { + "0": "Geeetech_Multi_Extruder_0", + "1": "Geeetech_Multi_Extruder_1", + "2": "Geeetech_Multi_Extruder_2" + }, + "preferred_material": "Geeetech_PLA_Blue" + }, + "overrides": + { + "brim_width": { "value": 10 }, + "gantry_height": { "value": 35 }, "machine_depth": { "default_value": 320 }, - "machine_height": {"default_value": 420 }, - "machine_head_with_fans_polygon": { "default_value": [[-75, 35], [18, 35], [18, -18], [-75, -18]] }, - "gantry_height": { "value": 35 }, - "brim_width":{ "value": 10 }, - "prime_tower_position_x":{ "value": 290 }, - "prime_tower_position_y":{ "value": 260 }, - + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-75, 35], + [18, 35], + [18, -18], + [-75, -18] + ] + }, + "machine_height": { "default_value": 420 }, + "machine_name": { "default_value": "Geeetech A30T" }, "machine_start_gcode": { "default_value": ";Geeetech A30T Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } - } -} + "machine_width": { "default_value": 320 }, + "prime_tower_position_x": { "value": 290 }, + "prime_tower_position_y": { "value": 260 } + } +} \ No newline at end of file diff --git a/resources/definitions/geeetech_E180.def.json b/resources/definitions/geeetech_E180.def.json index a2839d7fed..481f4db77a 100644 --- a/resources/definitions/geeetech_E180.def.json +++ b/resources/definitions/geeetech_E180.def.json @@ -2,23 +2,29 @@ "version": 2, "name": "Geeetech E180", "inherits": "Geeetech_Base_Single_Extruder", - "metadata": { - "visible": true, - "machine_extruder_trains": { - "0": "Geeetech_Single_Extruder" - } - }, - - "overrides": { - "machine_name": { "default_value": "Geeetech E180" }, - "machine_width": { "default_value": 125 }, + "metadata": + { + "visible": true, + "machine_extruder_trains": { "0": "Geeetech_Single_Extruder" } + }, + "overrides": + { + "gantry_height": { "value": 28 }, "machine_depth": { "default_value": 130 }, - "machine_height": {"default_value": 126 }, - "machine_head_with_fans_polygon": { "default_value": [[-31, 31], [34, 31], [34, -40], [-31, -40]] }, - "gantry_height": { "value": 28 }, - + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-31, 31], + [34, 31], + [34, -40], + [-31, -40] + ] + }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 126 }, + "machine_name": { "default_value": "Geeetech E180" }, "machine_start_gcode": { "default_value": ";Geeetech E180 Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y10 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y120.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y120.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y10 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y10 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, - "machine_heated_bed": { "default_value": false } - } -} + "machine_width": { "default_value": 125 } + } +} \ No newline at end of file diff --git a/resources/definitions/geeetech_GiantArmD200.def.json b/resources/definitions/geeetech_GiantArmD200.def.json index 027b8b8973..d625e8ded6 100644 --- a/resources/definitions/geeetech_GiantArmD200.def.json +++ b/resources/definitions/geeetech_GiantArmD200.def.json @@ -2,23 +2,29 @@ "version": 2, "name": "Geeetech GiantArmD200", "inherits": "Geeetech_Base_Single_Extruder", - "metadata": { - "visible": true, - "machine_extruder_trains": { - "0": "Geeetech_Single_Extruder" - } - }, - - "overrides": { - "machine_name": { "default_value": "Geeetech GiantArmD200" }, - "machine_width": { "default_value": 300 }, + "metadata": + { + "visible": true, + "machine_extruder_trains": { "0": "Geeetech_Single_Extruder" } + }, + "overrides": + { + "gantry_height": { "value": 45 }, "machine_depth": { "default_value": 180 }, - "machine_height": {"default_value": 180 }, - "machine_head_with_fans_polygon": { "default_value": [[-75, 35], [18, 35], [18, -18], [-75, -18]] }, - "gantry_height": { "value": 45 }, - "retraction_amount": { "value": 2 }, - + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-75, 35], + [18, 35], + [18, -18], + [-75, -18] + ] + }, + "machine_height": { "default_value": 180 }, + "machine_name": { "default_value": "Geeetech GiantArmD200" }, "machine_start_gcode": { "default_value": ";Geeetech GiantArmD200 Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y10 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y160.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y160.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y10 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y10 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } - } -} + "machine_width": { "default_value": 300 }, + "retraction_amount": { "value": 2 } + } +} \ No newline at end of file diff --git a/resources/definitions/geeetech_I3ProB.def.json b/resources/definitions/geeetech_I3ProB.def.json index 1cc17f55ec..c0420ebc84 100644 --- a/resources/definitions/geeetech_I3ProB.def.json +++ b/resources/definitions/geeetech_I3ProB.def.json @@ -2,23 +2,29 @@ "version": 2, "name": "Geeetech I3ProB", "inherits": "Geeetech_Base_Single_Extruder", - "metadata": { - "visible": true, - "machine_extruder_trains": { - "0": "Geeetech_Single_Extruder" - } - }, - - "overrides": { - "machine_name": { "default_value": "Geeetech I3ProB" }, - "machine_width": { "default_value": 200 }, + "metadata": + { + "visible": true, + "machine_extruder_trains": { "0": "Geeetech_Single_Extruder" } + }, + "overrides": + { + "gantry_height": { "value": 45 }, "machine_depth": { "default_value": 200 }, - "machine_height": {"default_value": 180 }, - "machine_head_with_fans_polygon": { "default_value": [[-75, 35], [18, 35], [18, -18], [-75, -18]] }, - "gantry_height": { "value": 45 }, - "retraction_amount": { "value": 2 }, - + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-75, 35], + [18, 35], + [18, -18], + [-75, -18] + ] + }, + "machine_height": { "default_value": 180 }, + "machine_name": { "default_value": "Geeetech I3ProB" }, "machine_start_gcode": { "default_value": ";Geeetech I3ProB Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y10 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y180.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y180.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y10 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } - } -} + "machine_width": { "default_value": 200 }, + "retraction_amount": { "value": 2 } + } +} \ No newline at end of file diff --git a/resources/definitions/geeetech_I3ProC.def.json b/resources/definitions/geeetech_I3ProC.def.json index 87d4b5391f..f05185e5ba 100644 --- a/resources/definitions/geeetech_I3ProC.def.json +++ b/resources/definitions/geeetech_I3ProC.def.json @@ -2,27 +2,37 @@ "version": 2, "name": "Geeetech I3ProC", "inherits": "Geeetech_Base_Dual_Extruder", - "metadata": { - "visible": true, - "preferred_material": "Geeetech_PLA_Black", - "machine_extruder_trains": { - "0": "Geeetech_Dual_Extruder_0", "1": "Geeetech_Dual_Extruder_1" - } - }, - - "overrides": { - "machine_name": { "default_value": "Geeetech I3ProC" }, - "machine_width": { "default_value": 200 }, + "metadata": + { + "visible": true, + "machine_extruder_trains": + { + "0": "Geeetech_Dual_Extruder_0", + "1": "Geeetech_Dual_Extruder_1" + }, + "preferred_material": "Geeetech_PLA_Black" + }, + "overrides": + { + "brim_width": { "value": 10 }, + "gantry_height": { "value": 45 }, "machine_depth": { "default_value": 200 }, - "machine_height": {"default_value": 180 }, - "machine_head_with_fans_polygon": { "default_value": [[-75, 35], [18, 35], [18, -18], [-75, -18]] }, - "gantry_height": { "value": 45 }, - "retraction_amount": { "value": 2 }, - "brim_width":{ "value": 10 }, - "prime_tower_position_x":{ "value": 170 }, - "prime_tower_position_y":{ "value": 140 }, - + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-75, 35], + [18, 35], + [18, -18], + [-75, -18] + ] + }, + "machine_height": { "default_value": 180 }, + "machine_name": { "default_value": "Geeetech I3ProC" }, "machine_start_gcode": { "default_value": ";Geeetech I3ProC Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y10 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y180.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y180.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y10 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } - } -} + "machine_width": { "default_value": 200 }, + "prime_tower_position_x": { "value": 170 }, + "prime_tower_position_y": { "value": 140 }, + "retraction_amount": { "value": 2 } + } +} \ No newline at end of file diff --git a/resources/definitions/geeetech_I3ProW.def.json b/resources/definitions/geeetech_I3ProW.def.json index fdc6f866bb..db54625f2d 100644 --- a/resources/definitions/geeetech_I3ProW.def.json +++ b/resources/definitions/geeetech_I3ProW.def.json @@ -2,23 +2,29 @@ "version": 2, "name": "Geeetech I3ProW", "inherits": "Geeetech_Base_Single_Extruder", - "metadata": { - "visible": true, - "machine_extruder_trains": { - "0": "Geeetech_Single_Extruder" - } - }, - - "overrides": { - "machine_name": { "default_value": "Geeetech I3ProW" }, - "machine_width": { "default_value": 200 }, + "metadata": + { + "visible": true, + "machine_extruder_trains": { "0": "Geeetech_Single_Extruder" } + }, + "overrides": + { + "gantry_height": { "value": 45 }, "machine_depth": { "default_value": 200 }, - "machine_height": {"default_value": 180 }, - "machine_head_with_fans_polygon": { "default_value": [[-75, 35], [18, 35], [18, -18], [-75, -18]] }, - "gantry_height": { "value": 45 }, - "retraction_amount": { "value": 2 }, - + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-75, 35], + [18, 35], + [18, -18], + [-75, -18] + ] + }, + "machine_height": { "default_value": 180 }, + "machine_name": { "default_value": "Geeetech I3ProW" }, "machine_start_gcode": { "default_value": ";Geeetech I3ProW Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y10 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y180.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y180.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y10 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } - } -} + "machine_width": { "default_value": 200 }, + "retraction_amount": { "value": 2 } + } +} \ No newline at end of file diff --git a/resources/definitions/geeetech_MeCreator.def.json b/resources/definitions/geeetech_MeCreator.def.json index c0d22e539c..3dece7354c 100644 --- a/resources/definitions/geeetech_MeCreator.def.json +++ b/resources/definitions/geeetech_MeCreator.def.json @@ -2,23 +2,29 @@ "version": 2, "name": "Geeetech MeCreator", "inherits": "Geeetech_Base_Single_Extruder", - "metadata": { - "visible": true, - "machine_extruder_trains": { - "0": "Geeetech_Single_Extruder" - } - }, - - "overrides": { - "machine_name": { "default_value": "Geeetech MeCreator" }, - "machine_width": { "default_value": 150 }, + "metadata": + { + "visible": true, + "machine_extruder_trains": { "0": "Geeetech_Single_Extruder" } + }, + "overrides": + { + "gantry_height": { "value": 45 }, "machine_depth": { "default_value": 150 }, - "machine_height": {"default_value": 125 }, - "machine_head_with_fans_polygon": { "default_value": [[-75, 35], [18, 35], [18, -18], [-75, -18]] }, - "gantry_height": { "value": 45 }, - "retraction_amount": { "value": 2 }, - + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-75, 35], + [18, 35], + [18, -18], + [-75, -18] + ] + }, + "machine_height": { "default_value": 125 }, + "machine_name": { "default_value": "Geeetech MeCreator" }, "machine_start_gcode": { "default_value": ";Geeetech MeCreator Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y10 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y130.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y130.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y10 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y10 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } - } -} + "machine_width": { "default_value": 150 }, + "retraction_amount": { "value": 2 } + } +} \ No newline at end of file diff --git a/resources/definitions/geeetech_MeCreator2.def.json b/resources/definitions/geeetech_MeCreator2.def.json index d9a5016093..4e963892e7 100644 --- a/resources/definitions/geeetech_MeCreator2.def.json +++ b/resources/definitions/geeetech_MeCreator2.def.json @@ -2,23 +2,29 @@ "version": 2, "name": "Geeetech MeCreator2", "inherits": "Geeetech_Base_Single_Extruder", - "metadata": { - "visible": true, - "machine_extruder_trains": { - "0": "Geeetech_Single_Extruder" - } - }, - - "overrides": { - "machine_name": { "default_value": "Geeetech MeCreator2" }, - "machine_width": { "default_value": 160 }, + "metadata": + { + "visible": true, + "machine_extruder_trains": { "0": "Geeetech_Single_Extruder" } + }, + "overrides": + { + "gantry_height": { "value": 45 }, "machine_depth": { "default_value": 160 }, - "machine_height": {"default_value": 160 }, - "machine_head_with_fans_polygon": { "default_value": [[-75, 35], [18, 35], [18, -18], [-75, -18]] }, - "gantry_height": { "value": 45 }, - "retraction_amount": { "value": 2 }, - + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-75, 35], + [18, 35], + [18, -18], + [-75, -18] + ] + }, + "machine_height": { "default_value": 160 }, + "machine_name": { "default_value": "Geeetech MeCreator2" }, "machine_start_gcode": { "default_value": ";Geeetech MeCreator2 Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y10 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y140.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y140.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y10 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y10 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } - } -} + "machine_width": { "default_value": 160 }, + "retraction_amount": { "value": 2 } + } +} \ No newline at end of file diff --git a/resources/definitions/geeetech_MeDucer.def.json b/resources/definitions/geeetech_MeDucer.def.json index 879f0cbfcd..ae7a6284d4 100644 --- a/resources/definitions/geeetech_MeDucer.def.json +++ b/resources/definitions/geeetech_MeDucer.def.json @@ -2,23 +2,29 @@ "version": 2, "name": "Geeetech MeDucer", "inherits": "Geeetech_Base_Single_Extruder", - "metadata": { - "visible": true, - "machine_extruder_trains": { - "0": "Geeetech_Single_Extruder" - } - }, - - "overrides": { - "machine_name": { "default_value": "Geeetech MeDucer" }, - "machine_width": { "default_value": 180 }, + "metadata": + { + "visible": true, + "machine_extruder_trains": { "0": "Geeetech_Single_Extruder" } + }, + "overrides": + { + "gantry_height": { "value": 45 }, "machine_depth": { "default_value": 150 }, - "machine_height": {"default_value": 150 }, - "machine_head_with_fans_polygon": { "default_value": [[-75, 35], [18, 35], [18, -18], [-75, -18]] }, - "gantry_height": { "value": 45 }, - "retraction_amount": { "value": 2 }, - + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-75, 35], + [18, 35], + [18, -18], + [-75, -18] + ] + }, + "machine_height": { "default_value": 150 }, + "machine_name": { "default_value": "Geeetech MeDucer" }, "machine_start_gcode": { "default_value": ";Geeetech MeDucer Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y10 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y130.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y130.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y10 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y10 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } - } -} + "machine_width": { "default_value": 180 }, + "retraction_amount": { "value": 2 } + } +} \ No newline at end of file diff --git a/resources/definitions/geeetech_Mizar.def.json b/resources/definitions/geeetech_Mizar.def.json index ef7e4e17cd..41a97eabd0 100644 --- a/resources/definitions/geeetech_Mizar.def.json +++ b/resources/definitions/geeetech_Mizar.def.json @@ -2,22 +2,28 @@ "version": 2, "name": "Geeetech Mizar", "inherits": "Geeetech_Base_Single_Extruder", - "metadata": { - "visible": true, - "machine_extruder_trains": { - "0": "Geeetech_Single_Extruder" - } - }, - - "overrides": { - "machine_name": { "default_value": "Geeetech Mizar" }, - "machine_width": { "default_value": 220 }, + "metadata": + { + "visible": true, + "machine_extruder_trains": { "0": "Geeetech_Single_Extruder" } + }, + "overrides": + { + "gantry_height": { "value": 35 }, "machine_depth": { "default_value": 220 }, - "machine_height": {"default_value": 260 }, - "machine_head_with_fans_polygon": { "default_value": [[-31, 31], [34, 31], [34, -40], [-31, -40]] }, - "gantry_height": { "value": 35 }, - + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-31, 31], + [34, 31], + [34, -40], + [-31, -40] + ] + }, + "machine_height": { "default_value": 260 }, + "machine_name": { "default_value": "Geeetech Mizar" }, "machine_start_gcode": { "default_value": ";Official open-source firmware for Mizar: https://github.com/Geeetech3D/Mizar \n\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } - } -} + "machine_width": { "default_value": 220 } + } +} \ No newline at end of file diff --git a/resources/definitions/geeetech_MizarM.def.json b/resources/definitions/geeetech_MizarM.def.json index ac9c2e4bd0..d4182ebb62 100644 --- a/resources/definitions/geeetech_MizarM.def.json +++ b/resources/definitions/geeetech_MizarM.def.json @@ -2,27 +2,37 @@ "version": 2, "name": "Geeetech MizarM", "inherits": "Geeetech_Base_Dual_Extruder", - "metadata": { - "visible": true, - "preferred_material": "Geeetech_PLA_Magenta", - "machine_extruder_trains": { - "0": "Geeetech_Dual_Extruder_0", "1": "Geeetech_Dual_Extruder_1" - } - }, - - "overrides": { - "machine_name": { "default_value": "Geeetech MizarM" }, - "machine_width": { "default_value": 255 }, - "machine_depth": { "default_value": 255 }, - "machine_height": {"default_value": 260 }, - "machine_head_with_fans_polygon": { "default_value": [[-31, 31], [34, 31], [34, -40], [-31, -40]] }, + "metadata": + { + "visible": true, + "machine_extruder_trains": + { + "0": "Geeetech_Dual_Extruder_0", + "1": "Geeetech_Dual_Extruder_1" + }, + "preferred_material": "Geeetech_PLA_Magenta" + }, + "overrides": + { + "brim_width": { "value": 10 }, "gantry_height": { "value": 35 }, - "brim_width":{ "value": 10 }, - "prime_tower_position_x":{ "value": 225 }, - "prime_tower_position_y":{ "value": 195 }, - + "machine_depth": { "default_value": 255 }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-31, 31], + [34, 31], + [34, -40], + [-31, -40] + ] + }, + "machine_height": { "default_value": 260 }, + "machine_name": { "default_value": "Geeetech MizarM" }, "machine_start_gcode": { "default_value": ";Official open-source firmware for MizarM: https://github.com/Geeetech3D/Mizar-M \n\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, - "material_standby_temperature": {"value": 200 } - } -} + "machine_width": { "default_value": 255 }, + "material_standby_temperature": { "value": 200 }, + "prime_tower_position_x": { "value": 225 }, + "prime_tower_position_y": { "value": 195 } + } +} \ No newline at end of file diff --git a/resources/definitions/geeetech_MizarMax.def.json b/resources/definitions/geeetech_MizarMax.def.json index 315318a6a7..00d320ab18 100644 --- a/resources/definitions/geeetech_MizarMax.def.json +++ b/resources/definitions/geeetech_MizarMax.def.json @@ -2,22 +2,28 @@ "version": 2, "name": "Geeetech MizarMax", "inherits": "Geeetech_Base_Single_Extruder", - "metadata": { - "visible": true, - "machine_extruder_trains": { - "0": "Geeetech_Single_Extruder" - } - }, - - "overrides": { - "machine_name": { "default_value": "Geeetech MizarMax" }, - "machine_width": { "default_value": 320 }, + "metadata": + { + "visible": true, + "machine_extruder_trains": { "0": "Geeetech_Single_Extruder" } + }, + "overrides": + { + "gantry_height": { "value": 35 }, "machine_depth": { "default_value": 320 }, - "machine_height": {"default_value": 400 }, - "machine_head_with_fans_polygon": { "default_value": [[-31, 31], [34, 31], [34, -40], [-31, -40]] }, - "gantry_height": { "value": 35 }, - + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-31, 31], + [34, 31], + [34, -40], + [-31, -40] + ] + }, + "machine_height": { "default_value": 400 }, + "machine_name": { "default_value": "Geeetech MizarMax" }, "machine_start_gcode": { "default_value": ";Official open-source firmware for MizarMax: https://github.com/Geeetech3D/Mizar-Max \n\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } - } -} + "machine_width": { "default_value": 320 } + } +} \ No newline at end of file diff --git a/resources/definitions/geeetech_MizarPro.def.json b/resources/definitions/geeetech_MizarPro.def.json index 683552127a..f5dd497d16 100644 --- a/resources/definitions/geeetech_MizarPro.def.json +++ b/resources/definitions/geeetech_MizarPro.def.json @@ -2,22 +2,28 @@ "version": 2, "name": "Geeetech MizarPro", "inherits": "Geeetech_Base_Single_Extruder", - "metadata": { - "visible": true, - "machine_extruder_trains": { - "0": "Geeetech_Single_Extruder" - } - }, - - "overrides": { - "machine_name": { "default_value": "Geeetech MizarPro" }, - "machine_width": { "default_value": 220 }, + "metadata": + { + "visible": true, + "machine_extruder_trains": { "0": "Geeetech_Single_Extruder" } + }, + "overrides": + { + "gantry_height": { "value": 35 }, "machine_depth": { "default_value": 220 }, - "machine_height": {"default_value": 260 }, - "machine_head_with_fans_polygon": { "default_value": [[-31, 31], [34, 31], [34, -40], [-31, -40]] }, - "gantry_height": { "value": 35 }, - + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-31, 31], + [34, 31], + [34, -40], + [-31, -40] + ] + }, + "machine_height": { "default_value": 260 }, + "machine_name": { "default_value": "Geeetech MizarPro" }, "machine_start_gcode": { "default_value": ";Official open-source firmware for MizarPro: https://github.com/Geeetech3D/Mizar-Pro \n\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } - } -} + "machine_width": { "default_value": 220 } + } +} \ No newline at end of file diff --git a/resources/definitions/geeetech_MizarS.def.json b/resources/definitions/geeetech_MizarS.def.json index ef4195413e..73f4f60aa8 100644 --- a/resources/definitions/geeetech_MizarS.def.json +++ b/resources/definitions/geeetech_MizarS.def.json @@ -2,22 +2,28 @@ "version": 2, "name": "Geeetech MizarS", "inherits": "Geeetech_Base_Single_Extruder", - "metadata": { - "visible": true, - "machine_extruder_trains": { - "0": "Geeetech_Single_Extruder" - } - }, - - "overrides": { - "machine_name": { "default_value": "Geeetech MizarS" }, - "machine_width": { "default_value": 255 }, - "machine_depth": { "default_value": 255 }, - "machine_height": {"default_value": 260 }, - "machine_head_with_fans_polygon": { "default_value": [[-31, 31], [34, 31], [34, -40], [-31, -40]] }, + "metadata": + { + "visible": true, + "machine_extruder_trains": { "0": "Geeetech_Single_Extruder" } + }, + "overrides": + { "gantry_height": { "value": 35 }, - + "machine_depth": { "default_value": 255 }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-31, 31], + [34, 31], + [34, -40], + [-31, -40] + ] + }, + "machine_height": { "default_value": 260 }, + "machine_name": { "default_value": "Geeetech MizarS" }, "machine_start_gcode": { "default_value": ";Official open-source firmware for MizarS: https://github.com/Geeetech3D/Mizar-S \n\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } - } -} + "machine_width": { "default_value": 255 } + } +} \ No newline at end of file diff --git a/resources/definitions/geeetech_Thunder.def.json b/resources/definitions/geeetech_Thunder.def.json index 0bb7383d5c..cc3e4044f8 100644 --- a/resources/definitions/geeetech_Thunder.def.json +++ b/resources/definitions/geeetech_Thunder.def.json @@ -2,71 +2,131 @@ "version": 2, "name": "Geeetech Thunder", "inherits": "Geeetech_Base_Single_Extruder", - "metadata": { - "visible": true, - "machine_extruder_trains": { - "0": "Geeetech_Single_Extruder" - } - }, - - "overrides": { - "machine_name": { "default_value": "Geeetech Thunder" }, - "machine_width": { "default_value": 250 }, + "metadata": + { + "visible": true, + "machine_extruder_trains": { "0": "Geeetech_Single_Extruder" } + }, + "overrides": + { + "acceleration_print": { "value": 3500 }, + "acceleration_travel": { "value": 5000 }, + "cool_fan_full_at_height": + { + "label": "Regular Fan Speed at Height", + "value": "layer_height_0 + layer_height" + }, + "cool_fan_speed": + { + "maximum_value": "151", + "value": "151 if speed_infill>=200 else 100" + }, + "cool_fan_speed_max": + { + "maximum_value": "151", + "value": "cool_fan_speed" + }, + "cool_fan_speed_min": + { + "maximum_value": "151", + "value": "cool_fan_speed" + }, + "cool_min_layer_time": { "value": "1.3 if speed_infill>=200 else 2.5" }, + "fill_outline_gaps": + { + "label": "Print Thin Walls", + "value": false + }, + "gantry_height": { "value": 35 }, + "infill_before_walls": + { + "label": "Infill Before Walls", + "value": false + }, + "infill_overlap": + { + "label": "Infill Overlap Percentage", + "value": 10.0 + }, + "infill_sparse_density": + { + "label": "Infill Density", + "value": "15" + }, + "infill_wipe_dist": + { + "label": "Infill Wipe Distance", + "value": 0.0 + }, + "line_width": { "value": "1.2*machine_nozzle_size if speed_infill>=200 else machine_nozzle_size" }, "machine_depth": { "default_value": 250 }, - "machine_height": {"default_value": 260 }, - "machine_head_with_fans_polygon": { "default_value": [[-20, 25], [20, 25], [20, -25], [-20, -25]] }, - "gantry_height": { "value": 35 }, - "machine_start_gcode": { "default_value": ";Official viki homepage for Thunder:https://www.geeetech.com/wiki/index.php/Geeetech_Thunder_3D_printer \n\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, - - "machine_max_feedrate_x": { "value": 300 }, - "machine_max_feedrate_e": { "value": 60 }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-20, 25], + [20, 25], + [20, -25], + [-20, -25] + ] + }, + "machine_height": { "default_value": 260 }, + "machine_max_acceleration_e": { "value": 3500 }, "machine_max_acceleration_x": { "value": 5000 }, "machine_max_acceleration_y": { "value": 4000 }, "machine_max_acceleration_z": { "value": 50 }, - "machine_max_acceleration_e": { "value": 3500 }, + "machine_max_feedrate_e": { "value": 60 }, + "machine_max_feedrate_x": { "value": 300 }, + "machine_max_jerk_e": { "value": 8 }, "machine_max_jerk_xy": { "value": 45 }, "machine_max_jerk_z": { "value": 0.8 }, - "machine_max_jerk_e": { "value": 8 }, - "acceleration_print": { "value": 3500 }, - "acceleration_travel": { "value": 5000 }, - - "line_width": { "value": "1.2*machine_nozzle_size if speed_infill>=200 else machine_nozzle_size" }, - "fill_outline_gaps": { "label": "Print Thin Walls", "value": false }, + "machine_name": { "default_value": "Geeetech Thunder" }, + "machine_start_gcode": { "default_value": ";Official viki homepage for Thunder:https://www.geeetech.com/wiki/index.php/Geeetech_Thunder_3D_printer \n\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_width": { "default_value": 250 }, + "material_flow_layer_0": { "value": 95 }, + "material_print_temperature": + { + "maximum_value": "250", + "value": "200 if speed_infill <=150 else 205 if speed_infill <= 200 else 215 if speed_infill <= 260 else 220" + }, + "material_print_temperature_layer_0": + { + "maximum_value_warning": 300, + "value": "material_print_temperature" + }, "retraction_speed": { "value": 35 }, - "infill_sparse_density": { "label": "Infill Density","value": "15" }, - "small_hole_max_size":{ "value": "8 if speed_infill>=200 else 0" }, - "cool_min_layer_time":{ "value": "1.3 if speed_infill>=200 else 2.5" }, - "cool_fan_full_at_height": { "label": "Regular Fan Speed at Height","value": "layer_height_0 + layer_height" }, - "cool_fan_speed":{ "maximum_value": "151","value": "151 if speed_infill>=200 else 100" }, - "cool_fan_speed_min":{ "maximum_value": "151","value": "cool_fan_speed" }, - "cool_fan_speed_max":{ "maximum_value": "151","value": "cool_fan_speed" }, - - "material_print_temperature": { "value": "200 if speed_infill <=150 else 205 if speed_infill <= 200 else 215 if speed_infill <= 260 else 220","maximum_value": "250" }, - "material_print_temperature_layer_0": { "value": "material_print_temperature","maximum_value_warning": 300 }, - "material_flow_layer_0": { "value": 95 }, - - "speed_print": { "value":250, "maximum_value_warning": "300" }, - "speed_infill": { "maximum_value_warning": "300" }, - "speed_wall": { "maximum_value_warning": "300" }, - "speed_wall_0": { "maximum_value_warning": "300" }, - "speed_wall_x": { "maximum_value_warning": "300" }, - "speed_topbottom": { "maximum_value_warning": "300" }, - "speed_roofing": { "maximum_value_warning": "300" }, - "speed_travel_layer_0": { "maximum_value_warning": "200" }, - + "skin_overlap": + { + "label": "Skin Overlap Percentage", + "value": 10.0 + }, + "small_hole_max_size": { "value": "8 if speed_infill>=200 else 0" }, + "speed_infill": { "maximum_value_warning": "300" }, + "speed_print": + { + "maximum_value_warning": "300", + "value": 250 + }, + "speed_roofing": { "maximum_value_warning": "300" }, "speed_support": { "maximum_value_warning": "200" }, + "speed_support_bottom": { "maximum_value_warning": "200" }, "speed_support_infill": { "maximum_value_warning": "200" }, "speed_support_interface": { "maximum_value_warning": "200" }, "speed_support_roof": { "maximum_value_warning": "200" }, - "speed_support_bottom": { "maximum_value_warning": "200" }, - - "infill_before_walls": { "label": "Infill Before Walls", "value": false }, - "infill_wipe_dist": { "label": "Infill Wipe Distance", "value": 0.0 }, - "wall_0_wipe_dist": { "label": "Outer Wall Wipe Distance","value": 0.0 }, - - "infill_overlap": { "label": "Infill Overlap Percentage", "value": 10.0 }, - "skin_overlap": { "label": "Skin Overlap Percentage", "value": 10.0 }, - "zig_zaggify_infill": { "label": "Connect Infill Lines","value": true } - } -} + "speed_topbottom": { "maximum_value_warning": "300" }, + "speed_travel_layer_0": { "maximum_value_warning": "200" }, + "speed_wall": { "maximum_value_warning": "300" }, + "speed_wall_0": { "maximum_value_warning": "300" }, + "speed_wall_x": { "maximum_value_warning": "300" }, + "wall_0_wipe_dist": + { + "label": "Outer Wall Wipe Distance", + "value": 0.0 + }, + "zig_zaggify_infill": + { + "label": "Connect Infill Lines", + "value": true + } + } +} \ No newline at end of file diff --git a/resources/extruders/Geeetech_Dual_Extruder_0.def.json b/resources/extruders/Geeetech_Dual_Extruder_0.def.json index 80c158541c..c9ce9b40c5 100644 --- a/resources/extruders/Geeetech_Dual_Extruder_0.def.json +++ b/resources/extruders/Geeetech_Dual_Extruder_0.def.json @@ -2,13 +2,18 @@ "version": 2, "name": "E0", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "Geeetech_Base_Dual_Extruder", "position": "0" }, - - "overrides": { - "extruder_nr": { "default_value": 0 ,"maximum_value": "1" }, - "material_diameter": { "default_value": 1.75 } + "overrides": + { + "extruder_nr": + { + "default_value": 0, + "maximum_value": "1" + }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/Geeetech_Dual_Extruder_1.def.json b/resources/extruders/Geeetech_Dual_Extruder_1.def.json index 523a5012be..39410d2815 100644 --- a/resources/extruders/Geeetech_Dual_Extruder_1.def.json +++ b/resources/extruders/Geeetech_Dual_Extruder_1.def.json @@ -2,13 +2,18 @@ "version": 2, "name": "E1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "Geeetech_Base_Dual_Extruder", "position": "1" }, - - "overrides": { - "extruder_nr": { "default_value": 1 ,"maximum_value": "1" }, - "material_diameter": { "default_value": 1.75 } + "overrides": + { + "extruder_nr": + { + "default_value": 1, + "maximum_value": "1" + }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/Geeetech_Multi_Extruder_0.def.json b/resources/extruders/Geeetech_Multi_Extruder_0.def.json index 11d9c1863f..970e7f242b 100644 --- a/resources/extruders/Geeetech_Multi_Extruder_0.def.json +++ b/resources/extruders/Geeetech_Multi_Extruder_0.def.json @@ -2,13 +2,18 @@ "version": 2, "name": "E0", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "Geeetech_Base_Multi_Extruder", "position": "0" }, - - "overrides": { - "extruder_nr": { "default_value": 0 ,"maximum_value": "2" }, - "material_diameter": { "default_value": 1.75 } + "overrides": + { + "extruder_nr": + { + "default_value": 0, + "maximum_value": "2" + }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/Geeetech_Multi_Extruder_1.def.json b/resources/extruders/Geeetech_Multi_Extruder_1.def.json index bd8f0a2a50..01910b03d9 100644 --- a/resources/extruders/Geeetech_Multi_Extruder_1.def.json +++ b/resources/extruders/Geeetech_Multi_Extruder_1.def.json @@ -2,13 +2,18 @@ "version": 2, "name": "E1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "Geeetech_Base_Multi_Extruder", "position": "1" }, - - "overrides": { - "extruder_nr": { "default_value": 1 ,"maximum_value": "2" }, - "material_diameter": { "default_value": 1.75 } + "overrides": + { + "extruder_nr": + { + "default_value": 1, + "maximum_value": "2" + }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/Geeetech_Multi_Extruder_2.def.json b/resources/extruders/Geeetech_Multi_Extruder_2.def.json index 2dd7890602..a46a852925 100644 --- a/resources/extruders/Geeetech_Multi_Extruder_2.def.json +++ b/resources/extruders/Geeetech_Multi_Extruder_2.def.json @@ -2,13 +2,18 @@ "version": 2, "name": "E2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "Geeetech_Base_Multi_Extruder", "position": "2" }, - - "overrides": { - "extruder_nr": { "default_value": 2 ,"maximum_value": "2" }, - "material_diameter": { "default_value": 1.75 } + "overrides": + { + "extruder_nr": + { + "default_value": 2, + "maximum_value": "2" + }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/Geeetech_Single_Extruder.def.json b/resources/extruders/Geeetech_Single_Extruder.def.json index 79477f3fa7..784d852f09 100644 --- a/resources/extruders/Geeetech_Single_Extruder.def.json +++ b/resources/extruders/Geeetech_Single_Extruder.def.json @@ -2,13 +2,14 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "Geeetech_Base_Single_Extruder", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, - "material_diameter": { "default_value": 1.75 } + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.2_ABS_super.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.2_ABS_super.inst.cfg index 23d68a1f19..c716e00de0 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.2_ABS_super.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.2_ABS_super.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = Geeetech_Base_Single_Extruder +name = Super Quality +version = 4 [metadata] +material = generic_abs +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_abs variant = 0.2mm Nozzle [values] wall_thickness = =line_width*8 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.2_ABS_ultra.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.2_ABS_ultra.inst.cfg index b6a5db63e2..0421d175a0 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.2_ABS_ultra.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.2_ABS_ultra.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Ultra Quality definition = Geeetech_Base_Single_Extruder +name = Ultra Quality +version = 4 [metadata] +material = generic_abs +quality_type = ultra setting_version = 20 type = quality -quality_type = ultra -material = generic_abs variant = 0.2mm Nozzle [values] wall_thickness = =line_width*8 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.2_PETG_super.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.2_PETG_super.inst.cfg index db0c9bdcfa..126071b104 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.2_PETG_super.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.2_PETG_super.inst.cfg @@ -1,17 +1,16 @@ [general] -version = 4 -name = Super Quality definition = Geeetech_Base_Single_Extruder +name = Super Quality +version = 4 [metadata] +material = generic_petg +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_petg variant = 0.2mm Nozzle [values] speed_layer_0 = 15 wall_thickness = =line_width*8 -#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.2_PETG_ultra.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.2_PETG_ultra.inst.cfg index fd2669f02a..40d4dda7c6 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.2_PETG_ultra.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.2_PETG_ultra.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Ultra Quality definition = Geeetech_Base_Single_Extruder +name = Ultra Quality +version = 4 [metadata] +material = generic_petg +quality_type = ultra setting_version = 20 type = quality -quality_type = ultra -material = generic_petg variant = 0.2mm Nozzle [values] speed_layer_0 = 15 wall_thickness = =line_width*8 -#retraction_extra_prime_amount = 0.5 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.2_PLA_super.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.2_PLA_super.inst.cfg index 0527d47d34..aa957258c9 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.2_PLA_super.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.2_PLA_super.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = Geeetech_Base_Single_Extruder +name = Super Quality +version = 4 [metadata] +material = generic_pla +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_pla variant = 0.2mm Nozzle [values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.2_PLA_ultra.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.2_PLA_ultra.inst.cfg index c9d5ffeced..80f6f9289e 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.2_PLA_ultra.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.2_PLA_ultra.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Ultra Quality definition = Geeetech_Base_Single_Extruder +name = Ultra Quality +version = 4 [metadata] +material = generic_pla +quality_type = ultra setting_version = 20 type = quality -quality_type = ultra -material = generic_pla variant = 0.2mm Nozzle [values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.3_ABS_adaptive.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.3_ABS_adaptive.inst.cfg index d2e51f1123..1ac70ca73d 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.3_ABS_adaptive.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.3_ABS_adaptive.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Dynamic Quality definition = Geeetech_Base_Single_Extruder +name = Dynamic Quality +version = 4 [metadata] +material = generic_abs +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_abs variant = 0.3mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.3_ABS_low.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.3_ABS_low.inst.cfg index ce1b00f4bf..e0ab43feb7 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.3_ABS_low.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.3_ABS_low.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Low Quality definition = Geeetech_Base_Single_Extruder +name = Low Quality +version = 4 [metadata] +material = generic_abs +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_abs variant = 0.3mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.3_ABS_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.3_ABS_standard.inst.cfg index bb44eab4b9..a649b2c0c5 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.3_ABS_standard.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.3_ABS_standard.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = Geeetech_Base_Single_Extruder +name = Standard Quality +version = 4 [metadata] +material = generic_abs +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_abs variant = 0.3mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.3_ABS_super.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.3_ABS_super.inst.cfg index 4c1f8631bf..06397942f1 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.3_ABS_super.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.3_ABS_super.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = Geeetech_Base_Single_Extruder +name = Super Quality +version = 4 [metadata] +material = generic_abs +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_abs variant = 0.3mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.3_PETG_adaptive.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.3_PETG_adaptive.inst.cfg index 36ca672c2a..e0ee7ef21c 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.3_PETG_adaptive.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.3_PETG_adaptive.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Dynamic Quality definition = Geeetech_Base_Single_Extruder +name = Dynamic Quality +version = 4 [metadata] +material = generic_petg +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_petg variant = 0.3mm Nozzle [values] speed_layer_0 = 15 wall_thickness = =line_width*4 -#retraction_extra_prime_amount = 0.5 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.3_PETG_low.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.3_PETG_low.inst.cfg index 95851f3b69..1ecc6a2be0 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.3_PETG_low.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.3_PETG_low.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Low Quality definition = Geeetech_Base_Single_Extruder +name = Low Quality +version = 4 [metadata] +material = generic_petg +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_petg variant = 0.3mm Nozzle [values] speed_layer_0 = 15 wall_thickness = =line_width*4 -#retraction_extra_prime_amount = 0.5 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.3_PETG_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.3_PETG_standard.inst.cfg index 0352cbaa00..9fb4a9cc65 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.3_PETG_standard.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.3_PETG_standard.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = Geeetech_Base_Single_Extruder +name = Standard Quality +version = 4 [metadata] +material = generic_petg +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_petg variant = 0.3mm Nozzle [values] speed_layer_0 = 15 wall_thickness = =line_width*4 -#retraction_extra_prime_amount = 0.5 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.3_PETG_super.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.3_PETG_super.inst.cfg index 2fdbe1ad66..0ab38c1878 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.3_PETG_super.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.3_PETG_super.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Super Quality definition = Geeetech_Base_Single_Extruder +name = Super Quality +version = 4 [metadata] +material = generic_petg +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_petg variant = 0.3mm Nozzle [values] speed_layer_0 = 15 wall_thickness = =line_width*4 -#retraction_extra_prime_amount = 0.5 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.3_PLA_adaptive.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.3_PLA_adaptive.inst.cfg index a7df86a624..2383119106 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.3_PLA_adaptive.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.3_PLA_adaptive.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Dynamic Quality definition = Geeetech_Base_Single_Extruder +name = Dynamic Quality +version = 4 [metadata] +material = generic_pla +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_pla variant = 0.3mm Nozzle [values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.3_PLA_low.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.3_PLA_low.inst.cfg index c39d03abac..d94a3dc781 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.3_PLA_low.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.3_PLA_low.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Low Quality definition = Geeetech_Base_Single_Extruder +name = Low Quality +version = 4 [metadata] +material = generic_pla +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_pla variant = 0.3mm Nozzle [values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.3_PLA_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.3_PLA_standard.inst.cfg index ce024f494f..be628a3342 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.3_PLA_standard.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.3_PLA_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = Geeetech_Base_Single_Extruder +name = Standard Quality +version = 4 [metadata] +material = generic_pla +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_pla variant = 0.3mm Nozzle [values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.3_PLA_super.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.3_PLA_super.inst.cfg index 13438f4b7d..b0c4d30dd5 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.3_PLA_super.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.3_PLA_super.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = Geeetech_Base_Single_Extruder +name = Super Quality +version = 4 [metadata] +material = generic_pla +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_pla variant = 0.3mm Nozzle [values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.3_TPU_adaptive.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.3_TPU_adaptive.inst.cfg index 69488d9dbe..84d40de570 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.3_TPU_adaptive.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.3_TPU_adaptive.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Dynamic Quality definition = Geeetech_Base_Single_Extruder +name = Dynamic Quality +version = 4 [metadata] +material = generic_tpu +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_tpu variant = 0.3mm Nozzle [values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.3_TPU_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.3_TPU_standard.inst.cfg index d09a702a35..d8cdcba1d3 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.3_TPU_standard.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.3_TPU_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = Geeetech_Base_Single_Extruder +name = Standard Quality +version = 4 [metadata] +material = generic_tpu +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_tpu variant = 0.3mm Nozzle [values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.3_TPU_super.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.3_TPU_super.inst.cfg index b8bdc47ac4..9f923fafaf 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.3_TPU_super.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.3_TPU_super.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = Geeetech_Base_Single_Extruder +name = Super Quality +version = 4 [metadata] +material = generic_tpu +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_tpu variant = 0.3mm Nozzle [values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.4_ABS_adaptive.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.4_ABS_adaptive.inst.cfg index 08b6311697..4082094ba7 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.4_ABS_adaptive.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.4_ABS_adaptive.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Dynamic Quality definition = Geeetech_Base_Single_Extruder +name = Dynamic Quality +version = 4 [metadata] +material = generic_abs +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_abs variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.4_ABS_low.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.4_ABS_low.inst.cfg index cadd36431c..7887ce26dc 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.4_ABS_low.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.4_ABS_low.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Low Quality definition = Geeetech_Base_Single_Extruder +name = Low Quality +version = 4 [metadata] +material = generic_abs +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_abs variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.4_ABS_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.4_ABS_standard.inst.cfg index d380982a96..6b8cdfb9ee 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.4_ABS_standard.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.4_ABS_standard.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = Geeetech_Base_Single_Extruder +name = Standard Quality +version = 4 [metadata] +material = generic_abs +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_abs variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.4_ABS_super.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.4_ABS_super.inst.cfg index 145a600020..4ed06a0bd6 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.4_ABS_super.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.4_ABS_super.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = Geeetech_Base_Single_Extruder +name = Super Quality +version = 4 [metadata] +material = generic_abs +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_abs variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.4_PETG_adaptive.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.4_PETG_adaptive.inst.cfg index c6d1c8e846..770fa64f82 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.4_PETG_adaptive.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.4_PETG_adaptive.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Dynamic Quality definition = Geeetech_Base_Single_Extruder +name = Dynamic Quality +version = 4 [metadata] +material = generic_petg +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_petg variant = 0.4mm Nozzle [values] speed_layer_0 = 15 wall_thickness = =line_width*4 -#retraction_extra_prime_amount = 0.5 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.4_PETG_low.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.4_PETG_low.inst.cfg index bcf24a02f6..cd32a817b6 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.4_PETG_low.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.4_PETG_low.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Low Quality definition = Geeetech_Base_Single_Extruder +name = Low Quality +version = 4 [metadata] +material = generic_petg +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_petg variant = 0.4mm Nozzle [values] speed_layer_0 = 15 wall_thickness = =line_width*4 -#retraction_extra_prime_amount = 0.5 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.4_PETG_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.4_PETG_standard.inst.cfg index 3058020223..4100e7593d 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.4_PETG_standard.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.4_PETG_standard.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = Geeetech_Base_Single_Extruder +name = Standard Quality +version = 4 [metadata] +material = generic_petg +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_petg variant = 0.4mm Nozzle [values] speed_layer_0 = 15 wall_thickness = =line_width*4 -#retraction_extra_prime_amount = 0.5 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.4_PETG_super.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.4_PETG_super.inst.cfg index 99bd835435..190e5968f2 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.4_PETG_super.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.4_PETG_super.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Super Quality definition = Geeetech_Base_Single_Extruder +name = Super Quality +version = 4 [metadata] +material = generic_petg +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_petg variant = 0.4mm Nozzle [values] speed_layer_0 = 15 wall_thickness = =line_width*4 -#retraction_extra_prime_amount = 0.5 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.4_PLA_adaptive.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.4_PLA_adaptive.inst.cfg index 29706a0afa..fdede1ecef 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.4_PLA_adaptive.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.4_PLA_adaptive.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Dynamic Quality definition = Geeetech_Base_Single_Extruder +name = Dynamic Quality +version = 4 [metadata] +material = generic_pla +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_pla variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.4_PLA_low.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.4_PLA_low.inst.cfg index f73d8500ce..c425ff5195 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.4_PLA_low.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.4_PLA_low.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Low Quality definition = Geeetech_Base_Single_Extruder +name = Low Quality +version = 4 [metadata] +material = generic_pla +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_pla variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.4_PLA_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.4_PLA_standard.inst.cfg index 236ac49c26..2c7482cb75 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.4_PLA_standard.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.4_PLA_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = Geeetech_Base_Single_Extruder +name = Standard Quality +version = 4 [metadata] +material = generic_pla +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_pla variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.4_PLA_super.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.4_PLA_super.inst.cfg index 494b688365..cc8953b80d 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.4_PLA_super.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.4_PLA_super.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = Geeetech_Base_Single_Extruder +name = Super Quality +version = 4 [metadata] +material = generic_pla +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_pla variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.4_TPU_adaptive.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.4_TPU_adaptive.inst.cfg index 19b76d25a4..0e7e97eefb 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.4_TPU_adaptive.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.4_TPU_adaptive.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Dynamic Quality definition = Geeetech_Base_Single_Extruder +name = Dynamic Quality +version = 4 [metadata] +material = generic_tpu +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_tpu variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.4_TPU_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.4_TPU_standard.inst.cfg index a138c2febb..83a3191e8a 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.4_TPU_standard.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.4_TPU_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = Geeetech_Base_Single_Extruder +name = Standard Quality +version = 4 [metadata] +material = generic_tpu +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_tpu variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.4_TPU_super.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.4_TPU_super.inst.cfg index 6fc524679d..2a48e4c813 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.4_TPU_super.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.4_TPU_super.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = Geeetech_Base_Single_Extruder +name = Super Quality +version = 4 [metadata] +material = generic_tpu +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_tpu variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.5_ABS_adaptive.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.5_ABS_adaptive.inst.cfg index 7c85b80f12..1762683e6c 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.5_ABS_adaptive.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.5_ABS_adaptive.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Dynamic Quality definition = Geeetech_Base_Single_Extruder +name = Dynamic Quality +version = 4 [metadata] +material = generic_abs +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_abs variant = 0.5mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.5_ABS_low.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.5_ABS_low.inst.cfg index 18847dde16..0e072af63a 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.5_ABS_low.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.5_ABS_low.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Low Quality definition = Geeetech_Base_Single_Extruder +name = Low Quality +version = 4 [metadata] +material = generic_abs +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_abs variant = 0.5mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.5_ABS_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.5_ABS_standard.inst.cfg index 2673fbc457..6d08e3fdf4 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.5_ABS_standard.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.5_ABS_standard.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = Geeetech_Base_Single_Extruder +name = Standard Quality +version = 4 [metadata] +material = generic_abs +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_abs variant = 0.5mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.5_ABS_super.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.5_ABS_super.inst.cfg index dcac153cae..40189351e9 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.5_ABS_super.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.5_ABS_super.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = Geeetech_Base_Single_Extruder +name = Super Quality +version = 4 [metadata] +material = generic_abs +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_abs variant = 0.5mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.5_PETG_adaptive.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.5_PETG_adaptive.inst.cfg index 6bcaadd27d..d23be94f20 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.5_PETG_adaptive.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.5_PETG_adaptive.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Dynamic Quality definition = Geeetech_Base_Single_Extruder +name = Dynamic Quality +version = 4 [metadata] +material = generic_petg +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_petg variant = 0.5mm Nozzle [values] speed_layer_0 = 15 wall_thickness = =line_width*4 -#retraction_extra_prime_amount = 0.5 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.5_PETG_low.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.5_PETG_low.inst.cfg index 96e94064ca..33b0038eec 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.5_PETG_low.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.5_PETG_low.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Low Quality definition = Geeetech_Base_Single_Extruder +name = Low Quality +version = 4 [metadata] +material = generic_petg +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_petg variant = 0.5mm Nozzle [values] speed_layer_0 = 15 wall_thickness = =line_width*4 -#retraction_extra_prime_amount = 0.5 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.5_PETG_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.5_PETG_standard.inst.cfg index 74e1b40b2c..716e95f84d 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.5_PETG_standard.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.5_PETG_standard.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = Geeetech_Base_Single_Extruder +name = Standard Quality +version = 4 [metadata] +material = generic_petg +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_petg variant = 0.5mm Nozzle [values] speed_layer_0 = 15 wall_thickness = =line_width*4 -#retraction_extra_prime_amount = 0.5 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.5_PETG_super.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.5_PETG_super.inst.cfg index d9631f34c0..da93ff74ba 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.5_PETG_super.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.5_PETG_super.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Super Quality definition = Geeetech_Base_Single_Extruder +name = Super Quality +version = 4 [metadata] +material = generic_petg +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_petg variant = 0.5mm Nozzle [values] speed_layer_0 = 15 wall_thickness = =line_width*4 -#retraction_extra_prime_amount = 0.5 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.5_PLA_adaptive.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.5_PLA_adaptive.inst.cfg index c234c8052d..4772f084b3 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.5_PLA_adaptive.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.5_PLA_adaptive.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Dynamic Quality definition = Geeetech_Base_Single_Extruder +name = Dynamic Quality +version = 4 [metadata] +material = generic_pla +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_pla variant = 0.5mm Nozzle [values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.5_PLA_low.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.5_PLA_low.inst.cfg index eb889c34db..0d40c4d92a 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.5_PLA_low.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.5_PLA_low.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Low Quality definition = Geeetech_Base_Single_Extruder +name = Low Quality +version = 4 [metadata] +material = generic_pla +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_pla variant = 0.5mm Nozzle [values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.5_PLA_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.5_PLA_standard.inst.cfg index e52f6c4e30..76dfa5bd4b 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.5_PLA_standard.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.5_PLA_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = Geeetech_Base_Single_Extruder +name = Standard Quality +version = 4 [metadata] +material = generic_pla +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_pla variant = 0.5mm Nozzle [values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.5_PLA_super.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.5_PLA_super.inst.cfg index a282aea68e..b634a17a19 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.5_PLA_super.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.5_PLA_super.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = Geeetech_Base_Single_Extruder +name = Super Quality +version = 4 [metadata] +material = generic_pla +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_pla variant = 0.5mm Nozzle [values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.5_TPU_adaptive.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.5_TPU_adaptive.inst.cfg index 00e0c97c9b..3070b3319b 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.5_TPU_adaptive.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.5_TPU_adaptive.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Dynamic Quality definition = Geeetech_Base_Single_Extruder +name = Dynamic Quality +version = 4 [metadata] +material = generic_tpu +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_tpu variant = 0.5mm Nozzle [values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.5_TPU_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.5_TPU_standard.inst.cfg index 24dd29ef1e..8f60d14411 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.5_TPU_standard.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.5_TPU_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = Geeetech_Base_Single_Extruder +name = Standard Quality +version = 4 [metadata] +material = generic_tpu +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_tpu variant = 0.5mm Nozzle [values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.5_TPU_super.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.5_TPU_super.inst.cfg index e16ba9d3cc..a8e3291832 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.5_TPU_super.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.5_TPU_super.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = Geeetech_Base_Single_Extruder +name = Super Quality +version = 4 [metadata] +material = generic_tpu +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_tpu variant = 0.5mm Nozzle [values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.6_ABS_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.6_ABS_standard.inst.cfg index a8284fbadc..bcad50d300 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.6_ABS_standard.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.6_ABS_standard.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = Geeetech_Base_Single_Extruder +name = Standard Quality +version = 4 [metadata] +material = generic_abs +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_abs variant = 0.6mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.6_PETG_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.6_PETG_standard.inst.cfg index 288322cd80..3156e9cc2b 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.6_PETG_standard.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.6_PETG_standard.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = Geeetech_Base_Single_Extruder +name = Standard Quality +version = 4 [metadata] +material = generic_petg +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_petg variant = 0.6mm Nozzle [values] speed_layer_0 = 15 wall_thickness = =line_width*3 -#retraction_extra_prime_amount = 0.5 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.6_PLA_draft.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.6_PLA_draft.inst.cfg index 4ad555530e..5cc4a83403 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.6_PLA_draft.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.6_PLA_draft.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Draft Quality definition = Geeetech_Base_Single_Extruder +name = Draft Quality +version = 4 [metadata] +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_pla variant = 0.6mm Nozzle [values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.6_PLA_low.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.6_PLA_low.inst.cfg index e3f82cf489..be762411a6 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.6_PLA_low.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.6_PLA_low.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Low Quality definition = Geeetech_Base_Single_Extruder +name = Low Quality +version = 4 [metadata] +material = generic_pla +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_pla variant = 0.6mm Nozzle [values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.6_PLA_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.6_PLA_standard.inst.cfg index dcac59be4d..67e6d1a747 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.6_PLA_standard.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.6_PLA_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = Geeetech_Base_Single_Extruder +name = Standard Quality +version = 4 [metadata] +material = generic_pla +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_pla variant = 0.6mm Nozzle [values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.6_TPU_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.6_TPU_standard.inst.cfg index 5cf65de53b..5b7756e0dd 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.6_TPU_standard.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.6_TPU_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = Geeetech_Base_Single_Extruder +name = Standard Quality +version = 4 [metadata] +material = generic_tpu +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_tpu variant = 0.6mm Nozzle [values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.8_ABS_draft.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.8_ABS_draft.inst.cfg index 1befe8746d..57a5c2976e 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.8_ABS_draft.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.8_ABS_draft.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Draft Quality definition = Geeetech_Base_Single_Extruder +name = Draft Quality +version = 4 [metadata] +material = generic_abs +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_abs variant = 0.8mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.8_PETG_draft.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.8_PETG_draft.inst.cfg index 1869e13f58..f2b7c564a3 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.8_PETG_draft.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.8_PETG_draft.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Draft Quality definition = Geeetech_Base_Single_Extruder +name = Draft Quality +version = 4 [metadata] +material = generic_petg +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_petg variant = 0.8mm Nozzle [values] speed_layer_0 = 15 wall_thickness = =line_width*3 -#retraction_extra_prime_amount = 0.5 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.8_PLA_draft.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.8_PLA_draft.inst.cfg index c2e0ae6af5..d8ff00c7ed 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.8_PLA_draft.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.8_PLA_draft.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Draft Quality definition = Geeetech_Base_Single_Extruder +name = Draft Quality +version = 4 [metadata] +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_pla variant = 0.8mm Nozzle [values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.8_TPU_draft.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.8_TPU_draft.inst.cfg index f5917efef8..e4069ae61b 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_0.8_TPU_draft.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_0.8_TPU_draft.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Draft Quality definition = Geeetech_Base_Single_Extruder +name = Draft Quality +version = 4 [metadata] +material = generic_tpu +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_tpu variant = 0.8mm Nozzle [values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_1.0_ABS_draft.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_1.0_ABS_draft.inst.cfg index 050e3f4f61..ddde9b268f 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_1.0_ABS_draft.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_1.0_ABS_draft.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Draft Quality definition = Geeetech_Base_Single_Extruder +name = Draft Quality +version = 4 [metadata] +material = generic_abs +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_abs variant = 1.0mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_1.0_PETG_draft.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_1.0_PETG_draft.inst.cfg index 50b9f58b67..64a025cfad 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_1.0_PETG_draft.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_1.0_PETG_draft.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Draft Quality definition = Geeetech_Base_Single_Extruder +name = Draft Quality +version = 4 [metadata] +material = generic_petg +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_petg variant = 1.0mm Nozzle [values] speed_layer_0 = 15 wall_thickness = =line_width*3 -#retraction_extra_prime_amount = 0.5 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_1.0_PLA_draft.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_1.0_PLA_draft.inst.cfg index 6df137e69f..1b6f9c1b0f 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_1.0_PLA_draft.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_1.0_PLA_draft.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Draft Quality definition = Geeetech_Base_Single_Extruder +name = Draft Quality +version = 4 [metadata] +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_pla variant = 1.0mm Nozzle [values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_1.0_TPU_draft.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_1.0_TPU_draft.inst.cfg index 992cc49a15..2529c7225a 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_1.0_TPU_draft.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_1.0_TPU_draft.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Draft Quality definition = Geeetech_Base_Single_Extruder +name = Draft Quality +version = 4 [metadata] +material = generic_tpu +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_tpu variant = 1.0mm Nozzle [values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_global_adaptive.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_global_adaptive.inst.cfg index d028674295..1135b75b56 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_global_adaptive.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_global_adaptive.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Dynamic Quality definition = Geeetech_Base_Single_Extruder +name = Dynamic Quality +version = 4 [metadata] +global_quality = True +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive weight = -2 -global_quality = True [values] +adaptive_layer_height_enabled = true layer_height = 0.16 layer_height_0 = 0.20 +support_interface_height = =layer_height*6 top_bottom_thickness = =layer_height_0+layer_height*4 wall_thickness = =line_width*3 -support_interface_height = =layer_height*6 -adaptive_layer_height_enabled = true + diff --git a/resources/quality/geeetech_quality/geeetech_quality_global_draft.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_global_draft.inst.cfg index 07ebd2ee1b..ac7566ac6d 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_global_draft.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_global_draft.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Draft Quality definition = Geeetech_Base_Single_Extruder +name = Draft Quality +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -5 -global_quality = True [values] layer_height = 0.32 layer_height_0 = 0.32 +support_interface_height = =layer_height*4 top_bottom_thickness = =layer_height_0+layer_height*3 wall_thickness = =line_width*2 -support_interface_height = =layer_height*4 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_global_low.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_global_low.inst.cfg index 914683e719..b5fffe82c0 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_global_low.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_global_low.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Low Quality definition = Geeetech_Base_Single_Extruder +name = Low Quality +version = 4 [metadata] +global_quality = True +quality_type = low setting_version = 20 type = quality -quality_type = low weight = -4 -global_quality = True [values] layer_height = 0.28 layer_height_0 = 0.28 +support_interface_height = =layer_height*4 top_bottom_thickness = =layer_height_0+layer_height*3 wall_thickness = =line_width*2 -support_interface_height = =layer_height*4 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_global_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_global_standard.inst.cfg index 2f956a84cc..c3d08b02cb 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_global_standard.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_global_standard.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Standard Quality definition = Geeetech_Base_Single_Extruder +name = Standard Quality +version = 4 [metadata] +global_quality = True +quality_type = standard setting_version = 20 type = quality -quality_type = standard weight = -3 -global_quality = True [values] layer_height = 0.2 layer_height_0 = 0.2 +support_interface_height = =layer_height*4 top_bottom_thickness = =layer_height_0+layer_height*3 wall_thickness = =line_width*2 -support_interface_height = =layer_height*4 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_global_super.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_global_super.inst.cfg index 881986b6a5..8c8efecbce 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_global_super.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_global_super.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Super Quality definition = Geeetech_Base_Single_Extruder +name = Super Quality +version = 4 [metadata] +global_quality = True +quality_type = super setting_version = 20 type = quality -quality_type = super weight = -1 -global_quality = True [values] layer_height = 0.12 layer_height_0 = 0.12 +support_interface_height = =layer_height*8 top_bottom_thickness = =layer_height_0+layer_height*6 wall_thickness = =line_width*3 -support_interface_height = =layer_height*8 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_global_ultra.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_global_ultra.inst.cfg index 1741b76338..558a54fdd7 100644 --- a/resources/quality/geeetech_quality/geeetech_quality_global_ultra.inst.cfg +++ b/resources/quality/geeetech_quality/geeetech_quality_global_ultra.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Ultra Quality definition = Geeetech_Base_Single_Extruder +name = Ultra Quality +version = 4 [metadata] +global_quality = True +quality_type = ultra setting_version = 20 type = quality -quality_type = ultra weight = 0 -global_quality = True [values] layer_height = 0.08 layer_height_0 = 0.12 +support_interface_height = =layer_height*12 top_bottom_thickness = =layer_height_0+layer_height*10 wall_thickness = =line_width*3 -support_interface_height = =layer_height*12 + diff --git a/resources/variants/geeetech_variants/geeetech_A10Pro_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_A10Pro_0.2.inst.cfg index e57bd02c59..c7802cd518 100644 --- a/resources/variants/geeetech_variants/geeetech_A10Pro_0.2.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_A10Pro_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_A10Pro name = 0.2mm Nozzle version = 4 -definition = geeetech_A10Pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/geeetech_variants/geeetech_A10Pro_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_A10Pro_0.3.inst.cfg index 0a11654fcb..e747eca5c1 100644 --- a/resources/variants/geeetech_variants/geeetech_A10Pro_0.3.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_A10Pro_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_A10Pro name = 0.3mm Nozzle version = 4 -definition = geeetech_A10Pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/geeetech_variants/geeetech_A10Pro_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_A10Pro_0.4.inst.cfg index 6a56b67260..51f2841417 100644 --- a/resources/variants/geeetech_variants/geeetech_A10Pro_0.4.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_A10Pro_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_A10Pro name = 0.4mm Nozzle version = 4 -definition = geeetech_A10Pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/geeetech_variants/geeetech_A10Pro_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_A10Pro_0.5.inst.cfg index 016b7a7538..f0d78f4d4d 100644 --- a/resources/variants/geeetech_variants/geeetech_A10Pro_0.5.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_A10Pro_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_A10Pro name = 0.5mm Nozzle version = 4 -definition = geeetech_A10Pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/geeetech_variants/geeetech_A10Pro_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_A10Pro_0.6.inst.cfg index f98a4dfe1c..8194aaf87a 100644 --- a/resources/variants/geeetech_variants/geeetech_A10Pro_0.6.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_A10Pro_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_A10Pro name = 0.6mm Nozzle version = 4 -definition = geeetech_A10Pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/geeetech_variants/geeetech_A10Pro_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_A10Pro_0.8.inst.cfg index b10582fccc..2ccc1efa62 100644 --- a/resources/variants/geeetech_variants/geeetech_A10Pro_0.8.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_A10Pro_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_A10Pro name = 0.8mm Nozzle version = 4 -definition = geeetech_A10Pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/geeetech_variants/geeetech_A10Pro_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_A10Pro_1.0.inst.cfg index bade1f88f8..0f35c3f2a4 100644 --- a/resources/variants/geeetech_variants/geeetech_A10Pro_1.0.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_A10Pro_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_A10Pro name = 1.0mm Nozzle version = 4 -definition = geeetech_A10Pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/geeetech_variants/geeetech_A20_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_A20_0.2.inst.cfg index 65002e9a9a..076e44cd77 100644 --- a/resources/variants/geeetech_variants/geeetech_A20_0.2.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_A20_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_A20 name = 0.2mm Nozzle version = 4 -definition = geeetech_A20 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/geeetech_variants/geeetech_A20_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_A20_0.3.inst.cfg index 883153496e..1056713d8f 100644 --- a/resources/variants/geeetech_variants/geeetech_A20_0.3.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_A20_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_A20 name = 0.3mm Nozzle version = 4 -definition = geeetech_A20 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/geeetech_variants/geeetech_A20_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_A20_0.4.inst.cfg index be2b02c8e0..e86e766648 100644 --- a/resources/variants/geeetech_variants/geeetech_A20_0.4.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_A20_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_A20 name = 0.4mm Nozzle version = 4 -definition = geeetech_A20 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/geeetech_variants/geeetech_A20_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_A20_0.5.inst.cfg index 39f26b5ed9..02a5affbbb 100644 --- a/resources/variants/geeetech_variants/geeetech_A20_0.5.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_A20_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_A20 name = 0.5mm Nozzle version = 4 -definition = geeetech_A20 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/geeetech_variants/geeetech_A20_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_A20_0.6.inst.cfg index b2d063c99e..2b857bb33f 100644 --- a/resources/variants/geeetech_variants/geeetech_A20_0.6.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_A20_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_A20 name = 0.6mm Nozzle version = 4 -definition = geeetech_A20 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/geeetech_variants/geeetech_A20_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_A20_0.8.inst.cfg index cf8751fc97..d0fce8e2e4 100644 --- a/resources/variants/geeetech_variants/geeetech_A20_0.8.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_A20_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_A20 name = 0.8mm Nozzle version = 4 -definition = geeetech_A20 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/geeetech_variants/geeetech_A20_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_A20_1.0.inst.cfg index 818115cd87..7dc1ae7151 100644 --- a/resources/variants/geeetech_variants/geeetech_A20_1.0.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_A20_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_A20 name = 1.0mm Nozzle version = 4 -definition = geeetech_A20 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/geeetech_variants/geeetech_A30Pro_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_A30Pro_0.2.inst.cfg index a50968c5d2..19e741a6d0 100644 --- a/resources/variants/geeetech_variants/geeetech_A30Pro_0.2.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_A30Pro_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_A30Pro name = 0.2mm Nozzle version = 4 -definition = geeetech_A30Pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/geeetech_variants/geeetech_A30Pro_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_A30Pro_0.3.inst.cfg index 11321ad662..cb0e6454b8 100644 --- a/resources/variants/geeetech_variants/geeetech_A30Pro_0.3.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_A30Pro_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_A30Pro name = 0.3mm Nozzle version = 4 -definition = geeetech_A30Pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/geeetech_variants/geeetech_A30Pro_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_A30Pro_0.4.inst.cfg index 2d2e170e16..e0b5ec3a98 100644 --- a/resources/variants/geeetech_variants/geeetech_A30Pro_0.4.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_A30Pro_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_A30Pro name = 0.4mm Nozzle version = 4 -definition = geeetech_A30Pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/geeetech_variants/geeetech_A30Pro_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_A30Pro_0.5.inst.cfg index 8a174e1c7b..9cb1ab9fed 100644 --- a/resources/variants/geeetech_variants/geeetech_A30Pro_0.5.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_A30Pro_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_A30Pro name = 0.5mm Nozzle version = 4 -definition = geeetech_A30Pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/geeetech_variants/geeetech_A30Pro_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_A30Pro_0.6.inst.cfg index ab2711ced0..d86b384cf9 100644 --- a/resources/variants/geeetech_variants/geeetech_A30Pro_0.6.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_A30Pro_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_A30Pro name = 0.6mm Nozzle version = 4 -definition = geeetech_A30Pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/geeetech_variants/geeetech_A30Pro_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_A30Pro_0.8.inst.cfg index 5e40bb7d7e..fe5259b438 100644 --- a/resources/variants/geeetech_variants/geeetech_A30Pro_0.8.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_A30Pro_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_A30Pro name = 0.8mm Nozzle version = 4 -definition = geeetech_A30Pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/geeetech_variants/geeetech_A30Pro_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_A30Pro_1.0.inst.cfg index 270dd9163d..8f38339613 100644 --- a/resources/variants/geeetech_variants/geeetech_A30Pro_1.0.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_A30Pro_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_A30Pro name = 1.0mm Nozzle version = 4 -definition = geeetech_A30Pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/geeetech_variants/geeetech_E180_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_E180_0.2.inst.cfg index 333d613a05..c90d24537d 100644 --- a/resources/variants/geeetech_variants/geeetech_E180_0.2.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_E180_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_E180 name = 0.2mm Nozzle version = 4 -definition = geeetech_E180 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/geeetech_variants/geeetech_E180_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_E180_0.3.inst.cfg index aa5e29015f..278e10c895 100644 --- a/resources/variants/geeetech_variants/geeetech_E180_0.3.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_E180_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_E180 name = 0.3mm Nozzle version = 4 -definition = geeetech_E180 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/geeetech_variants/geeetech_E180_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_E180_0.4.inst.cfg index 99fd1c851d..50e08b8dd4 100644 --- a/resources/variants/geeetech_variants/geeetech_E180_0.4.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_E180_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_E180 name = 0.4mm Nozzle version = 4 -definition = geeetech_E180 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/geeetech_variants/geeetech_E180_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_E180_0.5.inst.cfg index bf4ca9f9a0..06335141b7 100644 --- a/resources/variants/geeetech_variants/geeetech_E180_0.5.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_E180_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_E180 name = 0.5mm Nozzle version = 4 -definition = geeetech_E180 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/geeetech_variants/geeetech_E180_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_E180_0.6.inst.cfg index 3e3f270574..7b2a103a9e 100644 --- a/resources/variants/geeetech_variants/geeetech_E180_0.6.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_E180_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_E180 name = 0.6mm Nozzle version = 4 -definition = geeetech_E180 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/geeetech_variants/geeetech_E180_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_E180_0.8.inst.cfg index 3b91e4a0b2..b299d1642c 100644 --- a/resources/variants/geeetech_variants/geeetech_E180_0.8.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_E180_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_E180 name = 0.8mm Nozzle version = 4 -definition = geeetech_E180 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/geeetech_variants/geeetech_E180_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_E180_1.0.inst.cfg index 4008b20a89..3e9a1df2fa 100644 --- a/resources/variants/geeetech_variants/geeetech_E180_1.0.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_E180_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_E180 name = 1.0mm Nozzle version = 4 -definition = geeetech_E180 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.2.inst.cfg index 3081e76e13..c20936e103 100644 --- a/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.2.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_GiantArmD200 name = 0.2mm Nozzle version = 4 -definition = geeetech_GiantArmD200 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.3.inst.cfg index 916611db8a..46e196c944 100644 --- a/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.3.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_GiantArmD200 name = 0.3mm Nozzle version = 4 -definition = geeetech_GiantArmD200 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.4.inst.cfg index c38df3246b..1b646a11b1 100644 --- a/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.4.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_GiantArmD200 name = 0.4mm Nozzle version = 4 -definition = geeetech_GiantArmD200 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.5.inst.cfg index 6424117cc6..105455ac4f 100644 --- a/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.5.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_GiantArmD200 name = 0.5mm Nozzle version = 4 -definition = geeetech_GiantArmD200 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.6.inst.cfg index d0ac2691a7..17f9e1814f 100644 --- a/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.6.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_GiantArmD200 name = 0.6mm Nozzle version = 4 -definition = geeetech_GiantArmD200 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.8.inst.cfg index 0ac434758b..b9335595b5 100644 --- a/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.8.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_GiantArmD200 name = 0.8mm Nozzle version = 4 -definition = geeetech_GiantArmD200 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/geeetech_variants/geeetech_GiantArmD200_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_GiantArmD200_1.0.inst.cfg index 60c88742bd..e3dfbf2039 100644 --- a/resources/variants/geeetech_variants/geeetech_GiantArmD200_1.0.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_GiantArmD200_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_GiantArmD200 name = 1.0mm Nozzle version = 4 -definition = geeetech_GiantArmD200 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/geeetech_variants/geeetech_I3ProB_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProB_0.2.inst.cfg index 79470b558f..8ba4e2a3a1 100644 --- a/resources/variants/geeetech_variants/geeetech_I3ProB_0.2.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_I3ProB_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_I3ProB name = 0.2mm Nozzle version = 4 -definition = geeetech_I3ProB [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/geeetech_variants/geeetech_I3ProB_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProB_0.3.inst.cfg index e7c1a7dafc..b9cc4ef081 100644 --- a/resources/variants/geeetech_variants/geeetech_I3ProB_0.3.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_I3ProB_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_I3ProB name = 0.3mm Nozzle version = 4 -definition = geeetech_I3ProB [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/geeetech_variants/geeetech_I3ProB_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProB_0.4.inst.cfg index 24b80c5d43..d0d2ed8c78 100644 --- a/resources/variants/geeetech_variants/geeetech_I3ProB_0.4.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_I3ProB_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_I3ProB name = 0.4mm Nozzle version = 4 -definition = geeetech_I3ProB [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/geeetech_variants/geeetech_I3ProB_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProB_0.5.inst.cfg index 0e6ee0f6e2..210a37d790 100644 --- a/resources/variants/geeetech_variants/geeetech_I3ProB_0.5.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_I3ProB_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_I3ProB name = 0.5mm Nozzle version = 4 -definition = geeetech_I3ProB [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/geeetech_variants/geeetech_I3ProB_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProB_0.6.inst.cfg index fca2dcd3c9..00922b7c82 100644 --- a/resources/variants/geeetech_variants/geeetech_I3ProB_0.6.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_I3ProB_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_I3ProB name = 0.6mm Nozzle version = 4 -definition = geeetech_I3ProB [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/geeetech_variants/geeetech_I3ProB_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProB_0.8.inst.cfg index 6da1f460ca..4ba44d737f 100644 --- a/resources/variants/geeetech_variants/geeetech_I3ProB_0.8.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_I3ProB_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_I3ProB name = 0.8mm Nozzle version = 4 -definition = geeetech_I3ProB [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/geeetech_variants/geeetech_I3ProB_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProB_1.0.inst.cfg index 79ac7c5bae..789e8e3434 100644 --- a/resources/variants/geeetech_variants/geeetech_I3ProB_1.0.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_I3ProB_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_I3ProB name = 1.0mm Nozzle version = 4 -definition = geeetech_I3ProB [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/geeetech_variants/geeetech_I3ProW_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProW_0.2.inst.cfg index 31c396af51..715e1dcb7c 100644 --- a/resources/variants/geeetech_variants/geeetech_I3ProW_0.2.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_I3ProW_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_I3ProW name = 0.2mm Nozzle version = 4 -definition = geeetech_I3ProW [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/geeetech_variants/geeetech_I3ProW_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProW_0.3.inst.cfg index d3083a05db..58db0e7d88 100644 --- a/resources/variants/geeetech_variants/geeetech_I3ProW_0.3.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_I3ProW_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_I3ProW name = 0.3mm Nozzle version = 4 -definition = geeetech_I3ProW [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/geeetech_variants/geeetech_I3ProW_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProW_0.4.inst.cfg index 634a7edaf5..d92a26d4a5 100644 --- a/resources/variants/geeetech_variants/geeetech_I3ProW_0.4.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_I3ProW_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_I3ProW name = 0.4mm Nozzle version = 4 -definition = geeetech_I3ProW [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/geeetech_variants/geeetech_I3ProW_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProW_0.5.inst.cfg index 2bab59e13e..d3bb55f066 100644 --- a/resources/variants/geeetech_variants/geeetech_I3ProW_0.5.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_I3ProW_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_I3ProW name = 0.5mm Nozzle version = 4 -definition = geeetech_I3ProW [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/geeetech_variants/geeetech_I3ProW_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProW_0.6.inst.cfg index 0b93659a22..641fe2f834 100644 --- a/resources/variants/geeetech_variants/geeetech_I3ProW_0.6.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_I3ProW_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_I3ProW name = 0.6mm Nozzle version = 4 -definition = geeetech_I3ProW [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/geeetech_variants/geeetech_I3ProW_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProW_0.8.inst.cfg index f861d69db5..dd7a87dae9 100644 --- a/resources/variants/geeetech_variants/geeetech_I3ProW_0.8.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_I3ProW_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_I3ProW name = 0.8mm Nozzle version = 4 -definition = geeetech_I3ProW [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/geeetech_variants/geeetech_I3ProW_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProW_1.0.inst.cfg index 5db97005a1..7c70a2cb91 100644 --- a/resources/variants/geeetech_variants/geeetech_I3ProW_1.0.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_I3ProW_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_I3ProW name = 1.0mm Nozzle version = 4 -definition = geeetech_I3ProW [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/geeetech_variants/geeetech_MeCreator2_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator2_0.2.inst.cfg index 96c7308b11..8efe819e25 100644 --- a/resources/variants/geeetech_variants/geeetech_MeCreator2_0.2.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_MeCreator2_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_MeCreator2 name = 0.2mm Nozzle version = 4 -definition = geeetech_MeCreator2 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/geeetech_variants/geeetech_MeCreator2_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator2_0.3.inst.cfg index cb22f0229c..464db71752 100644 --- a/resources/variants/geeetech_variants/geeetech_MeCreator2_0.3.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_MeCreator2_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_MeCreator2 name = 0.3mm Nozzle version = 4 -definition = geeetech_MeCreator2 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/geeetech_variants/geeetech_MeCreator2_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator2_0.4.inst.cfg index 954210a493..fdac731888 100644 --- a/resources/variants/geeetech_variants/geeetech_MeCreator2_0.4.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_MeCreator2_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_MeCreator2 name = 0.4mm Nozzle version = 4 -definition = geeetech_MeCreator2 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/geeetech_variants/geeetech_MeCreator2_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator2_0.5.inst.cfg index e9ef35f4a2..0b3764f263 100644 --- a/resources/variants/geeetech_variants/geeetech_MeCreator2_0.5.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_MeCreator2_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_MeCreator2 name = 0.5mm Nozzle version = 4 -definition = geeetech_MeCreator2 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/geeetech_variants/geeetech_MeCreator2_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator2_0.6.inst.cfg index 8375acfc7e..47f690bc35 100644 --- a/resources/variants/geeetech_variants/geeetech_MeCreator2_0.6.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_MeCreator2_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_MeCreator2 name = 0.6mm Nozzle version = 4 -definition = geeetech_MeCreator2 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/geeetech_variants/geeetech_MeCreator2_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator2_0.8.inst.cfg index 373c0fb025..3d5508ad45 100644 --- a/resources/variants/geeetech_variants/geeetech_MeCreator2_0.8.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_MeCreator2_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_MeCreator2 name = 0.8mm Nozzle version = 4 -definition = geeetech_MeCreator2 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/geeetech_variants/geeetech_MeCreator2_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator2_1.0.inst.cfg index a8b8ae8b16..b9d738adac 100644 --- a/resources/variants/geeetech_variants/geeetech_MeCreator2_1.0.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_MeCreator2_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_MeCreator2 name = 1.0mm Nozzle version = 4 -definition = geeetech_MeCreator2 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/geeetech_variants/geeetech_MeCreator_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator_0.2.inst.cfg index d435f7b955..65c79a8ce1 100644 --- a/resources/variants/geeetech_variants/geeetech_MeCreator_0.2.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_MeCreator_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_MeCreator name = 0.2mm Nozzle version = 4 -definition = geeetech_MeCreator [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/geeetech_variants/geeetech_MeCreator_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator_0.3.inst.cfg index fa237bfaec..1d21372f1d 100644 --- a/resources/variants/geeetech_variants/geeetech_MeCreator_0.3.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_MeCreator_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_MeCreator name = 0.3mm Nozzle version = 4 -definition = geeetech_MeCreator [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/geeetech_variants/geeetech_MeCreator_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator_0.4.inst.cfg index 4a458227e3..704c1515d0 100644 --- a/resources/variants/geeetech_variants/geeetech_MeCreator_0.4.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_MeCreator_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_MeCreator name = 0.4mm Nozzle version = 4 -definition = geeetech_MeCreator [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/geeetech_variants/geeetech_MeCreator_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator_0.5.inst.cfg index 3d967ac82d..a81370aee0 100644 --- a/resources/variants/geeetech_variants/geeetech_MeCreator_0.5.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_MeCreator_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_MeCreator name = 0.5mm Nozzle version = 4 -definition = geeetech_MeCreator [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/geeetech_variants/geeetech_MeCreator_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator_0.6.inst.cfg index 0b1b39bb67..f074921b75 100644 --- a/resources/variants/geeetech_variants/geeetech_MeCreator_0.6.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_MeCreator_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_MeCreator name = 0.6mm Nozzle version = 4 -definition = geeetech_MeCreator [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/geeetech_variants/geeetech_MeCreator_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator_0.8.inst.cfg index 3b3814aeaf..dad45302db 100644 --- a/resources/variants/geeetech_variants/geeetech_MeCreator_0.8.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_MeCreator_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_MeCreator name = 0.8mm Nozzle version = 4 -definition = geeetech_MeCreator [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/geeetech_variants/geeetech_MeCreator_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator_1.0.inst.cfg index 8698920f4b..d57c22fee6 100644 --- a/resources/variants/geeetech_variants/geeetech_MeCreator_1.0.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_MeCreator_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_MeCreator name = 1.0mm Nozzle version = 4 -definition = geeetech_MeCreator [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/geeetech_variants/geeetech_MeDucer_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeDucer_0.2.inst.cfg index 20badd050c..9f5b1bfe50 100644 --- a/resources/variants/geeetech_variants/geeetech_MeDucer_0.2.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_MeDucer_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_MeDucer name = 0.2mm Nozzle version = 4 -definition = geeetech_MeDucer [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/geeetech_variants/geeetech_MeDucer_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeDucer_0.3.inst.cfg index f5febb1217..b6b5984b9c 100644 --- a/resources/variants/geeetech_variants/geeetech_MeDucer_0.3.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_MeDucer_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_MeDucer name = 0.3mm Nozzle version = 4 -definition = geeetech_MeDucer [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/geeetech_variants/geeetech_MeDucer_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeDucer_0.4.inst.cfg index cf6dcfb4ee..76f1a300b2 100644 --- a/resources/variants/geeetech_variants/geeetech_MeDucer_0.4.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_MeDucer_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_MeDucer name = 0.4mm Nozzle version = 4 -definition = geeetech_MeDucer [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/geeetech_variants/geeetech_MeDucer_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeDucer_0.5.inst.cfg index fa1938da75..4f300d6b4f 100644 --- a/resources/variants/geeetech_variants/geeetech_MeDucer_0.5.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_MeDucer_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_MeDucer name = 0.5mm Nozzle version = 4 -definition = geeetech_MeDucer [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/geeetech_variants/geeetech_MeDucer_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeDucer_0.6.inst.cfg index a6cd26da56..b689dcb89b 100644 --- a/resources/variants/geeetech_variants/geeetech_MeDucer_0.6.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_MeDucer_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_MeDucer name = 0.6mm Nozzle version = 4 -definition = geeetech_MeDucer [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/geeetech_variants/geeetech_MeDucer_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeDucer_0.8.inst.cfg index 9b49fca060..271c26dfc4 100644 --- a/resources/variants/geeetech_variants/geeetech_MeDucer_0.8.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_MeDucer_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_MeDucer name = 0.8mm Nozzle version = 4 -definition = geeetech_MeDucer [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/geeetech_variants/geeetech_MeDucer_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeDucer_1.0.inst.cfg index 47f526a9fa..1f28b152f8 100644 --- a/resources/variants/geeetech_variants/geeetech_MeDucer_1.0.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_MeDucer_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_MeDucer name = 1.0mm Nozzle version = 4 -definition = geeetech_MeDucer [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/geeetech_variants/geeetech_MizarMax_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarMax_0.2.inst.cfg index 46e3df1963..d21a33f196 100644 --- a/resources/variants/geeetech_variants/geeetech_MizarMax_0.2.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_MizarMax_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_MizarMax name = 0.2mm Nozzle version = 4 -definition = geeetech_MizarMax [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/geeetech_variants/geeetech_MizarMax_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarMax_0.3.inst.cfg index 6eba484b45..dcd3cb36a5 100644 --- a/resources/variants/geeetech_variants/geeetech_MizarMax_0.3.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_MizarMax_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_MizarMax name = 0.3mm Nozzle version = 4 -definition = geeetech_MizarMax [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/geeetech_variants/geeetech_MizarMax_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarMax_0.4.inst.cfg index aedfbba397..777416c7a7 100644 --- a/resources/variants/geeetech_variants/geeetech_MizarMax_0.4.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_MizarMax_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_MizarMax name = 0.4mm Nozzle version = 4 -definition = geeetech_MizarMax [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/geeetech_variants/geeetech_MizarMax_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarMax_0.5.inst.cfg index da8c73b800..028aa61c60 100644 --- a/resources/variants/geeetech_variants/geeetech_MizarMax_0.5.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_MizarMax_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_MizarMax name = 0.5mm Nozzle version = 4 -definition = geeetech_MizarMax [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/geeetech_variants/geeetech_MizarMax_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarMax_0.6.inst.cfg index 0c05ed2c47..584ab2729d 100644 --- a/resources/variants/geeetech_variants/geeetech_MizarMax_0.6.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_MizarMax_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_MizarMax name = 0.6mm Nozzle version = 4 -definition = geeetech_MizarMax [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/geeetech_variants/geeetech_MizarMax_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarMax_0.8.inst.cfg index 19a523686e..d44b4cb333 100644 --- a/resources/variants/geeetech_variants/geeetech_MizarMax_0.8.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_MizarMax_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_MizarMax name = 0.8mm Nozzle version = 4 -definition = geeetech_MizarMax [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/geeetech_variants/geeetech_MizarMax_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarMax_1.0.inst.cfg index 838816bfa3..25570aae27 100644 --- a/resources/variants/geeetech_variants/geeetech_MizarMax_1.0.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_MizarMax_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_MizarMax name = 1.0mm Nozzle version = 4 -definition = geeetech_MizarMax [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/geeetech_variants/geeetech_MizarPro_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarPro_0.2.inst.cfg index 168d96c0e7..ce3bcdfe3e 100644 --- a/resources/variants/geeetech_variants/geeetech_MizarPro_0.2.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_MizarPro_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_MizarPro name = 0.2mm Nozzle version = 4 -definition = geeetech_MizarPro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/geeetech_variants/geeetech_MizarPro_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarPro_0.3.inst.cfg index e608cd0520..5607a70f96 100644 --- a/resources/variants/geeetech_variants/geeetech_MizarPro_0.3.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_MizarPro_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_MizarPro name = 0.3mm Nozzle version = 4 -definition = geeetech_MizarPro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/geeetech_variants/geeetech_MizarPro_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarPro_0.4.inst.cfg index 07865035e4..14d4c40a22 100644 --- a/resources/variants/geeetech_variants/geeetech_MizarPro_0.4.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_MizarPro_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_MizarPro name = 0.4mm Nozzle version = 4 -definition = geeetech_MizarPro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/geeetech_variants/geeetech_MizarPro_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarPro_0.5.inst.cfg index d5c4f94752..ac28de5b0c 100644 --- a/resources/variants/geeetech_variants/geeetech_MizarPro_0.5.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_MizarPro_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_MizarPro name = 0.5mm Nozzle version = 4 -definition = geeetech_MizarPro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/geeetech_variants/geeetech_MizarPro_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarPro_0.6.inst.cfg index 8aca8f5c7b..bb61ce74f5 100644 --- a/resources/variants/geeetech_variants/geeetech_MizarPro_0.6.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_MizarPro_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_MizarPro name = 0.6mm Nozzle version = 4 -definition = geeetech_MizarPro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/geeetech_variants/geeetech_MizarPro_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarPro_0.8.inst.cfg index 0fc1c2a72a..a41cfc34f8 100644 --- a/resources/variants/geeetech_variants/geeetech_MizarPro_0.8.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_MizarPro_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_MizarPro name = 0.8mm Nozzle version = 4 -definition = geeetech_MizarPro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/geeetech_variants/geeetech_MizarPro_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarPro_1.0.inst.cfg index 4117d4e7f0..8f7f9e7a50 100644 --- a/resources/variants/geeetech_variants/geeetech_MizarPro_1.0.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_MizarPro_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_MizarPro name = 1.0mm Nozzle version = 4 -definition = geeetech_MizarPro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/geeetech_variants/geeetech_MizarS_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarS_0.2.inst.cfg index 282a840126..76b1786f7b 100644 --- a/resources/variants/geeetech_variants/geeetech_MizarS_0.2.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_MizarS_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_MizarS name = 0.2mm Nozzle version = 4 -definition = geeetech_MizarS [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/geeetech_variants/geeetech_MizarS_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarS_0.3.inst.cfg index 4033375477..e5c739886a 100644 --- a/resources/variants/geeetech_variants/geeetech_MizarS_0.3.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_MizarS_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_MizarS name = 0.3mm Nozzle version = 4 -definition = geeetech_MizarS [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/geeetech_variants/geeetech_MizarS_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarS_0.4.inst.cfg index 7eaffac17d..36ed7a163b 100644 --- a/resources/variants/geeetech_variants/geeetech_MizarS_0.4.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_MizarS_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_MizarS name = 0.4mm Nozzle version = 4 -definition = geeetech_MizarS [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/geeetech_variants/geeetech_MizarS_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarS_0.5.inst.cfg index 932a271175..aa613c7969 100644 --- a/resources/variants/geeetech_variants/geeetech_MizarS_0.5.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_MizarS_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_MizarS name = 0.5mm Nozzle version = 4 -definition = geeetech_MizarS [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/geeetech_variants/geeetech_MizarS_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarS_0.6.inst.cfg index 0e850b4a4e..e773157dac 100644 --- a/resources/variants/geeetech_variants/geeetech_MizarS_0.6.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_MizarS_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_MizarS name = 0.6mm Nozzle version = 4 -definition = geeetech_MizarS [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/geeetech_variants/geeetech_MizarS_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarS_0.8.inst.cfg index 41c3b8bf90..333eb2446e 100644 --- a/resources/variants/geeetech_variants/geeetech_MizarS_0.8.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_MizarS_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_MizarS name = 0.8mm Nozzle version = 4 -definition = geeetech_MizarS [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/geeetech_variants/geeetech_MizarS_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarS_1.0.inst.cfg index 664229e644..71582e9473 100644 --- a/resources/variants/geeetech_variants/geeetech_MizarS_1.0.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_MizarS_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_MizarS name = 1.0mm Nozzle version = 4 -definition = geeetech_MizarS [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/geeetech_variants/geeetech_Mizar_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_Mizar_0.2.inst.cfg index 8b0b86f92d..c137a471c8 100644 --- a/resources/variants/geeetech_variants/geeetech_Mizar_0.2.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_Mizar_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_Mizar name = 0.2mm Nozzle version = 4 -definition = geeetech_Mizar [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/geeetech_variants/geeetech_Mizar_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_Mizar_0.3.inst.cfg index 8621a8a578..b5dfa3afa0 100644 --- a/resources/variants/geeetech_variants/geeetech_Mizar_0.3.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_Mizar_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_Mizar name = 0.3mm Nozzle version = 4 -definition = geeetech_Mizar [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/geeetech_variants/geeetech_Mizar_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_Mizar_0.4.inst.cfg index dbc65e777f..70419eece2 100644 --- a/resources/variants/geeetech_variants/geeetech_Mizar_0.4.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_Mizar_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_Mizar name = 0.4mm Nozzle version = 4 -definition = geeetech_Mizar [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/geeetech_variants/geeetech_Mizar_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_Mizar_0.5.inst.cfg index 514d9c0d5b..bc728d2fd9 100644 --- a/resources/variants/geeetech_variants/geeetech_Mizar_0.5.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_Mizar_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_Mizar name = 0.5mm Nozzle version = 4 -definition = geeetech_Mizar [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/geeetech_variants/geeetech_Mizar_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_Mizar_0.6.inst.cfg index 1d2289ed94..2a6962a962 100644 --- a/resources/variants/geeetech_variants/geeetech_Mizar_0.6.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_Mizar_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_Mizar name = 0.6mm Nozzle version = 4 -definition = geeetech_Mizar [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/geeetech_variants/geeetech_Mizar_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_Mizar_0.8.inst.cfg index 08f107c725..52a88d5984 100644 --- a/resources/variants/geeetech_variants/geeetech_Mizar_0.8.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_Mizar_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_Mizar name = 0.8mm Nozzle version = 4 -definition = geeetech_Mizar [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/geeetech_variants/geeetech_Mizar_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_Mizar_1.0.inst.cfg index 2608b2d4f6..920262d551 100644 --- a/resources/variants/geeetech_variants/geeetech_Mizar_1.0.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_Mizar_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_Mizar name = 1.0mm Nozzle version = 4 -definition = geeetech_Mizar [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/geeetech_variants/geeetech_Thunder_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_Thunder_0.2.inst.cfg index efcf9ea3c6..6c6f5ca2a6 100644 --- a/resources/variants/geeetech_variants/geeetech_Thunder_0.2.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_Thunder_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_Thunder name = 0.2mm Nozzle version = 4 -definition = geeetech_Thunder [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/geeetech_variants/geeetech_Thunder_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_Thunder_0.3.inst.cfg index 2ae1381068..4a13f8db49 100644 --- a/resources/variants/geeetech_variants/geeetech_Thunder_0.3.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_Thunder_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_Thunder name = 0.3mm Nozzle version = 4 -definition = geeetech_Thunder [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/geeetech_variants/geeetech_Thunder_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_Thunder_0.4.inst.cfg index c83a143f1a..a106d17329 100644 --- a/resources/variants/geeetech_variants/geeetech_Thunder_0.4.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_Thunder_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_Thunder name = 0.4mm Nozzle version = 4 -definition = geeetech_Thunder [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/geeetech_variants/geeetech_Thunder_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_Thunder_0.5.inst.cfg index 2ac58f4ff7..54cdc1a17b 100644 --- a/resources/variants/geeetech_variants/geeetech_Thunder_0.5.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_Thunder_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_Thunder name = 0.5mm Nozzle version = 4 -definition = geeetech_Thunder [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/geeetech_variants/geeetech_Thunder_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_Thunder_0.6.inst.cfg index b9c4673121..99295e5f17 100644 --- a/resources/variants/geeetech_variants/geeetech_Thunder_0.6.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_Thunder_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_Thunder name = 0.6mm Nozzle version = 4 -definition = geeetech_Thunder [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/geeetech_variants/geeetech_Thunder_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_Thunder_0.8.inst.cfg index 3ac746efa3..4d0e5b7ab6 100644 --- a/resources/variants/geeetech_variants/geeetech_Thunder_0.8.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_Thunder_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_Thunder name = 0.8mm Nozzle version = 4 -definition = geeetech_Thunder [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/geeetech_variants/geeetech_Thunder_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_Thunder_1.0.inst.cfg index 4380bfed1c..547976d730 100644 --- a/resources/variants/geeetech_variants/geeetech_Thunder_1.0.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_Thunder_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = geeetech_Thunder name = 1.0mm Nozzle version = 4 -definition = geeetech_Thunder [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + From ffb59b28942f78b7d709a545f564e7b9bfb4d75f Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Wed, 14 Dec 2022 17:44:08 +0100 Subject: [PATCH 121/124] Move width, height properties to top of component CURA-9793 --- resources/qml/ExtruderIcon.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/qml/ExtruderIcon.qml b/resources/qml/ExtruderIcon.qml index 93c5adf55a..3231d924ee 100644 --- a/resources/qml/ExtruderIcon.qml +++ b/resources/qml/ExtruderIcon.qml @@ -47,14 +47,14 @@ Item UM.Label { id: extruderNumberText + width: contentWidth + height: contentHeight anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left anchors.right: parent.right horizontalAlignment: Text.AlignHCenter text: (index + 1).toString() font: UM.Theme.getFont("small_emphasis") - width: contentWidth - height: contentHeight } } } From f6d18266e61ae08a29fd5e5003acfbf4a09fb660 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Thu, 15 Dec 2022 13:37:28 +0100 Subject: [PATCH 122/124] Give the default settings pannel a max-height CURA-9793 --- .../qml/PrintSetupSelector/PrintSetupSelectorContents.qml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml b/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml index 52a22c6c76..05407e6e0e 100644 --- a/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml +++ b/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml @@ -69,7 +69,8 @@ Item visible: currentModeIndex == PrintSetupSelectorContents.Mode.Recommended height: { const height = base.height - (customPrintSetup.mapToItem(null, 0, 0).y + buttonRow.height + UM.Theme.getSize("default_margin").height); - return Math.min(implicitHeight, height); + const maxHeight = UM.Preferences.getValue("view/settings_list_height"); + return Math.min(implicitHeight, height, maxHeight); } function onModeChanged() From ce191611f75770f079fcee7ba9d881a768251a53 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Fri, 16 Dec 2022 08:36:14 +0100 Subject: [PATCH 123/124] Only run on relevant changes --- .github/workflows/printer-linter-format.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/printer-linter-format.yml b/.github/workflows/printer-linter-format.yml index df4e049755..e5e1b5b1d6 100644 --- a/.github/workflows/printer-linter-format.yml +++ b/.github/workflows/printer-linter-format.yml @@ -3,7 +3,11 @@ name: printer-linter-format on: push: paths: - - 'resources/**' + - 'resources/definitions/**' + - 'resources/extruders/**' + - 'resources/intent/**' + - 'resources/quality/**' + - 'resources/variants/**' jobs: printer-linter-format: From 340e03327ec35c5d25f9b02202f996d0a22f7cca Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Fri, 16 Dec 2022 13:04:14 +0100 Subject: [PATCH 124/124] Use raw literal for paths Fixes Windows backwards backslash issue --- UltiMaker-Cura.spec.jinja | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/UltiMaker-Cura.spec.jinja b/UltiMaker-Cura.spec.jinja index 74e4fd098b..5eb01845c1 100644 --- a/UltiMaker-Cura.spec.jinja +++ b/UltiMaker-Cura.spec.jinja @@ -16,9 +16,9 @@ datas += tmp_ret[0]; binaries += tmp_ret[1]; hiddenimports += tmp_ret[2] # Add dynamic libs in the venv bin/Script Path. This is needed because we might copy some additional libs # e.q.: OpenSSL 1.1.1l in that directory with a separate: # `conan install openssl@1.1.1l -g deploy && cp openssl/bin/*.so cura_inst/bin` -binaries.extend([(str(bin), ".") for bin in Path("{{ venv_script_path }}").glob("*.so*")]) -binaries.extend([(str(bin), ".") for bin in Path("{{ venv_script_path }}").glob("*.dll")]) -binaries.extend([(str(bin), ".") for bin in Path("{{ venv_script_path }}").glob("*.dylib")]) +binaries.extend([(str(bin), ".") for bin in Path(r"{{ venv_script_path }}").glob("*.so*")]) +binaries.extend([(str(bin), ".") for bin in Path(r"{{ venv_script_path }}").glob("*.dll")]) +binaries.extend([(str(bin), ".") for bin in Path(r"{{ venv_script_path }}").glob("*.dylib")]) block_cipher = None