Merge branch 'master' of https://github.com/kaleidoscopeit/Cura into kaleidoscopeit-master

resources/definitions/deltacomb.def.json

@@ -34,7 +34,7 @@
         "material_initial_print_temperature":    { "value": "material_print_temperature" },
         "material_print_temperature_layer_0":    { "value": "material_print_temperature + 5" },
         "travel_avoid_distance":                 { "default_value": 1, "value": "1" },
-        "speed_print" :                          { "default_value": 60 },
+        "speed_print" :                          { "default_value": 70 },
         "speed_travel":                          { "value": "150.0" },
         "speed_infill":                          { "value": "round(speed_print * 1.05, 0)" },
         "speed_topbottom":                       { "value": "round(speed_print * 0.95, 0)" },
@@ -52,6 +52,9 @@
         "top_bottom_thickness":                  { "default_value": 0.6 },
         "support_z_distance":                    { "value": "layer_height * 2" },
         "support_bottom_distance":               { "value": "layer_height" },
-        "support_use_towers" :                   { "default_value": false }
+        "support_use_towers" :                   { "default_value": false },
+        "jerk_wall_0" :                          { "value": "30" },
+        "jerk_travel" :                          { "default_value": 20 },
+        "acceleration_travel" :                  { "value": 10000 }
     }
 }

resources/quality/deltacomb/deltacomb_abs_Draft_Quality.inst.cfg

@@ -0,0 +1,24 @@
+[general]
+version = 4
+name = Fast (beta)
+definition = deltacomb
+
+[metadata]
+setting_version = 5
+type = quality
+quality_type = draft
+weight = -2
+material = generic_abs
+
+[values]
+adhesion_type = raft
+cool_fan_enabled = True
+cool_fan_full_at_height = =layer_height * 2
+cool_fan_speed = 50
+cool_fan_speed_max = 50
+cool_fan_speed_min = 50
+cool_min_layer_time = 5
+cool_min_speed = 20
+material_bed_temperature = 80
+material_print_temperature_layer_0 = =default_material_print_temperature + 5
+

resources/quality/deltacomb/deltacomb_abs_Fast_Quality.inst.cfg

@@ -1,7 +1,7 @@
 [general]
 version = 4
+name = Normal (beta)
 definition = deltacomb
-name = Fast Quality (beta)
 
 [metadata]
 setting_version = 5
@@ -12,13 +12,12 @@ material = generic_abs
 
 [values]
 adhesion_type = raft
-layer_height = 0.2
-layer_height_0 = 0.2
 cool_fan_enabled = True
-cool_fan_full_at_height = 0.4
+cool_fan_full_at_height = =layer_height * 2
 cool_fan_speed = 50
 cool_fan_speed_max = 50
 cool_fan_speed_min = 50
-cool_min_layer_time = 3
+cool_min_layer_time = 5
 cool_min_speed = 20
 material_bed_temperature = 80
+material_print_temperature_layer_0 = =default_material_print_temperature + 5

resources/quality/deltacomb/deltacomb_abs_High_Quality.inst.cfg

@@ -1,24 +1,23 @@
 [general]
 version = 4
+name = Extra Fine (beta)
 definition = deltacomb
-name = High Quality (beta)
 
 [metadata]
 setting_version = 5
 type = quality
 quality_type = high
-weight = 1
+weight = 0
 material = generic_abs
 
 [values]
 adhesion_type = raft
-layer_height = 0.1
-layer_height_0 = 0.1
 cool_fan_enabled = True
-cool_fan_full_at_height = 0.2
+cool_fan_full_at_height = =layer_height * 2
 cool_fan_speed = 50
 cool_fan_speed_max = 50
 cool_fan_speed_min = 50
-cool_min_layer_time = 3
+cool_min_layer_time = 5
 cool_min_speed = 20
 material_bed_temperature = 80
+material_print_temperature_layer_0 = =default_material_print_temperature + 5

resources/quality/deltacomb/deltacomb_abs_Normal_Quality.inst.cfg

@@ -1,7 +1,7 @@
 [general]
 version = 4
+name = Fine (beta)
 definition = deltacomb
-name = Normal Quality (beta)
 
 [metadata]
 setting_version = 5
@@ -12,13 +12,12 @@ material = generic_abs
 
 [values]
 adhesion_type = raft
