3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 22:35:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch 'feature_temp_disable'

Browse source
This commit is contained in:
Ghostkeeper 2017-03-06 16:51:59 +01:00
commit 37e7971b81
2 changed files with 29 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

38
resources/definitions/fdmprinter.def.json
View file

@ -93,6 +93,7 @@
"description": "Whether to wait until the nozzle temperature is reached at the start.",
"default_value": true,
"type": "bool",
"enabled": "machine_nozzle_temp_enabled",
"settable_per_mesh": false,
"settable_per_extruder": false,
"settable_per_meshgroup": false
@ -103,6 +104,7 @@
"description": "Whether to include nozzle temperature commands at the start of the gcode. When the start_gcode already contains nozzle temperature commands Cura frontend will automatically disable this setting.",
"default_value": true,
"type": "bool",
"enabled": "machine_nozzle_temp_enabled",
"settable_per_mesh": false,
"settable_per_extruder": false,
"settable_per_meshgroup": false
@ -249,6 +251,17 @@
"settable_per_extruder": true,
"settable_per_meshgroup": false
},
"machine_nozzle_temp_enabled":
{
"label": "Enable Nozzle Temperature Control",
"description": "Whether to control temperature from Cura. Turn this off to control nozzle temperature from outside of Cura.",
"default_value": true,
"value": "machine_gcode_flavor != \"UltiGCode\"",
"type": "bool",
"settable_per_mesh": false,
"settable_per_extruder": true,
"settable_per_meshgroup": false
},
"machine_nozzle_heat_up_speed":
{
"label": "Heat up speed",
@ -256,6 +269,7 @@
"default_value": 2.0,
"unit": "°C/s",
"type": "float",
"enabled": "machine_nozzle_temp_enabled",
"settable_per_mesh": false,
"settable_per_extruder": true
},
@ -266,6 +280,7 @@
"default_value": 2.0,
"unit": "°C/s",
"type": "float",
"enabled": "machine_nozzle_temp_enabled",
"settable_per_mesh": false,
"settable_per_extruder": true
},
@ -276,6 +291,7 @@
"default_value": 50.0,
"unit": "s",
"type": "float",
"enabled": "machine_nozzle_temp_enabled",
"settable_per_mesh": false,
"settable_per_extruder": true
},
@ -1346,7 +1362,7 @@
"description": "Change the temperature for each layer automatically with the average flow speed of that layer.",
"type": "bool",
"default_value": false,
"enabled": "False",
"enabled": "machine_nozzle_temp_enabled and False",
"settable_per_mesh": false,
"settable_per_extruder": true
},
@ -1359,14 +1375,14 @@
"default_value": 210,
"minimum_value_warning": "0",
"maximum_value_warning": "285",
"enabled": false,
"enabled": "machine_nozzle_temp_enabled",
"settable_per_extruder": true,
"minimum_value": "-273.15"
},
"material_print_temperature":
{
"label": "Printing Temperature",
"description": "The temperature used for printing. If this is 0, the extruder will not heat up for this print.",
"description": "The temperature used for printing.",
"unit": "°C",
"type": "float",
"default_value": 210,
@ -1374,7 +1390,7 @@
"minimum_value": "-273.15",
"minimum_value_warning": "0",
"maximum_value_warning": "285",
"enabled": "not (material_flow_dependent_temperature) and machine_gcode_flavor != \"UltiGCode\"",
"enabled": "machine_nozzle_temp_enabled and not (material_flow_dependent_temperature)",
"settable_per_mesh": false,
"settable_per_extruder": true
},
@ -1389,7 +1405,7 @@
"minimum_value": "-273.15",
"minimum_value_warning": "0",
"maximum_value_warning": "285",
"enabled": "machine_gcode_flavor != \"UltiGCode\"",
"enabled": "machine_nozzle_temp_enabled",
"settable_per_mesh": false,
"settable_per_extruder": true
},
@ -1404,7 +1420,7 @@
"minimum_value": "-273.15",
"minimum_value_warning": "material_standby_temperature",
"maximum_value_warning": "material_print_temperature",
"enabled": "machine_gcode_flavor != \"UltiGCode\"",
"enabled": "machine_nozzle_temp_enabled",
"settable_per_mesh": false,
"settable_per_extruder": true
},
@ -1419,7 +1435,7 @@
"minimum_value": "-273.15",
"minimum_value_warning": "material_standby_temperature",
"maximum_value_warning": "material_print_temperature",
"enabled": "machine_gcode_flavor != \"UltiGCode\"",
"enabled": "machine_nozzle_temp_enabled",
"settable_per_mesh": false,
"settable_per_extruder": true
},
@ -1430,8 +1446,7 @@
"unit": "[[mm³,°C]]",
"type": "str",
"default_value": "[[3.5,200],[7.0,240]]",
"enabled": "False",
"comments": "old enabled function: material_flow_dependent_temperature",
"enabled": "False and machine_nozzle_temp_enabled and material_flow_dependent_temperature",
"settable_per_mesh": false,
"settable_per_extruder": true
},
@ -1445,8 +1460,7 @@
"minimum_value": "0",
"maximum_value_warning": "10.0",
"maximum_value": "machine_nozzle_heat_up_speed",
"enabled": "False",
"comments": "old enabled function: material_flow_dependent_temperature or machine_extruder_count > 1",
"enabled": "material_flow_dependent_temperature or (machine_extruder_count > 1 and material_final_print_temperature != material_print_temperature)",
"settable_per_mesh": false,
"settable_per_extruder": true
},
@ -1653,7 +1667,7 @@
"minimum_value": "-273.15",
"minimum_value_warning": "0",
"maximum_value_warning": "260",
"enabled": "machine_extruder_count > 1 and machine_gcode_flavor != \"UltiGCode\"",
"enabled": "machine_extruder_count > 1 and machine_nozzle_temp_enabled",
"settable_per_mesh": false,
"settable_per_extruder": true
},

3
resources/definitions/ultimaker2.def.json
View file

@ -100,6 +100,9 @@
},
"machine_acceleration": {
"default_value": 3000
},
"machine_nozzle_temp_enabled": {
"default_value": false
}
}
}