From d1b889b96cde2f96f2580656b25193f641a9f5da Mon Sep 17 00:00:00 2001
From: Erwan MATHIEU <erwan.mathieu@ultimaker.com>
Date: Wed, 2 Oct 2024 08:56:18 +0200
Subject: [PATCH] Re-apply disallowed areas and build area fixes

CURA-12165
---
 .../definitions/ultimaker_method.def.json     | 29 -----------------
 .../ultimaker_method_base.def.json            | 26 ----------------
 .../definitions/ultimaker_methodx.def.json    | 29 -----------------
 .../definitions/ultimaker_methodxl.def.json   | 31 +++----------------
 4 files changed, 5 insertions(+), 110 deletions(-)

diff --git a/resources/definitions/ultimaker_method.def.json b/resources/definitions/ultimaker_method.def.json
index 2f4e372e28..5963f4dfa0 100644
--- a/resources/definitions/ultimaker_method.def.json
+++ b/resources/definitions/ultimaker_method.def.json
@@ -85,35 +85,6 @@
     "overrides":
     {
         "build_volume_temperature": { "maximum_value": "67" },
-        "machine_disallowed_areas":
-        {
-            "default_value": [
-                [
-                    [-141.65, -118.11],
-                    [141.65, -118.11],
-                    [141.65, -94],
-                    [-141.65, -94]
-                ],
-                [
-                    [-141.65, 118.37],
-                    [141.65, 118.37],
-                    [141.65, 94],
-                    [-141.65, 94]
-                ],
-                [
-                    [-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]
-                ]
-            ]
-        },
         "machine_name": { "default_value": "UltiMaker Method" },
         "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)" }
diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json
index 4221372d79..51ca06ccae 100644
--- a/resources/definitions/ultimaker_method_base.def.json
+++ b/resources/definitions/ultimaker_method_base.def.json
@@ -306,32 +306,6 @@
         "machine_depth": { "default_value": 236.48 },
         "machine_disallowed_areas":
         {
-            "default_value": [
-                [
-                    [-141.65, -118.11],
-                    [141.65, -118.11],
-                    [141.65, -95.205],
-                    [-141.65, -95.205]
-                ],
-                [
-                    [-141.65, 118.37],
-                    [141.65, 118.37],
-                    [141.65, 95.205],
-                    [-141.65, 95.205]
-                ],
-                [
-                    [-141.65, -118.11],
-                    [-76.149, -118.11],
-                    [-76.149, 118.37],
-                    [-141.65, 118.37]
-                ],
-                [
-                    [76.149, -118.11],
-                    [141.65, -118.11],
-                    [141.65, 118.37],
-                    [76.149, 118.37]
-                ]
-            ],
             "value": "[ [ [-141.65, -118.11], [141.65, -118.11], [141.65, -95.205], [-141.65, -95.205] ], [ [-141.65, 118.37], [141.65, 118.37], [141.65, 95.205], [-141.65, 95.205] ], [ [-141.65, -118.11], [-114.249, -118.11], [-114.249, 118.37], [-141.65, 118.37] ], [ [76.149, -118.11], [141.65, -118.11], [141.65, 118.37], [76.149, 118.37] ] ] if max(extruderValues('extruder_nr')) == 0 else [ [ [-141.65, -118.11], [141.65, -118.11], [141.65, -95.205], [-141.65, -95.205] ], [ [-141.65, 118.37], [141.65, 118.37], [141.65, 95.205], [-141.65, 95.205] ], [ [-141.65, -118.11], [-76.149, -118.11], [-76.149, 118.37], [-141.65, 118.37] ], [ [76.149, -118.11], [141.65, -118.11], [141.65, 118.37], [76.149, 118.37] ] ]"
         },
         "machine_end_gcode": { "default_value": "" },
diff --git a/resources/definitions/ultimaker_methodx.def.json b/resources/definitions/ultimaker_methodx.def.json
index 42c1ffda78..245ad23ecb 100644
--- a/resources/definitions/ultimaker_methodx.def.json
+++ b/resources/definitions/ultimaker_methodx.def.json
@@ -72,35 +72,6 @@
     "overrides":
     {
         "build_volume_temperature": { "maximum_value": "107" },
-        "machine_disallowed_areas":
-        {
-            "default_value": [
-                [
-                    [-141.65, -118.11],
-                    [141.65, -118.11],
-                    [141.65, -94],
-                    [-141.65, -94]
-                ],
-                [
-                    [-141.65, 118.37],
-                    [141.65, 118.37],
-                    [141.65, 94],
-                    [-141.65, 94]
-                ],
-                [
-                    [-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]
-                ]
-            ]
-        },
         "machine_name": { "default_value": "UltiMaker Method X" },
         "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)" }
diff --git a/resources/definitions/ultimaker_methodxl.def.json b/resources/definitions/ultimaker_methodxl.def.json
index f5c9ba9958..69200511fd 100644
--- a/resources/definitions/ultimaker_methodxl.def.json
+++ b/resources/definitions/ultimaker_methodxl.def.json
@@ -54,6 +54,11 @@
             "0": "ultimaker_methodxl_extruder_left",
             "1": "ultimaker_methodxl_extruder_right"
         },
+        "platform_offset": [
+            0,
+            0,
+            0
+        ],
         "preferred_quality_type": "draft",
         "reference_machine_id": "magma_10",
         "supports_network_connection": true,
@@ -67,32 +72,6 @@
         "machine_depth": { "default_value": 320 },
         "machine_disallowed_areas":
         {
-            "default_value": [
-                [
-                    [-204, -160],
-                    [204, -160],
-                    [204, -154.5],
-                    [-204, -154.5]
-                ],
-                [
-                    [-204, 160],
-                    [204, 160],
-                    [204, 154.5],
-                    [-204, 154.5]
-                ],
-                [
-                    [-205, -160],
-                    [-154.5, -160],
-                    [-154.5, 160],
-                    [-205, 160]
-                ],
-                [
-                    [154.5, -160],
-                    [205, -160],
-                    [205, 160],
-                    [154.5, 160]
-                ]
-            ],
             "value": "[ [ [-204, -160], [204, -160], [204, -154.5], [-204, -154.5] ], [ [-204, 160], [204, 160], [204, 154.5], [-204, 154.5] ], [ [-205, -160], [-191.5, -160], [-191.5, 160], [-205, 160] ], [ [154.5, -160], [205, -160], [205, 160], [154.5, 160] ] ] if max(extruderValues('extruder_nr')) == 0 else [ [ [-204, -160], [204, -160], [204, -154.5], [-204, -154.5] ], [ [-204, 160], [204, 160], [204, 154.5], [-204, 154.5] ], [ [-205, -160], [-154.5, -160], [-154.5, 160], [-205, 160] ], [ [154.5, -160], [205, -160], [205, 160], [154.5, 160] ] ]"
         },
         "machine_heated_bed": { "default_value": true },