cleanup raft top layers

This commit does effectively change nothing. The default of 2 top layers is set in fdmprinter and it is made 1 for 08 cores. PP-342

19 files changed, 4 insertions, 16 deletions

diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json
index 46d51d0c1c..6b5d331fac 100644
--- a/resources/definitions/ultimaker3.def.json
+++ b/resources/definitions/ultimaker3.def.json
@@ -116,7 +116,6 @@
         "raft_interface_line_spacing": { "value": "0.5" },
         "raft_interface_line_width": { "value": "0.5" },
         "raft_interface_thickness": { "value": "0.2" },
-        "raft_surface_layers": { "value": "1" },
         "retraction_amount": { "value": "6.5" },
         "retraction_hop": { "value": "2" },
         "retraction_hop_enabled": { "value": "extruders_enabled_count > 1"  },
diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json
index 18cdbf24df..05b5e4604f 100644
--- a/resources/definitions/ultimaker_s3.def.json
+++ b/resources/definitions/ultimaker_s3.def.json
@@ -108,7 +108,6 @@
         "raft_interface_speed": { "value": "20" },
         "raft_interface_thickness": { "value": "0.2" },
         "raft_speed": { "value": "25" },
-        "raft_surface_layers": { "value": "1" },
         "retraction_amount": { "value": "6.5" },
         "retraction_hop": { "value": "2" },
         "retraction_hop_enabled": { "value": "extruders_enabled_count > 1"  },
diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json
index e734ab1fa2..3859d2e2b8 100644
--- a/resources/definitions/ultimaker_s5.def.json
+++ b/resources/definitions/ultimaker_s5.def.json
@@ -109,7 +109,6 @@
         "raft_interface_speed": { "value": "20" },
         "raft_interface_thickness": { "value": "0.2" },
         "raft_speed": { "value": "25" },
-        "raft_surface_layers": { "value": "1" },
         "retraction_amount": { "value": "6.5" },
         "retraction_combing": { "value": "'no_outer_surfaces'"},
         "retraction_hop": { "value": "2" },
diff --git a/resources/variants/ultimaker3_aa0.25.inst.cfg b/resources/variants/ultimaker3_aa0.25.inst.cfg
index 449e8ebd82..d1aeffee74 100644
--- a/resources/variants/ultimaker3_aa0.25.inst.cfg
+++ b/resources/variants/ultimaker3_aa0.25.inst.cfg
@@ -23,7 +23,6 @@ raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2
 raft_interface_line_spacing = =raft_interface_line_width + 0.2
 raft_interface_line_width = =line_width * 2
 raft_interface_thickness = =layer_height * 1.5
-raft_surface_layers = 2
 retraction_min_travel = 0.7
 retraction_prime_speed = =retraction_speed
 skin_overlap = 15
diff --git a/resources/variants/ultimaker3_aa0.8.inst.cfg b/resources/variants/ultimaker3_aa0.8.inst.cfg
index 748ed78eb7..4adec1540b 100644
--- a/resources/variants/ultimaker3_aa0.8.inst.cfg
+++ b/resources/variants/ultimaker3_aa0.8.inst.cfg
@@ -30,6 +30,7 @@ material_initial_print_temperature = =material_print_temperature - 5
 multiple_mesh_overlap = 0
 prime_tower_enable = False
 prime_tower_wipe_enabled = True
+raft_surface_layers = 1
 retraction_amount = 6.5
 retraction_hop = 2
 retraction_hop_only_when_collides = True
diff --git a/resources/variants/ultimaker3_aa04.inst.cfg b/resources/variants/ultimaker3_aa04.inst.cfg
index 611eccc62c..e327235a95 100644
--- a/resources/variants/ultimaker3_aa04.inst.cfg
+++ b/resources/variants/ultimaker3_aa04.inst.cfg
@@ -19,7 +19,6 @@ raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2
 raft_interface_line_spacing = =raft_interface_line_width + 0.2
 raft_interface_line_width = =line_width * 2
 raft_interface_thickness = =layer_height * 1.5
-raft_surface_layers = 2
 retraction_amount = 6.5
 retraction_min_travel = =line_width * 2
 retraction_prime_speed = =retraction_speed
