From 3776d3c6d236cbaaba08d002ca740ad459b334e2 Mon Sep 17 00:00:00 2001
From: Tom Heijmans <t.heijmans@ultimaker.com>
Date: Fri, 15 Apr 2016 13:33:30 +0200
Subject: [PATCH] Updated material & UM2+ profiles

---
 resources/profiles/materials/abs.cfg          |  7 ++++---
 resources/profiles/materials/cpe.cfg          |  3 ++-
 resources/profiles/materials/pla.cfg          |  2 ++
 .../ultimaker2+/abs_0.25_normal.curaprofile   | 17 ++++++----------
 .../ultimaker2+/abs_0.4_fast.curaprofile      | 15 +++++---------
 .../ultimaker2+/abs_0.4_high.curaprofile      | 12 +++--------
 .../ultimaker2+/abs_0.4_normal.curaprofile    | 13 +++---------
 .../ultimaker2+/abs_0.6_normal.curaprofile    | 12 +++--------
 .../ultimaker2+/abs_0.8_normal.curaprofile    | 12 +++--------
 .../ultimaker2+/cpe_0.25_normal.curaprofile   | 17 +++++-----------
 .../ultimaker2+/cpe_0.4_fast.curaprofile      | 12 ++++-------
 .../ultimaker2+/cpe_0.4_high.curaprofile      | 19 +++++-------------
 .../ultimaker2+/cpe_0.4_normal.curaprofile    | 16 +++++----------
 .../ultimaker2+/cpe_0.6_normal.curaprofile    | 20 ++++++-------------
 .../ultimaker2+/cpe_0.8_normal.curaprofile    | 19 ++++++------------
 .../ultimaker2+/pla_0.25_normal.curaprofile   | 14 ++++---------
 .../ultimaker2+/pla_0.4_fast.curaprofile      | 15 +++++---------
 .../ultimaker2+/pla_0.4_high.curaprofile      | 14 ++++---------
 .../ultimaker2+/pla_0.4_normal.curaprofile    | 13 ++++--------
 .../ultimaker2+/pla_0.6_normal.curaprofile    | 13 ++++--------
 .../ultimaker2+/pla_0.8_normal.curaprofile    | 16 +++++----------
 21 files changed, 88 insertions(+), 193 deletions(-)

diff --git a/resources/profiles/materials/abs.cfg b/resources/profiles/materials/abs.cfg
index 3d05d7003a..d5fe2cc199 100644
--- a/resources/profiles/materials/abs.cfg
+++ b/resources/profiles/materials/abs.cfg
@@ -4,7 +4,8 @@ type = material
 name = ABS
 
 [settings]
-material_bed_temperature = 100
-material_flow = 107
 material_print_temperature = 250
-cool_fan_speed = 50
+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 3f1b33d74a..e389bdb23a 100644
--- a/resources/profiles/materials/cpe.cfg
+++ b/resources/profiles/materials/cpe.cfg
@@ -5,4 +5,5 @@ name = CPE
 
 [settings]
 material_print_temperature = 250
-cool_fan_speed = 50
+material_bed_temperature = 70
+retraction_amount = 6.5
diff --git a/resources/profiles/materials/pla.cfg b/resources/profiles/materials/pla.cfg
index 8aead264d8..216f2bfb66 100644
--- a/resources/profiles/materials/pla.cfg
+++ b/resources/profiles/materials/pla.cfg
@@ -4,3 +4,5 @@ type = material
 name = PLA
 
 [settings]
+material_bed_temperature = 60
+retraction_amount = 6.5
diff --git a/resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile
index 15632a183b..9f45e9d01a 100644
--- a/resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile
@@ -1,6 +1,6 @@
 [general]
 version = 1
-name = Normal Quality
+name = High Quality
 machine_type = ultimaker2plus
 machine_variant = 0.25 mm
 material = ABS
@@ -9,17 +9,12 @@ weight = -2
 [settings]
 layer_height = 0.06
 wall_thickness = 0.88
-line_width = 0.22
 top_bottom_thickness = 0.72
 infill_sparse_density = 22
-speed_print = 20
-layer_height_0 = 0.15
-speed_layer_0 = 20
-speed_infill = 30
-speed_topbottom = 20
-speed_wall_x = 25
-cool_min_layer_time = 2
-cool_min_speed = 10
-cool_lift_head = True
+speed_print = 30
+cool_min_layer_time = 3
 cool_fan_speed_min = 20
+cool_min_speed = 10
+cool_min_layer_time_fan_speed_max = 15
+
 
diff --git a/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile
index 03c5cad45f..50018372b5 100644
--- a/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile
@@ -9,18 +9,13 @@ weight = -1
 [settings]
 layer_height = 0.15
 wall_thickness = 0.7
