Merge branch '2.4'

This commit is contained in:
Ghostkeeper 2017-02-13 09:13:25 +01:00
commit 784b223fc7
No known key found for this signature in database
GPG Key ID: C5F96EE2BC0F7E75
16 changed files with 28 additions and 20 deletions

View File

@ -18,7 +18,7 @@ material_final_print_temperature = =material_print_temperature - 10
prime_tower_size = 16
skin_overlap = 20
speed_print = 60
speed_layer_0 = =round(speed_print * 30 / 60)
speed_layer_0 = 20
speed_topbottom = =math.ceil(speed_print * 35 / 60)
speed_wall = =math.ceil(speed_print * 45 / 60)
speed_wall_0 = =math.ceil(speed_wall * 35 / 45)

View File

@ -19,7 +19,7 @@ material_final_print_temperature = =material_print_temperature - 10
material_standby_temperature = 100
prime_tower_size = 16
speed_print = 60
speed_layer_0 = =round(speed_print * 30 / 60)
speed_layer_0 = 20
speed_topbottom = =math.ceil(speed_print * 30 / 60)
speed_wall = =math.ceil(speed_print * 40 / 60)
speed_wall_0 = =math.ceil(speed_wall * 30 / 40)

View File

@ -19,7 +19,7 @@ material_initial_print_temperature = =material_print_temperature - 5
material_final_print_temperature = =material_print_temperature - 10
prime_tower_size = 16
speed_print = 50
speed_layer_0 = =round(speed_print * 30 / 50)
speed_layer_0 = 20
speed_topbottom = =math.ceil(speed_print * 30 / 50)
speed_wall = =math.ceil(speed_print * 30 / 50)

View File

@ -17,7 +17,7 @@ material_final_print_temperature = =material_print_temperature - 10
material_standby_temperature = 100
prime_tower_size = 16
speed_print = 55
speed_layer_0 = =round(speed_print * 30 / 55)
speed_layer_0 = 20
speed_topbottom = =math.ceil(speed_print * 30 / 55)
speed_wall = =math.ceil(speed_print * 30 / 55)

View File

@ -17,7 +17,7 @@ material_standby_temperature = 100
prime_tower_size = 17
skin_overlap = 20
speed_print = 60
speed_layer_0 = =round(speed_print * 30 / 60)
speed_layer_0 = 20
speed_topbottom = =math.ceil(speed_print * 35 / 60)
speed_wall = =math.ceil(speed_print * 45 / 60)
speed_wall_0 = =math.ceil(speed_wall * 35 / 45)

View File

@ -17,7 +17,7 @@ material_final_print_temperature = =material_print_temperature - 10
material_standby_temperature = 100
prime_tower_size = 17
speed_print = 60
speed_layer_0 = =round(speed_print * 30 / 60)
speed_layer_0 = 20
speed_topbottom = =math.ceil(speed_print * 30 / 60)
speed_wall = =math.ceil(speed_print * 40 / 60)
speed_wall_0 = =math.ceil(speed_wall * 30 / 40)

View File

@ -19,7 +19,7 @@ material_final_print_temperature = =material_print_temperature - 10
material_standby_temperature = 100
prime_tower_size = 17
speed_print = 50
speed_layer_0 = =round(speed_print * 30 / 50)
speed_layer_0 = 20
speed_topbottom = =math.ceil(speed_print * 30 / 50)
speed_wall = =math.ceil(speed_print * 30 / 50)

View File

@ -17,7 +17,7 @@ material_final_print_temperature = =material_print_temperature - 10
material_standby_temperature = 100
prime_tower_size = 17
speed_print = 55
speed_layer_0 = =round(speed_print * 30 / 55)
speed_layer_0 = 20
speed_topbottom = =math.ceil(speed_print * 30 / 55)
speed_wall = =math.ceil(speed_print * 30 / 55)

View File

@ -18,6 +18,7 @@ material_print_temperature = =default_material_print_temperature + 5
material_standby_temperature = 100
prime_tower_enable = False
skin_overlap = 20
speed_layer_0 = 20
speed_topbottom = =math.ceil(speed_print * 35 / 70)
speed_wall = =math.ceil(speed_print * 50 / 70)
speed_wall_0 = =math.ceil(speed_wall * 35 / 50)

View File

