From 3bb782fd5f0bb7bb05856634e5f80c6fd3ee47bc Mon Sep 17 00:00:00 2001 From: "Justin F. Hallett" Date: Fri, 5 Jul 2024 09:52:28 -0600 Subject: [PATCH 1/6] Add 3 New UI Settings - Add UI to set `machine_start_gcode_first` so that no gcode is adding infront of the start_gcode. - Add float input box to set `machine_extruder_change_duration` which added proper extruder change times to the estimated print time. - Add textbox to set `machine_extruder_prestart_code` to add gcodes that will run pre extruder change, things like heat up so we are at change before with pick up the next extruder. --- plugins/CuraEngineBackend/StartSliceJob.py | 1 + .../MachineSettingsExtruderTab.qml | 74 ++++++++++++++++--- .../MachineSettingsPrinterTab.qml | 15 ++++ resources/definitions/fdmextruder.def.json | 25 ++++++- resources/definitions/fdmprinter.def.json | 12 ++- 5 files changed, 115 insertions(+), 12 deletions(-) diff --git a/plugins/CuraEngineBackend/StartSliceJob.py b/plugins/CuraEngineBackend/StartSliceJob.py index 9caadbdff69..894c5669fce 100644 --- a/plugins/CuraEngineBackend/StartSliceJob.py +++ b/plugins/CuraEngineBackend/StartSliceJob.py @@ -518,6 +518,7 @@ def _buildExtruderMessage(self, stack: ContainerStack) -> None: # Replace the setting tokens in start and end g-code. extruder_nr = stack.getProperty("extruder_nr", "value") + settings["machine_extruder_prestart_code"] = self._expandGcodeTokens(settings["machine_extruder_prestart_code"], extruder_nr) settings["machine_extruder_start_code"] = self._expandGcodeTokens(settings["machine_extruder_start_code"], extruder_nr) settings["machine_extruder_end_code"] = self._expandGcodeTokens(settings["machine_extruder_end_code"], extruder_nr) diff --git a/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml b/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml index 5e1ddc2f3f0..15b507480c9 100644 --- a/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml +++ b/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml @@ -54,7 +54,7 @@ Item { anchors.top: parent.top anchors.left: parent.left - width: parent.width * 2 / 3 + width: parent.width / 2 spacing: base.columnSpacing @@ -139,6 +139,39 @@ Item decimals: 0 forceUpdateOnChangeFunction: forceUpdateFunction } + } + + + // ======================================= + // Right-side column "Nozzle Settings" + // ======================================= + Column + { + anchors.top: parent.top + anchors.right: parent.right + width: parent.width / 2 + + spacing: base.columnSpacing + + UM.Label // Title Label + { + text: catalog.i18nc("@title:label", " ") + font: UM.Theme.getFont("medium_bold") + } + + Cura.NumericTextFieldWithUnit + { + id: extruderChangeDurationFieldId + containerStackId: base.extruderStackId + settingKey: "machine_extruder_change_duration" + settingStoreIndex: propertyStoreIndex + labelText: catalog.i18nc("@label", "Extruder Change duration") + labelFont: base.labelFont + labelWidth: base.labelWidth + controlWidth: base.controlWidth + unitText: catalog.i18nc("@label", "s") + forceUpdateOnChangeFunction: forceUpdateFunction + } Cura.NumericTextFieldWithUnit { @@ -179,25 +212,46 @@ Item anchors.right: parent.right anchors.margins: UM.Theme.getSize("default_margin").width - Cura.GcodeTextArea // "Extruder Start G-code" + Column { anchors.top: parent.top - anchors.bottom: parent.bottom - anchors.bottomMargin: UM.Theme.getSize("default_margin").height anchors.left: parent.left - width: base.columnWidth - UM.Theme.getSize("default_margin").width + anchors.bottom: parent.bottom + width: parent.width / 2 - labelText: catalog.i18nc("@title:label", "Extruder Start G-code") - containerStackId: base.extruderStackId - settingKey: "machine_extruder_start_code" - settingStoreIndex: propertyStoreIndex + spacing: base.columnSpacing + + Cura.GcodeTextArea // "Extruder Prestart G-code" + { + anchors.top: parent.top + anchors.left: parent.left + height: (parent.height / 2) - UM.Theme.getSize("default_margin").height + width: base.columnWidth - UM.Theme.getSize("default_margin").width + + labelText: catalog.i18nc("@title:label", "Extruder Prestart G-code") + containerStackId: base.extruderStackId + settingKey: "machine_extruder_prestart_code" + settingStoreIndex: propertyStoreIndex + } + + Cura.GcodeTextArea // "Extruder Start G-code" + { + anchors.bottom: parent.bottom + anchors.left: parent.left + height: (parent.height / 2) - UM.Theme.getSize("default_margin").height + width: base.columnWidth - UM.Theme.getSize("default_margin").width + + labelText: catalog.i18nc("@title:label", "Extruder Start G-code") + containerStackId: base.extruderStackId + settingKey: "machine_extruder_start_code" + settingStoreIndex: propertyStoreIndex + } } Cura.GcodeTextArea // "Extruder End G-code" { anchors.top: parent.top anchors.bottom: parent.bottom - anchors.bottomMargin: UM.Theme.getSize("default_margin").height anchors.right: parent.right width: base.columnWidth - UM.Theme.getSize("default_margin").width diff --git a/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml b/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml index 740e2488282..e57c28ddc87 100644 --- a/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml +++ b/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml @@ -344,6 +344,21 @@ Item labelWidth: base.labelWidth forceUpdateOnChangeFunction: forceUpdateFunction } + + /* + - Allows user to toggle if Start Gcode is the absolute first gcode. + */ + Cura.SimpleCheckBox // "Make sure Start Code is before all gcodes" + { + id: applyStartGcodeFirstCheckbox + containerStackId: machineStackId + settingKey: "machine_start_gcode_first" + settingStoreIndex: propertyStoreIndex + labelText: catalog.i18nc("@label", "Start GCode must be first") + labelFont: base.labelFont + labelWidth: base.labelWidth + forceUpdateOnChangeFunction: forceUpdateFunction + } /* The "Shared Heater" feature is temporarily disabled because its diff --git a/resources/definitions/fdmextruder.def.json b/resources/definitions/fdmextruder.def.json index f60cf63360f..cb42948d6b8 100644 --- a/resources/definitions/fdmextruder.def.json +++ b/resources/definitions/fdmextruder.def.json @@ -109,6 +109,17 @@ "type": "float", "unit": "mm" }, + "machine_extruder_prestart_code": + { + "default_value": "", + "description": "Prestart g-code to execute before switching to this extruder.", + "label": "Extruder Prestart G-Code", + "settable_globally": false, + "settable_per_extruder": true, + "settable_per_mesh": false, + "settable_per_meshgroup": false, + "type": "str" + }, "machine_extruder_start_code": { "default_value": "", @@ -120,6 +131,18 @@ "settable_per_meshgroup": false, "type": "str" }, + "machine_extruder_change_duration": + { + "default_value": 0, + "description": "When using a multi tool setup, this value is the tool change time in seconds. This value will be added to the estimate time based on the number of changes that occur.", + "label": "Extruder Change duration", + "minimum_value": "0", + "settable_globally": false, + "settable_per_extruder": true, + "settable_per_mesh": false, + "settable_per_meshgroup": false, + "type": "float" + }, "machine_extruder_start_code_duration": { "default_value": 0, @@ -278,4 +301,4 @@ "type": "category" } } -} \ No newline at end of file +} diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 64196b9f8bf..304a36a4704 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -511,6 +511,16 @@ "settable_per_extruder": false, "settable_per_meshgroup": false }, + "machine_start_gcode_first": + { + "label": "Start GCode must be first", + "description": "This setting controls if the start-gcode is forced to always be the first g-code. Without this option other g-code, such as a T0 can be inserted before the start g-code.", + "type": "bool", + "default_value": false, + "settable_per_mesh": false, + "settable_per_extruder": false, + "settable_per_meshgroup": false + }, "extruder_prime_pos_z": { "label": "Extruder Prime Z Position", @@ -8961,4 +8971,4 @@ } } } -} \ No newline at end of file +} From 0667e4b3a116bdaa311054814ec86f66bba850fe Mon Sep 17 00:00:00 2001 From: "Justin F. Hallett" Date: Sat, 10 Aug 2024 13:14:49 -0600 Subject: [PATCH 2/6] Add new defaults for Stealthchanger to make use of the new settings, NOT WORKING --- resources/definitions/voron2_stealthchanger_base.def.json | 5 +++-- .../extruders/voron2_stealthchanger_extruder_0.def.json | 8 +++++--- .../extruders/voron2_stealthchanger_extruder_1.def.json | 8 +++++--- .../extruders/voron2_stealthchanger_extruder_2.def.json | 8 +++++--- .../extruders/voron2_stealthchanger_extruder_3.def.json | 8 +++++--- .../extruders/voron2_stealthchanger_extruder_4.def.json | 8 +++++--- .../extruders/voron2_stealthchanger_extruder_5.def.json | 8 +++++--- .../extruders/voron2_stealthchanger_extruder_6.def.json | 8 +++++--- .../extruders/voron2_stealthchanger_extruder_7.def.json | 8 +++++--- 9 files changed, 43 insertions(+), 26 deletions(-) diff --git a/resources/definitions/voron2_stealthchanger_base.def.json b/resources/definitions/voron2_stealthchanger_base.def.json index e1db1d24c3d..16024667831 100644 --- a/resources/definitions/voron2_stealthchanger_base.def.json +++ b/resources/definitions/voron2_stealthchanger_base.def.json @@ -1,5 +1,5 @@ { - "version": 2, + "version": 3, "name": "Voron2 StealthChanger Base", "inherits": "voron2_base", "metadata": @@ -24,6 +24,7 @@ "machine_end_gcode": { "default_value": "PRINT_END" }, "machine_extruder_count": { "default_value": 1 }, "machine_name": { "default_value": "VORON2 StealthChanger" }, + "machine_start_gcode_first": { "default_value": true }, "machine_start_gcode": { "default_value": "PRINT_START TOOL_TEMP={material_print_temperature_layer_0} T{initial_extruder_nr}_TEMP={material_print_temperature_layer_0} BED_TEMP={material_bed_temperature_layer_0} TOOL={initial_extruder_nr}" } } -} \ No newline at end of file +} diff --git a/resources/extruders/voron2_stealthchanger_extruder_0.def.json b/resources/extruders/voron2_stealthchanger_extruder_0.def.json index 55ddf8f90b5..d0ef7cff8c3 100644 --- a/resources/extruders/voron2_stealthchanger_extruder_0.def.json +++ b/resources/extruders/voron2_stealthchanger_extruder_0.def.json @@ -1,5 +1,5 @@ { - "version": 2, + "version": 3, "name": "Toolhead 0", "inherits": "fdmextruder", "metadata": @@ -20,6 +20,8 @@ "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, - "material_diameter": { "default_value": 1.75 } + "material_diameter": { "default_value": 1.75 }, + "machine_extruder_change_duration": { "default_value": 10.0 }, + "machine_extruder_prestart_code": { "default_value": "M104 S{material_print_temperature} T{extruder_nr}" } } -} \ No newline at end of file +} diff --git a/resources/extruders/voron2_stealthchanger_extruder_1.def.json b/resources/extruders/voron2_stealthchanger_extruder_1.def.json index ad299669608..8e842e7c19f 100644 --- a/resources/extruders/voron2_stealthchanger_extruder_1.def.json +++ b/resources/extruders/voron2_stealthchanger_extruder_1.def.json @@ -1,5 +1,5 @@ { - "version": 2, + "version": 3, "name": "Toolhead 1", "inherits": "fdmextruder", "metadata": @@ -20,6 +20,8 @@ "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, - "material_diameter": { "default_value": 1.75 } + "material_diameter": { "default_value": 1.75 }, + "machine_extruder_change_duration": { "default_value": 10.0 }, + "machine_extruder_prestart_code": { "default_value": "M104 S{material_print_temperature} T{extruder_nr}" } } -} \ No newline at end of file +} diff --git a/resources/extruders/voron2_stealthchanger_extruder_2.def.json b/resources/extruders/voron2_stealthchanger_extruder_2.def.json index ec3b6ff3a98..9d2cdace3f3 100644 --- a/resources/extruders/voron2_stealthchanger_extruder_2.def.json +++ b/resources/extruders/voron2_stealthchanger_extruder_2.def.json @@ -1,5 +1,5 @@ { - "version": 2, + "version": 3, "name": "Toolhead 2", "inherits": "fdmextruder", "metadata": @@ -20,6 +20,8 @@ "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, - "material_diameter": { "default_value": 1.75 } + "material_diameter": { "default_value": 1.75 }, + "machine_extruder_change_duration": { "default_value": 10.0 }, + "machine_extruder_prestart_code": { "default_value": "M104 S{material_print_temperature} T{extruder_nr}" } } -} \ No newline at end of file +} diff --git a/resources/extruders/voron2_stealthchanger_extruder_3.def.json b/resources/extruders/voron2_stealthchanger_extruder_3.def.json index dfaa249e5d5..16113cc78ec 100644 --- a/resources/extruders/voron2_stealthchanger_extruder_3.def.json +++ b/resources/extruders/voron2_stealthchanger_extruder_3.def.json @@ -1,5 +1,5 @@ { - "version": 2, + "version": 3, "name": "Toolhead 3", "inherits": "fdmextruder", "metadata": @@ -20,6 +20,8 @@ "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, - "material_diameter": { "default_value": 1.75 } + "material_diameter": { "default_value": 1.75 }, + "machine_extruder_change_duration": { "default_value": 10.0 }, + "machine_extruder_prestart_code": { "default_value": "M104 S{material_print_temperature} T{extruder_nr}" } } -} \ No newline at end of file +} diff --git a/resources/extruders/voron2_stealthchanger_extruder_4.def.json b/resources/extruders/voron2_stealthchanger_extruder_4.def.json index eeb6fbbe601..d82127128d6 100644 --- a/resources/extruders/voron2_stealthchanger_extruder_4.def.json +++ b/resources/extruders/voron2_stealthchanger_extruder_4.def.json @@ -1,5 +1,5 @@ { - "version": 2, + "version": 3, "name": "Toolhead 4", "inherits": "fdmextruder", "metadata": @@ -20,6 +20,8 @@ "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, - "material_diameter": { "default_value": 1.75 } + "material_diameter": { "default_value": 1.75 }, + "machine_extruder_change_duration": { "default_value": 10.0 }, + "machine_extruder_prestart_code": { "default_value": "M104 S{material_print_temperature} T{extruder_nr}" } } -} \ No newline at end of file +} diff --git a/resources/extruders/voron2_stealthchanger_extruder_5.def.json b/resources/extruders/voron2_stealthchanger_extruder_5.def.json index 61e05b69456..9b4fb223352 100644 --- a/resources/extruders/voron2_stealthchanger_extruder_5.def.json +++ b/resources/extruders/voron2_stealthchanger_extruder_5.def.json @@ -1,5 +1,5 @@ { - "version": 2, + "version": 3, "name": "Toolhead 5", "inherits": "fdmextruder", "metadata": @@ -20,6 +20,8 @@ "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, - "material_diameter": { "default_value": 1.75 } + "material_diameter": { "default_value": 1.75 }, + "machine_extruder_change_duration": { "default_value": 10.0 }, + "machine_extruder_prestart_code": { "default_value": "M104 S{material_print_temperature} T{extruder_nr}" } } -} \ No newline at end of file +} diff --git a/resources/extruders/voron2_stealthchanger_extruder_6.def.json b/resources/extruders/voron2_stealthchanger_extruder_6.def.json index 3b3f614ae76..261c40e937c 100644 --- a/resources/extruders/voron2_stealthchanger_extruder_6.def.json +++ b/resources/extruders/voron2_stealthchanger_extruder_6.def.json @@ -1,5 +1,5 @@ { - "version": 2, + "version": 3, "name": "Toolhead 6", "inherits": "fdmextruder", "metadata": @@ -20,6 +20,8 @@ "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, - "material_diameter": { "default_value": 1.75 } + "material_diameter": { "default_value": 1.75 }, + "machine_extruder_change_duration": { "default_value": 10.0 }, + "machine_extruder_prestart_code": { "default_value": "M104 S{material_print_temperature} T{extruder_nr}" } } -} \ No newline at end of file +} diff --git a/resources/extruders/voron2_stealthchanger_extruder_7.def.json b/resources/extruders/voron2_stealthchanger_extruder_7.def.json index 071cd5d0644..33e62552216 100644 --- a/resources/extruders/voron2_stealthchanger_extruder_7.def.json +++ b/resources/extruders/voron2_stealthchanger_extruder_7.def.json @@ -1,5 +1,5 @@ { - "version": 2, + "version": 3, "name": "Toolhead 7", "inherits": "fdmextruder", "metadata": @@ -20,6 +20,8 @@ "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, - "material_diameter": { "default_value": 1.75 } + "material_diameter": { "default_value": 1.75 }, + "machine_extruder_change_duration": { "default_value": 10.0 }, + "machine_extruder_prestart_code": { "default_value": "M104 S{material_print_temperature} T{extruder_nr}" } } -} \ No newline at end of file +} From d6b94dd9d0451f5d28e40dc48600d31e9ab71706 Mon Sep 17 00:00:00 2001 From: TheSin- Date: Sat, 10 Aug 2024 19:15:39 +0000 Subject: [PATCH 3/6] Applied printer-linter format --- resources/definitions/voron2_stealthchanger_base.def.json | 6 +++--- .../extruders/voron2_stealthchanger_extruder_0.def.json | 8 ++++---- .../extruders/voron2_stealthchanger_extruder_1.def.json | 8 ++++---- .../extruders/voron2_stealthchanger_extruder_2.def.json | 8 ++++---- .../extruders/voron2_stealthchanger_extruder_3.def.json | 8 ++++---- .../extruders/voron2_stealthchanger_extruder_4.def.json | 8 ++++---- .../extruders/voron2_stealthchanger_extruder_5.def.json | 8 ++++---- .../extruders/voron2_stealthchanger_extruder_6.def.json | 8 ++++---- .../extruders/voron2_stealthchanger_extruder_7.def.json | 8 ++++---- 9 files changed, 35 insertions(+), 35 deletions(-) diff --git a/resources/definitions/voron2_stealthchanger_base.def.json b/resources/definitions/voron2_stealthchanger_base.def.json index 16024667831..f1bf4425a69 100644 --- a/resources/definitions/voron2_stealthchanger_base.def.json +++ b/resources/definitions/voron2_stealthchanger_base.def.json @@ -24,7 +24,7 @@ "machine_end_gcode": { "default_value": "PRINT_END" }, "machine_extruder_count": { "default_value": 1 }, "machine_name": { "default_value": "VORON2 StealthChanger" }, - "machine_start_gcode_first": { "default_value": true }, - "machine_start_gcode": { "default_value": "PRINT_START TOOL_TEMP={material_print_temperature_layer_0} T{initial_extruder_nr}_TEMP={material_print_temperature_layer_0} BED_TEMP={material_bed_temperature_layer_0} TOOL={initial_extruder_nr}" } + "machine_start_gcode": { "default_value": "PRINT_START TOOL_TEMP={material_print_temperature_layer_0} T{initial_extruder_nr}_TEMP={material_print_temperature_layer_0} BED_TEMP={material_bed_temperature_layer_0} TOOL={initial_extruder_nr}" }, + "machine_start_gcode_first": { "default_value": true } } -} +} \ No newline at end of file diff --git a/resources/extruders/voron2_stealthchanger_extruder_0.def.json b/resources/extruders/voron2_stealthchanger_extruder_0.def.json index d0ef7cff8c3..6ca8e4e019b 100644 --- a/resources/extruders/voron2_stealthchanger_extruder_0.def.json +++ b/resources/extruders/voron2_stealthchanger_extruder_0.def.json @@ -14,14 +14,14 @@ "default_value": 0, "maximum_value": 7 }, + "machine_extruder_change_duration": { "default_value": 10.0 }, "machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, + "machine_extruder_prestart_code": { "default_value": "M104 S{material_print_temperature} T{extruder_nr}" }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, - "material_diameter": { "default_value": 1.75 }, - "machine_extruder_change_duration": { "default_value": 10.0 }, - "machine_extruder_prestart_code": { "default_value": "M104 S{material_print_temperature} T{extruder_nr}" } + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/voron2_stealthchanger_extruder_1.def.json b/resources/extruders/voron2_stealthchanger_extruder_1.def.json index 8e842e7c19f..be41a84303c 100644 --- a/resources/extruders/voron2_stealthchanger_extruder_1.def.json +++ b/resources/extruders/voron2_stealthchanger_extruder_1.def.json @@ -14,14 +14,14 @@ "default_value": 1, "maximum_value": 7 }, + "machine_extruder_change_duration": { "default_value": 10.0 }, "machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, + "machine_extruder_prestart_code": { "default_value": "M104 S{material_print_temperature} T{extruder_nr}" }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, - "material_diameter": { "default_value": 1.75 }, - "machine_extruder_change_duration": { "default_value": 10.0 }, - "machine_extruder_prestart_code": { "default_value": "M104 S{material_print_temperature} T{extruder_nr}" } + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/voron2_stealthchanger_extruder_2.def.json b/resources/extruders/voron2_stealthchanger_extruder_2.def.json index 9d2cdace3f3..09851b2c263 100644 --- a/resources/extruders/voron2_stealthchanger_extruder_2.def.json +++ b/resources/extruders/voron2_stealthchanger_extruder_2.def.json @@ -14,14 +14,14 @@ "default_value": 2, "maximum_value": 7 }, + "machine_extruder_change_duration": { "default_value": 10.0 }, "machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, + "machine_extruder_prestart_code": { "default_value": "M104 S{material_print_temperature} T{extruder_nr}" }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, - "material_diameter": { "default_value": 1.75 }, - "machine_extruder_change_duration": { "default_value": 10.0 }, - "machine_extruder_prestart_code": { "default_value": "M104 S{material_print_temperature} T{extruder_nr}" } + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/voron2_stealthchanger_extruder_3.def.json b/resources/extruders/voron2_stealthchanger_extruder_3.def.json index 16113cc78ec..b54beef5d43 100644 --- a/resources/extruders/voron2_stealthchanger_extruder_3.def.json +++ b/resources/extruders/voron2_stealthchanger_extruder_3.def.json @@ -14,14 +14,14 @@ "default_value": 3, "maximum_value": 7 }, + "machine_extruder_change_duration": { "default_value": 10.0 }, "machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, + "machine_extruder_prestart_code": { "default_value": "M104 S{material_print_temperature} T{extruder_nr}" }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, - "material_diameter": { "default_value": 1.75 }, - "machine_extruder_change_duration": { "default_value": 10.0 }, - "machine_extruder_prestart_code": { "default_value": "M104 S{material_print_temperature} T{extruder_nr}" } + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/voron2_stealthchanger_extruder_4.def.json b/resources/extruders/voron2_stealthchanger_extruder_4.def.json index d82127128d6..4b3c624ed4b 100644 --- a/resources/extruders/voron2_stealthchanger_extruder_4.def.json +++ b/resources/extruders/voron2_stealthchanger_extruder_4.def.json @@ -14,14 +14,14 @@ "default_value": 4, "maximum_value": 7 }, + "machine_extruder_change_duration": { "default_value": 10.0 }, "machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, + "machine_extruder_prestart_code": { "default_value": "M104 S{material_print_temperature} T{extruder_nr}" }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, - "material_diameter": { "default_value": 1.75 }, - "machine_extruder_change_duration": { "default_value": 10.0 }, - "machine_extruder_prestart_code": { "default_value": "M104 S{material_print_temperature} T{extruder_nr}" } + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/voron2_stealthchanger_extruder_5.def.json b/resources/extruders/voron2_stealthchanger_extruder_5.def.json index 9b4fb223352..3bafcf840b4 100644 --- a/resources/extruders/voron2_stealthchanger_extruder_5.def.json +++ b/resources/extruders/voron2_stealthchanger_extruder_5.def.json @@ -14,14 +14,14 @@ "default_value": 5, "maximum_value": 7 }, + "machine_extruder_change_duration": { "default_value": 10.0 }, "machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, + "machine_extruder_prestart_code": { "default_value": "M104 S{material_print_temperature} T{extruder_nr}" }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, - "material_diameter": { "default_value": 1.75 }, - "machine_extruder_change_duration": { "default_value": 10.0 }, - "machine_extruder_prestart_code": { "default_value": "M104 S{material_print_temperature} T{extruder_nr}" } + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/voron2_stealthchanger_extruder_6.def.json b/resources/extruders/voron2_stealthchanger_extruder_6.def.json index 261c40e937c..ab2162d7888 100644 --- a/resources/extruders/voron2_stealthchanger_extruder_6.def.json +++ b/resources/extruders/voron2_stealthchanger_extruder_6.def.json @@ -14,14 +14,14 @@ "default_value": 6, "maximum_value": 7 }, + "machine_extruder_change_duration": { "default_value": 10.0 }, "machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, + "machine_extruder_prestart_code": { "default_value": "M104 S{material_print_temperature} T{extruder_nr}" }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, - "material_diameter": { "default_value": 1.75 }, - "machine_extruder_change_duration": { "default_value": 10.0 }, - "machine_extruder_prestart_code": { "default_value": "M104 S{material_print_temperature} T{extruder_nr}" } + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/voron2_stealthchanger_extruder_7.def.json b/resources/extruders/voron2_stealthchanger_extruder_7.def.json index 33e62552216..f4775f446b6 100644 --- a/resources/extruders/voron2_stealthchanger_extruder_7.def.json +++ b/resources/extruders/voron2_stealthchanger_extruder_7.def.json @@ -14,14 +14,14 @@ "default_value": 7, "maximum_value": 7 }, + "machine_extruder_change_duration": { "default_value": 10.0 }, "machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, + "machine_extruder_prestart_code": { "default_value": "M104 S{material_print_temperature} T{extruder_nr}" }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, - "material_diameter": { "default_value": 1.75 }, - "machine_extruder_change_duration": { "default_value": 10.0 }, - "machine_extruder_prestart_code": { "default_value": "M104 S{material_print_temperature} T{extruder_nr}" } + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file From d896dd56b5e7cb931c36eb0dc0eb3affaa827d3a Mon Sep 17 00:00:00 2001 From: TheSin- Date: Sat, 10 Aug 2024 21:24:47 +0000 Subject: [PATCH 4/6] Applied printer-linter format --- resources/definitions/fdmextruder.def.json | 26 +++++++++++----------- resources/definitions/fdmprinter.def.json | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/resources/definitions/fdmextruder.def.json b/resources/definitions/fdmextruder.def.json index dc7929f090a..fa87157ef6e 100644 --- a/resources/definitions/fdmextruder.def.json +++ b/resources/definitions/fdmextruder.def.json @@ -39,6 +39,18 @@ "type": "float", "unit": "mm" }, + "machine_extruder_change_duration": + { + "default_value": 0, + "description": "When using a multi tool setup, this value is the tool change time in seconds. This value will be added to the estimate time based on the number of changes that occur.", + "label": "Extruder Change duration", + "minimum_value": "0", + "settable_globally": false, + "settable_per_extruder": true, + "settable_per_mesh": false, + "settable_per_meshgroup": false, + "type": "float" + }, "machine_extruder_cooling_fan_number": { "default_value": 0, @@ -131,18 +143,6 @@ "settable_per_meshgroup": false, "type": "str" }, - "machine_extruder_change_duration": - { - "default_value": 0, - "description": "When using a multi tool setup, this value is the tool change time in seconds. This value will be added to the estimate time based on the number of changes that occur.", - "label": "Extruder Change duration", - "minimum_value": "0", - "settable_globally": false, - "settable_per_extruder": true, - "settable_per_mesh": false, - "settable_per_meshgroup": false, - "type": "float" - }, "machine_extruder_start_code_duration": { "default_value": 0, @@ -312,4 +312,4 @@ "type": "category" } } -} +} \ No newline at end of file diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 0adb64b16f4..1231910b37d 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -9003,4 +9003,4 @@ } } } -} +} \ No newline at end of file From c2bbeecea642634031b467034bd64d1c34298398 Mon Sep 17 00:00:00 2001 From: "Justin F. Hallett" Date: Sat, 10 Aug 2024 16:05:00 -0600 Subject: [PATCH 5/6] Misunderstood what version meant here --- resources/definitions/voron2_stealthchanger_base.def.json | 4 ++-- resources/extruders/voron2_stealthchanger_extruder_0.def.json | 4 ++-- resources/extruders/voron2_stealthchanger_extruder_1.def.json | 4 ++-- resources/extruders/voron2_stealthchanger_extruder_2.def.json | 4 ++-- resources/extruders/voron2_stealthchanger_extruder_3.def.json | 4 ++-- resources/extruders/voron2_stealthchanger_extruder_4.def.json | 4 ++-- resources/extruders/voron2_stealthchanger_extruder_5.def.json | 4 ++-- resources/extruders/voron2_stealthchanger_extruder_6.def.json | 4 ++-- resources/extruders/voron2_stealthchanger_extruder_7.def.json | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/resources/definitions/voron2_stealthchanger_base.def.json b/resources/definitions/voron2_stealthchanger_base.def.json index f1bf4425a69..eb1c30f2202 100644 --- a/resources/definitions/voron2_stealthchanger_base.def.json +++ b/resources/definitions/voron2_stealthchanger_base.def.json @@ -1,5 +1,5 @@ { - "version": 3, + "version": 2, "name": "Voron2 StealthChanger Base", "inherits": "voron2_base", "metadata": @@ -27,4 +27,4 @@ "machine_start_gcode": { "default_value": "PRINT_START TOOL_TEMP={material_print_temperature_layer_0} T{initial_extruder_nr}_TEMP={material_print_temperature_layer_0} BED_TEMP={material_bed_temperature_layer_0} TOOL={initial_extruder_nr}" }, "machine_start_gcode_first": { "default_value": true } } -} \ No newline at end of file +} diff --git a/resources/extruders/voron2_stealthchanger_extruder_0.def.json b/resources/extruders/voron2_stealthchanger_extruder_0.def.json index 6ca8e4e019b..1a845f1e451 100644 --- a/resources/extruders/voron2_stealthchanger_extruder_0.def.json +++ b/resources/extruders/voron2_stealthchanger_extruder_0.def.json @@ -1,5 +1,5 @@ { - "version": 3, + "version": 2, "name": "Toolhead 0", "inherits": "fdmextruder", "metadata": @@ -24,4 +24,4 @@ "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, "material_diameter": { "default_value": 1.75 } } -} \ No newline at end of file +} diff --git a/resources/extruders/voron2_stealthchanger_extruder_1.def.json b/resources/extruders/voron2_stealthchanger_extruder_1.def.json index be41a84303c..b9d5918f7dd 100644 --- a/resources/extruders/voron2_stealthchanger_extruder_1.def.json +++ b/resources/extruders/voron2_stealthchanger_extruder_1.def.json @@ -1,5 +1,5 @@ { - "version": 3, + "version": 2, "name": "Toolhead 1", "inherits": "fdmextruder", "metadata": @@ -24,4 +24,4 @@ "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, "material_diameter": { "default_value": 1.75 } } -} \ No newline at end of file +} diff --git a/resources/extruders/voron2_stealthchanger_extruder_2.def.json b/resources/extruders/voron2_stealthchanger_extruder_2.def.json index 09851b2c263..dfec372f94e 100644 --- a/resources/extruders/voron2_stealthchanger_extruder_2.def.json +++ b/resources/extruders/voron2_stealthchanger_extruder_2.def.json @@ -1,5 +1,5 @@ { - "version": 3, + "version": 2, "name": "Toolhead 2", "inherits": "fdmextruder", "metadata": @@ -24,4 +24,4 @@ "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, "material_diameter": { "default_value": 1.75 } } -} \ No newline at end of file +} diff --git a/resources/extruders/voron2_stealthchanger_extruder_3.def.json b/resources/extruders/voron2_stealthchanger_extruder_3.def.json index b54beef5d43..b5e19ae7a3f 100644 --- a/resources/extruders/voron2_stealthchanger_extruder_3.def.json +++ b/resources/extruders/voron2_stealthchanger_extruder_3.def.json @@ -1,5 +1,5 @@ { - "version": 3, + "version": 2, "name": "Toolhead 3", "inherits": "fdmextruder", "metadata": @@ -24,4 +24,4 @@ "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, "material_diameter": { "default_value": 1.75 } } -} \ No newline at end of file +} diff --git a/resources/extruders/voron2_stealthchanger_extruder_4.def.json b/resources/extruders/voron2_stealthchanger_extruder_4.def.json index 4b3c624ed4b..532d3f7ba10 100644 --- a/resources/extruders/voron2_stealthchanger_extruder_4.def.json +++ b/resources/extruders/voron2_stealthchanger_extruder_4.def.json @@ -1,5 +1,5 @@ { - "version": 3, + "version": 2, "name": "Toolhead 4", "inherits": "fdmextruder", "metadata": @@ -24,4 +24,4 @@ "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, "material_diameter": { "default_value": 1.75 } } -} \ No newline at end of file +} diff --git a/resources/extruders/voron2_stealthchanger_extruder_5.def.json b/resources/extruders/voron2_stealthchanger_extruder_5.def.json index 3bafcf840b4..8181a1d2b6c 100644 --- a/resources/extruders/voron2_stealthchanger_extruder_5.def.json +++ b/resources/extruders/voron2_stealthchanger_extruder_5.def.json @@ -1,5 +1,5 @@ { - "version": 3, + "version": 2, "name": "Toolhead 5", "inherits": "fdmextruder", "metadata": @@ -24,4 +24,4 @@ "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, "material_diameter": { "default_value": 1.75 } } -} \ No newline at end of file +} diff --git a/resources/extruders/voron2_stealthchanger_extruder_6.def.json b/resources/extruders/voron2_stealthchanger_extruder_6.def.json index ab2162d7888..1958c2e2a00 100644 --- a/resources/extruders/voron2_stealthchanger_extruder_6.def.json +++ b/resources/extruders/voron2_stealthchanger_extruder_6.def.json @@ -1,5 +1,5 @@ { - "version": 3, + "version": 2, "name": "Toolhead 6", "inherits": "fdmextruder", "metadata": @@ -24,4 +24,4 @@ "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, "material_diameter": { "default_value": 1.75 } } -} \ No newline at end of file +} diff --git a/resources/extruders/voron2_stealthchanger_extruder_7.def.json b/resources/extruders/voron2_stealthchanger_extruder_7.def.json index f4775f446b6..ae2662cee57 100644 --- a/resources/extruders/voron2_stealthchanger_extruder_7.def.json +++ b/resources/extruders/voron2_stealthchanger_extruder_7.def.json @@ -1,5 +1,5 @@ { - "version": 3, + "version": 2, "name": "Toolhead 7", "inherits": "fdmextruder", "metadata": @@ -24,4 +24,4 @@ "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, "material_diameter": { "default_value": 1.75 } } -} \ No newline at end of file +} From ef8559cec2b5638e5c1ba660e2f94c8b2d12eeda Mon Sep 17 00:00:00 2001 From: TheSin- Date: Sat, 10 Aug 2024 22:05:47 +0000 Subject: [PATCH 6/6] Applied printer-linter format --- resources/definitions/voron2_stealthchanger_base.def.json | 2 +- resources/extruders/voron2_stealthchanger_extruder_0.def.json | 2 +- resources/extruders/voron2_stealthchanger_extruder_1.def.json | 2 +- resources/extruders/voron2_stealthchanger_extruder_2.def.json | 2 +- resources/extruders/voron2_stealthchanger_extruder_3.def.json | 2 +- resources/extruders/voron2_stealthchanger_extruder_4.def.json | 2 +- resources/extruders/voron2_stealthchanger_extruder_5.def.json | 2 +- resources/extruders/voron2_stealthchanger_extruder_6.def.json | 2 +- resources/extruders/voron2_stealthchanger_extruder_7.def.json | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/resources/definitions/voron2_stealthchanger_base.def.json b/resources/definitions/voron2_stealthchanger_base.def.json index eb1c30f2202..3fccc15db3b 100644 --- a/resources/definitions/voron2_stealthchanger_base.def.json +++ b/resources/definitions/voron2_stealthchanger_base.def.json @@ -27,4 +27,4 @@ "machine_start_gcode": { "default_value": "PRINT_START TOOL_TEMP={material_print_temperature_layer_0} T{initial_extruder_nr}_TEMP={material_print_temperature_layer_0} BED_TEMP={material_bed_temperature_layer_0} TOOL={initial_extruder_nr}" }, "machine_start_gcode_first": { "default_value": true } } -} +} \ No newline at end of file diff --git a/resources/extruders/voron2_stealthchanger_extruder_0.def.json b/resources/extruders/voron2_stealthchanger_extruder_0.def.json index 1a845f1e451..e3f8cd07016 100644 --- a/resources/extruders/voron2_stealthchanger_extruder_0.def.json +++ b/resources/extruders/voron2_stealthchanger_extruder_0.def.json @@ -24,4 +24,4 @@ "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/voron2_stealthchanger_extruder_1.def.json b/resources/extruders/voron2_stealthchanger_extruder_1.def.json index b9d5918f7dd..b6338a38f59 100644 --- a/resources/extruders/voron2_stealthchanger_extruder_1.def.json +++ b/resources/extruders/voron2_stealthchanger_extruder_1.def.json @@ -24,4 +24,4 @@ "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/voron2_stealthchanger_extruder_2.def.json b/resources/extruders/voron2_stealthchanger_extruder_2.def.json index dfec372f94e..f101cdaf689 100644 --- a/resources/extruders/voron2_stealthchanger_extruder_2.def.json +++ b/resources/extruders/voron2_stealthchanger_extruder_2.def.json @@ -24,4 +24,4 @@ "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/voron2_stealthchanger_extruder_3.def.json b/resources/extruders/voron2_stealthchanger_extruder_3.def.json index b5e19ae7a3f..1011910025c 100644 --- a/resources/extruders/voron2_stealthchanger_extruder_3.def.json +++ b/resources/extruders/voron2_stealthchanger_extruder_3.def.json @@ -24,4 +24,4 @@ "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/voron2_stealthchanger_extruder_4.def.json b/resources/extruders/voron2_stealthchanger_extruder_4.def.json index 532d3f7ba10..35170fdb0b0 100644 --- a/resources/extruders/voron2_stealthchanger_extruder_4.def.json +++ b/resources/extruders/voron2_stealthchanger_extruder_4.def.json @@ -24,4 +24,4 @@ "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/voron2_stealthchanger_extruder_5.def.json b/resources/extruders/voron2_stealthchanger_extruder_5.def.json index 8181a1d2b6c..4f8471d50f7 100644 --- a/resources/extruders/voron2_stealthchanger_extruder_5.def.json +++ b/resources/extruders/voron2_stealthchanger_extruder_5.def.json @@ -24,4 +24,4 @@ "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/voron2_stealthchanger_extruder_6.def.json b/resources/extruders/voron2_stealthchanger_extruder_6.def.json index 1958c2e2a00..7a58e80f8b1 100644 --- a/resources/extruders/voron2_stealthchanger_extruder_6.def.json +++ b/resources/extruders/voron2_stealthchanger_extruder_6.def.json @@ -24,4 +24,4 @@ "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/voron2_stealthchanger_extruder_7.def.json b/resources/extruders/voron2_stealthchanger_extruder_7.def.json index ae2662cee57..196f6607d6b 100644 --- a/resources/extruders/voron2_stealthchanger_extruder_7.def.json +++ b/resources/extruders/voron2_stealthchanger_extruder_7.def.json @@ -24,4 +24,4 @@ "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file