From 3a69d916360d39fdf1ffc80e27fd5b1f161b6fa6 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Mon, 7 Nov 2016 15:25:32 +0100 Subject: [PATCH] JSON refactor: move UltiGcode setting enabled dependency to fdmprinter (CURA-2781, CURA-2736) --- resources/definitions/fdmprinter.def.json | 18 ++++++++------ resources/definitions/ultimaker2.def.json | 30 ----------------------- 2 files changed, 10 insertions(+), 38 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 7fd872c96e..0e3aa79bcb 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1148,7 +1148,7 @@ "minimum_value": "-273.15", "minimum_value_warning": "0", "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_extruder": true }, @@ -1163,7 +1163,7 @@ "minimum_value": "-273.15", "minimum_value_warning": "0", "maximum_value_warning": "260", - "enabled": "not (material_flow_dependent_temperature)", + "enabled": "machine_gcode_flavor != \"UltiGCode\"", "settable_per_mesh": false, "settable_per_extruder": true }, @@ -1204,7 +1204,7 @@ "minimum_value": "-273.15", "minimum_value_warning": "0", "maximum_value_warning": "260", - "enabled": "machine_heated_bed", + "enabled": "machine_heated_bed and machine_gcode_flavor != \"UltiGCode\"", "settable_per_mesh": false, "settable_per_extruder": false, "settable_per_meshgroup": false @@ -1220,7 +1220,7 @@ "minimum_value": "-273.15", "minimum_value_warning": "0", "maximum_value_warning": "260", - "enabled": "machine_heated_bed", + "enabled": "machine_heated_bed and machine_gcode_flavor != \"UltiGCode\"", "settable_per_mesh": false, "settable_per_extruder": false, "settable_per_meshgroup": false @@ -1235,6 +1235,7 @@ "minimum_value": "0.0001", "minimum_value_warning": "0.4", "maximum_value_warning": "3.5", + "enabled": "machine_gcode_flavor != \"UltiGCode\"", "settable_per_mesh": false, "settable_per_extruder": true }, @@ -1248,6 +1249,7 @@ "minimum_value": "5", "minimum_value_warning": "50", "maximum_value_warning": "150", + "enabled": "machine_gcode_flavor != \"UltiGCode\"", "settable_per_mesh": true }, "retraction_enable": @@ -1268,7 +1270,7 @@ "default_value": 6.5, "minimum_value_warning": "-0.0001", "maximum_value_warning": "10.0", - "enabled": "retraction_enable", + "enabled": "retraction_enable and machine_gcode_flavor != \"UltiGCode\"", "settable_per_mesh": false, "settable_per_extruder": true }, @@ -1283,7 +1285,7 @@ "minimum_value_warning": "1", "maximum_value": "machine_max_feedrate_e", "maximum_value_warning": "70", - "enabled": "retraction_enable", + "enabled": "retraction_enable and machine_gcode_flavor != \"UltiGCode\"", "settable_per_mesh": false, "settable_per_extruder": true, "children": @@ -1299,7 +1301,7 @@ "maximum_value": "machine_max_feedrate_e", "minimum_value_warning": "1", "maximum_value_warning": "70", - "enabled": "retraction_enable", + "enabled": "retraction_enable and machine_gcode_flavor != \"UltiGCode\"", "value": "retraction_speed", "settable_per_mesh": false, "settable_per_extruder": true @@ -1315,7 +1317,7 @@ "maximum_value": "machine_max_feedrate_e", "minimum_value_warning": "1", "maximum_value_warning": "70", - "enabled": "retraction_enable", + "enabled": "retraction_enable and machine_gcode_flavor != \"UltiGCode\"", "value": "retraction_speed", "settable_per_mesh": false, "settable_per_extruder": true diff --git a/resources/definitions/ultimaker2.def.json b/resources/definitions/ultimaker2.def.json index be04b0b5a7..84e09113f3 100644 --- a/resources/definitions/ultimaker2.def.json +++ b/resources/definitions/ultimaker2.def.json @@ -86,18 +86,6 @@ "machine_nozzle_expansion_angle": { "default_value": 45 }, - "material_print_temperature": { - "enabled": "not (material_flow_dependent_temperature) and machine_gcode_flavor != \"UltiGCode\"" - }, - "material_print_temperature_layer_0": { - "enabled": "machine_gcode_flavor != \"UltiGCode\"" - }, - "material_bed_temperature": { - "enabled": "machine_heated_bed and machine_gcode_flavor != \"UltiGCode\"" - }, - "material_bed_temperature_layer_0": { - "enabled": "machine_heated_bed and machine_gcode_flavor != \"UltiGCode\"" - }, "machine_max_feedrate_x": { "default_value": 300 }, @@ -112,24 +100,6 @@ }, "machine_acceleration": { "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\"" } } }