-line_width = 0.35
 top_bottom_thickness = 0.75
 infill_sparse_density = 18
-speed_print = 40
-layer_height_0 = 0.26
-speed_layer_0 = 30
+speed_print = 55
 speed_travel = 150
-speed_infill = 55
-speed_topbottom = 30
-speed_wall_0 = 30
+speed_layer_0 = 30
 cool_min_layer_time = 3
-cool_min_speed = 20
-cool_lift_head = True
-cool_fan_speed_min = 50
+cool_fan_speed_min = 20
+cool_min_speed = 10
+cool_min_layer_time_fan_speed_max = 15
 
diff --git a/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile b/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile
index 30867e8605..341c9cc34f 100644
--- a/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile
@@ -9,17 +9,11 @@ weight = -3
 [settings]
 layer_height = 0.06
 wall_thickness = 1.05
-line_width = 0.35
 top_bottom_thickness = 0.72
 infill_sparse_density = 22
-speed_print = 30
-layer_height_0 = 0.26
-speed_layer_0 = 20
-speed_infill = 45
-speed_topbottom = 20
-speed_wall_0 = 20
+speed_print = 45
 cool_min_layer_time = 3
-cool_min_speed = 10
 cool_fan_speed_min = 20
-cool_lift_head = True
+cool_min_speed = 10
+cool_min_layer_time_fan_speed_max = 15
 
diff --git a/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile
index a073713649..d8fce8a4dd 100644
--- a/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile
@@ -9,17 +9,10 @@ weight = -2
 [settings]
 layer_height = 0.1
 wall_thickness = 1.05
-line_width = 0.35
 top_bottom_thickness = 0.8
 infill_sparse_density = 20
-speed_print = 30
-layer_height_0 = 0.26
-speed_layer_0 = 20
-speed_infill = 45
-speed_topbottom = 20
-speed_wall_0 = 20
+speed_print = 45
 cool_min_layer_time = 3
-cool_fan_speed_min = 50
+cool_fan_speed_min = 20
 cool_min_speed = 10
-cool_lift_head = True
-
+cool_min_layer_time_fan_speed_max = 15
diff --git a/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile
index 7f14ef04a2..5512450471 100644
--- a/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile
@@ -9,18 +9,12 @@ weight = -2
 [settings]
 layer_height = 0.15
 wall_thickness = 1.59
-line_width = 0.53
 top_bottom_thickness = 1.2
 infill_sparse_density = 20
-speed_print = 25
-layer_height_0 = 0.39
-speed_layer_0 = 20
-speed_infill = 40
-speed_topbottom = 20
-speed_wall_0 = 20
-speed_wall_x = 30
+speed_print = 40
 cool_min_layer_time = 3
 cool_fan_speed_min = 50
 cool_min_speed = 20
-cool_lift_head = True
+cool_min_layer_time_fan_speed_max = 20
+
 
diff --git a/resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile
index 7851f82cee..e5f27c51a2 100644
--- a/resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile
@@ -1,6 +1,6 @@
 [general]
 version = 1
-name = Normal Quality
+name = Fast Print
 machine_type = ultimaker2plus
 machine_variant = 0.8 mm
 material = ABS
@@ -9,17 +9,11 @@ weight = -2
 [settings]
 layer_height = 0.2
 wall_thickness = 2.1
-line_width = 0.7
-speed_print = 20
 top_bottom_thickness = 1.2
 infill_sparse_density = 20
-layer_height_0 = 0.5
-speed_layer_0 = 20
-speed_infill = 40
-speed_topbottom = 20
-speed_wall_x = 30
+speed_print = 40
 cool_min_layer_time = 3
 cool_fan_speed_min = 50
 cool_min_speed = 15
-cool_lift_head = True
+cool_min_layer_time_fan_speed_max = 25
 
diff --git a/resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile
index 7003b825b5..c4c09932d8 100644
--- a/resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile
@@ -1,6 +1,6 @@
 [general]
 version = 1
-name = Normal Quality
+name = High Quality
 machine_type = ultimaker2plus
 machine_variant = 0.25 mm
 material = CPE
@@ -9,18 +9,11 @@ weight = -2
 [settings]
 layer_height = 0.06
 wall_thickness = 0.88
-line_width = 0.22
 top_bottom_thickness = 0.72
 infill_sparse_density = 22
-speed_print = 20
-layer_height_0 = 0.15
-speed_layer_0 = 20
-speed_infill = 30
-speed_topbottom = 20
-speed_wall_x = 25
+speed_print = 30
 cool_min_layer_time = 2
