Change dimensions of Ultimaker 3 and reset nozzle origins

The left nozzle is at the origin again now. And the right nozzle is at an offset of 18mm of that.

Contributes to issue CURA-2625.

resources/definitions/fdmprinter.def.json

@@ -283,6 +283,18 @@
                     "settable_per_extruder": false,
                     "settable_per_meshgroup": false
                 },
+                "nozzle_disallowed_areas":
+                {
+                    "label": "Nozzle Disallowed Areas",
+                    "description": "A list of polygons with areas the nozzle is not allowed to enter.",
+                    "type": "polygons",
+                    "default_value":
+                    [
+                    ],
+                    "settable_per_mesh": false,
+                    "settable_per_extruder": false,
+                    "settable_per_meshgroup": false
+                },
                 "machine_head_polygon":
                 {
                     "label": "Machine head polygon",

resources/definitions/ultimaker3.def.json

@@ -34,7 +34,7 @@
 
     "overrides": {
         "machine_name": { "default_value": "Ultimaker 3" },
-        "machine_width": { "default_value": 215 },
+        "machine_width": { "default_value": 233 },
         "machine_depth": { "default_value": 215 },
         "machine_height": { "default_value": 200 },
         "machine_heated_bed": { "default_value": true },
@@ -44,10 +44,10 @@
         {
             "default_value":
             [
-                [ -40, 10 ],
-                [ -40, -30 ],
-                [ 60, 10 ],
-                [ 60, -30 ]
+                [ -29, 6.1 ],
+                [ -29, -33.9 ],
+                [ 71, 6.1 ],
+                [ 71, -33.9 ]
             ]
         },
         "machine_gcode_flavor": { "default_value": "Griffin" },
@@ -57,13 +57,14 @@
         "machine_acceleration": { "default_value": 3000 },
         "gantry_height": { "default_value": 60 },
         "machine_disallowed_areas": { "default_value": [
-            [[-91.5, -115], [-115, -115], [-115, -104.6], [-91.5, -104.6]],
-            [[-94.5, 104.6], [-115, 104.6], [-115, 105.5], [-94.5, 105.5]],
-            [[-91.4, 105.5], [-115, 105.5], [-115, 115], [-91.4, 115]],
-
-            [[77.3, -115], [77.3, -98.6], [115, -98.6], [115, -115]],
-            [[97.2, -98.6], [97.2, -54.5], [113, -54.5], [113, -98.6]],
-            [[77, 99.3], [77, 115], [115, 115], [115, 99.3]]
+            [[92.8, -53.4], [92.8, -97.5], [116.5, -97.5], [116.5, -53.4]],
+            [[74.9, 107.5], [74.9, 100.5], [116.5, 100.5], [116.5, 107.5]]
+        ]},
+        "nozzle_disallowed_areas": { "default_value": [
+            [[-116.5, -103.5], [-116.5, -107.5], [-100.9, -107.5], [-100.9, -103.5]],
+            [[-116.5, 105.8], [-96.9, 105.8], [-96.9, 107.5], [-116.5, 107.5]],
+            [[74.6, 107.5], [74.6, 101.4], [116.5, 101.4], [116.5, 107.5]],
+            [[74.9, -97.5], [74.9, -107.5], [116.5, -107.5], [116.5, -97.5]]
         ]},
         "machine_extruder_count": { "default_value": 2 },
         "extruder_prime_pos_abs": { "default_value": true },

resources/extruders/ultimaker3_extended_extruder_left.def.json

@@ -13,8 +13,8 @@
             "default_value": 0,
             "maximum_value": "1"
         },
-        "machine_nozzle_offset_x": { "default_value": -11.0 },
-        "machine_nozzle_offset_y": { "default_value": 3.9 },
+        "machine_nozzle_offset_x": { "default_value": 0 },
+        "machine_nozzle_offset_y": { "default_value": 0 },
 
         "machine_extruder_start_pos_abs": { "default_value": true },
         "machine_extruder_start_pos_x": { "default_value": 213 },

resources/extruders/ultimaker3_extended_extruder_right.def.json

@@ -13,8 +13,8 @@
             "default_value": 1,
             "maximum_value": "1"
         },
-        "machine_nozzle_offset_x": { "default_value": 7.0 },
-        "machine_nozzle_offset_y": { "default_value": 3.9 },
+        "machine_nozzle_offset_x": { "default_value": 18 },
+        "machine_nozzle_offset_y": { "default_value": 0 },
 
         "machine_extruder_start_pos_abs": { "default_value": true },
         "machine_extruder_start_pos_x": { "default_value": 213 },

resources/extruders/ultimaker3_extruder_left.def.json

@@ -13,8 +13,8 @@
             "default_value": 0,
             "maximum_value": "1"
         },
-        "machine_nozzle_offset_x": { "default_value": -11.0 },
-        "machine_nozzle_offset_y": { "default_value": 3.9 },
+        "machine_nozzle_offset_x": { "default_value": 0 },
+        "machine_nozzle_offset_y": { "default_value": 0 },
 
         "machine_extruder_start_pos_abs": { "default_value": true },
         "machine_extruder_start_pos_x": { "default_value": 213 },

resources/extruders/ultimaker3_extruder_right.def.json

@@ -13,8 +13,8 @@
             "default_value": 1,
             "maximum_value": "1"
         },
-        "machine_nozzle_offset_x": { "default_value": 7.0 },
-        "machine_nozzle_offset_y": { "default_value": 3.9 },
+        "machine_nozzle_offset_x": { "default_value": 18 },
+        "machine_nozzle_offset_y": { "default_value": 0 },
 
         "machine_extruder_start_pos_abs": { "default_value": true },
         "machine_extruder_start_pos_x": { "default_value": 213 },