CURA-5334 Remove machine nozzle size from machine definitions and move

it to extruder definitions.

19 files changed, 19 insertions, 0 deletions

diff --git a/resources/extruders/felixtec4_dual_extruder_0.def.json b/resources/extruders/felixtec4_dual_extruder_0.def.json
index fee4cbb995..2a2d0468e1 100644
--- a/resources/extruders/felixtec4_dual_extruder_0.def.json
+++ b/resources/extruders/felixtec4_dual_extruder_0.def.json
@@ -15,6 +15,7 @@
         },
         "machine_nozzle_offset_x": { "default_value": 0 },
         "machine_nozzle_offset_y": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 0.35 },
         "material_diameter": { "default_value": 1.75 },
 
         "machine_extruder_start_pos_abs": { "default_value": true },
diff --git a/resources/extruders/felixtec4_dual_extruder_1.def.json b/resources/extruders/felixtec4_dual_extruder_1.def.json
index 2c44b41186..5d7e9c74a3 100644
--- a/resources/extruders/felixtec4_dual_extruder_1.def.json
+++ b/resources/extruders/felixtec4_dual_extruder_1.def.json
@@ -15,6 +15,7 @@
         },
         "machine_nozzle_offset_x": { "default_value": 13 },
         "machine_nozzle_offset_y": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 0.35 },
         "material_diameter": { "default_value": 1.75 },
 
         "machine_extruder_start_pos_abs": { "default_value": true },
diff --git a/resources/extruders/makeit_dual_1st.def.json b/resources/extruders/makeit_dual_1st.def.json
index 2882054cca..0f5a716e16 100644
--- a/resources/extruders/makeit_dual_1st.def.json
+++ b/resources/extruders/makeit_dual_1st.def.json
@@ -15,6 +15,7 @@
         },
         "machine_nozzle_offset_x": { "default_value": 0.0 },
         "machine_nozzle_offset_y": { "default_value": 0.0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
         "material_diameter": { "default_value": 1.75 },
 
         "machine_extruder_start_pos_abs": { "default_value": true },
diff --git a/resources/extruders/makeit_dual_2nd.def.json b/resources/extruders/makeit_dual_2nd.def.json
index 24e9be3a4a..f93d670c85 100644
--- a/resources/extruders/makeit_dual_2nd.def.json
+++ b/resources/extruders/makeit_dual_2nd.def.json
@@ -15,6 +15,7 @@
         },
         "machine_nozzle_offset_x": { "default_value": 0.0 },
         "machine_nozzle_offset_y": { "default_value": 0.0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
         "material_diameter": { "default_value": 1.75 },
 
         "machine_extruder_start_pos_abs": { "default_value": true },
diff --git a/resources/extruders/makeit_l_dual_1st.def.json b/resources/extruders/makeit_l_dual_1st.def.json
index bf3f99bfa7..6a9e8e3fc1 100644
--- a/resources/extruders/makeit_l_dual_1st.def.json
+++ b/resources/extruders/makeit_l_dual_1st.def.json
@@ -15,6 +15,7 @@
         },
         "machine_nozzle_offset_x": { "default_value": 0.0 },
         "machine_nozzle_offset_y": { "default_value": 0.0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
         "material_diameter": { "default_value": 1.75 },
 
         "machine_extruder_start_pos_abs": { "default_value": true },
diff --git a/resources/extruders/makeit_l_dual_2nd.def.json b/resources/extruders/makeit_l_dual_2nd.def.json
index 3964ef6779..72b86b22e4 100644
--- a/resources/extruders/makeit_l_dual_2nd.def.json
+++ b/resources/extruders/makeit_l_dual_2nd.def.json
@@ -15,6 +15,7 @@
         },
         "machine_nozzle_offset_x": { "default_value": 0.0 },
         "machine_nozzle_offset_y": { "default_value": 0.0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
         "material_diameter": { "default_value": 1.75 },
 
         "machine_extruder_start_pos_abs": { "default_value": true },
diff --git a/resources/extruders/ord_extruder_0.def.json b/resources/extruders/ord_extruder_0.def.json
index f98666716d..317ad70a3c 100644
--- a/resources/extruders/ord_extruder_0.def.json
+++ b/resources/extruders/ord_extruder_0.def.json
@@ -15,6 +15,7 @@
         },
         "machine_nozzle_offset_x": { "default_value": 0.0 },
         "machine_nozzle_offset_y": { "default_value": 0.0 },
