Merge pull request #701 from THeijmans/2.1

UM2+ profile improvements

resources/machines/ultimaker2plus.json

@@ -11,6 +11,13 @@
     "inherits": "ultimaker2.json",
 
     "overrides": {
+        "speed_infill": { "inherit_function": "speed_print"  },
+        "speed_wall_x": { "inherit_function": "speed_wall"  },
+        "layer_height_0": { "inherit_function": "round(machine_nozzle_size / 1.5, 2)"  },
+        "retraction_min_travel": { "inherit_function": "machine_nozzle_size * 2"  },
+        "line_width": { "inherit_function": "round(machine_nozzle_size * 0.875, 2)"  },
+        "speed_layer_0": { "default": "20" },
+        "speed_support": { "inherit_function": "speed_wall_0"  },
         "machine_height": { "default": 203 },
         "machine_show_variants": { "default": true },
         "gantry_height": { "default": 52 },

resources/machines/ultimaker2plus_025.json

@@ -12,6 +12,9 @@
     "variant": "0.25 mm",
 
     "overrides": {
+        "speed_wall": { "inherit_function": "round(speed_print / 1.2, 1)"  },
+        "speed_wall_0": { "inherit_function": "1 if speed_wall < 5 else (speed_wall - 5)"  },
+        "speed_topbottom": { "inherit_function": "round(speed_print / 1.5, 1)" },
         "machine_nozzle_size": { "default": 0.25 },
         "machine_nozzle_tip_outer_diameter": { "default": 0.8 },
         "coasting_volume": { "default": 0.1 },

resources/machines/ultimaker2plus_040.json

@@ -12,6 +12,9 @@
     "variant": "0.4 mm",
 
     "overrides": {
+        "speed_wall": { "inherit_function": "round(speed_print / 1.25, 1)"  },
+        "speed_wall_0": { "inherit_function": "1 if speed_wall < 10 else (speed_wall - 10)"  },
+        "speed_topbottom": { "inherit_function": "round(speed_print / 2.25, 1)" },
         "machine_nozzle_size": { "default": 0.40 },
         "machine_nozzle_tip_outer_diameter": { "default": 1.05 }
     }

resources/machines/ultimaker2plus_060.json

@@ -12,6 +12,9 @@
     "variant": "0.6 mm",
 
     "overrides": {
+        "speed_wall": { "inherit_function": "round(speed_print / 1.333333, 1)"  },
+        "speed_wall_0": { "inherit_function": "1 if speed_wall < 10 else (speed_wall - 10)"  },
+        "speed_topbottom": { "inherit_function": "round(speed_print / 2, 1)" },
         "machine_nozzle_size": { "default": 0.60 },
         "machine_nozzle_tip_outer_diameter": { "default": 1.25 },
         "coasting_volume": { "default": 1.36 }

resources/machines/ultimaker2plus_080.json

@@ -12,6 +12,9 @@
     "variant": "0.8 mm",
 
     "overrides": {
+        "speed_wall": { "inherit_function": "round(speed_print / 1.333333, 1)"  },
+        "speed_wall_0": { "inherit_function": "1 if speed_wall < 10 else (speed_wall - 10)"  },
+        "speed_topbottom": { "inherit_function": "round(speed_print / 2, 1)" },
         "machine_nozzle_size": { "default": 0.80 },
         "machine_nozzle_tip_outer_diameter": { "default": 1.35 },
         "coasting_volume": { "default": 3.22 }

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
+

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

resources/profiles/materials/pla.cfg

@@ -4,3 +4,5 @@ type = material
 name = PLA
 
 [settings]
+material_bed_temperature = 60
+retraction_amount = 6.5

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
+
 

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