-layer_height = 0.15
-layer_height_0 = 0.15
 cool_fan_enabled = True
-cool_fan_full_at_height = 0.3
+cool_fan_full_at_height = =layer_height * 2
 cool_fan_speed = 50
 cool_fan_speed_max = 50
 cool_fan_speed_min = 50
-cool_min_layer_time = 3
+cool_min_layer_time = 5
 cool_min_speed = 20
 material_bed_temperature = 80
+material_print_temperature_layer_0 = =default_material_print_temperature + 5

resources/quality/deltacomb/deltacomb_abs_Verydraft_Quality.inst.cfg

@@ -0,0 +1,23 @@
+[general]
+version = 4
+name = Extra Fast (beta)
+definition = deltacomb
+
+[metadata]
+setting_version = 5
+type = quality
+quality_type = verydraft
+weight = -3
+material = generic_abs
+
+[values]
+adhesion_type = raft
+cool_fan_enabled = True
+cool_fan_full_at_height = =layer_height * 2
+cool_fan_speed = 50
+cool_fan_speed_max = 50
+cool_fan_speed_min = 50
+cool_min_layer_time = 5
+cool_min_speed = 20
+material_bed_temperature = 80
+material_print_temperature_layer_0 = =default_material_print_temperature + 5

resources/quality/deltacomb/deltacomb_global_Draft_Quality.inst.cfg

@@ -0,0 +1,15 @@
+[general]
+version = 4
+name = Fast
+definition = deltacomb
+
+[metadata]
+setting_version = 5
+type = quality
+quality_type = draft
+weight = -2
+global_quality = True
+
+[values]
+layer_height = 0.2
+layer_height_0 = =layer_height

resources/quality/deltacomb/deltacomb_global_Fast_Quality.inst.cfg

@@ -0,0 +1,15 @@
+[general]
+version = 4
+name = Normal
+definition = deltacomb
+
+[metadata]
+setting_version = 5
+type = quality
+quality_type = fast
+weight = -1
+global_quality = True
+
+[values]
+layer_height = 0.15
+layer_height_0 = =layer_height

resources/quality/deltacomb/deltacomb_global_High_Quality.inst.cfg

@@ -0,0 +1,15 @@
+[general]
+version = 4
+name = Extra Fine
+definition = deltacomb
+
+[metadata]
+setting_version = 5
+type = quality
+quality_type = high
+weight = 0
+global_quality = True
+
+[values]
+layer_height = 0.05
+layer_height_0 = =layer_height * 2

resources/quality/deltacomb/deltacomb_global_Normal_Quality.inst.cfg

@@ -0,0 +1,15 @@
+[general]
+version = 4
+name = Fine
+definition = deltacomb
+
+[metadata]
+setting_version = 5
+type = quality
+quality_type = normal
+weight = 0
+global_quality = True
+
+[values]
+layer_height = 0.1
+layer_height_0 = =layer_height * 2

resources/quality/deltacomb/deltacomb_global_Verydraft_Quality.inst.cfg

@@ -0,0 +1,15 @@
+[general]
+version = 4
+name = Extra Fast
+definition = deltacomb
+
+[metadata]
+setting_version = 5
+type = quality
+quality_type = verydraft
+weight = -3
+global_quality = True
+
+[values]
+layer_height = 0.3
+layer_height_0 = =layer_height

resources/quality/deltacomb/deltacomb_nylon_fast.inst.cfg

