From a6a364c337efb4f732247f30e60d14884aabdadc Mon Sep 17 00:00:00 2001
From: Diego Prado Gesto <d.pradogesto@ultimaker.com>
Date: Tue, 27 Nov 2018 13:12:47 +0100
Subject: [PATCH] Move material diameter and machine nozzle size to the
 extruder definition.

Contributes to CURA-5902.
---
 resources/definitions/bibo2_dual.def.json          |  6 ------
 resources/extruders/bibo2_dual_extruder_0.def.json |  6 ++++++
 resources/extruders/bibo2_dual_extruder_1.def.json | 10 ++++++++--
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/resources/definitions/bibo2_dual.def.json b/resources/definitions/bibo2_dual.def.json
index e57fb64ec0..2036290ebd 100644
--- a/resources/definitions/bibo2_dual.def.json
+++ b/resources/definitions/bibo2_dual.def.json
@@ -37,9 +37,6 @@
 		"machine_heated_bed": {
 			"default_value": true
 		},
-		"machine_nozzle_size": {
-			"default_value": 0.4
-		},
 		"machine_nozzle_heat_up_speed": {
 			"default_value": 2
 		},
@@ -66,9 +63,6 @@
 				]
 			]
 		},
-		"material_diameter": {
-			"default_value": 1.75
-		},
 		"gantry_height": {
 			"default_value": 12
 		},
diff --git a/resources/extruders/bibo2_dual_extruder_0.def.json b/resources/extruders/bibo2_dual_extruder_0.def.json
index 7cdc03d504..f83801fa0c 100644
--- a/resources/extruders/bibo2_dual_extruder_0.def.json
+++ b/resources/extruders/bibo2_dual_extruder_0.def.json
@@ -12,6 +12,12 @@
 			"default_value": 0,
 			"maximum_value": "1"
 		},
+		"material_diameter": {
+			"default_value": 1.75
+		},
+		"machine_nozzle_size": {
+			"default_value": 0.4
+		},
 		"machine_nozzle_offset_x": {
 			"default_value": 0.0
 		},
diff --git a/resources/extruders/bibo2_dual_extruder_1.def.json b/resources/extruders/bibo2_dual_extruder_1.def.json
index daa1504220..5f479ba54b 100644
--- a/resources/extruders/bibo2_dual_extruder_1.def.json
+++ b/resources/extruders/bibo2_dual_extruder_1.def.json
@@ -12,11 +12,17 @@
 			"default_value": 1,
 			"maximum_value": "1"
 		},
+		"material_diameter": {
+			"default_value": 1.75
+		},
+		"machine_nozzle_size": {
+			"default_value": 0.4
+		},
 		"machine_nozzle_offset_x": {
-			"default_value": 0
+			"default_value": 0.0
 		},
 		"machine_nozzle_offset_y": {
-			"default_value": 0
+			"default_value": 0.0
 		},
 		"machine_extruder_start_pos_abs": {
 			"default_value": true