3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-09 14:55:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1

Browse source
This commit is contained in:
Tim Kuipers 2016-03-29 10:34:13 +02:00
commit 5bb63c5cfb
23 changed files with 21 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

10
resources/machines/fdmprinter.json
View file

@ -836,6 +836,7 @@
"type": "float",
"min_value": "0.1",
"max_value_warning": "150",
"max_value": "299792458000",
"default": 60,
"children": {
"speed_infill": {
@ -857,7 +858,7 @@
"max_value_warning": "150",
"default": 30,
"visible": false,
"inherit_function": "parent_value / 60 * 30",
"inherit_function": "parent_value / 2",
"children": {
"speed_wall_0": {
"label": "Outer Wall Speed",
@ -878,7 +879,7 @@
"max_value_warning": "150",
"default": 60,
"visible": false,
"inherit_function": "speed_print"
"inherit_function": "parent_value * 2"
}
}
},
@ -891,7 +892,7 @@
"max_value_warning": "150",
"default": 30,
"visible": false,
"inherit_function": "parent_value / 60 * 30"
"inherit_function": "parent_value / 2"
},
"speed_support": {
"label": "Support Speed",
@ -928,7 +929,7 @@
"max_value_warning": "150",
"visible": false,
"enabled": "support_roof_enable",
"inherit_function": "parent_value / 60 * 40",
"inherit_function": "parent_value / 1.5",
"global_only": true
}
}
@ -1095,7 +1096,6 @@
"unit": "%",
"type": "float",
"min_value": "0",
"max_value": "min(100, cool_fan_speed_max)",
"inherit_function": "parent_value",
"default": 100,
"visible": false,

1
resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile
View file

@ -17,7 +17,6 @@ layer_height_0 = 0.15
speed_layer_0 = 20
speed_infill = 30
speed_topbottom = 20
speed_wall_0 = 20
speed_wall_x = 25
cool_min_layer_time = 2
cool_min_speed = 10

1
resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile
View file

@ -19,7 +19,6 @@ speed_travel = 150
speed_infill = 55
speed_topbottom = 30
speed_wall_0 = 30
speed_wall_x = 40
cool_min_layer_time = 3
cool_min_speed = 20
cool_lift_head = True

1
resources/profiles/ultimaker2+/abs_0.4_high.curaprofile
View file

@ -18,7 +18,6 @@ speed_layer_0 = 20
speed_infill = 45
speed_topbottom = 20
speed_wall_0 = 20
speed_wall_x = 30
cool_min_layer_time = 3
cool_min_speed = 10
cool_fan_speed_min = 20

1
resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile
View file

@ -18,7 +18,6 @@ speed_layer_0 = 20
speed_infill = 45
speed_topbottom = 20
speed_wall_0 = 20
speed_wall_x = 30
cool_min_layer_time = 3
cool_fan_speed_min = 50
cool_min_speed = 10

1
resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile
View file

@ -17,7 +17,6 @@ layer_height_0 = 0.5
speed_layer_0 = 20
speed_infill = 40
speed_topbottom = 20
speed_wall_0 = 20
speed_wall_x = 30
cool_min_layer_time = 3
cool_fan_speed_min = 50

1
resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile
View file

@ -17,7 +17,6 @@ layer_height_0 = 0.15
speed_layer_0 = 20
speed_infill = 30
speed_topbottom = 20
speed_wall_0 = 20
speed_wall_x = 25
cool_min_layer_time = 2
cool_min_speed = 10

2
resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile
View file

@ -17,9 +17,7 @@ layer_height_0 = 0.26
speed_travel = 150
speed_layer_0 = 30
speed_infill = 45
speed_topbottom = 20
speed_wall_0 = 30
speed_wall_x = 40
cool_min_layer_time = 3
cool_fan_speed_min = 50
cool_min_speed = 10

1
resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile
View file

@ -17,7 +17,6 @@ layer_height_0 = 0.26
speed_layer_0 = 20
speed_infill = 45
speed_topbottom = 20
speed_wall_0 = 20
speed_wall_x = 30
cool_min_layer_time = 3
cool_fan_speed_min = 50

2
resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile
View file

@ -7,11 +7,9 @@ material = CPE
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

1
resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile
View file

@ -11,7 +11,6 @@ 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.4
speed_layer_0 = 20

2
resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile
View file

@ -11,13 +11,11 @@ layer_height = 0.2
wall_thickness = 2.1
line_width = 0.7
top_bottom_thickness = 1.2
infill_sparse_density = 20
speed_print = 20
layer_height_0 = 0.5
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

1
resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile
View file

@ -16,7 +16,6 @@ infill_sparse_density = 22
retraction_amount = 6
speed_print = 20
speed_infill = 30
speed_wall_0 = 20
speed_wall_x = 25
speed_topbottom = 20
speed_layer_0 = 25

1
resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile
View file

@ -16,7 +16,6 @@ infill_sparse_density = 18
retraction_amount = 5.5
speed_print = 40
speed_infill = 60
speed_wall_0 = 40
speed_wall_x = 50
speed_travel = 150
speed_topbottom = 30

1
resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
View file

@ -16,7 +16,6 @@ infill_sparse_density = 22
retraction_amount = 5.5
speed_print = 30
speed_infill = 50
speed_wall_0 = 30
speed_wall_x = 40
speed_topbottom = 20
speed_layer_0 = 25

2
resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile
View file

@ -8,7 +8,6 @@ weight = -2
[settings]
line_width = 0.35
layer_height = 0.1
layer_height_0 = 0.26
shell_thickness = 1.05
top_bottom_thickness = 0.8
@ -16,7 +15,6 @@ infill_sparse_density = 20
retraction_amount = 5.5
speed_print = 30
speed_infill = 50
speed_wall_0 = 30
speed_wall_x = 40
speed_topbottom = 20
speed_layer_0 = 25

1
resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile
View file

@ -17,7 +17,6 @@ retraction_amount = 5.5
retraction_extrusion_window = 6
speed_print = 30
speed_infill = 50
speed_wall_0 = 30
speed_wall_x = 40
speed_topbottom = 20
speed_layer_0 = 25

2
resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile
View file

@ -12,11 +12,9 @@ layer_height = 0.15
layer_height_0 = 0.4
shell_thickness = 1.59
top_bottom_thickness = 1.2
infill_sparse_density = 20
retraction_amount = 6
speed_print = 25
speed_infill = 55
speed_wall_0 = 25
speed_wall_x = 40
speed_topbottom = 20
speed_layer_0 = 25

1
resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile
View file

@ -16,7 +16,6 @@ infill_sparse_density = 20
retraction_amount = 6
speed_print = 20
speed_infill = 40
speed_wall_0 = 20
speed_wall_x = 30
speed_topbottom = 20
speed_layer_0 = 25