Merge pull request #4090 from Ultimaker/dagoma3d-dagoma_profiles

Add and fix Dagoma3D profiles

resources/definitions/dagoma_discoeasy200.def.json

@@ -9,6 +9,8 @@
         "file_formats": "text/x-gcode",
         "platform": "discoeasy200.stl",
         "platform_offset": [ 105, -59, 280],
+        "has_machine_quality": true,
+        "has_materials": true,
         "machine_extruder_trains":
         {
             "0": "dagoma_discoeasy200_extruder_0"
@@ -29,32 +31,44 @@
         },
         "machine_head_with_fans_polygon": {
             "default_value": [
-                [17, 70],
+                [-17, -70],
-                [17, -40],
+                [-17, 40],
-                [-17, -40],
+                [17, 40],
-                [17, 70]
+                [17, -70]
             ]
         },
         "gantry_height": {
             "default_value": 10
         },
         "machine_start_gcode": {
-            "default_value": ";Gcode by Cura\nG90\nM106 S250\nG28 X Y\nG1 X50\nM109 S180\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"
+            "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
         },
         "speed_travel": {
-            "value": "100"
+            "default_value": 100
         },
         "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
         }
     }
 }

resources/definitions/dagoma_neva.def.json

@@ -1,5 +1,4 @@
 {
-    "id": "Dagoma_neva",
     "name": "Dagoma NEVA",
     "version": 2,
     "inherits": "fdmprinter",
@@ -10,6 +9,8 @@
         "file_formats": "text/x-gcode",
         "platform": "neva.stl",
         "platform_offset": [ 0, 0, 0],
+        "has_machine_quality": true,
+        "has_materials": true,
         "machine_extruder_trains":
         {
             "0": "dagoma_neva_extruder_0"
@@ -30,10 +31,10 @@
         },
         "machine_head_with_fans_polygon": {
             "default_value": [
-                [17, 40],
+                [-36, -42],
-                [17, -70],
+                [-36, 42],
-                [-17, -70],
+                [36, 42],
-                [17, 40]
+                [36, -42]
             ]
         },
         "gantry_height": {
@@ -43,14 +44,17 @@
             "default_value": "elliptic"
         },
         "machine_gcode_flavor": {
-            "default_value": "RepRap (RepRap)"
+            "default_value": "RepRap"
         },
         "machine_start_gcode": {
-            "default_value": ";Gcode by Cura\nG90\nG28\nM109 S100\nG29\nM104 S{material_print_temperature_layer_0}\nG0 X0 Y-85\nG0 Z0.26\nM109 S{material_print_temperature_layer_0}\nM82\nG92 E0\nG1 F200 E6\nG92 E0\nG1 F200 E-3.5\nG0 Z0.15\nG0 X10\nG0 Z3\nG1 F6000\n"
+            "default_value": ";Gcode by Cura\nG90\nG28\nM107\nM109 R100\nG29\nM109 S{material_print_temperature_layer_0} U-55 X55 V-85 Y-85 W0.26 Z0.26\nM82\nG92 E0\nG1 F200 E6\nG92 E0\nG1 F200 E-3.5\nG0 Z0.15\nG0 X10\nG0 Z3\nG1 F6000\n"
         },
         "machine_end_gcode": {
             "default_value": "\nM104 S0\nM106 S255\nM140 S0\nG91\nG1 E-1 F300\nG1 Z+3 E-2 F9000\nG90\nG28\n"
         },
+        "default_material_print_temperature": {
+            "default_value": 205
+        },
         "speed_print": {
             "default_value": 40
         },
@@ -62,6 +66,15 @@
         },
         "retraction_speed": {
             "default_value": 60
+        },
+        "adhesion_type": {
+            "default_value": "skirt"
+        },
+        "skirt_line_count": {
+            "default_value": 2
+        },
+        "layer_height_0": {
+            "default_value": 0.26
         }
     }
 }

resources/definitions/dagoma_neva_magis.def.json

