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

Merge branch 'feature_extruder_temp_layer_0'

Browse Source
This commit is contained in:
Ghostkeeper 2016-11-08 14:46:15 +01:00
commit 59fb0bc739
No known key found for this signature in database
GPG Key ID: C5F96EE2BC0F7E75
2 changed files with 11 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1148,7 +1148,7 @@
"minimum_value": "-273.15", "minimum_value": "-273.15",
"minimum_value_warning": "0", "minimum_value_warning": "0",
"maximum_value_warning": "260", "maximum_value_warning": "260",
"enabled": "not (material_flow_dependent_temperature)", "enabled": "not (material_flow_dependent_temperature) and machine_gcode_flavor != \"UltiGCode\"",
"settable_per_mesh": false, "settable_per_mesh": false,
"settable_per_extruder": true "settable_per_extruder": true
}, },
@ -1163,7 +1163,7 @@
"minimum_value": "-273.15", "minimum_value": "-273.15",
"minimum_value_warning": "0", "minimum_value_warning": "0",
"maximum_value_warning": "260", "maximum_value_warning": "260",
"enabled": "not (material_flow_dependent_temperature)", "enabled": "machine_gcode_flavor != \"UltiGCode\"",
"settable_per_mesh": false, "settable_per_mesh": false,
"settable_per_extruder": true "settable_per_extruder": true
}, },
@ -1204,7 +1204,7 @@
"minimum_value": "-273.15", "minimum_value": "-273.15",
"minimum_value_warning": "0", "minimum_value_warning": "0",
"maximum_value_warning": "260", "maximum_value_warning": "260",
"enabled": "machine_heated_bed", "enabled": "machine_heated_bed and machine_gcode_flavor != \"UltiGCode\"",
"settable_per_mesh": false, "settable_per_mesh": false,
"settable_per_extruder": false, "settable_per_extruder": false,
"settable_per_meshgroup": false "settable_per_meshgroup": false
@ -1220,7 +1220,7 @@
"minimum_value": "-273.15", "minimum_value": "-273.15",
"minimum_value_warning": "0", "minimum_value_warning": "0",
"maximum_value_warning": "260", "maximum_value_warning": "260",
"enabled": "machine_heated_bed", "enabled": "machine_heated_bed and machine_gcode_flavor != \"UltiGCode\"",
"settable_per_mesh": false, "settable_per_mesh": false,
"settable_per_extruder": false, "settable_per_extruder": false,
"settable_per_meshgroup": false "settable_per_meshgroup": false
@ -1235,6 +1235,7 @@
"minimum_value": "0.0001", "minimum_value": "0.0001",
"minimum_value_warning": "0.4", "minimum_value_warning": "0.4",
"maximum_value_warning": "3.5", "maximum_value_warning": "3.5",
"enabled": "machine_gcode_flavor != \"UltiGCode\"",
"settable_per_mesh": false, "settable_per_mesh": false,
"settable_per_extruder": true "settable_per_extruder": true
}, },
@ -1248,6 +1249,7 @@
"minimum_value": "5", "minimum_value": "5",
"minimum_value_warning": "50", "minimum_value_warning": "50",
"maximum_value_warning": "150", "maximum_value_warning": "150",
"enabled": "machine_gcode_flavor != \"UltiGCode\"",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"retraction_enable": "retraction_enable":
@ -1268,7 +1270,7 @@
"default_value": 6.5, "default_value": 6.5,
"minimum_value_warning": "-0.0001", "minimum_value_warning": "-0.0001",
"maximum_value_warning": "10.0", "maximum_value_warning": "10.0",
"enabled": "retraction_enable", "enabled": "retraction_enable and machine_gcode_flavor != \"UltiGCode\"",
"settable_per_mesh": false, "settable_per_mesh": false,
"settable_per_extruder": true "settable_per_extruder": true
}, },
@ -1283,7 +1285,7 @@
"minimum_value_warning": "1", "minimum_value_warning": "1",
"maximum_value": "machine_max_feedrate_e", "maximum_value": "machine_max_feedrate_e",
"maximum_value_warning": "70", "maximum_value_warning": "70",
"enabled": "retraction_enable", "enabled": "retraction_enable and machine_gcode_flavor != \"UltiGCode\"",
"settable_per_mesh": false, "settable_per_mesh": false,
"settable_per_extruder": true, "settable_per_extruder": true,
"children": "children":
@ -1299,7 +1301,7 @@
"maximum_value": "machine_max_feedrate_e", "maximum_value": "machine_max_feedrate_e",
"minimum_value_warning": "1", "minimum_value_warning": "1",
"maximum_value_warning": "70", "maximum_value_warning": "70",
"enabled": "retraction_enable", "enabled": "retraction_enable and machine_gcode_flavor != \"UltiGCode\"",
"value": "retraction_speed", "value": "retraction_speed",
"settable_per_mesh": false, "settable_per_mesh": false,
"settable_per_extruder": true "settable_per_extruder": true
@ -1315,7 +1317,7 @@
"maximum_value": "machine_max_feedrate_e", "maximum_value": "machine_max_feedrate_e",
"minimum_value_warning": "1", "minimum_value_warning": "1",
"maximum_value_warning": "70", "maximum_value_warning": "70",
"enabled": "retraction_enable", "enabled": "retraction_enable and machine_gcode_flavor != \"UltiGCode\"",
"value": "retraction_speed", "value": "retraction_speed",
"settable_per_mesh": false, "settable_per_mesh": false,
"settable_per_extruder": true "settable_per_extruder": true
@ -1385,6 +1387,7 @@
"minimum_value": "-273.15", "minimum_value": "-273.15",
"minimum_value_warning": "0", "minimum_value_warning": "0",
"maximum_value_warning": "260", "maximum_value_warning": "260",
"enabled": "machine_extruder_count > 1 and machine_gcode_flavor != \"UltiGCode\"",
"settable_per_mesh": false, "settable_per_mesh": false,
"settable_per_extruder": true "settable_per_extruder": true
}, },

24
resources/definitions/ultimaker2.def.json
View File

@ -86,12 +86,6 @@
"machine_nozzle_expansion_angle": { "machine_nozzle_expansion_angle": {
"default_value": 45 "default_value": 45
}, },
"material_print_temperature": {
"enabled": "not (material_flow_dependent_temperature) and machine_gcode_flavor != \"UltiGCode\""
},
"material_bed_temperature": {
"enabled": "machine_heated_bed and machine_gcode_flavor != \"UltiGCode\""
},
"machine_max_feedrate_x": { "machine_max_feedrate_x": {
"default_value": 300 "default_value": 300
}, },
@ -106,24 +100,6 @@
}, },
"machine_acceleration": { "machine_acceleration": {
"default_value": 3000 "default_value": 3000
},
"material_diameter": {
"enabled": "machine_gcode_flavor != \"UltiGCode\""
},
"material_flow": {
"enabled": "machine_gcode_flavor != \"UltiGCode\""
},
"retraction_amount": {
"enabled": "retraction_enable and machine_gcode_flavor != \"UltiGCode\""
},
"retraction_speed": {
"enabled": "retraction_enable and machine_gcode_flavor != \"UltiGCode\""
},
"retraction_retract_speed": {
"enabled": "retraction_enable and machine_gcode_flavor != \"UltiGCode\""
},
"retraction_prime_speed": {
"enabled": "retraction_enable and machine_gcode_flavor != \"UltiGCode\""
} }
} }
} }