GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-22 05:39:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mb-shared-heater' of https://github.com/smartavionics/Cura

Browse Source
This commit is contained in:
Jaime van Kessel 2019-11-14 11:06:12 +01:00
commit c65ccf29b0
No known key found for this signature in database
GPG Key ID: 3710727397403C91
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml
View File

@ -331,6 +331,18 @@ Item
onGlobalContainerChanged: extruderCountModel.update() 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
}
} }
} }

14
resources/definitions/fdmprinter.def.json
View File

@ -387,6 +387,16 @@
"settable_per_extruder": false, "settable_per_extruder": false,
"settable_per_meshgroup": 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": "machine_disallowed_areas":
{ {
"label": "Disallowed Areas", "label": "Disallowed Areas",
@ -2172,7 +2182,7 @@
"minimum_value": "-273.15", "minimum_value": "-273.15",
"minimum_value_warning": "material_standby_temperature", "minimum_value_warning": "material_standby_temperature",
"maximum_value_warning": "material_print_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_mesh": false,
"settable_per_extruder": true "settable_per_extruder": true
}, },
@ -2187,7 +2197,7 @@
"minimum_value": "-273.15", "minimum_value": "-273.15",
"minimum_value_warning": "material_standby_temperature", "minimum_value_warning": "material_standby_temperature",
"maximum_value_warning": "material_print_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_mesh": false,
"settable_per_extruder": true "settable_per_extruder": true
}, },