Profile corrections

Extruder definitions should be per printer rather than in the base printer
Ultimaker · Jul 20, 2024 · 5ff041f · 5ff041f
1 parent 793946b
commit 5ff041f
Show file tree

Hide file tree

Showing 21 changed files with 43 additions and 97 deletions.
diff --git a/resources/definitions/mingda_1000pro.def.json b/resources/definitions/mingda_1000pro.def.json
@@ -1,10 +1,11 @@
 {
-    "version": 2,
+    "version": 3,
     "name": "Mingda 1000Pro",
     "inherits": "mingda_base",
     "metadata":
     {
         "visible": true,
+		"machine_extruder_trains": { "0": "mingda_base_extruder_0" },
         "quality_definition": "mingda_base"
     },
     "overrides":

diff --git a/resources/definitions/mingda_1000proplus.def.json b/resources/definitions/mingda_1000proplus.def.json
@@ -1,5 +1,5 @@
 {
-    "version": 2,
+    "version": 3,
     "name": "Mingda 1000Pro+",
     "inherits": "mingda_base",
     "metadata":

diff --git a/resources/definitions/mingda_400d.def.json b/resources/definitions/mingda_400d.def.json
@@ -1,5 +1,5 @@
 {
-    "version": 2,
+    "version": 3,
     "name": "Mingda 400D",
     "inherits": "mingda_base",
     "metadata":

diff --git a/resources/definitions/mingda_4h.def.json b/resources/definitions/mingda_4h.def.json
@@ -1,10 +1,11 @@
 {
-    "version": 2,
+    "version": 3,
     "name": "Mingda 4H",
     "inherits": "mingda_base",
     "metadata":
     {
         "visible": true,
+		"machine_extruder_trains": { "0": "mingda_base_extruder_0" },
         "quality_definition": "mingda_base"
     },
     "overrides":

diff --git a/resources/definitions/mingda_600pro.def.json b/resources/definitions/mingda_600pro.def.json
@@ -1,10 +1,11 @@
 {
-    "version": 2,
+    "version": 3,
     "name": "Mingda 600Pro",
     "inherits": "mingda_base",
     "metadata":
     {
         "visible": true,
+		"machine_extruder_trains": { "0": "mingda_base_extruder_0" },
         "quality_definition": "mingda_base"
     },
     "overrides":

diff --git a/resources/definitions/mingda_600proplus.def.json b/resources/definitions/mingda_600proplus.def.json
@@ -1,5 +1,5 @@
 {
-    "version": 2,
+    "version": 3,
     "name": "Mingda 600Pro+",
     "inherits": "mingda_base",
     "metadata":

diff --git a/resources/definitions/mingda_6h.def.json b/resources/definitions/mingda_6h.def.json
@@ -1,10 +1,11 @@
 {
-    "version": 2,
+    "version": 3,
     "name": "Mingda 6H",
     "inherits": "mingda_base",
     "metadata":
     {
         "visible": true,
+		"machine_extruder_trains": { "0": "mingda_base_extruder_0" },
         "quality_definition": "mingda_base"
     },
     "overrides":

diff --git a/resources/definitions/mingda_base.def.json b/resources/definitions/mingda_base.def.json
@@ -1,5 +1,5 @@
 {
-    "version": 2,
+    "version": 3,
     "name": "Mingda Base Printer",
     "inherits": "fdmprinter",
     "metadata":
@@ -18,7 +18,6 @@
         "has_machine_quality": true,
         "has_materials": true,
         "has_variants": true,
-        "machine_extruder_trains": { "0": "mingda_base_extruder_0" },
         "preferred_material": "generic_pla",
         "preferred_quality_type": "standard",
         "preferred_variant_name": "0.4mm Nozzle",

diff --git a/resources/definitions/mingda_base_extruder_0.def.json b/resources/definitions/mingda_base_extruder_0.def.json
diff --git a/resources/definitions/mingda_base_extruder_1.def.json b/resources/definitions/mingda_base_extruder_1.def.json
diff --git a/resources/definitions/mingda_d2.def.json b/resources/definitions/mingda_d2.def.json
@@ -1,10 +1,11 @@
 {
-    "version": 2,
+    "version": 3,
     "name": "Mingda D2",
     "inherits": "mingda_base",
     "metadata":
     {
         "visible": true,
+		"machine_extruder_trains": { "0": "mingda_base_extruder_0" },
         "platform": "mingda_d2_base.stl",
         "platform_offset": [
             -205,

diff --git a/resources/definitions/mingda_d3pro.def.json b/resources/definitions/mingda_d3pro.def.json
@@ -1,10 +1,11 @@
 {
-    "version": 2,
+    "version": 3,
     "name": "Mingda D3/Pro",
     "inherits": "mingda_base",
     "metadata":
     {
         "visible": true,
+		"machine_extruder_trains": { "0": "mingda_base_extruder_0" },
         "platform": "mingda_rock3_base.stl",
         "platform_offset": [
             -179,

diff --git a/resources/definitions/mingda_d4pro.def.json b/resources/definitions/mingda_d4pro.def.json
@@ -1,10 +1,11 @@
 {
-    "version": 2,
+    "version": 3,
     "name": "Mingda D4 Pro",
     "inherits": "mingda_base",
     "metadata":
     {
         "visible": true,
+		"machine_extruder_trains": { "0": "mingda_base_extruder_0" },
         "platform": "mingda_d4pro_base.stl",
         "platform_offset": [
             -177,

diff --git a/resources/definitions/mingda_magician_max.def.json b/resources/definitions/mingda_magician_max.def.json
@@ -1,10 +1,11 @@
 {
-    "version": 2,
+    "version": 3,
     "name": "Mingda Magician Max",
     "inherits": "mingda_base",
     "metadata":
     {
         "visible": true,
+		"machine_extruder_trains": { "0": "mingda_base_extruder_0" },
         "platform": "mingda_magician_max_base.stl",
         "platform_offset": [
             0,

diff --git a/resources/definitions/mingda_magician_maxplus.def.json b/resources/definitions/mingda_magician_maxplus.def.json
@@ -1,10 +1,11 @@
 {
-    "version": 2,
+    "version": 3,
     "name": "Mingda Magician Max2",
     "inherits": "mingda_base",
     "metadata":
     {
         "visible": true,
+		"machine_extruder_trains": { "0": "mingda_base_extruder_0" },
         "platform": "mingda_magician_max_base.stl",
         "platform_offset": [
             0,

diff --git a/resources/definitions/mingda_magician_pro.def.json b/resources/definitions/mingda_magician_pro.def.json
@@ -1,10 +1,11 @@
 {
-    "version": 2,
+    "version": 3,
     "name": "Mingda Magician Pro",
     "inherits": "mingda_base",
     "metadata":
     {
         "visible": true,
+		"machine_extruder_trains": { "0": "mingda_base_extruder_0" },
         "platform": "mingda_magician_pro_base.stl",
         "platform_offset": [
             0,

diff --git a/resources/definitions/mingda_magician_proplus.def.json b/resources/definitions/mingda_magician_proplus.def.json
@@ -1,10 +1,11 @@
 {
-    "version": 2,
+    "version": 3,
     "name": "Mingda Magician Pro2",
     "inherits": "mingda_base",
     "metadata":
     {
         "visible": true,
+		"machine_extruder_trains": { "0": "mingda_base_extruder_0" },
         "platform": "mingda_magician_pro_base.stl",
         "platform_offset": [
             0,

diff --git a/resources/definitions/mingda_magician_x.def.json b/resources/definitions/mingda_magician_x.def.json
@@ -1,10 +1,11 @@
 {
-    "version": 2,
+    "version": 3,
     "name": "Mingda Magician X",
     "inherits": "mingda_base",
     "metadata":
     {
         "visible": true,
+		"machine_extruder_trains": { "0": "mingda_base_extruder_0" },
         "platform": "mingda_magician_x_base.stl",
         "platform_offset": [
             0,

diff --git a/resources/definitions/mingda_magician_xplus.def.json b/resources/definitions/mingda_magician_xplus.def.json
@@ -1,10 +1,11 @@
 {
-    "version": 2,
+    "version": 3,
     "name": "Mingda Magician X2",
     "inherits": "mingda_base",
     "metadata":
     {
         "visible": true,
+		"machine_extruder_trains": { "0": "mingda_base_extruder_0" },
         "platform": "mingda_magician_x2_base.stl",
         "platform_offset": [
             0,

diff --git a/resources/extruders/mingda_base_extruder_0.def.json b/resources/extruders/mingda_base_extruder_0.def.json
@@ -9,7 +9,19 @@
     },
     "overrides":
     {
-        "extruder_nr": { "default_value": 0 },
+        "extruder_nr":
+        {
+            "default_value": 0,
+            "maximum_value": 1
+        },
+        "machine_extruder_end_pos_abs": { "default_value": true },
+        "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" },
+        "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" },
+        "machine_extruder_start_pos_abs": { "default_value": true },
+        "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" },
+        "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" },
+        "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 }
     }

diff --git a/resources/extruders/mingda_base_extruder_1.def.json b/resources/extruders/mingda_base_extruder_1.def.json