From 4a176a09a8a39e7a16cdc55b0c2bb57e10502906 Mon Sep 17 00:00:00 2001
From: "c.lamboo" <casperlamboo@gmail.com>
Date: Fri, 3 Nov 2023 14:17:16 +0100
Subject: [PATCH] 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