Revert "Increase print volume for method printers"

This reverts commit a111b39e

resources/definitions/ultimaker_method_base.def.json

@@ -321,16 +321,25 @@
         "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": "UltiMaker 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" },

resources/definitions/ultimaker_methodx.def.json

@@ -69,7 +69,7 @@
         "platform_offset": [
             0,
             0,
-            16
+            0
         ],
         "platform_texture": "MakerbotMethod.png",
         "preferred_material": "ultimaker_absr_175",
@@ -83,40 +83,8 @@
     },
     "overrides":
     {
-        "machine_depth": { "default_value": 236.48 },
+        "machine_name": {
-        "machine_disallowed_areas":
+            "default_value": "UltiMaker Method X"
-        {
+        }
-            "default_value": [
-                [
-                    [-141.65, -118.11],
-                    [141.65, -118.11],
-                    [141.65, -95],
-                    [-141.65, -95]
-                ],
-                [
-                    [-141.65, 118.37],
-                    [141.65, 118.37],
-                    [141.65, 95],
-                    [-141.65, 95]
-                ],
-                [
-                    [-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_height": { "default_value": 196 },
-        "machine_name": { "default_value": "UltiMaker 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)" }
     }
 }

resources/definitions/ultimaker_methodxl.def.json

@@ -32,43 +32,16 @@
     },
     "overrides":
     {
-        "machine_depth": { "default_value": 320 },
+        "machine_depth": {
-        "machine_disallowed_areas":
+            "default_value": 305
-        {
-            "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": "UltiMaker Method XL" },
-        "machine_width": { "default_value": 410 },
+        "machine_width": {
+            "default_value": 305
+        },
         "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)" },
         "speed_travel": { "value": 500 }
     }
 }