CURA-5334 Add extruder definition for Wanhao printers, Uni Print 3d and

Tevo Tornado. Those definitions were added without extruder definitions.

resources/definitions/tevo_tornado.def.json

@@ -8,7 +8,10 @@
         "manufacturer": "Tevo",
         "file_formats": "text/x-gcode",
         "icon": "icon_ultimaker2.png",
-        "has_materials": true
+        "has_materials": true,
+        "machine_extruder_trains": {
+            "0": "tevo_tornado_extruder_0"
+        }
     },
     "overrides": {
         "machine_name": { 
@@ -34,12 +37,6 @@
                 [30, 34]
             ]
         },
-        "material_diameter": {
-            "default_value": 1.75
-        },
-        "machine_nozzle_size": {
-            "default_value": 0.4
-        },
         "top_bottom_thickness": {
             "default_value": 1.2
         },

resources/definitions/uni_print_3d.def.json

@@ -11,7 +11,10 @@
         "manufacturer": "TheCoolTool",
         "file_formats": "text/x-ngc;text/x-gcode",
         "platform": "uni_print_3d_platform.stl",
-        "platform_offset": [0, 0, 0]
+        "platform_offset": [0, 0, 0],
+        "machine_extruder_trains": {
+            "0": "uni_print_3d_extruder_0"
+        }
     },
 
     "overrides": {
@@ -21,8 +24,6 @@
         "machine_height": { "default_value": 230 },
         "machine_depth": { "default_value": 220 },
         "machine_center_is_zero": { "default_value": true },
-        "machine_nozzle_size": { "default_value": 0.4 },
-        "material_diameter": { "default_value": 1.75 },
         "machine_nozzle_heat_up_speed": { "default_value": 2.0 },
         "machine_nozzle_cool_down_speed": { "default_value": 2.0 },
         "machine_head_shape_min_x": { "default_value": 75 },

resources/definitions/wanhao_d4s.def.json

@@ -11,6 +11,9 @@
     "has_materials": true,
     "platform": "wanhao_225_145_platform.obj",
     "platform_texture": "Wanhaobackplate.png",
+    "machine_extruder_trains": {
+        "0": "wanhao_d4s_extruder_0"
+    },
     "platform_offset": [
       0,
       -28,
@@ -33,9 +36,6 @@
     "machine_heated_bed": {
       "default_value": true
     },
-    "machine_nozzle_size": {
-      "default_value": 0.4
-    },
     "machine_gcode_flavor": {
       "default_value": "RepRap (Marlin/Sprinter)"
     },
@@ -44,9 +44,6 @@
     },
     "machine_end_gcode": {
       "default_value": "M104 S0 ;extruder heater off \n G91 ;relative positioning\n G1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning"
-    },
-    "material_diameter": {
-      "default_value": 1.75
     }
   }
 }

resources/definitions/wanhao_d6.def.json

@@ -11,6 +11,9 @@
     "has_materials": true,
     "platform": "wanhao_200_200_platform.obj",
     "platform_texture": "Wanhaobackplate.png",
+    "machine_extruder_trains": {
+        "0": "wanhao_d6_extruder_0"
+    },
     "platform_offset": [
       0,
       -28,
@@ -33,9 +36,6 @@
     "machine_depth": {
       "default_value": 200
     },
-    "machine_nozzle_size": {
-      "default_value": 0.4
-    },
     "machine_heated_bed": {
       "default_value": true
     },
@@ -50,9 +50,6 @@
     },
     "machine_end_gcode": {
       "default_value": "M104 S0 ;extruder heater off \n G91 ;relative positioning\n G1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning"
-    },
-    "material_diameter": {
-      "default_value": 1.75
     }
   }
 }

resources/definitions/wanhao_d6_plus.def.json

@@ -11,6 +11,9 @@
     "has_materials": true,
     "platform": "wanhao_200_200_platform.obj",
     "platform_texture": "Wanhaobackplate.png",
+    "machine_extruder_trains": {
+        "0": "wanhao_d6_plus_extruder_0"
+    },
     "platform_offset": [
       0,
       -28,
@@ -30,9 +33,6 @@
     "machine_depth": {
       "default_value": 200
     },
-    "machine_nozzle_size": {
-      "default_value": 0.4
-    },
     "machine_heated_bed": {
       "default_value": true
     },
@@ -44,9 +44,6 @@
     },
     "machine_end_gcode": {
       "default_value": "M104 S0 ;extruder heater off \n G91 ;relative positioning\n G1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning"
-    },
-    "material_diameter": {
-      "default_value": 1.75
     }
   }
 }

resources/definitions/wanhao_duplicator5S.def.json

@@ -11,6 +11,9 @@
     "has_materials": true,
     "platform": "wanhao_300_200_platform.obj",
     "platform_texture": "Wanhaobackplate.png",
+    "machine_extruder_trains": {
+        "0": "wanhao_duplicator5S_extruder_0"
+    },
     "platform_offset": [
       0,
       -28,
@@ -36,9 +39,6 @@
     "machine_heated_bed": {
       "default_value": false
     },
-    "machine_nozzle_size": {
-      "default_value": 0.4
-    },
     "machine_gcode_flavor": {
       "default_value": "RepRap (Marlin/Sprinter)"
     },
@@ -47,9 +47,6 @@
     },
     "machine_end_gcode": {
       "default_value": "M104 S0 ;extruder heater off \n G91 ;relative positioning\n G1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning"
-    },
-    "material_diameter": {
-      "default_value": 3
     }
   }
 }

resources/definitions/wanhao_duplicator5Smini.def.json

@@ -11,6 +11,9 @@
     "has_materials": true,
     "platform": "wanhao_300_200_platform.obj",
     "platform_texture": "Wanhaobackplate.png",