+        "machine_nozzle_size": { "default_value": 0.35 },
         "material_diameter": { "default_value": 1.75 }
     }
 }
diff --git a/resources/extruders/ord_extruder_1.def.json b/resources/extruders/ord_extruder_1.def.json
index 9ea08cf626..6e29ad2f2b 100644
--- a/resources/extruders/ord_extruder_1.def.json
+++ b/resources/extruders/ord_extruder_1.def.json
@@ -15,6 +15,7 @@
         },
         "machine_nozzle_offset_x": { "default_value": 62.95 },
         "machine_nozzle_offset_y": { "default_value": 2.05 },
+        "machine_nozzle_size": { "default_value": 0.35 },
         "material_diameter": { "default_value": 1.75 }
     }
 }
diff --git a/resources/extruders/ord_extruder_2.def.json b/resources/extruders/ord_extruder_2.def.json
index 1b521c7507..849930c988 100644
--- a/resources/extruders/ord_extruder_2.def.json
+++ b/resources/extruders/ord_extruder_2.def.json
@@ -15,6 +15,7 @@
         },
         "machine_nozzle_offset_x": { "default_value": 0.0 },
         "machine_nozzle_offset_y": { "default_value": 27.7 },
+        "machine_nozzle_size": { "default_value": 0.35 },
         "material_diameter": { "default_value": 1.75 }
     }
 }
diff --git a/resources/extruders/ord_extruder_3.def.json b/resources/extruders/ord_extruder_3.def.json
index bd4d0e2a61..eb3676c14f 100644
--- a/resources/extruders/ord_extruder_3.def.json
+++ b/resources/extruders/ord_extruder_3.def.json
@@ -15,6 +15,7 @@
         },
         "machine_nozzle_offset_x": { "default_value": 63.18 },
         "machine_nozzle_offset_y": { "default_value": 28.65 },
+        "machine_nozzle_size": { "default_value": 0.35 },
         "material_diameter": { "default_value": 1.75 }
     }
 }
diff --git a/resources/extruders/ord_extruder_4.def.json b/resources/extruders/ord_extruder_4.def.json
index 00635e9059..291e9e5501 100644
--- a/resources/extruders/ord_extruder_4.def.json
+++ b/resources/extruders/ord_extruder_4.def.json
@@ -15,6 +15,7 @@
         },
         "machine_nozzle_offset_x": { "default_value": 31.6 },
         "machine_nozzle_offset_y": { "default_value": 28.2 },
+        "machine_nozzle_size": { "default_value": 0.35 },
         "material_diameter": { "default_value": 1.75 }
     }
 }
diff --git a/resources/extruders/raise3D_N2_dual_extruder_0.def.json b/resources/extruders/raise3D_N2_dual_extruder_0.def.json
index b97ee19d24..48746969d3 100644
--- a/resources/extruders/raise3D_N2_dual_extruder_0.def.json
+++ b/resources/extruders/raise3D_N2_dual_extruder_0.def.json
@@ -15,6 +15,7 @@
         },
         "machine_nozzle_offset_x": { "default_value": 0 },
         "machine_nozzle_offset_y": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
         "material_diameter": { "default_value": 1.75 },
 
         "machine_extruder_start_pos_abs": { "default_value": true },
diff --git a/resources/extruders/raise3D_N2_dual_extruder_1.def.json b/resources/extruders/raise3D_N2_dual_extruder_1.def.json
index 28c030b28e..8ea6f95b16 100644
--- a/resources/extruders/raise3D_N2_dual_extruder_1.def.json
+++ b/resources/extruders/raise3D_N2_dual_extruder_1.def.json
@@ -15,6 +15,7 @@
         },
         "machine_nozzle_offset_x": { "default_value": 24.8 },
         "machine_nozzle_offset_y": { "default_value": 0.6 },
+        "machine_nozzle_size": { "default_value": 0.4 },
         "material_diameter": { "default_value": 1.75 },
 
         "machine_extruder_start_pos_abs": { "default_value": true },