diff --git a/resources/variants/ultimaker3_extended_aa0.25.inst.cfg b/resources/variants/ultimaker3_extended_aa0.25.inst.cfg
index bbb8c202a1..09da9980cf 100644
--- a/resources/variants/ultimaker3_extended_aa0.25.inst.cfg
+++ b/resources/variants/ultimaker3_extended_aa0.25.inst.cfg
@@ -23,7 +23,6 @@ raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2
 raft_interface_line_spacing = =raft_interface_line_width + 0.2
 raft_interface_line_width = =line_width * 2
 raft_interface_thickness = =layer_height * 1.5
-raft_surface_layers = 2
 retraction_min_travel = 0.7
 retraction_prime_speed = =retraction_speed
 skin_overlap = 15
diff --git a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg
index 96a34c059e..a215c4f455 100644
--- a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg
+++ b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg
@@ -30,6 +30,7 @@ material_initial_print_temperature = =material_print_temperature - 5
 multiple_mesh_overlap = 0
 prime_tower_enable = False
 prime_tower_wipe_enabled = True
+raft_surface_layers = 1
 retraction_amount = 6.5
 retraction_hop = 2
 retraction_hop_only_when_collides = True
diff --git a/resources/variants/ultimaker3_extended_aa04.inst.cfg b/resources/variants/ultimaker3_extended_aa04.inst.cfg
index a089826ed3..47eab5d850 100644
--- a/resources/variants/ultimaker3_extended_aa04.inst.cfg
+++ b/resources/variants/ultimaker3_extended_aa04.inst.cfg
@@ -19,7 +19,6 @@ raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2
 raft_interface_line_spacing = =raft_interface_line_width + 0.2
 raft_interface_line_width = =line_width * 2
 raft_interface_thickness = =layer_height * 1.5
-raft_surface_layers = 2
 retraction_amount = 6.5
 retraction_min_travel = =line_width * 2
 retraction_prime_speed = =retraction_speed
diff --git a/resources/variants/ultimaker_s3_aa0.25.inst.cfg b/resources/variants/ultimaker_s3_aa0.25.inst.cfg
index efc58c3766..58ac46eb08 100644
--- a/resources/variants/ultimaker_s3_aa0.25.inst.cfg
+++ b/resources/variants/ultimaker_s3_aa0.25.inst.cfg
@@ -23,8 +23,6 @@ raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2
 raft_interface_line_spacing = =raft_interface_line_width + 0.2
 raft_interface_line_width = =line_width * 2
 raft_interface_thickness = =layer_height * 1.5
-raft_surface_layers = 2
-
 retraction_min_travel = 0.7
 retraction_prime_speed = =retraction_speed
 skin_overlap = 15
diff --git a/resources/variants/ultimaker_s3_aa0.8.inst.cfg b/resources/variants/ultimaker_s3_aa0.8.inst.cfg
index 3e4f3156af..6e477f15e6 100644
--- a/resources/variants/ultimaker_s3_aa0.8.inst.cfg
+++ b/resources/variants/ultimaker_s3_aa0.8.inst.cfg
@@ -30,6 +30,7 @@ material_initial_print_temperature = =material_print_temperature - 5
 multiple_mesh_overlap = 0
 prime_tower_enable = False
 prime_tower_wipe_enabled = True
+raft_surface_layers = 1
 retraction_amount = 6.5
 retraction_hop = 2
 retraction_hop_only_when_collides = True
diff --git a/resources/variants/ultimaker_s3_aa04.inst.cfg b/resources/variants/ultimaker_s3_aa04.inst.cfg
index d14353c962..aeaadff7dd 100644
--- a/resources/variants/ultimaker_s3_aa04.inst.cfg
+++ b/resources/variants/ultimaker_s3_aa04.inst.cfg
@@ -19,7 +19,6 @@ raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2
 raft_interface_line_spacing = =raft_interface_line_width + 0.2
 raft_interface_line_width = =line_width * 2
 raft_interface_thickness = =layer_height * 1.5
-raft_surface_layers = 2
 retraction_amount = 6.5
 retraction_min_travel = =line_width * 2
 skin_overlap = 15
diff --git a/resources/variants/ultimaker_s3_cc04.inst.cfg b/resources/variants/ultimaker_s3_cc04.inst.cfg
index 3e5d71789c..cd518fa650 100644
--- a/resources/variants/ultimaker_s3_cc04.inst.cfg
+++ b/resources/variants/ultimaker_s3_cc04.inst.cfg
@@ -19,7 +19,6 @@ raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2
 raft_interface_line_spacing = =raft_interface_line_width + 0.2
 raft_interface_line_width = =line_width * 2
 raft_interface_thickness = =layer_height * 1.5