@@ -1,57 +0,0 @@
-[general]
-version = 4
-name = Fast Quality (beta)
-definition = deltacomb
-
-[metadata]
-setting_version = 5
-type = quality
-quality_type = fast
-weight = -1
-material = generic_nylon
-
-[values]
-adhesion_type = raft
-brim_width = 4
-cool_fan_enabled = False
-cool_fan_full_at_height = 0.45
-cool_fan_speed = 0
-cool_fan_speed_max = 0
-cool_fan_speed_min = 0
-cool_min_layer_time = 5
-cool_min_speed = 0
-infill_overlap = 15
-infill_sparse_density = 24
-layer_height = 0.20
-layer_height_0 = 0.15
-line_width = =machine_nozzle_size
-material_flow = 100
-raft_airgap = 0.22
-raft_base_line_width= =line_width * 2
-raft_base_thickness = =layer_height_0 * 2
-raft_interface_line_width  = =line_width
-raft_interface_thickness = =layer_height
-raft_margin = 5
-raft_surface_layers = 2
-raft_surface_line_width = =line_width
-raft_surface_thickness = =layer_height
-retraction_hop = 0.5
-retraction_hop_enabled = False
-retraction_hop_only_when_collides = True
-skin_overlap = 10
-skirt_brim_minimal_length = 75
-skirt_gap = 1.5
-skirt_line_count = 5
-speed_infill = =speed_print
-speed_layer_0 = =math.ceil(speed_print * 25 / 50)
-speed_print = 50
-speed_topbottom = =math.ceil(speed_print * 40 / 50)
-speed_travel = 200
-speed_wall_0 = =math.ceil(speed_print * 40 / 50)
-speed_wall_x = =speed_print
-support_angle = 70
-support_type = buildplate
-support_z_distance = 0.15
-top_bottom_thickness = 0.8
-wall_thickness = 0.8
-z_seam_type = random

resources/quality/deltacomb/deltacomb_nylon_high.inst.cfg

@@ -1,57 +0,0 @@
-[general]
-version = 4
-name = High Quality (beta)
-definition = deltacomb
-
-[metadata]
-setting_version = 5
-type = quality
-quality_type = high
-weight = 1
-material = generic_nylon
-
-[values]
-adhesion_type = raft
-brim_width = 4
-cool_fan_enabled = False
-cool_fan_full_at_height = 0.45
-cool_fan_speed = 0
-cool_fan_speed_max = 0
-cool_fan_speed_min = 0
-cool_min_layer_time = 5
-cool_min_speed = 0
-infill_overlap = 15
-infill_sparse_density = 24
-layer_height = 0.10
-layer_height_0 = 0.10
-line_width = =machine_nozzle_size
-material_flow = 100
-raft_airgap = 0.22
-raft_base_line_width= =line_width * 2
-raft_base_thickness = =layer_height_0 * 2
-raft_interface_line_width  = =line_width
-raft_interface_thickness = =layer_height
-raft_margin = 5
-raft_surface_layers = 2
-raft_surface_line_width = =line_width
-raft_surface_thickness = =layer_height
-retraction_hop = 0.5
-retraction_hop_enabled = False
-retraction_hop_only_when_collides = True
-skin_overlap = 10
-skirt_brim_minimal_length = 75
-skirt_gap = 1.5
-skirt_line_count = 5
-speed_infill = =speed_print
-speed_layer_0 = =math.ceil(speed_print * 25 / 50)
-speed_print = 50
-speed_topbottom = =math.ceil(speed_print * 40 / 50)
-speed_travel = 200
-speed_wall_0 = =math.ceil(speed_print * 40 / 50)
-speed_wall_x = =speed_print
-support_angle = 70
-support_type = buildplate
-support_z_distance = 0.15
-top_bottom_thickness = 0.8
-wall_thickness = 0.8
-z_seam_type = random

resources/quality/deltacomb/deltacomb_nylon_normal.inst.cfg

@@ -1,57 +0,0 @@
-[general]
-version = 4
-name = Normal Quality (beta)
-definition = deltacomb
-
-[metadata]
-setting_version = 5
-type = quality
-quality_type = normal
-weight = 0
-material = generic_nylon
-
-[values]
-adhesion_type = raft
-brim_width = 4
-cool_fan_enabled = False
-cool_fan_full_at_height = 0.45
-cool_fan_speed = 0
-cool_fan_speed_max = 0
-cool_fan_speed_min = 0
-cool_min_layer_time = 5
-cool_min_speed = 0
-infill_overlap = 15
-infill_sparse_density = 24
-layer_height = 0.15
-layer_height_0 = 0.10
-line_width = =machine_nozzle_size
-material_flow = 100
-raft_airgap = 0.22
-raft_base_line_width= =line_width * 2
-raft_base_thickness = =layer_height_0 * 2
-raft_interface_line_width  = =line_width
-raft_interface_thickness = =layer_height
-raft_margin = 5
-raft_surface_layers = 2
-raft_surface_line_width = =line_width
-raft_surface_thickness = =layer_height
-retraction_hop = 0.5
-retraction_hop_enabled = False
-retraction_hop_only_when_collides = True
-skin_overlap = 10
-skirt_brim_minimal_length = 75
-skirt_gap = 1.5
-skirt_line_count = 5
-speed_infill = =speed_print
-speed_layer_0 = =math.ceil(speed_print * 25 / 50)
-speed_print = 50
-speed_topbottom = =math.ceil(speed_print * 40 / 50)
-speed_travel = 200
-speed_wall_0 = =math.ceil(speed_print * 40 / 50)
-speed_wall_x = =speed_print
-support_angle = 70
-support_type = buildplate
-support_z_distance = 0.15
-top_bottom_thickness = 0.8
-wall_thickness = 0.8
-z_seam_type = random

