diff options
54 files changed, 54 insertions, 54 deletions
diff --git a/resources/definitions/maker_starter.def.json b/resources/definitions/maker_starter.def.json index 5b644da9c1..7eeb979410 100644 --- a/resources/definitions/maker_starter.def.json +++ b/resources/definitions/maker_starter.def.json @@ -81,7 +81,7 @@ "default_value": "ZigZag" }, "support_infill_rate": { - "value": "15 if support_enable else 0 if support_tree_enable else 15" + "value": "15 if support_structure=='normal' else 0 if support_structure=='tree' else 15" }, "adhesion_type": { "default_value": "raft" diff --git a/resources/definitions/renkforce_rf100.def.json b/resources/definitions/renkforce_rf100.def.json index 520f7ef6f8..144877b247 100644 --- a/resources/definitions/renkforce_rf100.def.json +++ b/resources/definitions/renkforce_rf100.def.json @@ -201,7 +201,7 @@ "value": "False" }, "support_infill_rate": { - "value": "15 if support_enable else 0 if support_tree_enable else 15" + "value": "15 if support_structure=='normal' else 0 if support_structure=='tree' else 15" }, "support_line_width": { "value": "0.6" diff --git a/resources/definitions/renkforce_rf100_v2.def.json b/resources/definitions/renkforce_rf100_v2.def.json index 2715e5d227..1cea9779aa 100644 --- a/resources/definitions/renkforce_rf100_v2.def.json +++ b/resources/definitions/renkforce_rf100_v2.def.json @@ -201,7 +201,7 @@ "value": "False" }, "support_infill_rate": { - "value": "15 if support_enable else 0 if support_tree_enable else 15" + "value": "15 if support_structure=='normal' else 0 if support_structure=='tree' else 15" }, "support_line_width": { "value": "0.6" diff --git a/resources/definitions/renkforce_rf100_xl.def.json b/resources/definitions/renkforce_rf100_xl.def.json index 4ad438fb08..68d6e98f61 100644 --- a/resources/definitions/renkforce_rf100_xl.def.json +++ b/resources/definitions/renkforce_rf100_xl.def.json @@ -189,7 +189,7 @@ "value": "False" }, "support_infill_rate": { - "value": "15 if support_enable else 0 if support_tree_enable else 15" + "value": "15 if support_structure=='normal' else 0 if support_structure=='tree' else 15" }, "support_line_width": { "value": "0.6" diff --git a/resources/definitions/winbo_dragonl4.def.json b/resources/definitions/winbo_dragonl4.def.json index 754a1a77a2..3a705c1cda 100644 --- a/resources/definitions/winbo_dragonl4.def.json +++ b/resources/definitions/winbo_dragonl4.def.json @@ -124,7 +124,7 @@ "support_bottom_height": { "value": "max((0.15 if(0.15%layer_height==0) else layer_height*int((0.15+layer_height)/layer_height)),layer_height)" }, "support_bottom_pattern": { "value": "'zigzag'" }, "support_connect_zigzags": { "value": "False" }, - "support_infill_rate": { "value": "8 if support_enable else 0 if support_tree_enable else 8" }, + "support_infill_rate": { "value": "8 if support_structure=='normal' else 0 if support_structure=='tree' else 8" }, "support_interface_density": { "value": "80" }, "support_interface_enable": { "value": "True" }, "support_interface_height": { "value": "0.5" }, diff --git a/resources/definitions/winbo_mini2.def.json b/resources/definitions/winbo_mini2.def.json index c2d2d9b7f4..c34e90a980 100644 --- a/resources/definitions/winbo_mini2.def.json +++ b/resources/definitions/winbo_mini2.def.json @@ -124,7 +124,7 @@ "support_bottom_height": { "value": "max((0.15 if(0.15%layer_height==0) else layer_height*int((0.15+layer_height)/layer_height)),layer_height)" }, "support_bottom_pattern": { "value": "'zigzag'" }, "support_connect_zigzags": { "value": "False" }, - "support_infill_rate": { "value": "8 if support_enable else 0 if support_tree_enable else 8" }, + "support_infill_rate": { "value": "8 if support_structure=='normal' else 0 if support_structure=='tree' else 8" }, "support_interface_density": { "value": "80" }, "support_interface_enable": { "value": "True" }, "support_interface_height": { "value": "0.5" }, diff --git a/resources/definitions/winbo_superhelper105.def.json b/resources/definitions/winbo_superhelper105.def.json index 576398551b..7f3f7f0981 100644 --- a/resources/definitions/winbo_superhelper105.def.json +++ b/resources/definitions/winbo_superhelper105.def.json @@ -113,7 +113,7 @@ "support_bottom_height": { "value": "max((0.15 if(0.15%layer_height==0) else layer_height*int((0.15+layer_height)/layer_height)),layer_height)" }, "support_bottom_pattern": { "value": "'zigzag'" }, "support_connect_zigzags": { "value": "False" }, - "support_infill_rate": { "value": "8 if support_enable else 0 if support_tree_enable else 8" }, + "support_infill_rate": { "value": "8 if support_structure=='normal' else 0 if support_structure=='tree' else 8" }, "support_interface_density": { "value": "80" }, "support_interface_enable": { "value": "True" }, "support_interface_height": { "value": "0.5" }, diff --git a/resources/quality/katihal/alya3dp_normal.inst.cfg b/resources/quality/katihal/alya3dp_normal.inst.cfg index f5e2a02df1..c4f2b70a46 100644 --- a/resources/quality/katihal/alya3dp_normal.inst.cfg +++ b/resources/quality/katihal/alya3dp_normal.inst.cfg @@ -44,7 +44,7 @@ support_top_distance = 0.15 support_z_distance = 0.25 support_bottom_distance = 0.15 support_brim_width = 6 -support_infill_rate = =15 if support_enable else 0 if support_tree_enable else 15 +support_infill_rate = =15 if support_structure=='normal' else 0 if support_structure=='tree' else 15 support_line_distance = 1.7 support_line_width = 0.25 support_initial_layer_line_distance = 2.7 diff --git a/resources/quality/katihal/alyanx3dp_normal.inst.cfg b/resources/quality/katihal/alyanx3dp_normal.inst.cfg index bb00f4da43..cee0f9be41 100644 --- a/resources/quality/katihal/alyanx3dp_normal.inst.cfg +++ b/resources/quality/katihal/alyanx3dp_normal.inst.cfg @@ -44,7 +44,7 @@ support_top_distance = 0.15 support_z_distance = 0.25 support_bottom_distance = 0.15 support_brim_width = 6 -support_infill_rate = =15 if support_enable else 0 if support_tree_enable else 15 +support_infill_rate = =15 if support_structure=='normal' else 0 if support_structure=='tree' else 15 support_line_distance = 1.7 support_line_width = 0.25 support_initial_layer_line_distance = 2.7 diff --git a/resources/quality/katihal/kupido_normal.inst.cfg b/resources/quality/katihal/kupido_normal.inst.cfg index e317749c79..ea10a3bad7 100644 --- a/resources/quality/katihal/kupido_normal.inst.cfg +++ b/resources/quality/katihal/kupido_normal.inst.cfg @@ -44,7 +44,7 @@ support_top_distance = 0.15 support_z_distance = 0.25 support_bottom_distance = 0.15 support_brim_width = 6 -support_infill_rate = =15 if support_enable else 0 if support_tree_enable else 15 +support_infill_rate = =15 if support_structure=='normal' else 0 if support_structure=='tree' else 15 support_line_distance = 1.7 support_line_width = 0.25 support_initial_layer_line_distance = 2.7 diff --git a/resources/quality/key3d/key3d_tyro_best.inst.cfg b/resources/quality/key3d/key3d_tyro_best.inst.cfg index 50a989446a..49d2ac2952 100644 --- a/resources/quality/key3d/key3d_tyro_best.inst.cfg +++ b/resources/quality/key3d/key3d_tyro_best.inst.cfg @@ -96,7 +96,7 @@ support_angle = 50 support_pattern = grid support_wall_count = 0 zig_zaggify_support = False -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 support_infill_angles = [0] support_brim_enable = True support_brim_line_count = 5 diff --git a/resources/quality/key3d/key3d_tyro_fast.inst.cfg b/resources/quality/key3d/key3d_tyro_fast.inst.cfg index 5908c970c8..c989044381 100644 --- a/resources/quality/key3d/key3d_tyro_fast.inst.cfg +++ b/resources/quality/key3d/key3d_tyro_fast.inst.cfg @@ -95,7 +95,7 @@ support_angle = 50 support_pattern = grid support_wall_count = 0 zig_zaggify_support = False -support_infill_rate = =15 if support_enable else 0 if support_tree_enable else 15 +support_infill_rate = =15 if support_structure=='normal' else 0 if support_structure=='tree' else 15 support_infill_angles = [0] support_brim_enable = True support_brim_line_count = 5 diff --git a/resources/quality/key3d/key3d_tyro_normal.inst.cfg b/resources/quality/key3d/key3d_tyro_normal.inst.cfg index a597f49798..2ea1e491c4 100644 --- a/resources/quality/key3d/key3d_tyro_normal.inst.cfg +++ b/resources/quality/key3d/key3d_tyro_normal.inst.cfg @@ -95,7 +95,7 @@ support_angle = 50 support_pattern = grid support_wall_count = 0 zig_zaggify_support = False -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 support_infill_angles = [0] support_brim_enable = True support_brim_line_count = 5 diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg index 1fb088a157..a562c8b33b 100644 --- a/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg +++ b/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg @@ -96,7 +96,7 @@ support_angle = 50 support_pattern = grid support_wall_count = 0 zig_zaggify_support = False -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 support_infill_angles = [0] support_brim_enable = True support_brim_line_count = 5 diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg index 3d10a863a6..e66a6d3083 100644 --- a/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg +++ b/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg @@ -92,7 +92,7 @@ support_angle = 50 support_pattern = grid support_wall_count = 0 zig_zaggify_support = False -support_infill_rate = =10 if support_enable else 0 if support_tree_enable else 10 +support_infill_rate = =10 if support_structure=='normal' else 0 if support_structure=='tree' else 10 support_infill_angles = [0] support_brim_enable = True support_brim_line_count = 5 diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg index 0f2dca2732..0a585918bf 100644 --- a/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg +++ b/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg @@ -96,7 +96,7 @@ support_angle = 50 support_pattern = grid support_wall_count = 0 zig_zaggify_support = False -support_infill_rate = =15 if support_enable else 0 if support_tree_enable else 15 +support_infill_rate = =15 if support_structure=='normal' else 0 if support_structure=='tree' else 15 support_infill_angles = [0] support_brim_enable = True support_brim_line_count = 5 diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg index d439050cc5..cecd33ae68 100644 --- a/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg +++ b/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg @@ -95,7 +95,7 @@ support_angle = 50 support_pattern = grid support_wall_count = 0 zig_zaggify_support = False -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 support_infill_angles = [0] support_brim_enable = True support_brim_line_count = 5 diff --git a/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg b/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg index 7fc7cbe9ff..020d9cfb2d 100644 --- a/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg +++ b/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg @@ -94,7 +94,7 @@ support_angle = 50 support_pattern = grid support_wall_count = 0 zig_zaggify_support = False -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 support_infill_angles = [0] support_brim_enable = True support_brim_line_count = 5 diff --git a/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg b/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg index 8584d01f01..bc3ce62dc8 100644 --- a/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg +++ b/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg @@ -94,7 +94,7 @@ support_angle = 50 support_pattern = grid support_wall_count = 0 zig_zaggify_support = False -support_infill_rate = =15 if support_enable else 0 if support_tree_enable else 15 +support_infill_rate = =15 if support_structure=='normal' else 0 if support_structure=='tree' else 15 support_infill_angles = [0] support_brim_enable = True support_brim_line_count = 5 diff --git a/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg b/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg index 6416837c03..5b5efb543d 100644 --- a/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg +++ b/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg @@ -94,7 +94,7 @@ support_angle = 50 support_pattern = grid support_wall_count = 0 zig_zaggify_support = False -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 support_infill_angles = [0] support_brim_enable = True support_brim_line_count = 5 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg index 1c883bb991..731259ac24 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg @@ -35,7 +35,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 25) speed_wall_x = =speed_print support_angle = 45 support_enable = True -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 support_pattern = lines support_z_distance = 0.26 top_bottom_thickness = 1.5 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg index 14b045176d..972d48732b 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg @@ -35,7 +35,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 35) speed_wall_x = =math.ceil(speed_print * 30 / 35) support_angle = 45 support_enable = True -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 support_pattern = lines support_z_distance = 0.26 top_bottom_thickness = 1.5 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg index 291c08a74e..624c54b0b0 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg @@ -37,7 +37,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 25) speed_wall_x = =speed_print support_angle = 45 support_enable = True -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 support_line_distance = 2.85 support_pattern = lines support_xy_distance = 0.6 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg index a6e5b5f005..dde9c3c63a 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg @@ -37,7 +37,7 @@ speed_wall_0 = =math.ceil(speed_print * 30 / 35) speed_wall_x = =speed_print support_angle = 45 support_enable = True -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 support_line_distance = 2.85 support_pattern = lines support_xy_distance = 0.6 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg index e45bdd6850..3313d15591 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg @@ -34,7 +34,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 25) speed_wall_x = =speed_print support_angle = 45 support_enable = True -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 support_pattern = lines support_z_distance = 0.26 top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg index f11d0d6d9c..740f0a692f 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg @@ -34,7 +34,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 30) speed_wall_x = =speed_print support_angle = 45 support_enable = True -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 support_pattern = lines support_z_distance = 0.26 top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg index 1928387f81..35652904d3 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg @@ -35,7 +35,7 @@ speed_travel = 150 speed_wall_0 = =math.ceil(speed_print * 20 / 40) speed_wall_x = =speed_print support_enable = True -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 support_pattern = lines support_xy_distance = 0.6 support_z_distance = =layer_height * 2 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg index 957a79363c..b393048bdb 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg @@ -35,7 +35,7 @@ speed_travel = 150 speed_wall_0 = =math.ceil(speed_print * 20 / 40) speed_wall_x = =speed_print support_enable = True -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 support_pattern = lines support_xy_distance = 0.6 support_z_distance = =layer_height * 2 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg index c2d665077e..e5a218d9b6 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg @@ -34,7 +34,7 @@ speed_travel = 150 speed_wall = =math.ceil(speed_print * 40 / 45) support_angle = 45 support_enable = True -support_infill_rate = =25 if support_enable else 0 if support_tree_enable else 25 +support_infill_rate = =25 if support_structure=='normal' else 0 if support_structure=='tree' else 25 support_pattern = lines support_xy_distance = 0.6 support_z_distance = =layer_height * 2 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg index 6a15615cfe..c6339d7a23 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg @@ -33,7 +33,7 @@ speed_travel = 150 speed_wall = =math.ceil(speed_print * 40 / 45) support_angle = 45 support_enable = True -support_infill_rate = =25 if support_enable else 0 if support_tree_enable else 25 +support_infill_rate = =25 if support_structure=='normal' else 0 if support_structure=='tree' else 25 support_pattern = lines support_xy_distance = 0.6 support_z_distance = =layer_height * 2 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg index 90750c53d4..28c1d36adb 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg @@ -38,7 +38,7 @@ speed_wall_x = =math.ceil(speed_print * 40 / 55) support_angle = 45 support_bottom_distance = 0.55 support_enable = True -support_infill_rate = =25 if support_enable else 0 if support_tree_enable else 25 +support_infill_rate = =25 if support_structure=='normal' else 0 if support_structure=='tree' else 25 support_pattern = lines support_top_distance = 0.55 support_xy_distance = 0.7 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg index ebbfcbe990..8034db74f2 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg @@ -37,7 +37,7 @@ speed_wall_0 = =math.ceil(speed_print * 15 / 55) speed_wall_x = =math.ceil(speed_print * 40 / 55) support_angle = 45 support_enable = True -support_infill_rate = =25 if support_enable else 0 if support_tree_enable else 25 +support_infill_rate = =25 if support_structure=='normal' else 0 if support_structure=='tree' else 25 support_pattern = lines support_xy_distance = 0.7 support_z_distance = =layer_height * 2 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg index 0983ca3f88..4fb01eadb5 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg @@ -37,7 +37,7 @@ speed_wall_x = =math.ceil(speed_print * 40 / 55) support_angle = 45 support_bottom_distance = 0.65 support_enable = True -support_infill_rate = =25 if support_enable else 0 if support_tree_enable else 25 +support_infill_rate = =25 if support_structure=='normal' else 0 if support_structure=='tree' else 25 support_pattern = lines support_top_distance = 0.5 support_xy_distance = 0.75 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg index c8a8d58379..b2a8c8dcbc 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg @@ -37,7 +37,7 @@ speed_wall_x = =math.ceil(speed_print * 40 / 55) support_angle = 45 support_bottom_distance = 0.65 support_enable = True -support_infill_rate = =25 if support_enable else 0 if support_tree_enable else 25 +support_infill_rate = =25 if support_structure=='normal' else 0 if support_structure=='tree' else 25 support_pattern = lines support_top_distance = 0.5 support_xy_distance = 0.75 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg index db63dd1c7b..c5e5dade9b 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg @@ -31,7 +31,7 @@ raft_surface_line_width = 0.2 speed_layer_0 = =round(speed_print * 30 / 30) speed_print = 30 support_enable = True -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 support_pattern = lines support_z_distance = 0.19 wall_thickness = 0.88 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg index 4306f25bfd..2e4465b333 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg @@ -31,7 +31,7 @@ raft_surface_line_width = 0.2 speed_layer_0 = =round(speed_print * 30 / 30) speed_print = 30 support_enable = True -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 support_pattern = lines support_z_distance = 0.19 wall_thickness = 0.88 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg index 5b8e937883..7465edb88f 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg @@ -32,7 +32,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 45) speed_wall_x = =math.ceil(speed_print * 30 / 45) support_angle = 45 support_enable = True -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 support_pattern = lines support_z_distance = 0.19 wall_thickness = 1.2 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg index d795f4ee70..ef34f14589 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg @@ -32,7 +32,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 45) speed_wall_x = =math.ceil(speed_print * 30 / 45) support_angle = 45 support_enable = True -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 support_pattern = lines support_z_distance = 0.19 wall_thickness = 1.2 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg index ab8838357e..4bdc98c850 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg @@ -36,7 +36,7 @@ speed_wall_0 = =math.ceil(speed_print * 30 / 45) speed_wall_x = =math.ceil(speed_print * 40 / 45) support_angle = 45 support_enable = True -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 support_line_distance = 3.5333 support_pattern = lines support_z_distance = 0.21 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg index 21b9c3bf09..a2e53665c4 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg @@ -36,7 +36,7 @@ speed_wall_0 = =math.ceil(speed_print * 30 / 45) speed_wall_x = =math.ceil(speed_print * 40 / 45) support_angle = 45 support_enable = True -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 support_line_distance = 3.5333 support_pattern = lines support_z_distance = 0.21 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg index e2ad5a52ed..32cc10fdd3 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg @@ -31,7 +31,7 @@ speed_layer_0 = =round(speed_print * 30 / 40) speed_print = 40 support_angle = 45 support_enable = True -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 support_pattern = lines support_z_distance = 0.26 top_bottom_thickness = 2.0 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg index c321b50435..1f6e60d1a0 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg @@ -31,7 +31,7 @@ speed_layer_0 = =round(speed_print * 30 / 40) speed_print = 40 support_angle = 45 support_enable = True -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 support_pattern = lines support_z_distance = 0.26 top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg index 080ec6a6fb..32b0150fe2 100644 --- a/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg @@ -35,7 +35,7 @@ speed_wall_0 = =math.ceil(speed_print * 15 / 40) speed_wall_x = =math.ceil(speed_print * 38 / 40) support_angle = 45 support_enable = True -support_infill_rate = =25 if support_enable else 0 if support_tree_enable else 25 +support_infill_rate = =25 if support_structure=='normal' else 0 if support_structure=='tree' else 25 support_xy_distance = 0.6 support_z_distance = =layer_height * 2 top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg index 37066bb371..18319d3f89 100644 --- a/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg @@ -33,7 +33,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 40) speed_wall_x = =math.ceil(speed_print * 35 / 40) support_angle = 45 support_enable = True -support_infill_rate = =25 if support_enable else 0 if support_tree_enable else 25 +support_infill_rate = =25 if support_structure=='normal' else 0 if support_structure=='tree' else 25 support_xy_distance = 0.65 support_z_distance = =layer_height * 2 top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg index 9ad54b3dbf..55ef46cfb0 100644 --- a/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg @@ -37,7 +37,7 @@ speed_wall_0 = =math.ceil(speed_print * 15 / 45) speed_wall_x = =math.ceil(speed_print * 40 / 45) support_angle = 45 support_enable = True -support_infill_rate = =25 if support_enable else 0 if support_tree_enable else 25 +support_infill_rate = =25 if support_structure=='normal' else 0 if support_structure=='tree' else 25 support_xy_distance = 0.7 support_z_distance = =layer_height * 2 top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg index 4e54892ddc..a2d9cc44ce 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg @@ -37,4 +37,4 @@ support_angle = 45 support_join_distance = 5 support_offset = 2 support_pattern = triangles -support_infill_rate = =10 if support_enable else 0 if support_tree_enable else 10 +support_infill_rate = =10 if support_structure=='normal' else 0 if support_structure=='tree' else 10 diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg index 35ccc57089..2f21ece950 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg @@ -36,4 +36,4 @@ support_angle = 45 support_join_distance = 5 support_offset = 2 support_pattern = triangles -support_infill_rate = =10 if support_enable else 0 if support_tree_enable else 10 +support_infill_rate = =10 if support_structure=='normal' else 0 if support_structure=='tree' else 10 diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg index 22ad9c16c2..3ef7330429 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg @@ -32,6 +32,6 @@ support_angle = 45 support_join_distance = 5 support_offset = 2 support_pattern = triangles -support_infill_rate = =10 if support_enable else 0 if support_tree_enable else 10 +support_infill_rate = =10 if support_structure=='normal' else 0 if support_structure=='tree' else 10 top_bottom_thickness = 1 wall_thickness = 1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg index 51ed81c003..096da32189 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg @@ -37,4 +37,4 @@ support_angle = 45 support_join_distance = 5 support_offset = 2 support_pattern = triangles -support_infill_rate = =10 if support_enable else 0 if support_tree_enable else 10 +support_infill_rate = =10 if support_structure=='normal' else 0 if support_structure=='tree' else 10 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg index 75b353c1e1..f07c7d9a28 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg @@ -36,4 +36,4 @@ support_angle = 45 support_join_distance = 5 support_offset = 2 support_pattern = triangles -support_infill_rate = =10 if support_enable else 0 if support_tree_enable else 10 +support_infill_rate = =10 if support_structure=='normal' else 0 if support_structure=='tree' else 10 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg index fdac81730c..6638c9d3f2 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg @@ -33,6 +33,6 @@ support_angle = 45 support_join_distance = 5 support_offset = 2 support_pattern = triangles -support_infill_rate = =10 if support_enable else 0 if support_tree_enable else 10 +support_infill_rate = =10 if support_structure=='normal' else 0 if support_structure=='tree' else 10 top_bottom_thickness = 1 wall_thickness = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg index cc7e8aaa98..9fea067b4a 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg @@ -37,4 +37,4 @@ support_angle = 45 support_join_distance = 5 support_offset = 2 support_pattern = triangles -support_infill_rate = =10 if support_enable else 0 if support_tree_enable else 10 +support_infill_rate = =10 if support_structure=='normal' else 0 if support_structure=='tree' else 10 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg index 8836231e41..68e6811341 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg @@ -36,4 +36,4 @@ support_angle = 45 support_join_distance = 5 support_offset = 2 support_pattern = triangles -support_infill_rate = =10 if support_enable else 0 if support_tree_enable else 10 +support_infill_rate = =10 if support_structure=='normal' else 0 if support_structure=='tree' else 10 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg index 5d2cd669f6..b449a884ab 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg @@ -33,6 +33,6 @@ support_angle = 45 support_join_distance = 5 support_offset = 2 support_pattern = triangles -support_infill_rate = =10 if support_enable else 0 if support_tree_enable else 10 +support_infill_rate = =10 if support_structure=='normal' else 0 if support_structure=='tree' else 10 top_bottom_thickness = 1 wall_thickness = 1 |