diff --git a/resources/extruders/raise3D_N2_plus_dual_extruder_0.def.json b/resources/extruders/raise3D_N2_plus_dual_extruder_0.def.json
index 3905e074ae..fc7531cf1b 100644
--- a/resources/extruders/raise3D_N2_plus_dual_extruder_0.def.json
+++ b/resources/extruders/raise3D_N2_plus_dual_extruder_0.def.json
@@ -15,6 +15,7 @@
         },
         "machine_nozzle_offset_x": { "default_value": 0 },
         "machine_nozzle_offset_y": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
         "material_diameter": { "default_value": 1.75 },
 
         "machine_extruder_start_pos_abs": { "default_value": true },
diff --git a/resources/extruders/raise3D_N2_plus_dual_extruder_1.def.json b/resources/extruders/raise3D_N2_plus_dual_extruder_1.def.json
index 65c9fb7274..83f949bb22 100644
--- a/resources/extruders/raise3D_N2_plus_dual_extruder_1.def.json
+++ b/resources/extruders/raise3D_N2_plus_dual_extruder_1.def.json
@@ -15,6 +15,7 @@
         },
         "machine_nozzle_offset_x": { "default_value": 24.8 },
         "machine_nozzle_offset_y": { "default_value": 0.6 },
+        "machine_nozzle_size": { "default_value": 0.4 },
         "material_diameter": { "default_value": 1.75 },
 
         "machine_extruder_start_pos_abs": { "default_value": true },
diff --git a/resources/extruders/ultimaker_original_dual_1st.def.json b/resources/extruders/ultimaker_original_dual_1st.def.json
index 62ec8479c9..3d837fc989 100644
--- a/resources/extruders/ultimaker_original_dual_1st.def.json
+++ b/resources/extruders/ultimaker_original_dual_1st.def.json
@@ -15,6 +15,7 @@
         },
         "machine_nozzle_offset_x": { "default_value": 0.0 },
         "machine_nozzle_offset_y": { "default_value": 0.0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
 
         "machine_extruder_start_pos_abs": { "default_value": true },
         "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" },
diff --git a/resources/extruders/ultimaker_original_dual_2nd.def.json b/resources/extruders/ultimaker_original_dual_2nd.def.json
index 42a4da524b..80cc17c58d 100644
--- a/resources/extruders/ultimaker_original_dual_2nd.def.json
+++ b/resources/extruders/ultimaker_original_dual_2nd.def.json
@@ -15,6 +15,7 @@
         },
         "machine_nozzle_offset_x": { "default_value": 0.0 },
         "machine_nozzle_offset_y": { "default_value": 21.6 },
+        "machine_nozzle_size": { "default_value": 0.4 },
 
         "machine_extruder_start_pos_abs": { "default_value": true },
         "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" },
diff --git a/resources/extruders/vertex_k8400_dual_1st.def.json b/resources/extruders/vertex_k8400_dual_1st.def.json
index 2694323f7d..86fb2266ba 100644
--- a/resources/extruders/vertex_k8400_dual_1st.def.json
+++ b/resources/extruders/vertex_k8400_dual_1st.def.json
@@ -15,6 +15,7 @@
         },
         "machine_nozzle_offset_x": { "default_value": 23.7 },
         "machine_nozzle_offset_y": { "default_value": 0.0 },
+        "machine_nozzle_size": { "default_value": 0.35 },
         "material_diameter": { "default_value": 1.75 },
 
         "machine_extruder_start_pos_abs": { "default_value": true },
diff --git a/resources/extruders/vertex_k8400_dual_2nd.def.json b/resources/extruders/vertex_k8400_dual_2nd.def.json
index 044f7000af..306b2dcb7a 100644
--- a/resources/extruders/vertex_k8400_dual_2nd.def.json
+++ b/resources/extruders/vertex_k8400_dual_2nd.def.json
@@ -15,6 +15,7 @@
         },
         "machine_nozzle_offset_x": { "default_value": 0.0 },
         "machine_nozzle_offset_y": { "default_value": 0.0 },
+        "machine_nozzle_size": { "default_value": 0.35 },
         "material_diameter": { "default_value": 1.75 },
 
         "machine_extruder_start_pos_abs": { "default_value": true },