From 3a7370a09e69037f626fea235d5e79c623f50c20 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Wed, 12 Oct 2016 15:27:01 +0200 Subject: [PATCH 01/11] JSON feat: dual_pre_wipe as separate from prime_tower_wipe_enabled (CURA-2325) --- resources/definitions/fdmprinter.def.json | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 4bd2d57973..4989836a82 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -3701,6 +3701,17 @@ "settable_per_mesh": false, "settable_per_extruder": false }, + "dual_pre_wipe": + { + "label": "Wipe Nozzle After Switch", + "description": "After switching nozzle, wipe the oozed material off of the nozzle on the first thing printed. This performs a safe slow wipe move at a place where the oozed material causes least harm to the surface quality of your print.", + "type": "bool", + "enabled": "resolveOrValue('prime_tower_enable')", + "default_value": true, + "resolve": "any(extruderValues('dual_pre_wipe'))", + "settable_per_mesh": false, + "settable_per_extruder": false + }, "multiple_mesh_overlap": { "label": "Dual Extrusion Overlap", From c1d600dfa7aa801ddee399bb6007339981eb0b2a Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Wed, 12 Oct 2016 15:27:43 +0200 Subject: [PATCH 02/11] JSON fix: rename Wipe Nozzle on Prime Tower to Wipe Inactive Nozzle on Prime Tower (CURA-2325) This way it's better distinguished from dual_pre_wipe --- resources/definitions/fdmprinter.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 4989836a82..51b2837d41 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -3692,7 +3692,7 @@ }, "prime_tower_wipe_enabled": { - "label": "Wipe Nozzle on Prime Tower", + "label": "Wipe Inactive Nozzle on Prime Tower", "description": "After printing the prime tower with one nozzle, wipe the oozed material from the other nozzle off on the prime tower.", "type": "bool", "enabled": "resolveOrValue('prime_tower_enable')", From 2c3f891885d7ba605c9ba2be127dc54f8cd17c27 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Wed, 12 Oct 2016 16:50:40 +0200 Subject: [PATCH 03/11] fix: make wipe settings settable per extruder (CURA-2325) --- resources/definitions/fdmprinter.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 51b2837d41..7b43b523a3 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -3699,7 +3699,7 @@ "default_value": true, "resolve": "any(extruderValues('prime_tower_wipe_enabled'))", "settable_per_mesh": false, - "settable_per_extruder": false + "settable_per_extruder": true }, "dual_pre_wipe": { @@ -3710,7 +3710,7 @@ "default_value": true, "resolve": "any(extruderValues('dual_pre_wipe'))", "settable_per_mesh": false, - "settable_per_extruder": false + "settable_per_extruder": true }, "multiple_mesh_overlap": { From 64aafcc8584c826a171170ab4e72dcc0032ef893 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Thu, 13 Oct 2016 09:48:14 +0200 Subject: [PATCH 04/11] JSON fix: make wiping settable per extruder (CURA-2325) --- resources/definitions/fdmprinter.def.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 7b43b523a3..2e638a1231 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -3697,7 +3697,6 @@ "type": "bool", "enabled": "resolveOrValue('prime_tower_enable')", "default_value": true, - "resolve": "any(extruderValues('prime_tower_wipe_enabled'))", "settable_per_mesh": false, "settable_per_extruder": true }, @@ -3708,7 +3707,6 @@ "type": "bool", "enabled": "resolveOrValue('prime_tower_enable')", "default_value": true, - "resolve": "any(extruderValues('dual_pre_wipe'))", "settable_per_mesh": false, "settable_per_extruder": true }, From c95f983b9b68d1838b13604ac8be65a52f62da90 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Thu, 13 Oct 2016 09:48:44 +0200 Subject: [PATCH 05/11] JSON feat: prime_tower_min_volume and prime_tower_wall_thickness (CURA-2325) --- resources/definitions/fdmprinter.def.json | 33 +++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 2e638a1231..8ba538b2ea 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -3646,6 +3646,39 @@ "settable_per_mesh": false, "settable_per_extruder": false }, + "prime_tower_min_volume": + { + "label": "Prime Tower Minimum Volume", + "description": "The minimum volume each layer of the prime tower in order to purge enough material.", + "unit": "mm³", + "type": "float", + "default_value": 4.544, + "minimum_value": "0", + "maximum_value_warning": "resolveOrValue('prime_tower_size') * resolveOrValue('prime_tower_size') * resolveOrValue('layer_height')", + "enabled": "resolveOrValue('prime_tower_enable')", + "resolve": "max(extruderValues('prime_tower_min_volume'))", + "settable_per_mesh": false, + "settable_per_extruder": false, + "children": + { + "prime_tower_wall_thickness": + { + "label": "Prime Tower Wall Thickness", + "description": "The thickness of the outside walls in the horizontal direction. This value divided by the wall line width defines the number of walls.", + "unit": "mm", + "type": "float", + "default_value": 0.8, + "value": "max(2 * min(extruderValues('prime_tower_line_width')), 0.5 * (resolveOrValue('prime_tower_size') - math.sqrt(resolveOrValue('prime_tower_size') * resolveOrValue('prime_tower_size') - max(extruderValues('prime_tower_min_volume')) / resolveOrValue('layer_height'))))", + "resolve": "max(extruderValues('prime_tower_wall_thickness'))", + "minimum_value": "0.001", + "minimum_value_warning": "2 * min(extruderValues('prime_tower_line_width'))", + "maximum_value_warning": "resolveOrValue('prime_tower_size') / 2", + "enabled": "resolveOrValue('prime_tower_enable')", + "settable_per_mesh": false, + "settable_per_extruder": false + } + } + }, "prime_tower_position_x": { "label": "Prime Tower X Position", From 8016cb648bc7c98d9097df018f2a9819cb352236 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Thu, 13 Oct 2016 20:09:28 +0200 Subject: [PATCH 06/11] JSOn fix: better language hollow wipe tower settings (CURA-2325) --- resources/definitions/fdmprinter.def.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 8ba538b2ea..4d6e78d03e 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -3649,7 +3649,7 @@ "prime_tower_min_volume": { "label": "Prime Tower Minimum Volume", - "description": "The minimum volume each layer of the prime tower in order to purge enough material.", + "description": "The minimum volume for each layer of the prime tower in order to purge enough material.", "unit": "mm³", "type": "float", "default_value": 4.544, @@ -3663,8 +3663,8 @@ { "prime_tower_wall_thickness": { - "label": "Prime Tower Wall Thickness", - "description": "The thickness of the outside walls in the horizontal direction. This value divided by the wall line width defines the number of walls.", + "label": "Prime Tower Thickness", + "description": "The thickness of the hollow prime tower. A thickness larger than half the Prime Tower Minimum Volume will result in a dense prime tower.", "unit": "mm", "type": "float", "default_value": 0.8, From 5e2f055cfe1bb2c10c27ee03ce22c339f5425d14 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Thu, 13 Oct 2016 20:11:02 +0200 Subject: [PATCH 07/11] JSON fix: better defaults hollow prime tower settings (CURA-2325) --- resources/definitions/fdmprinter.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 4d6e78d03e..e35dcd9a72 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -3652,7 +3652,7 @@ "description": "The minimum volume for each layer of the prime tower in order to purge enough material.", "unit": "mm³", "type": "float", - "default_value": 4.544, + "default_value": 10, "minimum_value": "0", "maximum_value_warning": "resolveOrValue('prime_tower_size') * resolveOrValue('prime_tower_size') * resolveOrValue('layer_height')", "enabled": "resolveOrValue('prime_tower_enable')", @@ -3667,7 +3667,7 @@ "description": "The thickness of the hollow prime tower. A thickness larger than half the Prime Tower Minimum Volume will result in a dense prime tower.", "unit": "mm", "type": "float", - "default_value": 0.8, + "default_value": 2, "value": "max(2 * min(extruderValues('prime_tower_line_width')), 0.5 * (resolveOrValue('prime_tower_size') - math.sqrt(resolveOrValue('prime_tower_size') * resolveOrValue('prime_tower_size') - max(extruderValues('prime_tower_min_volume')) / resolveOrValue('layer_height'))))", "resolve": "max(extruderValues('prime_tower_wall_thickness'))", "minimum_value": "0.001", From 61780b49800f72761b614cf9943eb349cd4a2ab5 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Fri, 14 Oct 2016 13:02:04 +0200 Subject: [PATCH 08/11] make prime_tower_min_volume settable per extruder (CURA-2325) --- resources/definitions/fdmprinter.def.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index e35dcd9a72..c5174cbccc 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -3656,9 +3656,8 @@ "minimum_value": "0", "maximum_value_warning": "resolveOrValue('prime_tower_size') * resolveOrValue('prime_tower_size') * resolveOrValue('layer_height')", "enabled": "resolveOrValue('prime_tower_enable')", - "resolve": "max(extruderValues('prime_tower_min_volume'))", "settable_per_mesh": false, - "settable_per_extruder": false, + "settable_per_extruder": true, "children": { "prime_tower_wall_thickness": From 1e343c26ebb6f0c07b7f0b5b8a48f12000f8dcd8 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Wed, 2 Nov 2016 10:23:42 +0100 Subject: [PATCH 09/11] JSON fix: better description dual_pre_wipe (CURA-2325) --- resources/definitions/fdmprinter.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index c5174cbccc..8547aa4df6 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -3735,7 +3735,7 @@ "dual_pre_wipe": { "label": "Wipe Nozzle After Switch", - "description": "After switching nozzle, wipe the oozed material off of the nozzle on the first thing printed. This performs a safe slow wipe move at a place where the oozed material causes least harm to the surface quality of your print.", + "description": "After switching extruder, wipe the oozed material off of the nozzle on the first thing printed. This performs a safe slow wipe move at a place where the oozed material causes least harm to the surface quality of your print.", "type": "bool", "enabled": "resolveOrValue('prime_tower_enable')", "default_value": true, From e0b4246336fa4f5c6055fcda3251f75501c48b31 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Wed, 2 Nov 2016 10:29:16 +0100 Subject: [PATCH 10/11] JSON fix: use exponent function ** 2 rather than x * x (CURA-2325) --- resources/definitions/fdmprinter.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 8547aa4df6..364608767c 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -3654,7 +3654,7 @@ "type": "float", "default_value": 10, "minimum_value": "0", - "maximum_value_warning": "resolveOrValue('prime_tower_size') * resolveOrValue('prime_tower_size') * resolveOrValue('layer_height')", + "maximum_value_warning": "resolveOrValue('prime_tower_size') ** 2 * resolveOrValue('layer_height')", "enabled": "resolveOrValue('prime_tower_enable')", "settable_per_mesh": false, "settable_per_extruder": true, @@ -3667,7 +3667,7 @@ "unit": "mm", "type": "float", "default_value": 2, - "value": "max(2 * min(extruderValues('prime_tower_line_width')), 0.5 * (resolveOrValue('prime_tower_size') - math.sqrt(resolveOrValue('prime_tower_size') * resolveOrValue('prime_tower_size') - max(extruderValues('prime_tower_min_volume')) / resolveOrValue('layer_height'))))", + "value": "max(2 * min(extruderValues('prime_tower_line_width')), 0.5 * (resolveOrValue('prime_tower_size') - math.sqrt(resolveOrValue('prime_tower_size') ** 2 - max(extruderValues('prime_tower_min_volume')) / resolveOrValue('layer_height'))))", "resolve": "max(extruderValues('prime_tower_wall_thickness'))", "minimum_value": "0.001", "minimum_value_warning": "2 * min(extruderValues('prime_tower_line_width'))", From 1bc0fdebc9d971b0a1adf91a8779bbc4109f8f50 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Thu, 3 Nov 2016 20:06:28 +0100 Subject: [PATCH 11/11] JSON fix: disable post-wipe on prime tower for UM3 (CURA-2325) it has nozzle lifting so it's impossible! --- resources/definitions/ultimaker3.def.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index 1356efff91..243cf58a8b 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -70,6 +70,7 @@ "machine_end_gcode": { "default_value": "" }, "prime_tower_position_x": { "default_value": 175 }, "prime_tower_position_y": { "default_value": 179 }, + "prime_tower_wipe_enabled": { "default_value": false }, "acceleration_enabled": { "value": "True" }, "acceleration_layer_0": { "value": "acceleration_topbottom" },