Merge branch 'dagoma_discoultimate' of https://github.com/0r31/Cura into 0r31-dagoma_discoultimate

resources/definitions/dagoma_discoeasy200.def.json

@@ -7,24 +7,32 @@
         "author": "Dagoma",
         "manufacturer": "Dagoma",
         "file_formats": "text/x-gcode",
-        "platform": "discoeasy200.stl",
-        "platform_offset": [ 105, -59, 280],
+        "platform": "dagoma_discoeasy200.stl",
+        "platform_offset": [0, -19, -11],
         "has_machine_quality": true,
         "has_materials": true,
+        "preferred_material": "chromatik_pla",
         "machine_extruder_trains":
         {
-            "0": "dagoma_discoeasy200_extruder_0"
+            "0": "dagoma_discoeasy200_extruder_0",
+            "1": "dagoma_discoeasy200_extruder_1"
         }
     },
     "overrides": {
+        "machine_extruder_count": {
+            "default_value": 2
+        },
+        "machine_extruders_share_heater": {
+            "default_value": true
+        },
         "machine_width": {
-            "default_value": 211
+            "default_value": 205
         },
         "machine_height": {
             "default_value": 205
         },
         "machine_depth": {
-            "default_value": 211
+            "default_value": 205
         },
         "machine_center_is_zero": {
             "default_value": false
@@ -66,6 +74,9 @@
         },
         "layer_height_0": {
             "default_value": 0.26
+        },
+        "top_bottom_thickness": {
+            "default_value": 1
         }
     }
 }

resources/definitions/dagoma_discoultimate.def.json

@@ -0,0 +1,82 @@
+{
+    "name": "Dagoma DiscoUltimate",
+    "version": 2,
+    "inherits": "fdmprinter",
+    "metadata": {
+        "visible": true,
+        "author": "Dagoma",
+        "manufacturer": "Dagoma",
+        "file_formats": "text/x-gcode",
+        "platform": "dagoma_discoultimate.stl",
+        "platform_offset": [0, -19, -11],
+        "has_machine_quality": true,
+        "has_materials": true,
+        "preferred_material": "chromatik_pla",
+        "machine_extruder_trains":
+        {
+            "0": "dagoma_discoultimate_extruder_0",
+            "1": "dagoma_discoultimate_extruder_1"
+        }
+    },
+    "overrides": {
+        "machine_extruder_count": {
+            "default_value": 2
+        },
+        "machine_extruders_share_heater": {
+            "default_value": true
+        },
+        "machine_width": {
+            "default_value": 205
+        },
+        "machine_height": {
+            "default_value": 205
+        },
+        "machine_depth": {
+            "default_value": 205
+        },
+        "machine_center_is_zero": {
+            "default_value": false
+        },
+        "machine_head_with_fans_polygon": {
+            "default_value": [
+                [-17, -70],
+                [-17, 40],
+                [17, 40],
+                [17, -70]
+            ]
+        },
+        "gantry_height": {
+            "value": "10"
+        },
+        "machine_start_gcode": {
+            "default_value": ";Gcode by Cura\nG90\nM106 S255\nG28 X Y\nG1 X50\nM109 R90\nG28\nM104 S{material_print_temperature_layer_0}\nG29\nM107\nG1 X100 Y20 F3000\nG1 Z0.5\nM109 S{material_print_temperature_layer_0}\nM82\nG92 E0\nG1 F200 E10\nG92 E0\nG1 Z3\nG1 F6000\n"
+        },
+        "machine_end_gcode": {
+            "default_value": "\nM104 S0\nM106 S255\nM140 S0\nG91\nG1 E-1 F300\nG1 Z+3 F3000\nG90\nG28 X Y\nM107\nM84\n"
+        },
+        "default_material_print_temperature": {
+            "default_value": 205
+        },
+        "speed_print": {
+            "default_value": 60
+        },
+        "retraction_amount": {
+            "default_value": 3.5
+        },
+        "retraction_speed": {
+            "default_value": 50
+        },
+        "adhesion_type": {
+            "default_value": "skirt"
+        },
+        "skirt_line_count": {
+            "default_value": 2
+        },
+        "layer_height_0": {
+            "default_value": 0.26
+        },
+        "top_bottom_thickness": {
+            "default_value": 1
+        }
+    }
+}

resources/definitions/dagoma_magis.def.json

@@ -7,10 +7,11 @@
         "author": "Dagoma",
         "manufacturer": "Dagoma",
         "file_formats": "text/x-gcode",
-        "platform": "neva.stl",
-        "platform_offset": [ 0, 0, 0],
+        "platform": "dagoma_magis.stl",
+        "platform_offset": [0, -28, -35],
         "has_machine_quality": true,
         "has_materials": true,
+        "preferred_material": "chromatik_pla",
         "machine_extruder_trains":
         {
             "0": "dagoma_magis_extruder_0"
@@ -69,6 +70,9 @@
         },
         "layer_height_0": {
             "default_value": 0.26
+        },
+        "top_bottom_thickness": {
+            "default_value": 1
         }
     }
 }

resources/definitions/dagoma_neva.def.json

@@ -7,10 +7,11 @@
         "author": "Dagoma",
         "manufacturer": "Dagoma",
         "file_formats": "text/x-gcode",
-        "platform": "neva.stl",
-        "platform_offset": [ 0, 0, 0],
+        "platform": "dagoma_neva.stl",
+        "platform_offset": [0, -28, -35],
         "has_machine_quality": true,
         "has_materials": true,
+        "preferred_material": "chromatik_pla",
         "machine_extruder_trains":
         {
             "0": "dagoma_neva_extruder_0"
@@ -69,6 +70,9 @@
         },
         "layer_height_0": {
             "default_value": 0.26
+        },
+        "top_bottom_thickness": {
+            "default_value": 1
         }
     }
 }