diff options
| author | fieldOfView <aldo@fieldofview.com> | 2016-08-02 10:50:42 +0300 |
|---|---|---|
| committer | fieldOfView <aldo@fieldofview.com> | 2016-08-02 10:50:42 +0300 |
| commit | a2fa8246b63829891c74dd46184d92070f1f2bdc (patch) | |
| tree | bd0171810c7f2322927bdee311d7c5c0e352579a /resources/definitions/ultimaker2.def.json | |
| parent | 42fc25ab09abd044fcd3a12e87586b4edb286460 (diff) | |
Disable UM2 material-related settings depending on gcode flavor...
...instead of hardcoding them as disabled.
The fdmprinter inheritance-functions for "enabled" are combined with a check for the flavor. This way it will be easier to switch an UM2 to a functional Reprap flavor in a variant. CURA-580
Diffstat (limited to 'resources/definitions/ultimaker2.def.json')
| -rw-r--r-- | resources/definitions/ultimaker2.def.json | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/resources/definitions/ultimaker2.def.json b/resources/definitions/ultimaker2.def.json index 3b246ba682..9985dea764 100644 --- a/resources/definitions/ultimaker2.def.json +++ b/resources/definitions/ultimaker2.def.json @@ -83,10 +83,10 @@ "default_value": 45 }, "material_print_temperature": { - "enabled": "False" + "enabled": "not (material_flow_dependent_temperature) and machine_gcode_flavor != \"UltiGCode\"" }, "material_bed_temperature": { - "enabled": "False" + "enabled": "machine_heated_bed and machine_gcode_flavor != \"UltiGCode\"" }, "machine_max_feedrate_x": { "default_value": 300 @@ -104,22 +104,22 @@ "default_value": 3000 }, "material_diameter": { - "enabled": "False" + "enabled": "machine_gcode_flavor != \"UltiGCode\"" }, "material_flow": { - "enabled": "False" + "enabled": "machine_gcode_flavor != \"UltiGCode\"" }, "retraction_amount": { - "enabled": "False" + "enabled": "retraction_enable and machine_gcode_flavor != \"UltiGCode\"" }, "retraction_speed": { - "enabled": "False" + "enabled": "retraction_enable and machine_gcode_flavor != \"UltiGCode\"" }, "retraction_retract_speed": { - "enabled": "False" + "enabled": "retraction_enable and machine_gcode_flavor != \"UltiGCode\"" }, "retraction_prime_speed": { - "enabled": "False" + "enabled": "retraction_enable and machine_gcode_flavor != \"UltiGCode\"" } } } |