fix: moved extruder definition settings to a new file fdmextruder.def.json (CURA-1616)

resources/definitions/fdmextruder.def.json

@@ -0,0 +1,119 @@
+{
+    "id": "fdmextruder",
+    "name": "Extruder",
+    "version": 2,
+    "metadata":
+    {
+        "type": "extruder",
+        "author": "Ultimaker B.V.",
+        "manufacturer": "Ultimaker",
+        "visible": false
+    },
+    "settings":
+    {
+        "machine_settings":
+        {
+            "label": "Machine",
+            "type": "category",
+            "description": "Machine specific settings",
+            "children":
+            {
+                "extruder_nr":
+                {
+                    "label": "Extruder",
+                    "description": "The extruder train used for printing. This is used in multi-extrusion.",
+                    "type": "int",
+                    "default_value": 0,
+                    "minimum_value": "0",
+                    "maximum_value": "machine_extruder_count - 1"
+                },
+                "machine_nozzle_offset_x":
+                {
+                    "label": "Nozzle X Offset",
+                    "description": "The x-coordinate of the offset of the nozzle.",
+                    "type": "float",
+                    "unit": "mm",
+                    "default_value": 0,
+                    "global_only": "True"
+                },
+                "machine_nozzle_offset_y":
+                {
+                    "label": "Nozzle Y Offset",
+                    "description": "The y-coordinate of the offset of the nozzle.",
+                    "type": "float",
+                    "unit": "mm",
+                    "default_value": 0,
+                    "global_only": "True"
+                },
+                "machine_extruder_start_code":
+                {
+                    "label": "Extruder Start G-Code",
+                    "description": "Start g-code to execute whenever turning the extruder on.",
+                    "type": "str",
+                    "default_value": "",
+                    "global_only": "True"
+                },
+                "machine_extruder_start_pos_abs":
+                {
+                    "label": "Extruder Start Position Absolute",
+                    "description": "Make the extruder starting position absolute rather than relative to the last-known location of the head.",
+                    "type": "bool",
+                    "default_value": false,
+                    "global_only": "True"
+                },
+                "machine_extruder_start_pos_x":
+                {
+                    "label": "Extruder Start Position X",
+                    "description": "The x-coordinate of the starting position when turning the extruder on.",
+                    "type": "float",
+                    "unit": "mm",
+                    "default_value": 0,
+                    "global_only": "True"
+                },
+                "machine_extruder_start_pos_y":
+                {
+                    "label": "Extruder Start Position Y",
+                    "description": "The y-coordinate of the starting position when turning the extruder on.",
+                    "type": "float",
+                    "unit": "mm",
+                    "default_value": 0,
+                    "global_only": "True"
+                },
+                "machine_extruder_end_code":
+                {
+                    "label": "Extruder End G-Code",
+                    "description": "End g-code to execute whenever turning the extruder off.",
+                    "type": "str",
+                    "default_value": "",
+                    "global_only": "True"
+                },
+                "machine_extruder_end_pos_abs":
+                {
+                    "label": "Extruder End Position Absolute",
+                    "description": "Make the extruder ending position absolute rather than relative to the last-known location of the head.",
+                    "type": "bool",
+                    "default_value": false,
+                    "global_only": "True"
+                },
+                "machine_extruder_end_pos_x":
+                {
+                    "label": "Extruder End Position X",
+                    "description": "The x-coordinate of the ending position when turning the extruder off.",
+                    "type": "float",
+                    "unit": "mm",
+                    "default_value": 0,
+                    "global_only": "True"
+                },
+                "machine_extruder_end_pos_y":
+                {
+                    "label": "Extruder End Position Y",
+                    "description": "The y-coordinate of the ending position when turning the extruder off.",
+                    "type": "float",
+                    "unit": "mm",
+                    "default_value": 0,
+                    "global_only": "True"
+                },
+            }
+        }
+    }
+}

resources/definitions/fdmprinter.def.json

