From 510c988c431b4f7ac6263fd49f9d359b830c78c8 Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Fri, 25 Nov 2016 09:39:19 +0100
Subject: [PATCH] Moved some setting functions back to definitions

CURA-3018
---
 resources/definitions/ultimaker3.def.json   | 3 ---
 resources/variants/ultimaker3_aa04.inst.cfg | 3 ---
 resources/variants/ultimaker3_bb04.inst.cfg | 3 +++
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json
index 9465cd062a..ae0966242d 100644
--- a/resources/definitions/ultimaker3.def.json
+++ b/resources/definitions/ultimaker3.def.json
@@ -109,15 +109,12 @@
         "multiple_mesh_overlap": { "value": "0" },
         "prime_tower_enable": { "value": "True" },
         "raft_airgap": { "value": "0" },
-        "raft_base_speed": { "value": "20" },
         "raft_base_thickness": { "value": "0.3" },
         "raft_interface_line_spacing": { "value": "0.5" },
         "raft_interface_line_width": { "value": "0.5" },
-        "raft_interface_speed": { "value": "20" },
         "raft_interface_thickness": { "value": "0.2" },
         "raft_jerk": { "value": "jerk_layer_0" },
         "raft_margin": { "value": "10" },
-        "raft_speed": { "value": "25" },
         "raft_surface_layers": { "value": "1" },
         "retraction_amount": { "value": "2" },
         "retraction_count_max": { "value": "10" },
diff --git a/resources/variants/ultimaker3_aa04.inst.cfg b/resources/variants/ultimaker3_aa04.inst.cfg
index c8d5b8aceb..dae256c990 100644
--- a/resources/variants/ultimaker3_aa04.inst.cfg
+++ b/resources/variants/ultimaker3_aa04.inst.cfg
@@ -12,15 +12,12 @@ brim_width = 7
 machine_nozzle_cool_down_speed = 0.9
 raft_acceleration = =acceleration_print
 raft_airgap = 0.3
-raft_base_speed = =0.75 * raft_speed
 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_speed = =raft_speed * 0.75
 raft_interface_thickness = =layer_height * 1.5
 raft_jerk = =jerk_print
 raft_margin = 15
-raft_speed = =speed_print / 60 * 30
 raft_surface_layers = 2
 retraction_amount = 6.5
 retraction_count_max = 25
diff --git a/resources/variants/ultimaker3_bb04.inst.cfg b/resources/variants/ultimaker3_bb04.inst.cfg
index 94069901cf..b813e8474d 100644
--- a/resources/variants/ultimaker3_bb04.inst.cfg
+++ b/resources/variants/ultimaker3_bb04.inst.cfg
@@ -16,6 +16,8 @@ speed_layer_0 = 20
 speed_wall_0 = =math.ceil(speed_wall * 25 / 30)
 support_bottom_height = =layer_height * 2
 support_bottom_stair_step_height = =layer_height
+raft_interface_speed = 20
+raft_base_speed = 20
 support_infill_rate = 25
 support_interface_enable = True
 support_join_distance = 3
@@ -23,4 +25,5 @@ support_line_width = =round(line_width * 0.4 / 0.35, 2)
 support_offset = 3
 support_xy_distance = =wall_line_width_0 * 3
 support_xy_distance_overhang = =wall_line_width_0 / 2
+raft_speed = 25