@@ -0,0 +1,80 @@
+{
+    "name": "Dagoma NEVA Magis",
+    "version": 2,
+    "inherits": "fdmprinter",
+    "metadata": {
+        "visible": true,
+        "author": "Dagoma",
+        "manufacturer": "Dagoma",
+        "file_formats": "text/x-gcode",
+        "platform": "neva.stl",
+        "platform_offset": [ 0, 0, 0],
+        "has_machine_quality": true,
+        "has_materials": true,
+        "machine_extruder_trains":
+        {
+            "0": "dagoma_neva_magis_extruder_0"
+        }
+    },
+    "overrides": {
+        "machine_width": {
+            "default_value": 195.55
+        },
+        "machine_height": {
+            "default_value": 205
+        },
+        "machine_depth": {
+            "default_value": 195.55
+        },
+        "machine_center_is_zero": {
+            "default_value": true
+        },
+        "machine_head_with_fans_polygon": {
+            "default_value": [
+                [-36, -42],
+                [-36, 42],
+                [36, 42],
+                [36, -42]
+            ]
+        },
+        "gantry_height": {
+          "default_value": 0
+        },
+        "machine_shape": {
+            "default_value": "elliptic"
+        },
+        "machine_gcode_flavor": {
+            "default_value": "RepRap"
+        },
+        "machine_start_gcode": {
+            "default_value": ";Gcode by Cura\nG90\nG28\nM107\nM109 R100\nG29\nM109 S{material_print_temperature_layer_0} U-55 X55 V-85 Y-85 W0.26 Z0.26\nM82\nG92 E0\nG1 F200 E6\nG92 E0\nG1 F200 E-3.5\nG0 Z0.15\nG0 X10\nG0 Z3\nG1 F6000\n"
+        },
+        "machine_end_gcode": {
+            "default_value": "\nM104 S0\nM106 S255\nM140 S0\nG91\nG1 E-1 F300\nG1 Z+3 E-2 F9000\nG90\nG28\n"
+        },
+        "default_material_print_temperature": {
+            "default_value": 205
+        },
+        "speed_print": {
+            "default_value": 40
+        },
+        "speed_travel": {
+            "default_value": 120
+        },
+        "retraction_amount": {
+            "default_value": 3.8
+        },
+        "retraction_speed": {
+            "default_value": 60
+        },
+        "adhesion_type": {
+            "default_value": "skirt"
+        },
+        "skirt_line_count": {
+            "default_value": 2
+        },
+        "layer_height_0": {
+            "default_value": 0.26
+        }
+    }
+}

resources/extruders/dagoma_discoeasy200_extruder_0.def.json

@@ -1,5 +1,4 @@
 {
-    "id": "dagoma_discoeasy200_extruder_0",
     "version": 2,
     "name": "Extruder 1",
     "inherits": "fdmextruder",
@@ -9,8 +8,14 @@
     },
 
     "overrides": {
-        "extruder_nr": { "default_value": 0 },
+        "extruder_nr": {
-        "machine_nozzle_size": { "default_value": 0.4 },
+            "default_value": 0
-        "material_diameter": { "default_value": 1.75 }
+        },
+        "machine_nozzle_size": {
+            "default_value": 0.4
+        },
+        "material_diameter": {
+            "default_value": 1.75
+        }
     }
 }

resources/extruders/dagoma_neva_extruder_0.def.json

@@ -1,5 +1,4 @@
 {
-    "id": "dagoma_neva_extruder_0",
     "version": 2,
     "name": "Extruder 1",
     "inherits": "fdmextruder",
@@ -9,8 +8,14 @@
     },
 
     "overrides": {
-        "extruder_nr": { "default_value": 0 },
+        "extruder_nr": {
-        "machine_nozzle_size": { "default_value": 0.4 },
+            "default_value": 0
-        "material_diameter": { "default_value": 1.75 }
+        },
+        "machine_nozzle_size": {
+            "default_value": 0.4
+        },
+        "material_diameter": {
+            "default_value": 1.75
+        }
     }
 }

resources/extruders/dagoma_neva_magis_extruder_0.def.json

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

resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg

@@ -0,0 +1,15 @@
+[general]
+version = 4
+name = Fast
+definition = dagoma_discoeasy200
+
+[metadata]
+setting_version = 5
+type = quality
+quality_type = draft
+weight = -2
+material = generic_pla
+
+[values]
+material_print_temperature = =default_material_print_temperature + 10
+material_bed_temperature_layer_0 = =default_material_bed_temperature + 10

resources/quality/dagoma/dagoma_discoeasy200_pla_fine.inst.cfg

