From c4573ba8552be04fce8596e0234e22b1a60f91cd Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Mon, 13 Nov 2023 10:46:44 +0100 Subject: [PATCH 1/3] Add extruder start/end gcode duration settings CURA-11099 --- .../MachineSettingsExtruderTab.qml | 28 +++++++++++++++++++ resources/definitions/fdmextruder.def.json | 22 +++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml b/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml index dc1a479be9..5e1ddc2f3f 100644 --- a/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml +++ b/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml @@ -139,6 +139,34 @@ Item decimals: 0 forceUpdateOnChangeFunction: forceUpdateFunction } + + Cura.NumericTextFieldWithUnit + { + id: extruderStartCodeDurationFieldId + containerStackId: base.extruderStackId + settingKey: "machine_extruder_start_code_duration" + settingStoreIndex: propertyStoreIndex + labelText: catalog.i18nc("@label", "Extruder Start G-code duration") + labelFont: base.labelFont + labelWidth: base.labelWidth + controlWidth: base.controlWidth + unitText: catalog.i18nc("@label", "s") + forceUpdateOnChangeFunction: forceUpdateFunction + } + + Cura.NumericTextFieldWithUnit + { + id: extruderEndCodeDurationFieldId + containerStackId: base.extruderStackId + settingKey: "machine_extruder_end_code_duration" + settingStoreIndex: propertyStoreIndex + labelText: catalog.i18nc("@label", "Extruder End G-code duration") + labelFont: base.labelFont + labelWidth: base.labelWidth + controlWidth: base.controlWidth + unitText: catalog.i18nc("@label", "s") + forceUpdateOnChangeFunction: forceUpdateFunction + } } } diff --git a/resources/definitions/fdmextruder.def.json b/resources/definitions/fdmextruder.def.json index d79a0cb045..43b76c20e2 100644 --- a/resources/definitions/fdmextruder.def.json +++ b/resources/definitions/fdmextruder.def.json @@ -62,6 +62,17 @@ "settable_per_meshgroup": false, "type": "str" }, + "machine_extruder_end_code_duration": { + "default_value": 0, + "description": "Duration it takes to execute the end g-code when switching away from this extruder.", + "label": "Extruder End G-Code Duration", + "minimum_value": "0", + "settable_globally": false, + "settable_per_extruder": true, + "settable_per_mesh": false, + "settable_per_meshgroup": false, + "type": "float" + }, "machine_extruder_end_pos_abs": { "default_value": false, @@ -108,6 +119,17 @@ "settable_per_meshgroup": false, "type": "str" }, + "machine_extruder_start_code_duration": { + "default_value": 0, + "description": "Duration it takes to execute the start g-code to when switching away from this extruder.", + "label": "Extruder Start G-Code Duration", + "minimum_value": "0", + "settable_globally": false, + "settable_per_extruder": true, + "settable_per_mesh": false, + "settable_per_meshgroup": false, + "type": "float" + }, "machine_extruder_start_pos_abs": { "default_value": false, From d56b77db37050306a4e1e9f982c76791730326cd Mon Sep 17 00:00:00 2001 From: casperlamboo Date: Mon, 13 Nov 2023 09:49:14 +0000 Subject: [PATCH 2/3] Applied printer-linter format --- resources/definitions/fdmextruder.def.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/resources/definitions/fdmextruder.def.json b/resources/definitions/fdmextruder.def.json index 43b76c20e2..f7cbfc5a2c 100644 --- a/resources/definitions/fdmextruder.def.json +++ b/resources/definitions/fdmextruder.def.json @@ -62,7 +62,8 @@ "settable_per_meshgroup": false, "type": "str" }, - "machine_extruder_end_code_duration": { + "machine_extruder_end_code_duration": + { "default_value": 0, "description": "Duration it takes to execute the end g-code when switching away from this extruder.", "label": "Extruder End G-Code Duration", @@ -119,7 +120,8 @@ "settable_per_meshgroup": false, "type": "str" }, - "machine_extruder_start_code_duration": { + "machine_extruder_start_code_duration": + { "default_value": 0, "description": "Duration it takes to execute the start g-code to when switching away from this extruder.", "label": "Extruder Start G-Code Duration", From 2c1f0fc58fcb6b6bd491d0acf6cb7a52a5c22bb5 Mon Sep 17 00:00:00 2001 From: Casper Lamboo Date: Tue, 14 Nov 2023 14:42:44 +0100 Subject: [PATCH 3/3] Apply suggestions from code review Co-authored-by: Remco Burema <41987080+rburema@users.noreply.github.com> --- resources/definitions/fdmextruder.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/fdmextruder.def.json b/resources/definitions/fdmextruder.def.json index f7cbfc5a2c..006a6eac52 100644 --- a/resources/definitions/fdmextruder.def.json +++ b/resources/definitions/fdmextruder.def.json @@ -65,7 +65,7 @@ "machine_extruder_end_code_duration": { "default_value": 0, - "description": "Duration it takes to execute the end g-code when switching away from this extruder.", + "description": "The time it takes to execute the end g-code, when switching away from this extruder.", "label": "Extruder End G-Code Duration", "minimum_value": "0", "settable_globally": false, @@ -123,7 +123,7 @@ "machine_extruder_start_code_duration": { "default_value": 0, - "description": "Duration it takes to execute the start g-code to when switching away from this extruder.", + "description": "The time it'll take to execute the start g-code, when switching to this extruder.", "label": "Extruder Start G-Code Duration", "minimum_value": "0", "settable_globally": false,