From 4da9b99ff803e5751af825aefd67cd9346bb93e2 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 17 Nov 2016 12:43:14 +0100 Subject: [PATCH 1/2] Disable print sequence for all multi-extrusion machines Also for ORD and whatever else we have. It is now more inherent in the setting and it gives a better indication of why the setting is disabled when you hover the 'i' in the setting visibility screen. --- resources/definitions/fdmprinter.def.json | 3 ++- resources/definitions/ultimaker3.def.json | 2 -- resources/definitions/ultimaker_original_dual.def.json | 3 --- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 1962476424..8ac4f4f6e4 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -169,7 +169,7 @@ }, "machine_extruder_count": { - "label": "Number extruders", + "label": "Number of Extruders", "description": "Number of extruder trains. An extruder train is the combination of a feeder, bowden tube, and nozzle.", "default_value": 1, "minimum_value": "1", @@ -3769,6 +3769,7 @@ "one_at_a_time": "One at a Time" }, "default_value": "all_at_once", + "enabled": "machine_extruder_count == 1", "settable_per_mesh": false, "settable_per_extruder": false, "settable_per_meshgroup": false diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index 16feda7d64..f9ee93ee65 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -71,8 +71,6 @@ "prime_tower_position_x": { "default_value": 175 }, "prime_tower_position_y": { "default_value": 179 }, - "print_sequence": {"enabled": false}, - "acceleration_enabled": { "value": "True" }, "acceleration_layer_0": { "value": "acceleration_topbottom" }, "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" }, diff --git a/resources/definitions/ultimaker_original_dual.def.json b/resources/definitions/ultimaker_original_dual.def.json index 48d2436b92..ab2f3ddf46 100644 --- a/resources/definitions/ultimaker_original_dual.def.json +++ b/resources/definitions/ultimaker_original_dual.def.json @@ -72,9 +72,6 @@ "machine_extruder_count": { "default_value": 2 }, - "print_sequence": { - "enabled": false - }, "prime_tower_position_x": { "default_value": 185 }, From 891eda203e34f1e493bd14e1d7254edb109bb87e Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Thu, 17 Nov 2016 14:57:26 +0100 Subject: [PATCH 2/2] JSOn fix: start each layer near switching bay (CURA-1112) --- resources/definitions/ultimaker3.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index f9ee93ee65..1356efff91 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -99,8 +99,8 @@ "jerk_wall": { "value": "math.ceil(jerk_print * 10 / 25)" }, "jerk_wall_0": { "value": "math.ceil(jerk_wall * 5 / 10)" }, "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" }, - "layer_start_x": { "value": "sum(extruderValues('extruder_prime_pos_x')) / len(extruderValues('extruder_prime_pos_x'))" }, - "layer_start_y": { "value": "sum(extruderValues('extruder_prime_pos_y')) / len(extruderValues('extruder_prime_pos_y'))" }, + "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, + "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, "line_width": { "value": "machine_nozzle_size * 0.875" }, "machine_min_cool_heat_time_window": { "value": "15" }, "material_print_temperature": { "value": "200" },