@@ -0,0 +1,13 @@
+[general]
+version = 4
+name = Fine
+definition = dagoma_discoeasy200
+
+[metadata]
+setting_version = 5
+type = quality
+quality_type = normal
+weight = 0
+material = generic_pla
+
+[values]

resources/quality/dagoma/dagoma_discoeasy200_pla_standard.inst.cfg

@@ -0,0 +1,15 @@
+[general]
+version = 4
+name = Standard
+definition = dagoma_discoeasy200
+
+[metadata]
+setting_version = 5
+type = quality
+quality_type = fast
+weight = -1
+material = generic_pla
+
+[values]
+material_print_temperature = =default_material_print_temperature + 5
+material_bed_temperature_layer_0 = =default_material_bed_temperature + 5

resources/quality/dagoma/dagoma_global_fast.inst.cfg

@@ -0,0 +1,14 @@
+[general]
+version = 4
+name = Fast
+definition = dagoma_discoeasy200
+
+[metadata]
+setting_version = 5
+type = quality
+quality_type = draft
+weight = -2
+global_quality = True
+
+[values]
+layer_height = 0.2

resources/quality/dagoma/dagoma_global_fine.inst.cfg

@@ -0,0 +1,14 @@
+[general]
+version = 4
+name = Fine
+definition = dagoma_discoeasy200
+
+[metadata]
+setting_version = 5
+type = quality
+quality_type = normal
+weight = 0
+global_quality = True
+
+[values]
+layer_height = 0.1

resources/quality/dagoma/dagoma_global_standard.inst.cfg

@@ -0,0 +1,14 @@
+[general]
+version = 4
+name = Standard
+definition = dagoma_discoeasy200
+
+[metadata]
+setting_version = 5
+type = quality
+quality_type = fast
+weight = -1
+global_quality = True
+
+[values]
+layer_height = 0.15

resources/quality/dagoma/dagoma_neva_magis_pla_fast.inst.cfg

@@ -0,0 +1,15 @@
+[general]
+version = 4
+name = Fast
+definition = dagoma_neva
+
+[metadata]
+setting_version = 5
+type = quality
+quality_type = draft
+weight = -2
+material = generic_pla
+
+[values]
+material_print_temperature = =default_material_print_temperature + 10
+material_bed_temperature_layer_0 = =default_material_bed_temperature + 10

resources/quality/dagoma/dagoma_neva_magis_pla_fine.inst.cfg

@@ -0,0 +1,13 @@
+[general]
+version = 4
+name = Fine
+definition = dagoma_neva
+
+[metadata]
+setting_version = 5
+type = quality
+quality_type = normal
+weight = 0
+material = generic_pla
+
+[values]

resources/quality/dagoma/dagoma_neva_magis_pla_standard.inst.cfg

@@ -0,0 +1,15 @@
+[general]
+version = 4
+name = Standard
+definition = dagoma_neva
+
+[metadata]
+setting_version = 5
+type = quality
+quality_type = fast
+weight = -1
+material = generic_pla
+
+[values]
+material_print_temperature = =default_material_print_temperature + 5
+material_bed_temperature_layer_0 = =default_material_bed_temperature + 5

resources/quality/dagoma/dagoma_neva_pla_fast.inst.cfg

@@ -0,0 +1,15 @@
+[general]
+version = 4
+name = Fast
+definition = dagoma_neva
+
+[metadata]
+setting_version = 5
+type = quality
+quality_type = draft
+weight = -2
+material = generic_pla
+
+[values]
+material_print_temperature = =default_material_print_temperature + 10
+material_bed_temperature_layer_0 = =default_material_bed_temperature + 10

resources/quality/dagoma/dagoma_neva_pla_fine.inst.cfg

@@ -0,0 +1,13 @@
+[general]
+version = 4
+name = Fine
+definition = dagoma_neva
+
+[metadata]
+setting_version = 5
+type = quality
+quality_type = normal
+weight = 0
+material = generic_pla
+
+[values]

resources/quality/dagoma/dagoma_neva_pla_standard.inst.cfg

@@ -0,0 +1,15 @@
+[general]
+version = 4
+name = Standard
+definition = dagoma_neva
+
+[metadata]
+setting_version = 5
+type = quality
+quality_type = fast
+weight = -1
+material = generic_pla
+
+[values]
+material_print_temperature = =default_material_print_temperature + 5
+material_bed_temperature_layer_0 = =default_material_bed_temperature + 5