From 4a176a09a8a39e7a16cdc55b0c2bb57e10502906 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Fri, 3 Nov 2023 14:17:16 +0100 Subject: [PATCH 1/8] increase print volume for method printers this includes method x, and method xl CURA-11260 --- .../ultimaker_method_base.def.json | 3 - .../definitions/ultimaker_methodx.def.json | 91 ++++++++++++++++++- .../definitions/ultimaker_methodxl.def.json | 88 +++++++++++++++++- 3 files changed, 174 insertions(+), 8 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index f574969069..3472376a4f 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -321,19 +321,16 @@ "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, "machine_acceleration": { "default_value": 3000 }, "machine_center_is_zero": { "value": true }, - "machine_depth": { "default_value": 190 }, "machine_end_gcode": { "default_value": "" }, "machine_extruder_count": { "default_value": 2 }, "machine_gcode_flavor": { "default_value": "Griffin" }, "machine_heated_bed": { "default_value": false }, "machine_heated_build_volume": { "default_value": true }, - "machine_height": { "default_value": 196 }, "machine_min_cool_heat_time_window": { "value": 15 }, "machine_name": { "default_value": "Makerbot Method" }, "machine_nozzle_cool_down_speed": { "value": 0.8 }, "machine_nozzle_heat_up_speed": { "value": 3.5 }, "machine_start_gcode": { "default_value": "" }, - "machine_width": { "default_value": 150 }, "material_bed_temperature": { "enabled": "machine_heated_bed" }, "material_bed_temperature_layer_0": { "enabled": "machine_heated_bed" }, "material_final_print_temperature": { "value": "material_print_temperature-10" }, diff --git a/resources/definitions/ultimaker_methodx.def.json b/resources/definitions/ultimaker_methodx.def.json index 5e63ddea79..e0dfe1e6ee 100644 --- a/resources/definitions/ultimaker_methodx.def.json +++ b/resources/definitions/ultimaker_methodx.def.json @@ -69,7 +69,7 @@ "platform_offset": [ 0, 0, - 0 + 16 ], "platform_texture": "MakerbotMethod.png", "preferred_material": "ultimaker_absr_175", @@ -83,6 +83,93 @@ }, "overrides": { - "machine_name": { "default_value": "Makerbot Method X" } + "machine_depth": { + "default_value": 236.48 + }, + "machine_width": { + "default_value": 283.3 + }, + "machine_height": { + "default_value": 196 + }, + "machine_name": { + "default_value": "Makerbot Method X" + }, + "machine_disallowed_areas": { + "default_value": [ + [ + [ + -141.65, + -118.11 + ], + [ + 141.65, + -118.11 + ], + [ + 141.65, + -79 + ], + [ + -141.65, + -79 + ] + ], + [ + [ + -141.65, + 118.37 + ], + [ + 141.65, + 118.37 + ], + [ + 141.65, + 111 + ], + [ + -141.65, + 111 + ] + ], + [ + [ + -141.65, + -118.11 + ], + [ + -75, + -118.11 + ], + [ + -75, + 118.37 + ], + [ + -141.65, + 118.37 + ] + ], + [ + [ + 75, + -118.11 + ], + [ + 141.65, + -118.11 + ], + [ + 141.65, + 118.37 + ], + [ + 75, + 118.37 + ] + ] + ] + } } } \ No newline at end of file diff --git a/resources/definitions/ultimaker_methodxl.def.json b/resources/definitions/ultimaker_methodxl.def.json index ac64e3a95d..94ee1b20c8 100644 --- a/resources/definitions/ultimaker_methodxl.def.json +++ b/resources/definitions/ultimaker_methodxl.def.json @@ -32,12 +32,94 @@ }, "overrides": { - "machine_depth": { "default_value": 305 }, + "machine_depth": { + "default_value": 320 + }, "machine_heated_bed": { "default_value": true }, "machine_height": { "default_value": 317 }, "machine_name": { "default_value": "Makerbot Method XL" }, - "machine_width": { "default_value": 305 }, + "machine_width": { + "default_value": 410 + }, "material_shrinkage_percentage_z": { "resolve": "sum(extruderValues(\"material_shrinkage_percentage_z\")) / len(extruderValues(\"material_shrinkage_percentage_z\"))" }, - "speed_travel": { "value": 500 } + "speed_travel": { + "value": 500 + }, + "machine_disallowed_areas": { + "default_value": [ + [ + [ + -204, + -160 + ], + [ + 204, + -160 + ], + [ + 204, + -152.5 + ], + [ + -204, + -152.5 + ] + ], + [ + [ + -204, + 160 + ], + [ + 204, + 160 + ], + [ + 204, + 152.5 + ], + [ + -204, + 152.5 + ] + ], + [ + [ + -205, + -160 + ], + [ + -152.5, + -160 + ], + [ + -152.5, + 160 + ], + [ + -205, + 160 + ] + ], + [ + [ + 152.5, + -160 + ], + [ + 205, + -160 + ], + [ + 205, + 160 + ], + [ + 152.5, + 160 + ] + ] + ] + } } } \ No newline at end of file From 9ca8582a5021ccd8759646b2e49fdf99f4026eab Mon Sep 17 00:00:00 2001 From: casperlamboo Date: Fri, 3 Nov 2023 13:18:16 +0000 Subject: [PATCH 2/8] Applied printer-linter format --- .../definitions/ultimaker_methodx.def.json | 101 ++++----------- .../definitions/ultimaker_methodxl.def.json | 115 +++++------------- 2 files changed, 54 insertions(+), 162 deletions(-) diff --git a/resources/definitions/ultimaker_methodx.def.json b/resources/definitions/ultimaker_methodx.def.json index e0dfe1e6ee..605432e87e 100644 --- a/resources/definitions/ultimaker_methodx.def.json +++ b/resources/definitions/ultimaker_methodx.def.json @@ -83,93 +83,38 @@ }, "overrides": { - "machine_depth": { - "default_value": 236.48 - }, - "machine_width": { - "default_value": 283.3 - }, - "machine_height": { - "default_value": 196 - }, - "machine_name": { - "default_value": "Makerbot Method X" - }, - "machine_disallowed_areas": { + "machine_depth": { "default_value": 236.48 }, + "machine_disallowed_areas": + { "default_value": [ [ - [ - -141.65, - -118.11 - ], - [ - 141.65, - -118.11 - ], - [ - 141.65, - -79 - ], - [ - -141.65, - -79 - ] + [-141.65, -118.11], + [141.65, -118.11], + [141.65, -79], + [-141.65, -79] ], [ - [ - -141.65, - 118.37 - ], - [ - 141.65, - 118.37 - ], - [ - 141.65, - 111 - ], - [ - -141.65, - 111 - ] + [-141.65, 118.37], + [141.65, 118.37], + [141.65, 111], + [-141.65, 111] ], [ - [ - -141.65, - -118.11 - ], - [ - -75, - -118.11 - ], - [ - -75, - 118.37 - ], - [ - -141.65, - 118.37 - ] + [-141.65, -118.11], + [-75, -118.11], + [-75, 118.37], + [-141.65, 118.37] ], [ - [ - 75, - -118.11 - ], - [ - 141.65, - -118.11 - ], - [ - 141.65, - 118.37 - ], - [ - 75, - 118.37 - ] + [75, -118.11], + [141.65, -118.11], + [141.65, 118.37], + [75, 118.37] ] ] - } + }, + "machine_height": { "default_value": 196 }, + "machine_name": { "default_value": "Makerbot Method X" }, + "machine_width": { "default_value": 283.3 } } } \ No newline at end of file diff --git a/resources/definitions/ultimaker_methodxl.def.json b/resources/definitions/ultimaker_methodxl.def.json index 94ee1b20c8..0af2879d36 100644 --- a/resources/definitions/ultimaker_methodxl.def.json +++ b/resources/definitions/ultimaker_methodxl.def.json @@ -32,94 +32,41 @@ }, "overrides": { - "machine_depth": { - "default_value": 320 + "machine_depth": { "default_value": 320 }, + "machine_disallowed_areas": + { + "default_value": [ + [ + [-204, -160], + [204, -160], + [204, -152.5], + [-204, -152.5] + ], + [ + [-204, 160], + [204, 160], + [204, 152.5], + [-204, 152.5] + ], + [ + [-205, -160], + [-152.5, -160], + [-152.5, 160], + [-205, 160] + ], + [ + [152.5, -160], + [205, -160], + [205, 160], + [152.5, 160] + ] + ] }, "machine_heated_bed": { "default_value": true }, "machine_height": { "default_value": 317 }, "machine_name": { "default_value": "Makerbot Method XL" }, - "machine_width": { - "default_value": 410 - }, + "machine_width": { "default_value": 410 }, "material_shrinkage_percentage_z": { "resolve": "sum(extruderValues(\"material_shrinkage_percentage_z\")) / len(extruderValues(\"material_shrinkage_percentage_z\"))" }, - "speed_travel": { - "value": 500 - }, - "machine_disallowed_areas": { - "default_value": [ - [ - [ - -204, - -160 - ], - [ - 204, - -160 - ], - [ - 204, - -152.5 - ], - [ - -204, - -152.5 - ] - ], - [ - [ - -204, - 160 - ], - [ - 204, - 160 - ], - [ - 204, - 152.5 - ], - [ - -204, - 152.5 - ] - ], - [ - [ - -205, - -160 - ], - [ - -152.5, - -160 - ], - [ - -152.5, - 160 - ], - [ - -205, - 160 - ] - ], - [ - [ - 152.5, - -160 - ], - [ - 205, - -160 - ], - [ - 205, - 160 - ], - [ - 152.5, - 160 - ] - ] - ] - } + "speed_travel": { "value": 500 } } } \ No newline at end of file From 66632b8636d399e61ac03b3dad737406d0b817f2 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Fri, 3 Nov 2023 14:36:48 +0100 Subject: [PATCH 3/8] Fix positioning of method x CURA-11260 --- .../definitions/ultimaker_methodx.def.json | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/resources/definitions/ultimaker_methodx.def.json b/resources/definitions/ultimaker_methodx.def.json index 605432e87e..7a6f45cfb4 100644 --- a/resources/definitions/ultimaker_methodx.def.json +++ b/resources/definitions/ultimaker_methodx.def.json @@ -90,14 +90,26 @@ [ [-141.65, -118.11], [141.65, -118.11], - [141.65, -79], - [-141.65, -79] + [ + 141.65, + -95 + ], + [ + -141.65, + -95 + ] ], [ [-141.65, 118.37], [141.65, 118.37], - [141.65, 111], - [-141.65, 111] + [ + 141.65, + 95 + ], + [ + -141.65, + 95 + ] ], [ [-141.65, -118.11], From 02635ff994c1ebf0801006f235f9bc6188c60380 Mon Sep 17 00:00:00 2001 From: casperlamboo Date: Fri, 3 Nov 2023 13:37:53 +0000 Subject: [PATCH 4/8] Applied printer-linter format --- .../definitions/ultimaker_methodx.def.json | 20 ++++--------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/resources/definitions/ultimaker_methodx.def.json b/resources/definitions/ultimaker_methodx.def.json index 7a6f45cfb4..5d6970b324 100644 --- a/resources/definitions/ultimaker_methodx.def.json +++ b/resources/definitions/ultimaker_methodx.def.json @@ -90,26 +90,14 @@ [ [-141.65, -118.11], [141.65, -118.11], - [ - 141.65, - -95 - ], - [ - -141.65, - -95 - ] + [141.65, -95], + [-141.65, -95] ], [ [-141.65, 118.37], [141.65, 118.37], - [ - 141.65, - 95 - ], - [ - -141.65, - 95 - ] + [141.65, 95], + [-141.65, 95] ], [ [-141.65, -118.11], From 24235d2ef5a82fe969f9bff8496c2bce00bc4215 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Fri, 3 Nov 2023 16:15:16 +0100 Subject: [PATCH 5/8] Update prime tower position CURA-11260 --- resources/definitions/ultimaker_methodx.def.json | 10 +++++++++- resources/definitions/ultimaker_methodxl.def.json | 6 ++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/resources/definitions/ultimaker_methodx.def.json b/resources/definitions/ultimaker_methodx.def.json index 5d6970b324..f3de670b26 100644 --- a/resources/definitions/ultimaker_methodx.def.json +++ b/resources/definitions/ultimaker_methodx.def.json @@ -115,6 +115,14 @@ }, "machine_height": { "default_value": 196 }, "machine_name": { "default_value": "Makerbot Method X" }, - "machine_width": { "default_value": 283.3 } + "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)" + } } } \ No newline at end of file diff --git a/resources/definitions/ultimaker_methodxl.def.json b/resources/definitions/ultimaker_methodxl.def.json index 0af2879d36..13e16f72d5 100644 --- a/resources/definitions/ultimaker_methodxl.def.json +++ b/resources/definitions/ultimaker_methodxl.def.json @@ -62,6 +62,12 @@ ] ] }, + "prime_tower_position_x": { + "value": "(305 / 2 + resolveOrValue('prime_tower_size') / 2) if resolveOrValue('machine_shape') == 'elliptic' else (305 - (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)) - (305 / 2 if resolveOrValue('machine_center_is_zero') else 0)" + }, + "prime_tower_position_y": { + "value": "305 - 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) - (305 / 2 if resolveOrValue('machine_center_is_zero') else 0)" + }, "machine_heated_bed": { "default_value": true }, "machine_height": { "default_value": 317 }, "machine_name": { "default_value": "Makerbot Method XL" }, From 721e0cb1ac6de53eb71108a07c35fd829c7ce7f0 Mon Sep 17 00:00:00 2001 From: casperlamboo Date: Fri, 3 Nov 2023 15:16:16 +0000 Subject: [PATCH 6/8] Applied printer-linter format --- resources/definitions/ultimaker_methodx.def.json | 12 +++--------- resources/definitions/ultimaker_methodxl.def.json | 8 ++------ 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/resources/definitions/ultimaker_methodx.def.json b/resources/definitions/ultimaker_methodx.def.json index f3de670b26..ae8afe4fe6 100644 --- a/resources/definitions/ultimaker_methodx.def.json +++ b/resources/definitions/ultimaker_methodx.def.json @@ -115,14 +115,8 @@ }, "machine_height": { "default_value": 196 }, "machine_name": { "default_value": "Makerbot Method X" }, - "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)" - } + "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)" } } } \ No newline at end of file diff --git a/resources/definitions/ultimaker_methodxl.def.json b/resources/definitions/ultimaker_methodxl.def.json index 13e16f72d5..7c47079c9f 100644 --- a/resources/definitions/ultimaker_methodxl.def.json +++ b/resources/definitions/ultimaker_methodxl.def.json @@ -62,17 +62,13 @@ ] ] }, - "prime_tower_position_x": { - "value": "(305 / 2 + resolveOrValue('prime_tower_size') / 2) if resolveOrValue('machine_shape') == 'elliptic' else (305 - (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)) - (305 / 2 if resolveOrValue('machine_center_is_zero') else 0)" - }, - "prime_tower_position_y": { - "value": "305 - 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) - (305 / 2 if resolveOrValue('machine_center_is_zero') else 0)" - }, "machine_heated_bed": { "default_value": true }, "machine_height": { "default_value": 317 }, "machine_name": { "default_value": "Makerbot Method XL" }, "machine_width": { "default_value": 410 }, "material_shrinkage_percentage_z": { "resolve": "sum(extruderValues(\"material_shrinkage_percentage_z\")) / len(extruderValues(\"material_shrinkage_percentage_z\"))" }, + "prime_tower_position_x": { "value": "(305 / 2 + resolveOrValue('prime_tower_size') / 2) if resolveOrValue('machine_shape') == 'elliptic' else (305 - (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)) - (305 / 2 if resolveOrValue('machine_center_is_zero') else 0)" }, + "prime_tower_position_y": { "value": "305 - 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) - (305 / 2 if resolveOrValue('machine_center_is_zero') else 0)" }, "speed_travel": { "value": 500 } } } \ No newline at end of file From f8f880f648cca3118db710d09fcc0821ff9862ef Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Mon, 6 Nov 2023 10:28:23 +0100 Subject: [PATCH 7/8] Simplify prime tower positioning formula Since method printers do not have an elliptic buildplate this case can be ignored. It is also safe to assume the "machine center is zero" is True CURA-11260 --- resources/definitions/ultimaker_methodxl.def.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/resources/definitions/ultimaker_methodxl.def.json b/resources/definitions/ultimaker_methodxl.def.json index 7c47079c9f..bb5bcff952 100644 --- a/resources/definitions/ultimaker_methodxl.def.json +++ b/resources/definitions/ultimaker_methodxl.def.json @@ -67,8 +67,12 @@ "machine_name": { "default_value": "Makerbot Method XL" }, "machine_width": { "default_value": 410 }, "material_shrinkage_percentage_z": { "resolve": "sum(extruderValues(\"material_shrinkage_percentage_z\")) / len(extruderValues(\"material_shrinkage_percentage_z\"))" }, - "prime_tower_position_x": { "value": "(305 / 2 + resolveOrValue('prime_tower_size') / 2) if resolveOrValue('machine_shape') == 'elliptic' else (305 - (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)) - (305 / 2 if resolveOrValue('machine_center_is_zero') else 0)" }, - "prime_tower_position_y": { "value": "305 - 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) - (305 / 2 if resolveOrValue('machine_center_is_zero') else 0)" }, + "prime_tower_position_x": { + "value": "(305 - (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)) - (305 / 2)" + }, + "prime_tower_position_y": { + "value": "305 - 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) - (305 / 2)" + }, "speed_travel": { "value": 500 } } } \ No newline at end of file From ceb8c320c811a2eaaa2fbf0a04cd60321409b794 Mon Sep 17 00:00:00 2001 From: casperlamboo Date: Mon, 6 Nov 2023 09:29:40 +0000 Subject: [PATCH 8/8] Applied printer-linter format --- resources/definitions/ultimaker_methodxl.def.json | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/resources/definitions/ultimaker_methodxl.def.json b/resources/definitions/ultimaker_methodxl.def.json index bb5bcff952..e80b3ed272 100644 --- a/resources/definitions/ultimaker_methodxl.def.json +++ b/resources/definitions/ultimaker_methodxl.def.json @@ -67,12 +67,8 @@ "machine_name": { "default_value": "Makerbot Method XL" }, "machine_width": { "default_value": 410 }, "material_shrinkage_percentage_z": { "resolve": "sum(extruderValues(\"material_shrinkage_percentage_z\")) / len(extruderValues(\"material_shrinkage_percentage_z\"))" }, - "prime_tower_position_x": { - "value": "(305 - (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)) - (305 / 2)" - }, - "prime_tower_position_y": { - "value": "305 - 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) - (305 / 2)" - }, + "prime_tower_position_x": { "value": "(305 - (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)) - (305 / 2)" }, + "prime_tower_position_y": { "value": "305 - 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) - (305 / 2)" }, "speed_travel": { "value": 500 } } } \ No newline at end of file