From 46ce90c803cea95a68c76d151f76d5934d2aec35 Mon Sep 17 00:00:00 2001
From: Ian Paschal <ian.paschal@gmail.com>
Date: Mon, 16 Jul 2018 16:54:50 +0200
Subject: [PATCH] Fix-up Dagoma definitions

- Removed nozzle size in magis def because it's in the extruder def on other machines
- Removed material diam from disco extruder def because its in the disco machine
- Remove material diam from neva extruder def because its in the neva machine

Contributes to CURA-5499
---
 .../definitions/dagoma_neva_magis.def.json    |  3 ---
 .../dagoma_discoeasy200_extruder_0.def.json   |  9 ++++++---
 .../extruders/dagoma_neva_extruder_0.def.json |  9 ++++++---
 .../dagoma_neva_magis_extruder_0.def.json     | 19 +++++++++++++++++++
 4 files changed, 31 insertions(+), 9 deletions(-)
 create mode 100644 resources/extruders/dagoma_neva_magis_extruder_0.def.json

diff --git a/resources/definitions/dagoma_neva_magis.def.json b/resources/definitions/dagoma_neva_magis.def.json
index fe5cff471e..91f99146ba 100644
--- a/resources/definitions/dagoma_neva_magis.def.json
+++ b/resources/definitions/dagoma_neva_magis.def.json
@@ -24,9 +24,6 @@
         "machine_center_is_zero": {
             "default_value": true
         },
-        "machine_nozzle_size": {
-            "default_value": 0.4
-        },
         "machine_head_with_fans_polygon": {
             "default_value": [
                 [-36, -42],
diff --git a/resources/extruders/dagoma_discoeasy200_extruder_0.def.json b/resources/extruders/dagoma_discoeasy200_extruder_0.def.json
index eb2b8ef1f7..342741c559 100644
--- a/resources/extruders/dagoma_discoeasy200_extruder_0.def.json
+++ b/resources/extruders/dagoma_discoeasy200_extruder_0.def.json
@@ -9,8 +9,11 @@
     },
 
     "overrides": {
-        "extruder_nr": { "default_value": 0 },
-        "machine_nozzle_size": { "default_value": 0.4 },
-        "material_diameter": { "default_value": 1.75 }
+        "extruder_nr": {
+            "default_value": 0
+        },
+        "machine_nozzle_size": {
+            "default_value": 0.4
+        }
     }
 }
diff --git a/resources/extruders/dagoma_neva_extruder_0.def.json b/resources/extruders/dagoma_neva_extruder_0.def.json
index dcb8311be4..eeb8a42a3a 100644
--- a/resources/extruders/dagoma_neva_extruder_0.def.json
+++ b/resources/extruders/dagoma_neva_extruder_0.def.json
@@ -9,8 +9,11 @@
     },
 
     "overrides": {
-        "extruder_nr": { "default_value": 0 },
-        "machine_nozzle_size": { "default_value": 0.4 },
-        "material_diameter": { "default_value": 1.75 }
+        "extruder_nr": {
+            "default_value": 0
+        },
+        "machine_nozzle_size": {
+            "default_value": 0.4
+        }
     }
 }
diff --git a/resources/extruders/dagoma_neva_magis_extruder_0.def.json b/resources/extruders/dagoma_neva_magis_extruder_0.def.json
new file mode 100644
index 0000000000..4a20b64fe8
--- /dev/null
+++ b/resources/extruders/dagoma_neva_magis_extruder_0.def.json
@@ -0,0 +1,19 @@
+{
+    "id": "dagoma_neva_magis_extruder_0",
+    "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
+        }
+    }
+}