+    "machine_extruder_trains": {
+        "0": "wanhao_duplicator5Smini_extruder_0"
+    },
     "platform_offset": [
       0,
       -28,
@@ -33,9 +36,6 @@
     "machine_heated_bed": {
       "default_value": false
     },
-    "machine_nozzle_size": {
-      "default_value": 0.4
-    },
     "machine_gcode_flavor": {
       "default_value": "RepRap (Marlin/Sprinter)"
     },
@@ -44,9 +44,6 @@
     },
     "machine_end_gcode": {
       "default_value": "M104 S0 ;extruder heater off \n G91 ;relative positioning\n G1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning"
-    },
-    "material_diameter": {
-      "default_value": 3
     }
   }
 }

resources/definitions/wanhao_i3.def.json

@@ -11,6 +11,9 @@
     "has_materials": true,
     "platform": "wanhao_200_200_platform.obj",
     "platform_texture": "Wanhaobackplate.png",
+    "machine_extruder_trains": {
+        "0": "wanhao_i3_extruder_0"
+    },
     "platform_offset": [
       0,
       -28,
@@ -33,9 +36,6 @@
     "machine_heated_bed": {
       "default_value": true
     },
-    "machine_nozzle_size": {
-      "default_value": 0.4
-    },
     "machine_gcode_flavor": {
       "default_value": "RepRap (Marlin/Sprinter)"
     },
@@ -44,9 +44,6 @@
     },
     "machine_end_gcode": {
       "default_value": "M104 S0 ;extruder heater off \n G91 ;relative positioning\n G1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning"
-    },
-    "material_diameter": {
-      "default_value": 1.75
     }
   }
 }

resources/definitions/wanhao_i3mini.def.json

@@ -11,6 +11,9 @@
     "has_materials": true,
     "platform": "wanhao_110_110_platform.obj",
     "platform_texture": "Wanhaobackplate.png",
+    "machine_extruder_trains": {
+        "0": "wanhao_i3mini_extruder_0"
+    },
     "platform_offset": [
       0,
       -15,
@@ -33,9 +36,6 @@
     "machine_heated_bed": {
       "default_value": false
     },
-    "machine_nozzle_size": {
-      "default_value": 0.4
-    },
     "machine_gcode_flavor": {
       "default_value": "RepRap (Marlin/Sprinter)"
     },
@@ -44,9 +44,6 @@
     },
     "machine_end_gcode": {
       "default_value": "M104 S0 ;extruder heater off \n G91 ;relative positioning\n G1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning"
-    },
-    "material_diameter": {
-      "default_value": 1.75
     }
   }
 }

resources/definitions/wanhao_i3plus.def.json

@@ -11,6 +11,9 @@
     "has_materials": true,
     "platform": "wanhao_200_200_platform.obj",
     "platform_texture": "Wanhaobackplate.png",
+    "machine_extruder_trains": {
+        "0": "wanhao_i3plus_extruder_0"
+    },
     "platform_offset": [
       0,
       -28,
@@ -33,9 +36,6 @@
     "machine_heated_bed": {
       "default_value": true
     },
-    "machine_nozzle_size": {
-      "default_value": 0.4
-    },
     "machine_gcode_flavor": {
       "default_value": "RepRap (Marlin/Sprinter)"
     },
@@ -44,9 +44,6 @@
     },
     "machine_end_gcode": {
       "default_value": "M104 S0 ;extruder heater off \n G91 ;relative positioning\n G1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning"
-    },
-    "material_diameter": {
-      "default_value": 1.75
     }
   }
 }

resources/extruders/tevo_tornado_extruder_0.def.json

@@ -0,0 +1,16 @@
+{
+    "id": "tevo_tornado_extruder_0",
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "tevo_tornado",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}

resources/extruders/uni_print_3d_extruder_0.def.json

@@ -0,0 +1,16 @@
+{
+    "id": "uni_print_3d_extruder_0",
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "uni_print_3d",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}

resources/extruders/wanhao_d4s_extruder_0.def.json

@@ -0,0 +1,16 @@
+{
+    "id": "wanhao_d4s_extruder_0",
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "wanhao_d4s",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}

resources/extruders/wanhao_d6_extruder_0.def.json

@@ -0,0 +1,16 @@
+{
+    "id": "wanhao_d6_extruder_0",
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "wanhao_d6",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}

resources/extruders/wanhao_d6_plus_extruder_0.def.json

@@ -0,0 +1,16 @@
+{
+    "id": "wanhao_d6_plus_extruder_0",
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "wanhao_d6_plus",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}

resources/extruders/wanhao_duplicator5S_extruder_0.def.json

@@ -0,0 +1,16 @@
+{
+    "id": "wanhao_duplicator5S_extruder_0",
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "wanhao_duplicator5S",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 3 }
+    }
+}

resources/extruders/wanhao_duplicator5Smini_extruder_0.def.json

@@ -0,0 +1,16 @@
+{
+    "id": "wanhao_duplicator5Smini_extruder_0",
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "wanhao_duplicator5Smini",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 3 }
+    }
+}

resources/extruders/wanhao_i3_extruder_0.def.json

@@ -0,0 +1,16 @@
+{
+    "id": "wanhao_i3_extruder_0",
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "wanhao_i3",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}

resources/extruders/wanhao_i3mini_extruder_0.def.json

@@ -0,0 +1,16 @@
+{
+    "id": "wanhao_i3mini_extruder_0",
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "wanhao_i3mini",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}

resources/extruders/wanhao_i3plus_extruder_0.def.json

@@ -0,0 +1,16 @@
+{
+    "id": "wanhao_i3plus_extruder_0",
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "wanhao_i3plus",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}