resources/quality/deltacomb/deltacomb_pla_Draft_Quality.inst.cfg

@@ -0,0 +1,22 @@
+[general]
+version = 4
+name = Fast
+definition = deltacomb
+
+[metadata]
+setting_version = 5
+type = quality
+quality_type = draft
+weight = -2
+material = generic_pla
+
+[values]
+adhesion_type = skirt
+cool_fan_enabled = True
+cool_fan_full_at_height = =layer_height
+cool_fan_speed = 100
+cool_fan_speed_max = 100
+cool_fan_speed_min = 100
+cool_min_layer_time = 5
+cool_min_speed = 20
+material_print_temperature_layer_0 = =default_material_print_temperature + 5

resources/quality/deltacomb/deltacomb_pla_Fast_Quality.inst.cfg

@@ -1,7 +1,7 @@
 [general]
 version = 4
+name = Normal
 definition = deltacomb
-name = Fast Quality
 
 [metadata]
 setting_version = 5
@@ -12,12 +12,11 @@ material = generic_pla
 
 [values]
 adhesion_type = skirt
-layer_height = 0.2
-layer_height_0 = 0.2
 cool_fan_enabled = True
-cool_fan_full_at_height = 0.4
+cool_fan_full_at_height = =layer_height
 cool_fan_speed = 100
 cool_fan_speed_max = 100
 cool_fan_speed_min = 100
 cool_min_layer_time = 5
 cool_min_speed = 20
+material_print_temperature_layer_0 = =default_material_print_temperature + 5

resources/quality/deltacomb/deltacomb_pla_High_Quality.inst.cfg

@@ -1,21 +1,19 @@
 [general]
 version = 4
+name = Extra Fine
 definition = deltacomb
-name = High Quality
 
 [metadata]
 setting_version = 5
 type = quality
 quality_type = high
-weight = 1
+weight = 0
 material = generic_pla
 
 [values]
 adhesion_type = skirt
-layer_height = 0.1
-layer_height_0 = 0.1
 cool_fan_enabled = True
-cool_fan_full_at_height = 0.2
+cool_fan_full_at_height = =layer_height
 cool_fan_speed = 100
 cool_fan_speed_max = 100
 cool_fan_speed_min = 100

resources/quality/deltacomb/deltacomb_pla_Normal_Quality.inst.cfg

@@ -1,7 +1,7 @@
 [general]
 version = 4
+name = Fine
 definition = deltacomb
-name = Normal Quality
 
 [metadata]
 setting_version = 5
@@ -12,12 +12,11 @@ material = generic_pla
 
 [values]
 adhesion_type = skirt
-layer_height = 0.15
-layer_height_0 = 0.15
 cool_fan_enabled = True
-cool_fan_full_at_height = 0.3
+cool_fan_full_at_height = =layer_height
 cool_fan_speed = 100
 cool_fan_speed_max = 100
 cool_fan_speed_min = 100
 cool_min_layer_time = 5
 cool_min_speed = 20
+material_print_temperature_layer_0 = =default_material_print_temperature + 5

resources/quality/deltacomb/deltacomb_pla_Verydraft_Quality.inst.cfg

@@ -0,0 +1,22 @@
+[general]
+version = 4
+name = Extra Fast
+definition = deltacomb
+
+[metadata]
+setting_version = 5
+type = quality
+quality_type = verydraft
+weight = -3
+material = generic_pla
+
+[values]
+adhesion_type = skirt
+cool_fan_enabled = True
+cool_fan_full_at_height = =layer_height
+cool_fan_speed = 100
+cool_fan_speed_max = 100
+cool_fan_speed_min = 100
+cool_min_layer_time = 5
+cool_min_speed = 20
+material_print_temperature_layer_0 = =default_material_print_temperature + 5