Merge branch 'master' of https://github.com/jianshu-du/Cura into jianshu-du-master

25 files changed, 317 insertions, 3 deletions

diff --git a/resources/definitions/mingda_base.def.json b/resources/definitions/mingda_base.def.json
index 5dd9eeed7a..699942c813 100644
--- a/resources/definitions/mingda_base.def.json
+++ b/resources/definitions/mingda_base.def.json
@@ -4,7 +4,7 @@
     "inherits": "fdmprinter",
     "metadata": {
         "visible": false,
-        "author": "Cataclism",
+        "author": "Mingda",
         "manufacturer": "Mingda",
         "file_formats": "text/x-gcode",
         "first_start_actions": ["MachineSettingsAction"],
@@ -120,8 +120,10 @@
     },
     "overrides": {
         "machine_name": { "default_value": "MINGDA Base Printer" },
-        "machine_start_gcode": { "default_value": "G28 ; home all axes\n M117 Purge extruder\n G92 E0 ; reset extruder\n G1 Z1.0 F3000 ; move z up little to prevent scratching of surface\n G1 X2 Y20 Z0.3 F5000.0 ; move to start-line position\n G1 X2 Y200.0 Z0.3 F1500.0 E15 ; draw 1st line\n G1 X2 Y200.0 Z0.4 F5000.0 ; move to side a little\n G1 X2 Y20 Z0.4 F1500.0 E30 ; draw 2nd line\n G92 E0 ; reset extruder\n G1 Z1.0 F3000 ; move z up little to prevent scratching of surface"},
-        "machine_end_gcode": { "default_value": "G91; relative positioning\n G1 Z1.0 F3000 ; move z up little to prevent scratching of print\n G90; absolute positioning\n G1 X0 Y200 F1000 ; prepare for part removal\n M104 S0; turn off extruder\n M140 S0 ; turn off bed\n G1 X0 Y300 F1000 ; prepare for part removal\n M84 ; disable motors\n M106 S0 ; turn off fan" },
+        
+		"machine_start_gcode": { "default_value": " G28 ; home all axes\n M117 ; Purge extruder\n G92 E0 ; reset extruder\n G1 Z1.0 F3000 ; move z up little to prevent scratching of surface\n G1 X2 Y20 Z0.3 F5000.0 ; move to start-line position\n G1 X2 Y200.0 Z0.3 F1500.0 E15 ; draw 1st line\n G1 X2 Y200.0 Z0.4 F5000.0 ; move to side a little\n G1 X2 Y20 Z0.4 F1500.0 E30 ; draw 2nd line\n G92 E0 ; reset extruder\n G1 Z1.0 F3000 ; move z up little to prevent scratching of surface"},
+        
+		"machine_end_gcode": { "default_value": " G91; relative positioning\n G1 Z1.0 F3000 ; move z up little to prevent scratching of print\n G90; absolute positioning\n G1 X0 Y0 F1000 ; prepare for part removal\n M104 S0; turn off extruder\n M140 S0 ; turn off bed\n M84 ; disable motors\n M106 S0 ; turn off fan" },
 
         "machine_max_feedrate_x": { "value": 500 },
         "machine_max_feedrate_y": { "value": 500 },
diff --git a/resources/definitions/mingda_magician_max.def.json b/resources/definitions/mingda_magician_max.def.json
new file mode 100644
index 0000000000..444457ab4e
--- /dev/null
+++ b/resources/definitions/mingda_magician_max.def.json
@@ -0,0 +1,19 @@
+{
+    "name": "Mingda Magician Max",
+    "version": 2,
+    "inherits": "mingda_base",
+    "overrides": {
+        "machine_name": { "default_value": "Mingda Magician Max" },
+        "machine_width": { "default_value": 320 },
+        "machine_depth": { "default_value": 320 },
+        "machine_height": { "default_value": 400 },
+        "gantry_height": { "value": 25 }
+
+    },
+    "metadata": {
+		"quality_definition": "mingda_base",
+		"visible": true,
+		"platform": "mingda_rock3_base.stl",
+		"platform_offset": [ -179, -108, 150]
+    }
+}
diff --git a/resources/definitions/mingda_magician_pro.def.json b/resources/definitions/mingda_magician_pro.def.json
new file mode 100644
index 0000000000..b38e168c65
--- /dev/null
+++ b/resources/definitions/mingda_magician_pro.def.json
@@ -0,0 +1,22 @@
+{
+    "name": "Mingda Magician Pro",
+    "version": 2,
+    "inherits": "mingda_base",
+    "overrides": {
+        "machine_name": { "default_value": "Mingda Magician Pro" },
+		"machine_start_gcode": {
+			"default_value":" G28 ; home all axes\n M117 ; Purge extruder\n G92 E0 ; reset extruder\n G1 Z1.0 F3000 ; move z up little to prevent scratching of surface\n G1 X2 Y20 Z0.3 F5000.0 ; move to start-line position\n G1 X2 Y200.0 Z0.3 F1500.0 E15 ; draw 1st line\n G1 X2 Y200.0 Z0.4 F5000.0 ; move to side a little\n G1 X2 Y20 Z0.4 F1500.0 E30 ; draw 2nd line\n G92 E0 ; reset extruder\n G1 Z1.0 F3000 ; move z up little to prevent scratching of surface" 
+		},
+        "machine_width": { "default_value": 400 },
+        "machine_depth": { "default_value": 400 },
+        "machine_height": { "default_value": 400 },
+        "gantry_height": { "value": 25 }
+
+    },
+    "metadata": {
+        "quality_definition": "mingda_base",
+        "visible": true,
+        "platform": "mingda_d4pro_base.stl",
+        "platform_offset": [ -177, -140, 170]
+    }
+}
diff --git a/resources/definitions/mingda_magician_x.def.json b/resources/definitions/mingda_magician_x.def.json
new file mode 100644
index 0000000000..2dd3e5cd82
--- /dev/null
+++ b/resources/definitions/mingda_magician_x.def.json
@@ -0,0 +1,19 @@
+{
+    "name": "Mingda Magician X",
+    "version": 2,
+    "inherits": "mingda_base",
+    "overrides": {
+        "machine_name": { "default_value": "Mingda Magician X" },
+        "machine_width": { "default_value": 230 },
+        "machine_depth": { "default_value": 230 },
+        "machine_height": { "default_value": 260 },
+        "gantry_height": { "value": 25 }
+
+    },
+    "metadata": {
+        "quality_definition": "mingda_base",
+        "visible": true,
+        "platform": "mingda_d2_base.stl",
+        "platform_offset": [ -205, -77, 65]
+    }
+}
diff --git a/resources/variants/mingda_magician_max_0.2.inst.cfg b/resources/variants/mingda_magician_max_0.2.inst.cfg
new file mode 100644
index 0000000000..08a18a7c7f
--- /dev/null
+++ b/resources/variants/mingda_magician_max_0.2.inst.cfg
@@ -0,0 +1,12 @@
+[general]
+name = 0.2mm Nozzle
+version = 4
+definition = mingda_magician_max
+
+[metadata]
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.2
diff --git a/resources/variants/mingda_magician_max_0.3.inst.cfg b/resources/variants/mingda_magician_max_0.3.inst.cfg
new file mode 100644
index 0000000000..594e6395eb
--- /dev/null
+++ b/resources/variants/mingda_magician_max_0.3.inst.cfg
@@ -0,0 +1,12 @@
+[general]
+name = 0.3mm Nozzle
+version = 4
+definition = mingda_magician_max
+
+[metadata]
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.3
diff --git a/resources/variants/mingda_magician_max_0.4.inst.cfg b/resources/variants/mingda_magician_max_0.4.inst.cfg
new file mode 100644
index 0000000000..e09859e82c
--- /dev/null
+++ b/resources/variants/mingda_magician_max_0.4.inst.cfg
@@ -0,0 +1,12 @@
+[general]
+name = 0.4mm Nozzle
+version = 4
+definition = mingda_magician_max
+
+[metadata]
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.4
diff --git a/resources/variants/mingda_magician_max_0.5.inst.cfg b/resources/variants/mingda_magician_max_0.5.inst.cfg
new file mode 100644
index 0000000000..7d3aa63dd0
--- /dev/null
+++ b/resources/variants/mingda_magician_max_0.5.inst.cfg
@@ -0,0 +1,12 @@
+[general]
+name = 0.5mm Nozzle
+version = 4
+definition = mingda_magician_max
+
+[metadata]
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.5
diff --git a/resources/variants/mingda_magician_max_0.6.inst.cfg b/resources/variants/mingda_magician_max_0.6.inst.cfg
new file mode 100644
index 0000000000..1ffacf08b3
--- /dev/null
+++ b/resources/variants/mingda_magician_max_0.6.inst.cfg
@@ -0,0 +1,12 @@
+[general]
+name = 0.6mm Nozzle
+version = 4
+definition = mingda_magician_max
+
+[metadata]
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.6
diff --git a/resources/variants/mingda_magician_max_0.8.inst.cfg b/resources/variants/mingda_magician_max_0.8.inst.cfg
new file mode 100644
index 0000000000..3e44d4e82b
--- /dev/null
+++ b/resources/variants/mingda_magician_max_0.8.inst.cfg
@@ -0,0 +1,12 @@
+[general]
+name = 0.8mm Nozzle
+version = 4
+definition = mingda_magician_max
+
+[metadata]
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.8
diff --git a/resources/variants/mingda_magician_max_1.0.inst.cfg b/resources/variants/mingda_magician_max_1.0.inst.cfg
new file mode 100644
index 0000000000..349e93369d
--- /dev/null
+++ b/resources/variants/mingda_magician_max_1.0.inst.cfg
@@ -0,0 +1,12 @@
+[general]
+name = 1.0mm Nozzle
+version = 4
+definition = mingda_magician_max
+
+[metadata]
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 1.0
diff --git a/resources/variants/mingda_magician_pro_0.2.inst.cfg b/resources/variants/mingda_magician_pro_0.2.inst.cfg
new file mode 100644
index 0000000000..ab0621308a
--- /dev/null
+++ b/resources/variants/mingda_magician_pro_0.2.inst.cfg
@@ -0,0 +1,12 @@
+[general]
+name = 0.2mm Nozzle
+version = 4
+definition = mingda_magician_pro
+
+[metadata]
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.2
diff --git a/resources/variants/mingda_magician_pro_0.3.inst.cfg b/resources/variants/mingda_magician_pro_0.3.inst.cfg
new file mode 100644
index 0000000000..b174d05c7a
--- /dev/null
+++ b/resources/variants/mingda_magician_pro_0.3.inst.cfg
@@ -0,0 +1,12 @@
+[general]
+name = 0.3mm Nozzle
+version = 4
+definition = mingda_magician_pro
+
+[metadata]
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.3
diff --git a/resources/variants/mingda_magician_pro_0.4.inst.cfg b/resources/variants/mingda_magician_pro_0.4.inst.cfg
new file mode 100644
index 0000000000..f66b5cc4cd
--- /dev/null
+++ b/resources/variants/mingda_magician_pro_0.4.inst.cfg
@@ -0,0 +1,12 @@
+[general]
+name = 0.4mm Nozzle
+version = 4
+definition = mingda_magician_pro
+
+[metadata]
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.4
diff --git a/resources/variants/mingda_magician_pro_0.5.inst.cfg b/resources/variants/mingda_magician_pro_0.5.inst.cfg
new file mode 100644
index 0000000000..2e9fda0dd1
--- /dev/null
+++ b/resources/variants/mingda_magician_pro_0.5.inst.cfg
@@ -0,0 +1,12 @@
+[general]
+name = 0.5mm Nozzle
+version = 4
+definition = mingda_magician_pro
+
+[metadata]
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.5
diff --git a/resources/variants/mingda_magician_pro_0.6.inst.cfg b/resources/variants/mingda_magician_pro_0.6.inst.cfg
new file mode 100644
index 0000000000..ef17bf0350
--- /dev/null
+++ b/resources/variants/mingda_magician_pro_0.6.inst.cfg
@@ -0,0 +1,12 @@
+[general]
+name = 0.6mm Nozzle
+version = 4
+definition = mingda_magician_pro
+
+[metadata]
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.6
diff --git a/resources/variants/mingda_magician_pro_0.8.inst.cfg b/resources/variants/mingda_magician_pro_0.8.inst.cfg
new file mode 100644
index 0000000000..7d489b1e7b
--- /dev/null
+++ b/resources/variants/mingda_magician_pro_0.8.inst.cfg
@@ -0,0 +1,12 @@
+[general]
+name = 0.8mm Nozzle
+version = 4
+definition = mingda_magician_pro
+
+[metadata]
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.8
diff --git a/resources/variants/mingda_magician_pro_1.0.inst.cfg b/resources/variants/mingda_magician_pro_1.0.inst.cfg
new file mode 100644
index 0000000000..c57bab368e
--- /dev/null
+++ b/resources/variants/mingda_magician_pro_1.0.inst.cfg
@@ -0,0 +1,12 @@
+[general]
+name = 1.0mm Nozzle
+version = 4
+definition = mingda_magician_pro
+
+[metadata]
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 1.0
diff --git a/resources/variants/mingda_magician_x_0.2.inst.cfg b/resources/variants/mingda_magician_x_0.2.inst.cfg
new file mode 100644
index 0000000000..133b164ec6
--- /dev/null
+++ b/resources/variants/mingda_magician_x_0.2.inst.cfg
@@ -0,0 +1,12 @@
+[general]
+name = 0.2mm Nozzle
+version = 4
+definition = mingda_magician_x
+
+[metadata]
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.2
diff --git a/resources/variants/mingda_magician_x_0.3.inst.cfg b/resources/variants/mingda_magician_x_0.3.inst.cfg
new file mode 100644
index 0000000000..c161d04995
--- /dev/null
+++ b/resources/variants/mingda_magician_x_0.3.inst.cfg
@@ -0,0 +1,12 @@
+[general]
+name = 0.3mm Nozzle
+version = 4
+definition = mingda_magician_x
+
+[metadata]
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.3
diff --git a/resources/variants/mingda_magician_x_0.4.inst.cfg b/resources/variants/mingda_magician_x_0.4.inst.cfg
new file mode 100644
index 0000000000..88a8b5af25
--- /dev/null
+++ b/resources/variants/mingda_magician_x_0.4.inst.cfg
@@ -0,0 +1,12 @@
+[general]
+name = 0.4mm Nozzle
+version = 4
+definition = mingda_magician_x
+
+[metadata]
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.4
diff --git a/resources/variants/mingda_magician_x_0.5.inst.cfg b/resources/variants/mingda_magician_x_0.5.inst.cfg
new file mode 100644
index 0000000000..0601788476
--- /dev/null
+++ b/resources/variants/mingda_magician_x_0.5.inst.cfg
@@ -0,0 +1,12 @@
+[general]
+name = 0.5mm Nozzle
+version = 4
+definition = mingda_magician_x
+
+[metadata]
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.5
diff --git a/resources/variants/mingda_magician_x_0.6.inst.cfg b/resources/variants/mingda_magician_x_0.6.inst.cfg
new file mode 100644
index 0000000000..bfb6fbccb5
--- /dev/null
+++ b/resources/variants/mingda_magician_x_0.6.inst.cfg
@@ -0,0 +1,12 @@
+[general]
+name = 0.6mm Nozzle
+version = 4
+definition = mingda_magician_x
+
+[metadata]
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.6
diff --git a/resources/variants/mingda_magician_x_0.8.inst.cfg b/resources/variants/mingda_magician_x_0.8.inst.cfg
new file mode 100644
index 0000000000..b502b4b617
--- /dev/null
+++ b/resources/variants/mingda_magician_x_0.8.inst.cfg
@@ -0,0 +1,12 @@
+[general]
+name = 0.8mm Nozzle
+version = 4
+definition = mingda_magician_x
+
+[metadata]
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.8
diff --git a/resources/variants/mingda_magician_x_1.0.inst.cfg b/resources/variants/mingda_magician_x_1.0.inst.cfg
new file mode 100644
index 0000000000..4b119508a1
--- /dev/null
+++ b/resources/variants/mingda_magician_x_1.0.inst.cfg
@@ -0,0 +1,12 @@
+[general]
+name = 1.0mm Nozzle
+version = 4
+definition = mingda_magician_x
+
+[metadata]
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 1.0