@@ -4,6 +4,7 @@
     "version": 2,
     "metadata":
     {
+        "type": "machine",
         "author": "Ultimaker B.V.",
         "category": "Ultimaker",
         "manufacturer": "Ultimaker",
@@ -12,6 +13,10 @@
         "preferred_material": "pla",
         "preferred_quality": "normal"
     },
+    "machine_extruder_trains":
+    {
+        "0": "fdmextruder"
+    },
     "settings":
     {
         "machine_settings":
@@ -242,92 +247,6 @@
                     "minimum_value": "0.001",
                     "maximum_value_warning": "10"
                 },
-                "machine_nozzle_offset_x":
-                {
-                    "label": "Nozzle X Offset",
-                    "description": "The x-coordinate of the offset of the nozzle.",
-                    "type": "float",
-                    "unit": "mm",
-                    "default_value": 0,
-                    "global_only": "True"
-                },
-                "machine_nozzle_offset_y":
-                {
-                    "label": "Nozzle Y Offset",
-                    "description": "The y-coordinate of the offset of the nozzle.",
-                    "type": "float",
-                    "unit": "mm",
-                    "default_value": 0,
-                    "global_only": "True"
-                },
-                "machine_extruder_start_code":
-                {
-                    "label": "Extruder Start G-Code",
-                    "description": "Start g-code to execute whenever turning the extruder on.",
-                    "type": "str",
-                    "default_value": "",
-                    "global_only": "True"
-                },
-                "machine_extruder_start_pos_abs":
-                {
-                    "label": "Extruder Start Position Absolute",
-                    "description": "Make the extruder starting position absolute rather than relative to the last-known location of the head.",
-                    "type": "bool",
-                    "default_value": false,
-                    "global_only": "True"
-                },
-                "machine_extruder_start_pos_x":
-                {
-                    "label": "Extruder Start Position X",
-                    "description": "The x-coordinate of the starting position when turning the extruder on.",
-                    "type": "float",
-                    "unit": "mm",
-                    "default_value": 0,
-                    "global_only": "True"
-                },
-                "machine_extruder_start_pos_y":
-                {
-                    "label": "Extruder Start Position Y",
-                    "description": "The y-coordinate of the starting position when turning the extruder on.",
-                    "type": "float",
-                    "unit": "mm",
-                    "default_value": 0,
-                    "global_only": "True"
-                },
-                "machine_extruder_end_code":
-                {
-                    "label": "Extruder End G-Code",
-                    "description": "End g-code to execute whenever turning the extruder off.",
-                    "type": "str",
-                    "default_value": "",
-                    "global_only": "True"
-                },
-                "machine_extruder_end_pos_abs":
-                {
-                    "label": "Extruder End Position Absolute",
-                    "description": "Make the extruder ending position absolute rather than relative to the last-known location of the head.",
-                    "type": "bool",
-                    "default_value": false,
-                    "global_only": "True"
-                },
-                "machine_extruder_end_pos_x":
-                {
-                    "label": "Extruder End Position X",
-                    "description": "The x-coordinate of the ending position when turning the extruder off.",
-                    "type": "float",
-                    "unit": "mm",
-                    "default_value": 0,
-                    "global_only": "True"
-                },
-                "machine_extruder_end_pos_y":
-                {
-                    "label": "Extruder End Position Y",
-                    "description": "The y-coordinate of the ending position when turning the extruder off.",
-                    "type": "float",
-                    "unit": "mm",
-                    "default_value": 0,
-                    "global_only": "True"
-                },
                 "machine_use_extruder_offset_to_offset_coords":
                 {
                     "label": "Offset With Extruder",
@@ -2201,15 +2120,6 @@
             "description": "Settings used for printing with multiple extruders.",
             "children":
             {
-                "extruder_nr":
-                {
-                    "label": "Extruder",
-                    "description": "The extruder train used for printing. This is used in multi-extrusion.",
-                    "type": "int",
-                    "default_value": 0,
-                    "minimum_value": "0",
-                    "maximum_value": "machine_extruder_count - 1"
-                },
                 "adhesion_extruder_nr":
                 {
                     "label": "Platform Adhesion Extruder",