-cool_min_speed = 10
-cool_fan_speed_min = 50
-cool_lift_head = True
-infill_overlap = 17
+cool_fan_speed_min = 20
+cool_min_speed = 15
+cool_min_layer_time_fan_speed_max = 15
 
diff --git a/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile
index 41da312634..f9050e5ce5 100644
--- a/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile
@@ -9,18 +9,14 @@ weight = -1
 [settings]
 layer_height = 0.15
 wall_thickness = 0.7
-line_width = 0.35
 top_bottom_thickness = 0.75
 infill_sparse_density = 18
-speed_print = 40
-layer_height_0 = 0.26
+speed_print = 45
 speed_travel = 150
 speed_layer_0 = 30
-speed_infill = 45
-speed_wall_0 = 30
 cool_min_layer_time = 3
-cool_fan_speed_min = 50
+cool_fan_speed_min = 80
 cool_min_speed = 10
-cool_lift_head = True
-infill_overlap = 17
+cool_min_layer_time_fan_speed_max = 15
+
 
diff --git a/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile b/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile
index bfa93ff46c..377ab5b257 100644
--- a/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile
@@ -9,19 +9,10 @@ weight = -3
 [settings]
 layer_height = 0.06
 wall_thickness = 1.05
-line_width = 0.35
 top_bottom_thickness = 0.72
 infill_sparse_density = 22
-speed_print = 20
-layer_height_0 = 0.26
-speed_layer_0 = 20
-speed_infill = 45
-speed_topbottom = 20
-speed_wall_x = 30
-cool_min_layer_time = 3
-cool_fan_speed_min = 50
-cool_min_speed = 10
-cool_lift_head = True
-infill_overlap = 15
-
-
+speed_print = 45
+cool_min_layer_time = 2
+cool_fan_speed_min = 80
+cool_min_speed = 15
+cool_min_layer_time_fan_speed_max = 15
diff --git a/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile
index b725a17713..e8142405ff 100644
--- a/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile
@@ -7,19 +7,13 @@ material = CPE
 weight = -2
 
 [settings]
+layer_height = 0.1
 wall_thickness = 1.05
-line_width = 0.35
 top_bottom_thickness = 0.8
-speed_print = 30
-layer_height_0 = 0.26
-speed_layer_0 = 20
-speed_infill = 45
-speed_topbottom = 20
-speed_wall_0 = 20
-speed_wall_x = 30
+infill_sparse_density = 20
+speed_print = 45
 cool_min_layer_time = 3
-cool_fan_speed_min = 50
+cool_fan_speed_min = 80
 cool_min_speed = 10
-cool_lift_head = True
-infill_overlap = 15
+cool_min_layer_time_fan_speed_max = 15
 
diff --git a/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile
index e45bf7ef3f..034fa17e1b 100644
--- a/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile
@@ -9,18 +9,10 @@ weight = -2
 [settings]
 layer_height = 0.15
 wall_thickness = 1.59
-line_width = 0.53
 top_bottom_thickness = 1.2
-speed_print = 25
-layer_height_0 = 0.4
-speed_layer_0 = 20
-speed_infill = 40
-speed_topbottom = 20
-speed_wall_0 = 20
-speed_wall_x = 30
-cool_min_layer_time = 3
-cool_min_speed = 10
-cool_fan_speed_min = 50
-cool_lift_head = True
-infill_overlap = 17
-
+infill_sparse_density = 20
+speed_print = 40
+cool_min_layer_time = 5
+cool_fan_speed_min = 80
+cool_min_speed = 8
+cool_min_layer_time_fan_speed_max = 20
diff --git a/resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile
index 19cbc9a18e..523a5d3243 100644
--- a/resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile
@@ -1,6 +1,6 @@
 [general]
 version = 1
-name = Normal Quality
+name = Fast Print
 machine_type = ultimaker2plus
 machine_variant = 0.8 mm
 material = CPE
@@ -9,17 +9,10 @@ weight = -2
 [settings]
 layer_height = 0.2
 wall_thickness = 2.1
-line_width = 0.7
 top_bottom_thickness = 1.2
-speed_print = 20
-layer_height_0 = 0.5
-speed_layer_0 = 20
-speed_infill = 40
-speed_topbottom = 20
-speed_wall_x = 30
+infill_sparse_density = 20
+speed_print = 40
 cool_min_layer_time = 3
-cool_min_speed = 10
-cool_fan_speed_min = 50
-cool_lift_head = True
-infill_overlap = 17
-
+cool_fan_speed_min = 80
+cool_min_speed = 8
+cool_min_layer_time_fan_speed_max = 25
diff --git a/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile
index d5c27687a5..63c1fc9fdd 100644
--- a/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile
@@ -1,22 +1,16 @@
 [general]
 version = 1