@ -17,7 +17,7 @@ machine_nozzle_heat_up_speed = 1.6
material_standby_temperature = 100
prime_tower_enable = False
speed_print = 80
speed_layer_0 = =round(speed_print * 30 / 80)
speed_layer_0 = 20
speed_topbottom = =math.ceil(speed_print * 30 / 80)
speed_wall = =math.ceil(speed_print * 40 / 80)
speed_wall_0 = =math.ceil(speed_wall * 30 / 40)

View File

@ -20,7 +20,7 @@ material_standby_temperature = 100
prime_tower_enable = False
skin_overlap = 10
speed_print = 60
speed_layer_0 = =round(speed_print * 30 / 60)
speed_layer_0 = 20
speed_topbottom = =math.ceil(speed_print * 30 / 60)
speed_wall = =math.ceil(speed_print * 30 / 60)
top_bottom_thickness = 1

View File

@ -18,6 +18,7 @@ machine_nozzle_heat_up_speed = 1.6
material_standby_temperature = 100
prime_tower_enable = False
skin_overlap = 10
speed_layer_0 = 20
top_bottom_thickness = 1
wall_thickness = 1

View File

@ -12,13 +12,15 @@ material = generic_pva_ultimaker3_BB_0.4
[values]
acceleration_support = =math.ceil(acceleration_print * 500 / 4000)
acceleration_support_infill = =acceleration_support
acceleration_support_interface = =acceleration_support
jerk_support = =math.ceil(jerk_print * 5 / 25)
jerk_support_infill = =jerk_support
jerk_support_interface = =jerk_support
material_print_temperature = =default_material_print_temperature + 10
material_standby_temperature = 100
skin_overlap = 20
support_interface_height = 0.8
prime_tower_enable = False
speed_support_interface = =math.ceil(speed_support * 20 / 25)
jerk_support_interface = =math.ceil(jerk_support * 1 / 5)
acceleration_support_interface = =math.ceil(acceleration_support * 100 / 500 )
support_xy_distance = =round(line_width * 1.5, 2)

View File

@ -12,13 +12,14 @@ material = generic_pva_ultimaker3_BB_0.4
[values]
acceleration_support = =math.ceil(acceleration_print * 500 / 4000)
acceleration_support_infill = =acceleration_support
acceleration_support_interface = =acceleration_support
jerk_support = =math.ceil(jerk_print * 5 / 25)
jerk_support_infill = =jerk_support
jerk_support_interface = =jerk_support
material_print_temperature = =default_material_print_temperature + 5
material_standby_temperature = 100
skin_overlap = 15
support_interface_height = 0.8
prime_tower_enable = False
speed_support_interface = =math.ceil(speed_support * 20 / 25)
jerk_support_interface = =math.ceil(jerk_support * 1 / 5)
acceleration_support_interface = =math.ceil(acceleration_support * 100 / 500 )
support_xy_distance = =round(line_width * 1.5, 2)

View File

@ -12,12 +12,14 @@ material = generic_pva_ultimaker3_BB_0.4
[values]
acceleration_support = =math.ceil(acceleration_print * 500 / 4000)
acceleration_support_infill = =acceleration_support
acceleration_support_interface = =acceleration_support
jerk_support = =math.ceil(jerk_print * 5 / 25)
jerk_support_infill = =jerk_support
jerk_support_interface = =jerk_support
support_infill_rate = 25
support_interface_height = 0.8
material_standby_temperature = 100
prime_tower_enable = False
speed_support_interface = =math.ceil(speed_support * 20 / 25)
jerk_support_interface = =math.ceil(jerk_support * 1 / 5)
acceleration_support_interface = =math.ceil(acceleration_support * 100 / 500 )
support_xy_distance = =round(line_width * 1.5, 2)

View File

@ -12,12 +12,13 @@ material = generic_pva_ultimaker3_BB_0.4
[values]
acceleration_support = =math.ceil(acceleration_print * 500 / 4000)
acceleration_support_infill = =acceleration_support
acceleration_support_interface = =acceleration_support
jerk_support = =math.ceil(jerk_print * 5 / 25)
jerk_support_infill = =jerk_support
jerk_support_interface = =jerk_support
support_infill_rate = 25
support_interface_height = 0.8
material_standby_temperature = 100
prime_tower_enable = False
speed_support_interface = =math.ceil(speed_support * 20 / 25)
jerk_support_interface = =math.ceil(jerk_support * 1 / 5)
acceleration_support_interface = =math.ceil(acceleration_support * 100 / 500 )
support_xy_distance = =round(line_width * 1.5, 2)