-raft_surface_layers = 2
 retraction_min_travel = =line_width * 2
 retraction_prime_speed = =retraction_speed
 speed_infill = =speed_print
diff --git a/resources/variants/ultimaker_s3_cc06.inst.cfg b/resources/variants/ultimaker_s3_cc06.inst.cfg
index 8bf8c90455..3c5fa2ce11 100644
--- a/resources/variants/ultimaker_s3_cc06.inst.cfg
+++ b/resources/variants/ultimaker_s3_cc06.inst.cfg
@@ -19,7 +19,6 @@ raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2
 raft_interface_line_spacing = =raft_interface_line_width + 0.2
 raft_interface_line_width = =line_width * 2
 raft_interface_thickness = =layer_height * 1.5
-raft_surface_layers = 2
 retraction_min_travel = =line_width * 2
 retraction_prime_speed = =retraction_speed
 speed_infill = =speed_print
diff --git a/resources/variants/ultimaker_s5_aa0.25.inst.cfg b/resources/variants/ultimaker_s5_aa0.25.inst.cfg
index 8e351eadfc..52b0f686b0 100644
--- a/resources/variants/ultimaker_s5_aa0.25.inst.cfg
+++ b/resources/variants/ultimaker_s5_aa0.25.inst.cfg
@@ -23,7 +23,6 @@ raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2
 raft_interface_line_spacing = =raft_interface_line_width + 0.2
 raft_interface_line_width = =line_width * 2
 raft_interface_thickness = =layer_height * 1.5
-raft_surface_layers = 2
 retraction_min_travel = 0.7
 retraction_prime_speed = =retraction_speed
 skin_overlap = 15
diff --git a/resources/variants/ultimaker_s5_aa0.8.inst.cfg b/resources/variants/ultimaker_s5_aa0.8.inst.cfg
index 78e6f55104..4433739430 100644
--- a/resources/variants/ultimaker_s5_aa0.8.inst.cfg
+++ b/resources/variants/ultimaker_s5_aa0.8.inst.cfg
@@ -30,6 +30,7 @@ material_initial_print_temperature = =material_print_temperature - 5
 multiple_mesh_overlap = 0
 prime_tower_enable = False
 prime_tower_wipe_enabled = True
+raft_surface_layers = 1
 retraction_amount = 6.5
 retraction_hop = 2
 retraction_hop_only_when_collides = True
diff --git a/resources/variants/ultimaker_s5_aa04.inst.cfg b/resources/variants/ultimaker_s5_aa04.inst.cfg
index 51174319c5..0d25823e59 100644
--- a/resources/variants/ultimaker_s5_aa04.inst.cfg
+++ b/resources/variants/ultimaker_s5_aa04.inst.cfg
@@ -19,7 +19,6 @@ raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2
 raft_interface_line_spacing = =raft_interface_line_width + 0.2
 raft_interface_line_width = =line_width * 2
 raft_interface_thickness = =layer_height * 1.5
-raft_surface_layers = 2
 retraction_amount = 6.5
 retraction_min_travel = =line_width * 2
 skin_overlap = 15
diff --git a/resources/variants/ultimaker_s5_cc04.inst.cfg b/resources/variants/ultimaker_s5_cc04.inst.cfg
index 1492ecd636..100b9d5de0 100644
--- a/resources/variants/ultimaker_s5_cc04.inst.cfg
+++ b/resources/variants/ultimaker_s5_cc04.inst.cfg
@@ -19,7 +19,6 @@ raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2
 raft_interface_line_spacing = =raft_interface_line_width + 0.2
 raft_interface_line_width = =line_width * 2
 raft_interface_thickness = =layer_height * 1.5
-raft_surface_layers = 2
 retraction_min_travel = =line_width * 2
 retraction_prime_speed = =retraction_speed
 speed_infill = =speed_print
diff --git a/resources/variants/ultimaker_s5_cc06.inst.cfg b/resources/variants/ultimaker_s5_cc06.inst.cfg
index f7fa2c9054..ed73d2826e 100644
--- a/resources/variants/ultimaker_s5_cc06.inst.cfg
+++ b/resources/variants/ultimaker_s5_cc06.inst.cfg
@@ -19,7 +19,6 @@ raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2
 raft_interface_line_spacing = =raft_interface_line_width + 0.2
 raft_interface_line_width = =line_width * 2
 raft_interface_thickness = =layer_height * 1.5
-raft_surface_layers = 2
 retraction_min_travel = =line_width * 2
 retraction_prime_speed = =retraction_speed
 speed_infill = =speed_print