diff --git a/resources/definitions/mingda_1000pro.def.json b/resources/definitions/mingda_1000pro.def.json index bfcab9c9ca..97292569fe 100644 --- 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 index 19f15d22da..beb1df1d47 100644 --- 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 index 6c002a6cce..be0cd8dc1d 100644 --- 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 index a9977fdf67..862dd157f7 100644 --- 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 index 7909bcc872..e411caabbe 100644 --- 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 index 6fe187b14f..a02f9a42b3 100644 --- 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 index 63e39b7a5d..7c0eede4f1 100644 --- 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 index b07dbe458f..f23f9bec19 100644 --- 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 deleted file mode 100644 index 99355355ec..0000000000 --- a/resources/definitions/mingda_base_extruder_0.def.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "version": 2, - "name": "Extruder 1", - "inherits": "fdmextruder", - "metadata": - { - "machine": "mingda_base", - "position": "0" - }, - "overrides": - { - "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 } - } -} \ No newline at end of file diff --git a/resources/definitions/mingda_base_extruder_1.def.json b/resources/definitions/mingda_base_extruder_1.def.json deleted file mode 100644 index f94095e440..0000000000 --- a/resources/definitions/mingda_base_extruder_1.def.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "version": 2, - "name": "Extruder 2", - "inherits": "fdmextruder", - "metadata": - { - "machine": "mingda_base", - "position": "1" - }, - "overrides": - { - "extruder_nr": - { - "default_value": 1, - "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": 30.0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } - } -} \ No newline at end of file diff --git a/resources/definitions/mingda_d2.def.json b/resources/definitions/mingda_d2.def.json index 54e969ab74..307a53ea94 100644 --- 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 index 89475e6f42..164d5e0129 100644 --- 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 index 478dac45f7..d2acfd0af1 100644 --- 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 index 18323b0a29..0560f962a8 100644 --- 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 index a52b2879b8..467417aa3f 100644 --- 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 index 8ca11061a0..8a2af14bf3 100644 --- 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 index 2f41be100a..0ff22837f5 100644 --- 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 index 61270cf715..115d6c3e60 100644 --- 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 index c4048b3d4f..9ba3c083bd 100644 --- 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 index 2a63d15eb6..99355355ec 100644 --- 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 deleted file mode 100644 index d6a49e62f1..0000000000 --- a/resources/extruders/mingda_base_extruder_1.def.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": 2, - "name": "Extruder 2", - "inherits": "fdmextruder", - "metadata": - { - "machine": "mingda_base", - "position": "1" - }, - "overrides": - { - "extruder_nr": - { - "default_value": 1, - "maximum_value": "3" - }, - "machine_nozzle_offset_x": { "default_value": 0.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_nozzle_size": { "default_value": 0.5 }, - "material_diameter": { "default_value": 1.75 } - } -} \ No newline at end of file