From 4e16dc081471adadd229709881d88b44ef9967b7 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 30 Jul 2024 12:54:45 +0200 Subject: [PATCH 01/16] Add force depends on properties to metod CURA-12050 --- resources/definitions/ultimaker_method.def.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/resources/definitions/ultimaker_method.def.json b/resources/definitions/ultimaker_method.def.json index 93a6b23f7b..5edcc2821d 100644 --- a/resources/definitions/ultimaker_method.def.json +++ b/resources/definitions/ultimaker_method.def.json @@ -128,6 +128,10 @@ ] ] }, + "raft_interface_line_width": {"force_depends_on_settings": [ "raft_base_thickness" ] }, + "raft_interface_line_spacing": {"force_depends_on_settings": [ "raft_base_thickness" ] }, + "raft_interface_z_offset": {"force_depends_on_settings": [ "raft_base_thickness" ] }, + "raft_interface_infill_overlap": {"force_depends_on_settings": [ "raft_base_thickness" ] }, "machine_height": { "default_value": 196 }, "machine_name": { "default_value": "UltiMaker Method" }, "machine_width": { "default_value": 283.3 }, From fb2f28a32123ecd53dcb162ccdf0c2cb6c66093a Mon Sep 17 00:00:00 2001 From: nallath Date: Tue, 30 Jul 2024 10:56:21 +0000 Subject: [PATCH 02/16] Applied printer-linter format --- .../definitions/ultimaker_method.def.json | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/resources/definitions/ultimaker_method.def.json b/resources/definitions/ultimaker_method.def.json index 5edcc2821d..95d722e5e8 100644 --- a/resources/definitions/ultimaker_method.def.json +++ b/resources/definitions/ultimaker_method.def.json @@ -128,14 +128,26 @@ ] ] }, - "raft_interface_line_width": {"force_depends_on_settings": [ "raft_base_thickness" ] }, - "raft_interface_line_spacing": {"force_depends_on_settings": [ "raft_base_thickness" ] }, - "raft_interface_z_offset": {"force_depends_on_settings": [ "raft_base_thickness" ] }, - "raft_interface_infill_overlap": {"force_depends_on_settings": [ "raft_base_thickness" ] }, "machine_height": { "default_value": 196 }, "machine_name": { "default_value": "UltiMaker Method" }, "machine_width": { "default_value": 283.3 }, "prime_tower_position_x": { "value": "(150 / 2 + resolveOrValue('prime_tower_size') / 2) if resolveOrValue('machine_shape') == 'elliptic' else (150 - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_x'))), 1)) - (150 / 2 if resolveOrValue('machine_center_is_zero') else 0)" }, - "prime_tower_position_y": { "value": "190 - prime_tower_size - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_y'))), 1) - (190 / 2 if resolveOrValue('machine_center_is_zero') else 0)" } + "prime_tower_position_y": { "value": "190 - prime_tower_size - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_y'))), 1) - (190 / 2 if resolveOrValue('machine_center_is_zero') else 0)" }, + "raft_interface_infill_overlap": + { + "force_depends_on_settings": [ "raft_base_thickness" ] + }, + "raft_interface_line_spacing": + { + "force_depends_on_settings": [ "raft_base_thickness" ] + }, + "raft_interface_line_width": + { + "force_depends_on_settings": [ "raft_base_thickness" ] + }, + "raft_interface_z_offset": + { + "force_depends_on_settings": [ "raft_base_thickness" ] + } } } \ No newline at end of file From 96b5833035be1a5b856aaf3d74458864f10fa39b Mon Sep 17 00:00:00 2001 From: HellAholic Date: Tue, 30 Jul 2024 14:10:44 +0200 Subject: [PATCH 03/16] Move the changes to the method base definition --- .../ultimaker_method_base.def.json | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 118f2ed883..1f269c8395 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -345,8 +345,24 @@ "raft_base_wall_count": { "value": "raft_wall_count" }, "raft_interface_extruder_nr": { "value": "raft_surface_extruder_nr" }, "raft_interface_fan_speed": { "value": 0 }, + "raft_interface_infill_overlap": + { + "force_depends_on_settings": [ "raft_base_thickness" ] + }, + "raft_interface_line_spacing": + { + "force_depends_on_settings": [ "raft_base_thickness" ] + }, + "raft_interface_line_width": + { + "value": 0.7, + "force_depends_on_settings": [ "raft_base_thickness" ] + }, + "raft_interface_z_offset": + { + "force_depends_on_settings": [ "raft_base_thickness" ] + }, "raft_interface_layers": { "value": 2 }, - "raft_interface_line_width": { "value": 0.7 }, "raft_interface_speed": { "value": 90 }, "raft_interface_thickness": { "value": 0.3 }, "raft_interface_wall_count": { "value": "raft_wall_count" }, @@ -405,7 +421,6 @@ "support_interface_enable": { "value": true }, "support_interface_height": { "value": "4*support_infill_sparse_thickness" }, "support_interface_material_flow": { "value": "material_flow" }, - "support_interface_offset": { "value": "1" }, "support_interface_pattern": { "value": "'lines'" }, "support_interface_wall_count": { "value": "1" }, "support_material_flow": { "value": "material_flow" }, @@ -414,7 +429,6 @@ "support_roof_height": { "value": "4*layer_height" }, "support_roof_material_flow": { "value": "material_flow" }, "support_supported_skin_fan_speed": { "value": "cool_fan_speed_max" }, - "support_use_towers": { "value": "False" }, "support_wall_count": { "value": "2 if support_conical_enabled or support_structure == 'tree' else 0" }, "support_xy_distance": { "value": 0.2 }, "support_xy_distance_overhang": { "value": "support_xy_distance" }, From 162f9e5f62fc65534e9a9f801202497474b954d3 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Tue, 30 Jul 2024 14:13:37 +0200 Subject: [PATCH 04/16] Revert "Move the changes to the method base definition" This reverts commit 96b5833035be1a5b856aaf3d74458864f10fa39b. --- .../ultimaker_method_base.def.json | 20 +++---------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 1f269c8395..118f2ed883 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -345,24 +345,8 @@ "raft_base_wall_count": { "value": "raft_wall_count" }, "raft_interface_extruder_nr": { "value": "raft_surface_extruder_nr" }, "raft_interface_fan_speed": { "value": 0 }, - "raft_interface_infill_overlap": - { - "force_depends_on_settings": [ "raft_base_thickness" ] - }, - "raft_interface_line_spacing": - { - "force_depends_on_settings": [ "raft_base_thickness" ] - }, - "raft_interface_line_width": - { - "value": 0.7, - "force_depends_on_settings": [ "raft_base_thickness" ] - }, - "raft_interface_z_offset": - { - "force_depends_on_settings": [ "raft_base_thickness" ] - }, "raft_interface_layers": { "value": 2 }, + "raft_interface_line_width": { "value": 0.7 }, "raft_interface_speed": { "value": 90 }, "raft_interface_thickness": { "value": 0.3 }, "raft_interface_wall_count": { "value": "raft_wall_count" }, @@ -421,6 +405,7 @@ "support_interface_enable": { "value": true }, "support_interface_height": { "value": "4*support_infill_sparse_thickness" }, "support_interface_material_flow": { "value": "material_flow" }, + "support_interface_offset": { "value": "1" }, "support_interface_pattern": { "value": "'lines'" }, "support_interface_wall_count": { "value": "1" }, "support_material_flow": { "value": "material_flow" }, @@ -429,6 +414,7 @@ "support_roof_height": { "value": "4*layer_height" }, "support_roof_material_flow": { "value": "material_flow" }, "support_supported_skin_fan_speed": { "value": "cool_fan_speed_max" }, + "support_use_towers": { "value": "False" }, "support_wall_count": { "value": "2 if support_conical_enabled or support_structure == 'tree' else 0" }, "support_xy_distance": { "value": 0.2 }, "support_xy_distance_overhang": { "value": "support_xy_distance" }, From 3a76f7e0ac782bab303bd0f82c473100dfcac355 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Tue, 30 Jul 2024 14:17:18 +0200 Subject: [PATCH 05/16] Add force update to method base def --- .../definitions/ultimaker_method_base.def.json | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 118f2ed883..271ee39f51 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -435,6 +435,22 @@ "z_seam_position": { "value": "'backright'" }, "z_seam_relative": { "value": true }, "z_seam_type": { "value": "'sharpest_corner'" }, - "zig_zaggify_infill": { "value": true } + "zig_zaggify_infill": { "value": true }, + "raft_interface_infill_overlap": + { + "force_depends_on_settings": [ "raft_base_thickness" ] + }, + "raft_interface_line_spacing": + { + "force_depends_on_settings": [ "raft_base_thickness" ] + }, + "raft_interface_line_width": + { + "force_depends_on_settings": [ "raft_base_thickness" ] + }, + "raft_interface_z_offset": + { + "force_depends_on_settings": [ "raft_base_thickness" ] + } } } \ No newline at end of file From e2d1381ceb0fc1d8915952d71e35f4116a59a14f Mon Sep 17 00:00:00 2001 From: HellAholic Date: Tue, 30 Jul 2024 12:20:35 +0000 Subject: [PATCH 06/16] Applied printer-linter format --- .../ultimaker_method_base.def.json | 35 +++++++++---------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 271ee39f51..d6a9a8e034 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -345,11 +345,26 @@ "raft_base_wall_count": { "value": "raft_wall_count" }, "raft_interface_extruder_nr": { "value": "raft_surface_extruder_nr" }, "raft_interface_fan_speed": { "value": 0 }, + "raft_interface_infill_overlap": + { + "force_depends_on_settings": [ "raft_base_thickness" ] + }, "raft_interface_layers": { "value": 2 }, - "raft_interface_line_width": { "value": 0.7 }, + "raft_interface_line_spacing": + { + "force_depends_on_settings": [ "raft_base_thickness" ] + }, + "raft_interface_line_width": + { + "force_depends_on_settings": [ "raft_base_thickness" ] + }, "raft_interface_speed": { "value": 90 }, "raft_interface_thickness": { "value": 0.3 }, "raft_interface_wall_count": { "value": "raft_wall_count" }, + "raft_interface_z_offset": + { + "force_depends_on_settings": [ "raft_base_thickness" ] + }, "raft_margin": { "value": 1.2 }, "raft_smoothing": { "value": 9.5 }, "raft_surface_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material')) if support_enable and extruderValue(support_extruder_nr,'material_is_support_material') else raft_base_extruder_nr" }, @@ -435,22 +450,6 @@ "z_seam_position": { "value": "'backright'" }, "z_seam_relative": { "value": true }, "z_seam_type": { "value": "'sharpest_corner'" }, - "zig_zaggify_infill": { "value": true }, - "raft_interface_infill_overlap": - { - "force_depends_on_settings": [ "raft_base_thickness" ] - }, - "raft_interface_line_spacing": - { - "force_depends_on_settings": [ "raft_base_thickness" ] - }, - "raft_interface_line_width": - { - "force_depends_on_settings": [ "raft_base_thickness" ] - }, - "raft_interface_z_offset": - { - "force_depends_on_settings": [ "raft_base_thickness" ] - } + "zig_zaggify_infill": { "value": true } } } \ No newline at end of file From bec4278f9b31cff684c9507b88e3caa9ebef05f9 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Tue, 30 Jul 2024 14:21:22 +0200 Subject: [PATCH 07/16] Revert "Add force depends on properties to metod" This reverts commit 4e16dc081471adadd229709881d88b44ef9967b7. Revert "Applied printer-linter format" This reverts commit fb2f28a32123ecd53dcb162ccdf0c2cb6c66093a. --- .../definitions/ultimaker_method.def.json | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/resources/definitions/ultimaker_method.def.json b/resources/definitions/ultimaker_method.def.json index 95d722e5e8..93a6b23f7b 100644 --- a/resources/definitions/ultimaker_method.def.json +++ b/resources/definitions/ultimaker_method.def.json @@ -132,22 +132,6 @@ "machine_name": { "default_value": "UltiMaker Method" }, "machine_width": { "default_value": 283.3 }, "prime_tower_position_x": { "value": "(150 / 2 + resolveOrValue('prime_tower_size') / 2) if resolveOrValue('machine_shape') == 'elliptic' else (150 - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_x'))), 1)) - (150 / 2 if resolveOrValue('machine_center_is_zero') else 0)" }, - "prime_tower_position_y": { "value": "190 - prime_tower_size - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_y'))), 1) - (190 / 2 if resolveOrValue('machine_center_is_zero') else 0)" }, - "raft_interface_infill_overlap": - { - "force_depends_on_settings": [ "raft_base_thickness" ] - }, - "raft_interface_line_spacing": - { - "force_depends_on_settings": [ "raft_base_thickness" ] - }, - "raft_interface_line_width": - { - "force_depends_on_settings": [ "raft_base_thickness" ] - }, - "raft_interface_z_offset": - { - "force_depends_on_settings": [ "raft_base_thickness" ] - } + "prime_tower_position_y": { "value": "190 - prime_tower_size - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_y'))), 1) - (190 / 2 if resolveOrValue('machine_center_is_zero') else 0)" } } } \ No newline at end of file From 6ec660e97475aff337cb562a72c8517cb01f09c8 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Tue, 30 Jul 2024 14:26:35 +0200 Subject: [PATCH 08/16] Add removed value during linter to raft_interface_line_width --- resources/definitions/ultimaker_method_base.def.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index d6a9a8e034..baf5bd5ba8 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -356,6 +356,7 @@ }, "raft_interface_line_width": { + "value": 0.7, "force_depends_on_settings": [ "raft_base_thickness" ] }, "raft_interface_speed": { "value": 90 }, From 0c09490d363ec4b267d24dee62f809bf22bc6e24 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Tue, 30 Jul 2024 12:28:20 +0000 Subject: [PATCH 09/16] Applied printer-linter format --- resources/definitions/ultimaker_method_base.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index baf5bd5ba8..4773cfb674 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -356,8 +356,8 @@ }, "raft_interface_line_width": { - "value": 0.7, - "force_depends_on_settings": [ "raft_base_thickness" ] + "force_depends_on_settings": [ "raft_base_thickness" ], + "value": 0.7 }, "raft_interface_speed": { "value": 90 }, "raft_interface_thickness": { "value": 0.3 }, From dca373735e04951dfabff9dcab59ca4dd45b4461 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Tue, 30 Jul 2024 16:47:59 +0200 Subject: [PATCH 10/16] Add other dependencies and update condition --- .../ultimaker_method_base.def.json | 52 ++++++++++++++++--- 1 file changed, 44 insertions(+), 8 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 4773cfb674..2f8dc67c4f 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -321,6 +321,10 @@ "material_bed_temperature": { "enabled": "machine_heated_bed" }, "material_flow": { "value": 100 }, "material_initial_print_temperature": { "value": "material_print_temperature-10" }, + "material_print_temperature": + { + "force_depends_on_settings": [ "support_extruder_nr" ] + }, "material_shrinkage_percentage": { "enabled": true }, "min_bead_width": { "value": "0.75*line_width" }, "min_wall_line_width": { "value": 0.4 }, @@ -337,26 +341,42 @@ "prime_tower_raft_base_line_spacing": { "value": "raft_base_line_width" }, "prime_tower_wipe_enabled": { "value": true }, "print_sequence": { "enabled": false }, + "raft_airgap": + { + "force_depends_on_settings": [ "support_extruder_nr" ] + }, "raft_base_fan_speed": { "value": 0 }, "raft_base_line_spacing": { "value": "2*raft_base_line_width" }, - "raft_base_line_width": { "value": 1.4 }, + "raft_base_line_width": + { + "force_depends_on_settings": ["raft_interface_extruder_nr"], + "value": 1.4 + }, "raft_base_speed": { "value": 10 }, - "raft_base_thickness": { "value": 0.8 }, - "raft_base_wall_count": { "value": "raft_wall_count" }, + "raft_base_thickness": + { + "force_depends_on_settings": [ "raft_interface_extruder_nr" ], + "value": 0.8 + }, + "raft_base_wall_count": + { + "force_depends_on_settings": [ "support_extruder_nr" ], + "value": "raft_wall_count" + }, "raft_interface_extruder_nr": { "value": "raft_surface_extruder_nr" }, "raft_interface_fan_speed": { "value": 0 }, "raft_interface_infill_overlap": { - "force_depends_on_settings": [ "raft_base_thickness" ] + "force_depends_on_settings": [ "raft_interface_extruder_nr" ] }, "raft_interface_layers": { "value": 2 }, "raft_interface_line_spacing": { - "force_depends_on_settings": [ "raft_base_thickness" ] + "force_depends_on_settings": [ "raft_interface_extruder_nr" ] }, "raft_interface_line_width": { - "force_depends_on_settings": [ "raft_base_thickness" ], + "force_depends_on_settings": [ "raft_interface_extruder_nr" ], "value": 0.7 }, "raft_interface_speed": { "value": 90 }, @@ -364,13 +384,29 @@ "raft_interface_wall_count": { "value": "raft_wall_count" }, "raft_interface_z_offset": { - "force_depends_on_settings": [ "raft_base_thickness" ] + "force_depends_on_settings": [ "raft_interface_extruder_nr" ] }, "raft_margin": { "value": 1.2 }, "raft_smoothing": { "value": 9.5 }, "raft_surface_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material')) if support_enable and extruderValue(support_extruder_nr,'material_is_support_material') else raft_base_extruder_nr" }, "raft_surface_fan_speed": { "value": 0 }, + "raft_surface_flow": + { + "force_depends_on_settings": [ "support_extruder_nr" ] + }, + "raft_surface_speed": + { + "force_depends_on_settings": [ "support_extruder_nr" ] + }, + "raft_surface_thickness": + { + "force_depends_on_settings": [ "support_extruder_nr" ] + }, "raft_surface_wall_count": { "value": "raft_wall_count" }, + "raft_surface_z_offset": + { + "force_depends_on_settings": [ "support_extruder_nr" ] + }, "raft_wall_count": { "value": 2 }, "retract_at_layer_change": { "value": true }, "retraction_amount": { "value": 0.75 }, @@ -453,4 +489,4 @@ "z_seam_type": { "value": "'sharpest_corner'" }, "zig_zaggify_infill": { "value": true } } -} \ No newline at end of file +} From c3a74c07b9e6d69dbce3c97e0bb75f2d1ade5515 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Tue, 30 Jul 2024 14:49:28 +0000 Subject: [PATCH 11/16] Applied printer-linter format --- resources/definitions/ultimaker_method_base.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 2f8dc67c4f..99482d08dd 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -349,7 +349,7 @@ "raft_base_line_spacing": { "value": "2*raft_base_line_width" }, "raft_base_line_width": { - "force_depends_on_settings": ["raft_interface_extruder_nr"], + "force_depends_on_settings": [ "raft_interface_extruder_nr" ], "value": 1.4 }, "raft_base_speed": { "value": 10 }, @@ -489,4 +489,4 @@ "z_seam_type": { "value": "'sharpest_corner'" }, "zig_zaggify_infill": { "value": true } } -} +} \ No newline at end of file From 1f1f9ee5e709729cc20bc1ae68dae8811b4096f3 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Wed, 31 Jul 2024 09:58:25 +0200 Subject: [PATCH 12/16] Apply PPM review raft_base_line_spacing depends on raft_interface_extruder_nr cool_fan_enabled depends on support_extruder_nr raft_base_thickness not only depends on raft_interface_extruder_nr but also on support_extruder_nr --- .../definitions/ultimaker_method_base.def.json | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 99482d08dd..832bb9d586 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -191,6 +191,10 @@ "bridge_wall_material_flow": { "value": "material_flow" }, "bridge_wall_speed": { "value": "speed_wall" }, "brim_width": { "value": 5 }, + "cool_fan_enabled": + { + "force_depends_on_settings": [ "support_extruder_nr" ] + }, "default_material_bed_temperature": { "resolve": "min(extruderValues('default_material_bed_temperature'))" }, "extruder_prime_pos_abs": { "default_value": true }, "gradual_support_infill_steps": { "value": 0 }, @@ -346,7 +350,11 @@ "force_depends_on_settings": [ "support_extruder_nr" ] }, "raft_base_fan_speed": { "value": 0 }, - "raft_base_line_spacing": { "value": "2*raft_base_line_width" }, + "raft_base_line_spacing": + { + "force_depends_on_settings": [ "raft_interface_extruder_nr" ] + "value": "2*raft_base_line_width" + }, "raft_base_line_width": { "force_depends_on_settings": [ "raft_interface_extruder_nr" ], @@ -355,7 +363,7 @@ "raft_base_speed": { "value": 10 }, "raft_base_thickness": { - "force_depends_on_settings": [ "raft_interface_extruder_nr" ], + "force_depends_on_settings": [ "raft_interface_extruder_nr", "support_extruder_nr" ], "value": 0.8 }, "raft_base_wall_count": @@ -489,4 +497,4 @@ "z_seam_type": { "value": "'sharpest_corner'" }, "zig_zaggify_infill": { "value": true } } -} \ No newline at end of file +} From eb80d84da8724682d23c8270427c95ff8d254c15 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Wed, 31 Jul 2024 10:06:31 +0200 Subject: [PATCH 13/16] comma --- resources/definitions/ultimaker_method_base.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 832bb9d586..8161c4ec3e 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -352,7 +352,7 @@ "raft_base_fan_speed": { "value": 0 }, "raft_base_line_spacing": { - "force_depends_on_settings": [ "raft_interface_extruder_nr" ] + "force_depends_on_settings": [ "raft_interface_extruder_nr" ], "value": "2*raft_base_line_width" }, "raft_base_line_width": From 4be2d22fa936871e21105ef570bc3a58231ff64a Mon Sep 17 00:00:00 2001 From: HellAholic Date: Wed, 31 Jul 2024 08:07:45 +0000 Subject: [PATCH 14/16] Applied printer-linter format --- resources/definitions/ultimaker_method_base.def.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 8161c4ec3e..07a1ef2669 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -363,7 +363,10 @@ "raft_base_speed": { "value": 10 }, "raft_base_thickness": { - "force_depends_on_settings": [ "raft_interface_extruder_nr", "support_extruder_nr" ], + "force_depends_on_settings": [ + "raft_interface_extruder_nr", + "support_extruder_nr" + ], "value": 0.8 }, "raft_base_wall_count": @@ -497,4 +500,4 @@ "z_seam_type": { "value": "'sharpest_corner'" }, "zig_zaggify_infill": { "value": true } } -} +} \ No newline at end of file From 1ac563119ea203b0fff5d6684e69c21b21e5e56a Mon Sep 17 00:00:00 2001 From: HellAholic Date: Wed, 31 Jul 2024 11:32:59 +0200 Subject: [PATCH 15/16] Add raft_base_thickness dependency For raft_interface_z_offset, raft_interface_line_spacing, and raft_interface_z_offset --- .../definitions/ultimaker_method_base.def.json | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 07a1ef2669..058eaf8205 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -383,11 +383,17 @@ "raft_interface_layers": { "value": 2 }, "raft_interface_line_spacing": { - "force_depends_on_settings": [ "raft_interface_extruder_nr" ] + "force_depends_on_settings": [ + "raft_base_thickness", + "raft_interface_extruder_nr" + ] }, "raft_interface_line_width": { - "force_depends_on_settings": [ "raft_interface_extruder_nr" ], + "force_depends_on_settings": [ + "raft_base_thickness", + "raft_interface_extruder_nr" + ], "value": 0.7 }, "raft_interface_speed": { "value": 90 }, @@ -395,7 +401,10 @@ "raft_interface_wall_count": { "value": "raft_wall_count" }, "raft_interface_z_offset": { - "force_depends_on_settings": [ "raft_interface_extruder_nr" ] + "force_depends_on_settings": [ + "raft_base_thickness", + "raft_interface_extruder_nr" + ] }, "raft_margin": { "value": 1.2 }, "raft_smoothing": { "value": 9.5 }, @@ -500,4 +509,4 @@ "z_seam_type": { "value": "'sharpest_corner'" }, "zig_zaggify_infill": { "value": true } } -} \ No newline at end of file +} From ad12851426e863d64fdd39412dc6954885304e6d Mon Sep 17 00:00:00 2001 From: HellAholic Date: Wed, 31 Jul 2024 09:34:34 +0000 Subject: [PATCH 16/16] Applied printer-linter format --- resources/definitions/ultimaker_method_base.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 058eaf8205..23e61410d9 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -383,7 +383,7 @@ "raft_interface_layers": { "value": 2 }, "raft_interface_line_spacing": { - "force_depends_on_settings": [ + "force_depends_on_settings": [ "raft_base_thickness", "raft_interface_extruder_nr" ] @@ -509,4 +509,4 @@ "z_seam_type": { "value": "'sharpest_corner'" }, "zig_zaggify_infill": { "value": true } } -} +} \ No newline at end of file