-name = Normal Quality
+name = High Quality
 machine_type = ultimaker2plus
 machine_variant = 0.25 mm
 material = PLA
 weight = -2
 
 [settings]
-line_width = 0.22
 layer_height = 0.06
-layer_height_0 = 0.15
 wall_thickness = 0.88
 top_bottom_thickness = 0.72
 infill_sparse_density = 22
-retraction_amount = 6
-speed_print = 20
-speed_infill = 30
-speed_wall_x = 25
-speed_topbottom = 20
-speed_layer_0 = 25
-cool_min_layer_time_fan_speed_max = 15
+speed_print = 30
+cool_min_layer_time = 5
+cool_min_speed = 10
diff --git a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile
index 5088c055c2..06e401c139 100644
--- a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile
@@ -7,17 +7,12 @@ material = PLA
 weight = -1
 
 [settings]
-line_width = 0.35
 layer_height = 0.15
-layer_height_0 = 0.26
 wall_thickness = 0.7
-top_bottom_thickness = 0.6
+top_bottom_thickness = 0.75
 infill_sparse_density = 18
-retraction_amount = 5.5
-speed_print = 40
-speed_infill = 60
-speed_wall_x = 50
+speed_print = 60
 speed_travel = 150
-speed_topbottom = 30
-speed_layer_0 = 25
-cool_min_layer_time_fan_speed_max = 15
+speed_layer_0 = 30
+cool_min_layer_time = 5
+cool_min_speed = 10
diff --git a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
index 5140474e48..5e2f762354 100644
--- a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
@@ -7,16 +7,10 @@ material = PLA
 weight = -3
 
 [settings]
-line_width = 0.35
 layer_height = 0.06
-layer_height_0 = 0.26
 wall_thickness = 1.05
-top_bottom_thickness = 0.84
+top_bottom_thickness = 0.72
 infill_sparse_density = 22
-retraction_amount = 5.5
-speed_print = 30
-speed_infill = 50
-speed_wall_x = 40
-speed_topbottom = 20
-speed_layer_0 = 25
-cool_min_layer_time_fan_speed_max = 15
\ No newline at end of file
+speed_print = 50
+cool_min_layer_time = 5
+cool_min_speed = 10
diff --git a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile
index 88862832b2..689a3251b2 100644
--- a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile
@@ -7,15 +7,10 @@ material = PLA
 weight = -2
 
 [settings]
-line_width = 0.35
-layer_height_0 = 0.26
+layer_height = 0.1
 wall_thickness = 1.05
 top_bottom_thickness = 0.8
 infill_sparse_density = 20
-retraction_amount = 5.5
-speed_print = 30
-speed_infill = 50
-speed_wall_x = 40
-speed_topbottom = 20
-speed_layer_0 = 25
-cool_min_layer_time_fan_speed_max = 15
+speed_print = 50
+cool_min_layer_time = 5
+cool_min_speed = 10
diff --git a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile
index 13d1c783d6..188ed42a95 100644
--- a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile
@@ -7,15 +7,10 @@ material = PLA
 weight = -2
 
 [settings]
-line_width = 0.53
 layer_height = 0.15
-layer_height_0 = 0.4
 wall_thickness = 1.59
 top_bottom_thickness = 1.2
-retraction_amount = 6
-speed_print = 25
-speed_infill = 55
-speed_wall_x = 40
-speed_topbottom = 20
-speed_layer_0 = 25
-cool_min_layer_time_fan_speed_max = 20
+infill_sparse_density = 20
+speed_print = 55
+cool_min_layer_time = 5
+cool_min_speed = 10
diff --git a/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile
index 030bd38064..92cb4a6054 100644
--- a/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile
@@ -1,22 +1,16 @@
 [general]
 version = 1
-name = Normal Quality
+name = Fast Print
 machine_type = ultimaker2plus
 machine_variant = 0.8 mm
 material = PLA
 weight = -2
 
 [settings]
-line_width = 0.7
 layer_height = 0.2
-layer_height_0 = 0.5
 wall_thickness = 2.1
-top_bottom_thickness = 1.6
+top_bottom_thickness = 1.2
 infill_sparse_density = 20
-retraction_amount = 6
-speed_print = 20
-speed_infill = 40
-speed_wall_x = 30
-speed_topbottom = 20
-speed_layer_0 = 25
-cool_min_layer_time_fan_speed_max = 25
+speed_print = 40
+cool_min_layer_time = 5
+cool_min_speed = 10