diff options
| author | Jaime van Kessel <nallath@gmail.com> | 2019-11-14 13:06:12 +0300 |
|---|---|---|
| committer | Jaime van Kessel <nallath@gmail.com> | 2019-11-14 13:06:12 +0300 |
| commit | c65ccf29b0e849de76f773d4e3a79024d12038d2 (patch) | |
| tree | 8e5fc5fda47700a9127e7316e1e0cc8c4517ce3e | |
| parent | ebea5fbd1413e94d5b1b98ad0af77c836d2c3a27 (diff) | |
| parent | 5163c8f983bda76101b0800a9c695a60dae614d8 (diff) | |
Merge branch 'mb-shared-heater' of https://github.com/smartavionics/Cura
| -rw-r--r-- | plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml | 12 | ||||
| -rw-r--r-- | resources/definitions/fdmprinter.def.json | 14 |
2 files changed, 24 insertions, 2 deletions
diff --git a/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml b/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml index 21d2f978cb..3780d6447b 100644 --- a/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml +++ b/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml @@ -331,6 +331,18 @@ Item onGlobalContainerChanged: extruderCountModel.update() } } + + Cura.SimpleCheckBox // "Shared Heater" + { + id: sharedHeaterCheckBox + containerStackId: machineStackId + settingKey: "machine_extruders_share_heater" + settingStoreIndex: propertyStoreIndex + labelText: catalog.i18nc("@label", "Shared Heater") + labelFont: base.labelFont + labelWidth: base.labelWidth + forceUpdateOnChangeFunction: forceUpdateFunction + } } } diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 2df14c4948..6a5163384e 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -387,6 +387,16 @@ "settable_per_extruder": false, "settable_per_meshgroup": false }, + "machine_extruders_share_heater": + { + "label": "Extruders Share Heater", + "description": "Whether the extruders share a single heater rather than each extruder having its own heater.", + "type": "bool", + "default_value": false, + "settable_per_mesh": false, + "settable_per_extruder": false, + "settable_per_meshgroup": false + }, "machine_disallowed_areas": { "label": "Disallowed Areas", @@ -2172,7 +2182,7 @@ "minimum_value": "-273.15", "minimum_value_warning": "material_standby_temperature", "maximum_value_warning": "material_print_temperature", - "enabled": "machine_nozzle_temp_enabled", + "enabled": "machine_nozzle_temp_enabled and not machine_extruders_share_heater", "settable_per_mesh": false, "settable_per_extruder": true }, @@ -2187,7 +2197,7 @@ "minimum_value": "-273.15", "minimum_value_warning": "material_standby_temperature", "maximum_value_warning": "material_print_temperature", - "enabled": "machine_nozzle_temp_enabled", + "enabled": "machine_nozzle_temp_enabled and not machine_extruders_share_heater", "settable_per_mesh": false, "settable_per_extruder": true }, |