From 43dff1296cfa332bba699f5adcc1ae8ae3e6934c Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 25 Apr 2016 13:58:01 +0200 Subject: [PATCH] Move retraction distance to material settings I've discussed this with Tom, Kristel, Diana, Marvin and Oscar. This setting should really be dependent on material since the material influences the speed it can handle the most. Contributes to issue CURA-346. --- resources/machines/RigidBot.json | 1 - resources/machines/RigidBotBig.json | 1 - resources/machines/bq_hephestos.json | 1 - resources/machines/bq_hephestos_2.json | 1 - resources/machines/bq_hephestos_xl.json | 1 - resources/machines/bq_witbox.json | 1 - resources/machines/bq_witbox_2.json | 1 - resources/machines/fdmprinter.json | 2 +- resources/machines/innovo-inventor.json | 1 - resources/machines/ultimaker2plus.json | 1 - resources/profiles/materials/abs.cfg | 2 -- resources/profiles/materials/cpe.cfg | 3 +-- resources/profiles/materials/pla.cfg | 3 +-- 13 files changed, 3 insertions(+), 16 deletions(-) diff --git a/resources/machines/RigidBot.json b/resources/machines/RigidBot.json index 9b19c0871e..61f0289f2a 100644 --- a/resources/machines/RigidBot.json +++ b/resources/machines/RigidBot.json @@ -44,7 +44,6 @@ "material_diameter": { "default": 1.75, "visible": true }, "retraction_enable": { "default": true, "always_visible": true }, "retraction_speed": { "default": 50.0, "visible": false }, - "retraction_amount": { "default": 0.8, "visible": false }, "retraction_hop": { "default": 0.075, "visible": false }, "speed_print": { "default": 60.0, "visible": true }, "speed_infill": { "default": 100.0, "visible": true }, diff --git a/resources/machines/RigidBotBig.json b/resources/machines/RigidBotBig.json index 20b1ea2982..2f6afc104d 100644 --- a/resources/machines/RigidBotBig.json +++ b/resources/machines/RigidBotBig.json @@ -42,7 +42,6 @@ "material_diameter": { "default": 1.75, "visible": true }, "retraction_enable": { "default": true, "always_visible": true}, "retraction_speed": { "default": 50.0, "visible": false }, - "retraction_amount": { "default": 0.8, "visible": false }, "retraction_hop": { "default": 0.075, "visible": false }, "speed_print": { "default": 60.0, "visible": true}, "speed_infill": { "default": 100.0, "visible": true }, diff --git a/resources/machines/bq_hephestos.json b/resources/machines/bq_hephestos.json index 01aac77f0d..de33e792e5 100644 --- a/resources/machines/bq_hephestos.json +++ b/resources/machines/bq_hephestos.json @@ -51,7 +51,6 @@ "speed_travel": { "default": 120.0 }, "speed_layer_0": { "default": 20.0, "visible": false }, "retraction_speed": { "default": 30.0, "visible": false}, - "retraction_amount": { "default": 2.0, "visible": false }, "retraction_hop": { "default": 0.075, "visible": false }, "support_enable": { "default": true } } diff --git a/resources/machines/bq_hephestos_2.json b/resources/machines/bq_hephestos_2.json index cc87057cc5..ae4eee9c0d 100644 --- a/resources/machines/bq_hephestos_2.json +++ b/resources/machines/bq_hephestos_2.json @@ -54,7 +54,6 @@ "speed_infill": { "default": 80.0, "visible": true }, "speed_topbottom": { "default": 35.0, "visible": false }, "skirt_speed": { "default": 35.0, "visible": false }, - "retraction_amount": { "default": 2.0, "visible": false }, "retraction_speed": { "default": 45.0, "visible": false }, "skirt_line_count": { "default": 4 }, "skirt_minimal_length": { "default": 30.0, "visible": false }, diff --git a/resources/machines/bq_hephestos_xl.json b/resources/machines/bq_hephestos_xl.json index 8a8ad162ce..056b0881c2 100644 --- a/resources/machines/bq_hephestos_xl.json +++ b/resources/machines/bq_hephestos_xl.json @@ -51,7 +51,6 @@ "speed_travel": { "default": 120.0 }, "speed_layer_0": { "default": 20.0, "visible": false }, "retraction_speed": { "default": 30.0, "visible": false}, - "retraction_amount": { "default": 2.0, "visible": false }, "retraction_hop": { "default": 0.075, "visible": false }, "support_enable": { "default": true } } diff --git a/resources/machines/bq_witbox.json b/resources/machines/bq_witbox.json index e12c812fc0..af41ae66ea 100644 --- a/resources/machines/bq_witbox.json +++ b/resources/machines/bq_witbox.json @@ -51,7 +51,6 @@ "speed_travel": { "default": 120.0 }, "speed_layer_0": { "default": 20.0, "visible": false }, "retraction_speed": { "default": 30.0, "visible": false}, - "retraction_amount": { "default": 2.0, "visible": false }, "retraction_hop": { "default": 0.075, "visible": false }, "support_enable": { "default": true } } diff --git a/resources/machines/bq_witbox_2.json b/resources/machines/bq_witbox_2.json index 4eb9b67d99..5377d594b5 100644 --- a/resources/machines/bq_witbox_2.json +++ b/resources/machines/bq_witbox_2.json @@ -54,7 +54,6 @@ "speed_infill": { "default": 80.0, "visible": true }, "speed_topbottom": { "default": 35.0, "visible": false }, "skirt_speed": { "default": 35.0, "visible": false }, - "retraction_amount": { "default": 2.0, "visible": false }, "retraction_speed": { "default": 45.0, "visible": false }, "skirt_line_count": { "default": 4 }, "skirt_minimal_length": { "default": 30.0, "visible": false }, diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index 11843cac0f..f0be309eaa 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -718,7 +718,7 @@ "description": "The length of material retracted during a retraction move.", "unit": "mm", "type": "float", - "default": 4.5, + "default": 6.5, "min_value_warning": "-0.0001", "max_value_warning": "10.0", "visible": false, diff --git a/resources/machines/innovo-inventor.json b/resources/machines/innovo-inventor.json index 7ba8b9a48c..df5a0ccb66 100644 --- a/resources/machines/innovo-inventor.json +++ b/resources/machines/innovo-inventor.json @@ -36,7 +36,6 @@ "material_diameter": { "default": 1.75, "visible": true}, "retraction_enable": { "default": true, "always_visible": true}, "retraction_speed": { "default": 50.0, "visible": false }, - "retraction_amount": { "default": 2.5, "visible": false }, "retraction_hop": { "default": 0.075, "visible": false }, "speed_print": { "default": 60.0, "visible": true}, "speed_infill": { "default": 100.0, "visible": true }, diff --git a/resources/machines/ultimaker2plus.json b/resources/machines/ultimaker2plus.json index 0a344d4aa6..296cd99a06 100644 --- a/resources/machines/ultimaker2plus.json +++ b/resources/machines/ultimaker2plus.json @@ -45,7 +45,6 @@ ] ] }, - "retraction_amount": { "default": 6.0 }, "machine_disallowed_areas": { "default": [ [[-115.0, 112.5], [ -78.0, 112.5], [ -80.0, 102.5], [-115.0, 102.5]], [[ 115.0, 112.5], [ 115.0, 102.5], [ 105.0, 102.5], [ 103.0, 112.5]], diff --git a/resources/profiles/materials/abs.cfg b/resources/profiles/materials/abs.cfg index d5fe2cc199..67abc32810 100644 --- a/resources/profiles/materials/abs.cfg +++ b/resources/profiles/materials/abs.cfg @@ -7,5 +7,3 @@ name = ABS material_print_temperature = 250 material_bed_temperature = 80 material_flow = 107 -retraction_amount = 6.5 - diff --git a/resources/profiles/materials/cpe.cfg b/resources/profiles/materials/cpe.cfg index e389bdb23a..0621260745 100644 --- a/resources/profiles/materials/cpe.cfg +++ b/resources/profiles/materials/cpe.cfg @@ -5,5 +5,4 @@ name = CPE [settings] material_print_temperature = 250 -material_bed_temperature = 70 -retraction_amount = 6.5 +material_bed_temperature = 70 \ No newline at end of file diff --git a/resources/profiles/materials/pla.cfg b/resources/profiles/materials/pla.cfg index 216f2bfb66..b5af61b9b6 100644 --- a/resources/profiles/materials/pla.cfg +++ b/resources/profiles/materials/pla.cfg @@ -4,5 +4,4 @@ type = material name = PLA [settings] -material_bed_temperature = 60 -retraction_amount = 6.5 +material_bed_temperature = 60 \ No newline at end of file