From 93c249280e71dc5c0fe8e82e9daee512b3a7aab7 Mon Sep 17 00:00:00 2001
From: Ghostkeeper <rubend@tutanota.com>
Date: Tue, 16 May 2017 14:03:15 +0200
Subject: [PATCH] Copy UM3 variants to UM3E

They should be kept in sync for now.
---
 .../ultimaker3_extended_bb0.8.inst.cfg        | 16 ++++++++---
 .../ultimaker3_extended_bb04.inst.cfg         | 28 +++++++++++++------
 2 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg
index f88dc818c8..2e6292ed08 100644
--- a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg
@@ -11,7 +11,9 @@ setting_version = 1
 [values]
 acceleration_enabled = True
 acceleration_print = 4000
-acceleration_support_interface = =math.ceil(acceleration_topbottom * 100 / 500)
+acceleration_support = =math.ceil(acceleration_print * 2000 / 4000)
+acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000)
+acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500)
 brim_width = 3
 cool_fan_speed = 50
 cool_min_speed = 5
@@ -21,7 +23,9 @@ infill_pattern = triangles
 infill_wipe_dist = 0
 jerk_enabled = True
 jerk_print = 25
-jerk_support_interface = =math.ceil(jerk_topbottom * 1 / 5)
+jerk_support = =math.ceil(jerk_print * 15 / 25)
+jerk_support_interface = =math.ceil(jerk_support * 10 / 15)
+jerk_support_bottom = =math.ceil(jerk_support_interface * 1 / 10)
 layer_height = 0.2
 machine_min_cool_heat_time_window = 15
 machine_nozzle_heat_up_speed = 1.5
@@ -54,20 +58,24 @@ retraction_prime_speed = 15
 skin_overlap = 5
 speed_layer_0 = 20
 speed_print = 35
-speed_support_interface = =math.ceil(speed_topbottom * 15 / 20)
+speed_support = =math.ceil(speed_print * 25 / 35)
+speed_support_interface = =math.ceil(speed_support * 20 / 25)
+speed_support_bottom = =math.ceil(speed_support_interface * 10 / 20)
 speed_wall_0 = =math.ceil(speed_wall * 25 / 30)
 support_angle = 60
 support_bottom_height = =layer_height * 2
+support_bottom_pattern = zigzag
 support_bottom_stair_step_height = =layer_height
 support_infill_rate = 25
 support_interface_enable = True
 support_interface_height = =layer_height * 5
+support_interface_skip_height = =layer_height
 support_join_distance = 3
 support_line_width = =round(line_width * 0.4 / 0.35, 2)
 support_offset = 1.5
 support_pattern = triangles
 support_use_towers = False
-support_xy_distance = =wall_line_width_0 / 2
+support_xy_distance = =round(wall_line_width_0 * 0.75, 2)
 support_xy_distance_overhang = =wall_line_width_0 / 4
 support_z_distance = 0
 switch_extruder_prime_speed = 15
diff --git a/resources/variants/ultimaker3_extended_bb04.inst.cfg b/resources/variants/ultimaker3_extended_bb04.inst.cfg
index 229bde1916..abeaf69db2 100644
--- a/resources/variants/ultimaker3_extended_bb04.inst.cfg
+++ b/resources/variants/ultimaker3_extended_bb04.inst.cfg
@@ -9,20 +9,32 @@ type = variant
 setting_version = 1
 
 [values]
-cool_fan_speed_max = 100
+acceleration_support = =math.ceil(acceleration_print * 2000 / 4000)
+acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000)
+acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500)
+cool_fan_speed_max = =cool_fan_speed
+jerk_support = =math.ceil(jerk_print * 15 / 25)
+jerk_support_interface = =math.ceil(jerk_support * 10 / 15)
+jerk_support_bottom = =math.ceil(jerk_support_interface * 1 / 10)
 machine_nozzle_heat_up_speed = 1.5
-machine_nozzle_size = 0.4
-material_bed_temperature = 60
 material_print_temperature = 215
-raft_acceleration = =acceleration_layer_0
-raft_jerk = =jerk_layer_0
+raft_base_speed = 20
+raft_interface_speed = 20
+raft_speed = 25
 retraction_extrusion_window = =retraction_amount
+speed_layer_0 = 20
+speed_support = =math.ceil(speed_print * 25 / 35)
+speed_support_interface = =math.ceil(speed_support * 20 / 25)
+speed_support_bottom = =math.ceil(speed_support_interface * 10 / 20)
 speed_wall_0 = =math.ceil(speed_wall * 25 / 30)
 support_bottom_height = =layer_height * 2
+support_bottom_pattern = zigzag
 support_bottom_stair_step_height = =layer_height
+support_infill_rate = 25
 support_interface_enable = True
+support_interface_skip_height = =layer_height
+support_join_distance = 3
 support_line_width = =round(line_width * 0.4 / 0.35, 2)
-support_pattern = triangles
-support_use_towers = False
-support_xy_distance = =wall_line_width_0 * 3
+support_offset = 3
+support_xy_distance = =round(wall_line_width_0 * 0.75, 2)
 support_xy_distance_overhang = =wall_line_width_0 / 2