From 05a2fa88f01d4cf86aee47b6b28ed477493b3d02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E6=A0=91?= <3008993280@qq.com> Date: Thu, 18 Nov 2021 14:38:52 +0800 Subject: [PATCH 1/3] Add new Mingda printers(X,MAX,PRO) --- .../definitions/mingda_MagicianMax.def.json | 19 ++++++++++++++++ .../definitions/mingda_MagicianPro.def.json | 22 +++++++++++++++++++ .../definitions/mingda_MagicianX.def.json | 19 ++++++++++++++++ resources/definitions/mingda_base.def.json | 8 ++++--- .../variants/mingda_MagicianMax_0.2.inst.cfg | 12 ++++++++++ .../variants/mingda_MagicianMax_0.3.inst.cfg | 12 ++++++++++ .../variants/mingda_MagicianMax_0.4.inst.cfg | 12 ++++++++++ .../variants/mingda_MagicianMax_0.5.inst.cfg | 12 ++++++++++ .../variants/mingda_MagicianMax_0.6.inst.cfg | 12 ++++++++++ .../variants/mingda_MagicianMax_0.8.inst.cfg | 12 ++++++++++ .../variants/mingda_MagicianMax_1.0.inst.cfg | 12 ++++++++++ .../variants/mingda_MagicianPro_0.2.inst.cfg | 12 ++++++++++ .../variants/mingda_MagicianPro_0.3.inst.cfg | 12 ++++++++++ .../variants/mingda_MagicianPro_0.4.inst.cfg | 12 ++++++++++ .../variants/mingda_MagicianPro_0.5.inst.cfg | 12 ++++++++++ .../variants/mingda_MagicianPro_0.6.inst.cfg | 12 ++++++++++ .../variants/mingda_MagicianPro_0.8.inst.cfg | 12 ++++++++++ .../variants/mingda_MagicianPro_1.0.inst.cfg | 12 ++++++++++ .../variants/mingda_MagicianX_0.2.inst.cfg | 12 ++++++++++ .../variants/mingda_MagicianX_0.3.inst.cfg | 12 ++++++++++ .../variants/mingda_MagicianX_0.4.inst.cfg | 12 ++++++++++ .../variants/mingda_MagicianX_0.5.inst.cfg | 12 ++++++++++ .../variants/mingda_MagicianX_0.6.inst.cfg | 12 ++++++++++ .../variants/mingda_MagicianX_0.8.inst.cfg | 12 ++++++++++ .../variants/mingda_MagicianX_1.0.inst.cfg | 12 ++++++++++ 25 files changed, 317 insertions(+), 3 deletions(-) create mode 100644 resources/definitions/mingda_MagicianMax.def.json create mode 100644 resources/definitions/mingda_MagicianPro.def.json create mode 100644 resources/definitions/mingda_MagicianX.def.json create mode 100644 resources/variants/mingda_MagicianMax_0.2.inst.cfg create mode 100644 resources/variants/mingda_MagicianMax_0.3.inst.cfg create mode 100644 resources/variants/mingda_MagicianMax_0.4.inst.cfg create mode 100644 resources/variants/mingda_MagicianMax_0.5.inst.cfg create mode 100644 resources/variants/mingda_MagicianMax_0.6.inst.cfg create mode 100644 resources/variants/mingda_MagicianMax_0.8.inst.cfg create mode 100644 resources/variants/mingda_MagicianMax_1.0.inst.cfg create mode 100644 resources/variants/mingda_MagicianPro_0.2.inst.cfg create mode 100644 resources/variants/mingda_MagicianPro_0.3.inst.cfg create mode 100644 resources/variants/mingda_MagicianPro_0.4.inst.cfg create mode 100644 resources/variants/mingda_MagicianPro_0.5.inst.cfg create mode 100644 resources/variants/mingda_MagicianPro_0.6.inst.cfg create mode 100644 resources/variants/mingda_MagicianPro_0.8.inst.cfg create mode 100644 resources/variants/mingda_MagicianPro_1.0.inst.cfg create mode 100644 resources/variants/mingda_MagicianX_0.2.inst.cfg create mode 100644 resources/variants/mingda_MagicianX_0.3.inst.cfg create mode 100644 resources/variants/mingda_MagicianX_0.4.inst.cfg create mode 100644 resources/variants/mingda_MagicianX_0.5.inst.cfg create mode 100644 resources/variants/mingda_MagicianX_0.6.inst.cfg create mode 100644 resources/variants/mingda_MagicianX_0.8.inst.cfg create mode 100644 resources/variants/mingda_MagicianX_1.0.inst.cfg diff --git a/resources/definitions/mingda_MagicianMax.def.json b/resources/definitions/mingda_MagicianMax.def.json new file mode 100644 index 0000000000..444457ab4e --- /dev/null +++ b/resources/definitions/mingda_MagicianMax.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_MagicianPro.def.json b/resources/definitions/mingda_MagicianPro.def.json new file mode 100644 index 0000000000..b38e168c65 --- /dev/null +++ b/resources/definitions/mingda_MagicianPro.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_MagicianX.def.json b/resources/definitions/mingda_MagicianX.def.json new file mode 100644 index 0000000000..2dd3e5cd82 --- /dev/null +++ b/resources/definitions/mingda_MagicianX.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/definitions/mingda_base.def.json b/resources/definitions/mingda_base.def.json index 1051e53c2a..b33e7958ba 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/variants/mingda_MagicianMax_0.2.inst.cfg b/resources/variants/mingda_MagicianMax_0.2.inst.cfg new file mode 100644 index 0000000000..edffc28e51 --- /dev/null +++ b/resources/variants/mingda_MagicianMax_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = mingda_MagicianMax + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/mingda_MagicianMax_0.3.inst.cfg b/resources/variants/mingda_MagicianMax_0.3.inst.cfg new file mode 100644 index 0000000000..d965bc8361 --- /dev/null +++ b/resources/variants/mingda_MagicianMax_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = mingda_MagicianMax + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/mingda_MagicianMax_0.4.inst.cfg b/resources/variants/mingda_MagicianMax_0.4.inst.cfg new file mode 100644 index 0000000000..61abe39d06 --- /dev/null +++ b/resources/variants/mingda_MagicianMax_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = mingda_MagicianMax + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/mingda_MagicianMax_0.5.inst.cfg b/resources/variants/mingda_MagicianMax_0.5.inst.cfg new file mode 100644 index 0000000000..aa316f6fd1 --- /dev/null +++ b/resources/variants/mingda_MagicianMax_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = mingda_MagicianMax + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/mingda_MagicianMax_0.6.inst.cfg b/resources/variants/mingda_MagicianMax_0.6.inst.cfg new file mode 100644 index 0000000000..4db3ebf4bd --- /dev/null +++ b/resources/variants/mingda_MagicianMax_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = mingda_MagicianMax + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/mingda_MagicianMax_0.8.inst.cfg b/resources/variants/mingda_MagicianMax_0.8.inst.cfg new file mode 100644 index 0000000000..22bed5c103 --- /dev/null +++ b/resources/variants/mingda_MagicianMax_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = mingda_MagicianMax + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/mingda_MagicianMax_1.0.inst.cfg b/resources/variants/mingda_MagicianMax_1.0.inst.cfg new file mode 100644 index 0000000000..7482f47231 --- /dev/null +++ b/resources/variants/mingda_MagicianMax_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = mingda_MagicianMax + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/mingda_MagicianPro_0.2.inst.cfg b/resources/variants/mingda_MagicianPro_0.2.inst.cfg new file mode 100644 index 0000000000..dbf3a580fc --- /dev/null +++ b/resources/variants/mingda_MagicianPro_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = mingda_MagicianPro + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/mingda_MagicianPro_0.3.inst.cfg b/resources/variants/mingda_MagicianPro_0.3.inst.cfg new file mode 100644 index 0000000000..834f4183a1 --- /dev/null +++ b/resources/variants/mingda_MagicianPro_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = mingda_MagicianPro + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/mingda_MagicianPro_0.4.inst.cfg b/resources/variants/mingda_MagicianPro_0.4.inst.cfg new file mode 100644 index 0000000000..03d5d34eee --- /dev/null +++ b/resources/variants/mingda_MagicianPro_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = mingda_MagicianPro + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/mingda_MagicianPro_0.5.inst.cfg b/resources/variants/mingda_MagicianPro_0.5.inst.cfg new file mode 100644 index 0000000000..310c6c6b91 --- /dev/null +++ b/resources/variants/mingda_MagicianPro_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = mingda_MagicianPro + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/mingda_MagicianPro_0.6.inst.cfg b/resources/variants/mingda_MagicianPro_0.6.inst.cfg new file mode 100644 index 0000000000..4cf6df4211 --- /dev/null +++ b/resources/variants/mingda_MagicianPro_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = mingda_MagicianPro + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/mingda_MagicianPro_0.8.inst.cfg b/resources/variants/mingda_MagicianPro_0.8.inst.cfg new file mode 100644 index 0000000000..7d63e98b85 --- /dev/null +++ b/resources/variants/mingda_MagicianPro_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = mingda_MagicianPro + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/mingda_MagicianPro_1.0.inst.cfg b/resources/variants/mingda_MagicianPro_1.0.inst.cfg new file mode 100644 index 0000000000..2ca2c5058b --- /dev/null +++ b/resources/variants/mingda_MagicianPro_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = mingda_MagicianPro + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/mingda_MagicianX_0.2.inst.cfg b/resources/variants/mingda_MagicianX_0.2.inst.cfg new file mode 100644 index 0000000000..e6b90ec4a7 --- /dev/null +++ b/resources/variants/mingda_MagicianX_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = mingda_MagicianX + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/mingda_MagicianX_0.3.inst.cfg b/resources/variants/mingda_MagicianX_0.3.inst.cfg new file mode 100644 index 0000000000..5af7d03ffd --- /dev/null +++ b/resources/variants/mingda_MagicianX_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = mingda_MagicianX + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/mingda_MagicianX_0.4.inst.cfg b/resources/variants/mingda_MagicianX_0.4.inst.cfg new file mode 100644 index 0000000000..a22f2a5f82 --- /dev/null +++ b/resources/variants/mingda_MagicianX_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = mingda_MagicianX + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/mingda_MagicianX_0.5.inst.cfg b/resources/variants/mingda_MagicianX_0.5.inst.cfg new file mode 100644 index 0000000000..62fa1e923d --- /dev/null +++ b/resources/variants/mingda_MagicianX_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = mingda_MagicianX + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/mingda_MagicianX_0.6.inst.cfg b/resources/variants/mingda_MagicianX_0.6.inst.cfg new file mode 100644 index 0000000000..f262890359 --- /dev/null +++ b/resources/variants/mingda_MagicianX_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = mingda_MagicianX + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/mingda_MagicianX_0.8.inst.cfg b/resources/variants/mingda_MagicianX_0.8.inst.cfg new file mode 100644 index 0000000000..1c53bc68c2 --- /dev/null +++ b/resources/variants/mingda_MagicianX_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = mingda_MagicianX + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/mingda_MagicianX_1.0.inst.cfg b/resources/variants/mingda_MagicianX_1.0.inst.cfg new file mode 100644 index 0000000000..cfb0377c6f --- /dev/null +++ b/resources/variants/mingda_MagicianX_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = mingda_MagicianX + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 From 4dee92f04c5c7ce23f5274c57f6b6d04bce15995 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E6=A0=91?= <3008993280@qq.com> Date: Wed, 12 Jan 2022 11:14:14 +0800 Subject: [PATCH 2/3] change the definition file names to be lowercase with underscores --- .../{mingda_MagicianMax.def.json => mingda_magician_max.def.json} | 0 .../{mingda_MagicianPro.def.json => mingda_magician_pro.def.json} | 0 .../{mingda_MagicianX.def.json => mingda_magician_x.def.json} | 0 ..._MagicianMax_0.2.inst.cfg => mingda_magician_max_0.2.inst.cfg} | 0 ..._MagicianMax_0.3.inst.cfg => mingda_magician_max_0.3.inst.cfg} | 0 ..._MagicianMax_0.4.inst.cfg => mingda_magician_max_0.4.inst.cfg} | 0 ..._MagicianMax_0.5.inst.cfg => mingda_magician_max_0.5.inst.cfg} | 0 ..._MagicianMax_0.6.inst.cfg => mingda_magician_max_0.6.inst.cfg} | 0 ..._MagicianMax_0.8.inst.cfg => mingda_magician_max_0.8.inst.cfg} | 0 ..._MagicianMax_1.0.inst.cfg => mingda_magician_max_1.0.inst.cfg} | 0 ..._MagicianPro_0.2.inst.cfg => mingda_magician_pro_0.2.inst.cfg} | 0 ..._MagicianPro_0.3.inst.cfg => mingda_magician_pro_0.3.inst.cfg} | 0 ..._MagicianPro_0.4.inst.cfg => mingda_magician_pro_0.4.inst.cfg} | 0 ..._MagicianPro_0.5.inst.cfg => mingda_magician_pro_0.5.inst.cfg} | 0 ..._MagicianPro_0.6.inst.cfg => mingda_magician_pro_0.6.inst.cfg} | 0 ..._MagicianPro_0.8.inst.cfg => mingda_magician_pro_0.8.inst.cfg} | 0 ..._MagicianPro_1.0.inst.cfg => mingda_magician_pro_1.0.inst.cfg} | 0 ...ngda_MagicianX_0.2.inst.cfg => mingda_magician_x_0.2.inst.cfg} | 0 ...ngda_MagicianX_0.3.inst.cfg => mingda_magician_x_0.3.inst.cfg} | 0 ...ngda_MagicianX_0.4.inst.cfg => mingda_magician_x_0.4.inst.cfg} | 0 ...ngda_MagicianX_0.5.inst.cfg => mingda_magician_x_0.5.inst.cfg} | 0 ...ngda_MagicianX_0.6.inst.cfg => mingda_magician_x_0.6.inst.cfg} | 0 ...ngda_MagicianX_0.8.inst.cfg => mingda_magician_x_0.8.inst.cfg} | 0 ...ngda_MagicianX_1.0.inst.cfg => mingda_magician_x_1.0.inst.cfg} | 0 24 files changed, 0 insertions(+), 0 deletions(-) rename resources/definitions/{mingda_MagicianMax.def.json => mingda_magician_max.def.json} (100%) rename resources/definitions/{mingda_MagicianPro.def.json => mingda_magician_pro.def.json} (100%) rename resources/definitions/{mingda_MagicianX.def.json => mingda_magician_x.def.json} (100%) rename resources/variants/{mingda_MagicianMax_0.2.inst.cfg => mingda_magician_max_0.2.inst.cfg} (100%) rename resources/variants/{mingda_MagicianMax_0.3.inst.cfg => mingda_magician_max_0.3.inst.cfg} (100%) rename resources/variants/{mingda_MagicianMax_0.4.inst.cfg => mingda_magician_max_0.4.inst.cfg} (100%) rename resources/variants/{mingda_MagicianMax_0.5.inst.cfg => mingda_magician_max_0.5.inst.cfg} (100%) rename resources/variants/{mingda_MagicianMax_0.6.inst.cfg => mingda_magician_max_0.6.inst.cfg} (100%) rename resources/variants/{mingda_MagicianMax_0.8.inst.cfg => mingda_magician_max_0.8.inst.cfg} (100%) rename resources/variants/{mingda_MagicianMax_1.0.inst.cfg => mingda_magician_max_1.0.inst.cfg} (100%) rename resources/variants/{mingda_MagicianPro_0.2.inst.cfg => mingda_magician_pro_0.2.inst.cfg} (100%) rename resources/variants/{mingda_MagicianPro_0.3.inst.cfg => mingda_magician_pro_0.3.inst.cfg} (100%) rename resources/variants/{mingda_MagicianPro_0.4.inst.cfg => mingda_magician_pro_0.4.inst.cfg} (100%) rename resources/variants/{mingda_MagicianPro_0.5.inst.cfg => mingda_magician_pro_0.5.inst.cfg} (100%) rename resources/variants/{mingda_MagicianPro_0.6.inst.cfg => mingda_magician_pro_0.6.inst.cfg} (100%) rename resources/variants/{mingda_MagicianPro_0.8.inst.cfg => mingda_magician_pro_0.8.inst.cfg} (100%) rename resources/variants/{mingda_MagicianPro_1.0.inst.cfg => mingda_magician_pro_1.0.inst.cfg} (100%) rename resources/variants/{mingda_MagicianX_0.2.inst.cfg => mingda_magician_x_0.2.inst.cfg} (100%) rename resources/variants/{mingda_MagicianX_0.3.inst.cfg => mingda_magician_x_0.3.inst.cfg} (100%) rename resources/variants/{mingda_MagicianX_0.4.inst.cfg => mingda_magician_x_0.4.inst.cfg} (100%) rename resources/variants/{mingda_MagicianX_0.5.inst.cfg => mingda_magician_x_0.5.inst.cfg} (100%) rename resources/variants/{mingda_MagicianX_0.6.inst.cfg => mingda_magician_x_0.6.inst.cfg} (100%) rename resources/variants/{mingda_MagicianX_0.8.inst.cfg => mingda_magician_x_0.8.inst.cfg} (100%) rename resources/variants/{mingda_MagicianX_1.0.inst.cfg => mingda_magician_x_1.0.inst.cfg} (100%) diff --git a/resources/definitions/mingda_MagicianMax.def.json b/resources/definitions/mingda_magician_max.def.json similarity index 100% rename from resources/definitions/mingda_MagicianMax.def.json rename to resources/definitions/mingda_magician_max.def.json diff --git a/resources/definitions/mingda_MagicianPro.def.json b/resources/definitions/mingda_magician_pro.def.json similarity index 100% rename from resources/definitions/mingda_MagicianPro.def.json rename to resources/definitions/mingda_magician_pro.def.json diff --git a/resources/definitions/mingda_MagicianX.def.json b/resources/definitions/mingda_magician_x.def.json similarity index 100% rename from resources/definitions/mingda_MagicianX.def.json rename to resources/definitions/mingda_magician_x.def.json diff --git a/resources/variants/mingda_MagicianMax_0.2.inst.cfg b/resources/variants/mingda_magician_max_0.2.inst.cfg similarity index 100% rename from resources/variants/mingda_MagicianMax_0.2.inst.cfg rename to resources/variants/mingda_magician_max_0.2.inst.cfg diff --git a/resources/variants/mingda_MagicianMax_0.3.inst.cfg b/resources/variants/mingda_magician_max_0.3.inst.cfg similarity index 100% rename from resources/variants/mingda_MagicianMax_0.3.inst.cfg rename to resources/variants/mingda_magician_max_0.3.inst.cfg diff --git a/resources/variants/mingda_MagicianMax_0.4.inst.cfg b/resources/variants/mingda_magician_max_0.4.inst.cfg similarity index 100% rename from resources/variants/mingda_MagicianMax_0.4.inst.cfg rename to resources/variants/mingda_magician_max_0.4.inst.cfg diff --git a/resources/variants/mingda_MagicianMax_0.5.inst.cfg b/resources/variants/mingda_magician_max_0.5.inst.cfg similarity index 100% rename from resources/variants/mingda_MagicianMax_0.5.inst.cfg rename to resources/variants/mingda_magician_max_0.5.inst.cfg diff --git a/resources/variants/mingda_MagicianMax_0.6.inst.cfg b/resources/variants/mingda_magician_max_0.6.inst.cfg similarity index 100% rename from resources/variants/mingda_MagicianMax_0.6.inst.cfg rename to resources/variants/mingda_magician_max_0.6.inst.cfg diff --git a/resources/variants/mingda_MagicianMax_0.8.inst.cfg b/resources/variants/mingda_magician_max_0.8.inst.cfg similarity index 100% rename from resources/variants/mingda_MagicianMax_0.8.inst.cfg rename to resources/variants/mingda_magician_max_0.8.inst.cfg diff --git a/resources/variants/mingda_MagicianMax_1.0.inst.cfg b/resources/variants/mingda_magician_max_1.0.inst.cfg similarity index 100% rename from resources/variants/mingda_MagicianMax_1.0.inst.cfg rename to resources/variants/mingda_magician_max_1.0.inst.cfg diff --git a/resources/variants/mingda_MagicianPro_0.2.inst.cfg b/resources/variants/mingda_magician_pro_0.2.inst.cfg similarity index 100% rename from resources/variants/mingda_MagicianPro_0.2.inst.cfg rename to resources/variants/mingda_magician_pro_0.2.inst.cfg diff --git a/resources/variants/mingda_MagicianPro_0.3.inst.cfg b/resources/variants/mingda_magician_pro_0.3.inst.cfg similarity index 100% rename from resources/variants/mingda_MagicianPro_0.3.inst.cfg rename to resources/variants/mingda_magician_pro_0.3.inst.cfg diff --git a/resources/variants/mingda_MagicianPro_0.4.inst.cfg b/resources/variants/mingda_magician_pro_0.4.inst.cfg similarity index 100% rename from resources/variants/mingda_MagicianPro_0.4.inst.cfg rename to resources/variants/mingda_magician_pro_0.4.inst.cfg diff --git a/resources/variants/mingda_MagicianPro_0.5.inst.cfg b/resources/variants/mingda_magician_pro_0.5.inst.cfg similarity index 100% rename from resources/variants/mingda_MagicianPro_0.5.inst.cfg rename to resources/variants/mingda_magician_pro_0.5.inst.cfg diff --git a/resources/variants/mingda_MagicianPro_0.6.inst.cfg b/resources/variants/mingda_magician_pro_0.6.inst.cfg similarity index 100% rename from resources/variants/mingda_MagicianPro_0.6.inst.cfg rename to resources/variants/mingda_magician_pro_0.6.inst.cfg diff --git a/resources/variants/mingda_MagicianPro_0.8.inst.cfg b/resources/variants/mingda_magician_pro_0.8.inst.cfg similarity index 100% rename from resources/variants/mingda_MagicianPro_0.8.inst.cfg rename to resources/variants/mingda_magician_pro_0.8.inst.cfg diff --git a/resources/variants/mingda_MagicianPro_1.0.inst.cfg b/resources/variants/mingda_magician_pro_1.0.inst.cfg similarity index 100% rename from resources/variants/mingda_MagicianPro_1.0.inst.cfg rename to resources/variants/mingda_magician_pro_1.0.inst.cfg diff --git a/resources/variants/mingda_MagicianX_0.2.inst.cfg b/resources/variants/mingda_magician_x_0.2.inst.cfg similarity index 100% rename from resources/variants/mingda_MagicianX_0.2.inst.cfg rename to resources/variants/mingda_magician_x_0.2.inst.cfg diff --git a/resources/variants/mingda_MagicianX_0.3.inst.cfg b/resources/variants/mingda_magician_x_0.3.inst.cfg similarity index 100% rename from resources/variants/mingda_MagicianX_0.3.inst.cfg rename to resources/variants/mingda_magician_x_0.3.inst.cfg diff --git a/resources/variants/mingda_MagicianX_0.4.inst.cfg b/resources/variants/mingda_magician_x_0.4.inst.cfg similarity index 100% rename from resources/variants/mingda_MagicianX_0.4.inst.cfg rename to resources/variants/mingda_magician_x_0.4.inst.cfg diff --git a/resources/variants/mingda_MagicianX_0.5.inst.cfg b/resources/variants/mingda_magician_x_0.5.inst.cfg similarity index 100% rename from resources/variants/mingda_MagicianX_0.5.inst.cfg rename to resources/variants/mingda_magician_x_0.5.inst.cfg diff --git a/resources/variants/mingda_MagicianX_0.6.inst.cfg b/resources/variants/mingda_magician_x_0.6.inst.cfg similarity index 100% rename from resources/variants/mingda_MagicianX_0.6.inst.cfg rename to resources/variants/mingda_magician_x_0.6.inst.cfg diff --git a/resources/variants/mingda_MagicianX_0.8.inst.cfg b/resources/variants/mingda_magician_x_0.8.inst.cfg similarity index 100% rename from resources/variants/mingda_MagicianX_0.8.inst.cfg rename to resources/variants/mingda_magician_x_0.8.inst.cfg diff --git a/resources/variants/mingda_MagicianX_1.0.inst.cfg b/resources/variants/mingda_magician_x_1.0.inst.cfg similarity index 100% rename from resources/variants/mingda_MagicianX_1.0.inst.cfg rename to resources/variants/mingda_magician_x_1.0.inst.cfg From ddcfd9413a1c0a2e05c91534b9f5e24feac40403 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E6=A0=91?= <3008993280@qq.com> Date: Thu, 13 Jan 2022 12:01:26 +0800 Subject: [PATCH 3/3] change definition names --- resources/variants/mingda_magician_max_0.2.inst.cfg | 2 +- resources/variants/mingda_magician_max_0.3.inst.cfg | 2 +- resources/variants/mingda_magician_max_0.4.inst.cfg | 2 +- resources/variants/mingda_magician_max_0.5.inst.cfg | 2 +- resources/variants/mingda_magician_max_0.6.inst.cfg | 2 +- resources/variants/mingda_magician_max_0.8.inst.cfg | 2 +- resources/variants/mingda_magician_max_1.0.inst.cfg | 2 +- resources/variants/mingda_magician_pro_0.2.inst.cfg | 2 +- resources/variants/mingda_magician_pro_0.3.inst.cfg | 2 +- resources/variants/mingda_magician_pro_0.4.inst.cfg | 2 +- resources/variants/mingda_magician_pro_0.5.inst.cfg | 2 +- resources/variants/mingda_magician_pro_0.6.inst.cfg | 2 +- resources/variants/mingda_magician_pro_0.8.inst.cfg | 2 +- resources/variants/mingda_magician_pro_1.0.inst.cfg | 2 +- resources/variants/mingda_magician_x_0.2.inst.cfg | 2 +- resources/variants/mingda_magician_x_0.3.inst.cfg | 2 +- resources/variants/mingda_magician_x_0.4.inst.cfg | 2 +- resources/variants/mingda_magician_x_0.5.inst.cfg | 2 +- resources/variants/mingda_magician_x_0.6.inst.cfg | 2 +- resources/variants/mingda_magician_x_0.8.inst.cfg | 2 +- resources/variants/mingda_magician_x_1.0.inst.cfg | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/resources/variants/mingda_magician_max_0.2.inst.cfg b/resources/variants/mingda_magician_max_0.2.inst.cfg index edffc28e51..08a18a7c7f 100644 --- a/resources/variants/mingda_magician_max_0.2.inst.cfg +++ b/resources/variants/mingda_magician_max_0.2.inst.cfg @@ -1,7 +1,7 @@ [general] name = 0.2mm Nozzle version = 4 -definition = mingda_MagicianMax +definition = mingda_magician_max [metadata] setting_version = 19 diff --git a/resources/variants/mingda_magician_max_0.3.inst.cfg b/resources/variants/mingda_magician_max_0.3.inst.cfg index d965bc8361..594e6395eb 100644 --- a/resources/variants/mingda_magician_max_0.3.inst.cfg +++ b/resources/variants/mingda_magician_max_0.3.inst.cfg @@ -1,7 +1,7 @@ [general] name = 0.3mm Nozzle version = 4 -definition = mingda_MagicianMax +definition = mingda_magician_max [metadata] setting_version = 19 diff --git a/resources/variants/mingda_magician_max_0.4.inst.cfg b/resources/variants/mingda_magician_max_0.4.inst.cfg index 61abe39d06..e09859e82c 100644 --- a/resources/variants/mingda_magician_max_0.4.inst.cfg +++ b/resources/variants/mingda_magician_max_0.4.inst.cfg @@ -1,7 +1,7 @@ [general] name = 0.4mm Nozzle version = 4 -definition = mingda_MagicianMax +definition = mingda_magician_max [metadata] setting_version = 19 diff --git a/resources/variants/mingda_magician_max_0.5.inst.cfg b/resources/variants/mingda_magician_max_0.5.inst.cfg index aa316f6fd1..7d3aa63dd0 100644 --- a/resources/variants/mingda_magician_max_0.5.inst.cfg +++ b/resources/variants/mingda_magician_max_0.5.inst.cfg @@ -1,7 +1,7 @@ [general] name = 0.5mm Nozzle version = 4 -definition = mingda_MagicianMax +definition = mingda_magician_max [metadata] setting_version = 19 diff --git a/resources/variants/mingda_magician_max_0.6.inst.cfg b/resources/variants/mingda_magician_max_0.6.inst.cfg index 4db3ebf4bd..1ffacf08b3 100644 --- a/resources/variants/mingda_magician_max_0.6.inst.cfg +++ b/resources/variants/mingda_magician_max_0.6.inst.cfg @@ -1,7 +1,7 @@ [general] name = 0.6mm Nozzle version = 4 -definition = mingda_MagicianMax +definition = mingda_magician_max [metadata] setting_version = 19 diff --git a/resources/variants/mingda_magician_max_0.8.inst.cfg b/resources/variants/mingda_magician_max_0.8.inst.cfg index 22bed5c103..3e44d4e82b 100644 --- a/resources/variants/mingda_magician_max_0.8.inst.cfg +++ b/resources/variants/mingda_magician_max_0.8.inst.cfg @@ -1,7 +1,7 @@ [general] name = 0.8mm Nozzle version = 4 -definition = mingda_MagicianMax +definition = mingda_magician_max [metadata] setting_version = 19 diff --git a/resources/variants/mingda_magician_max_1.0.inst.cfg b/resources/variants/mingda_magician_max_1.0.inst.cfg index 7482f47231..349e93369d 100644 --- a/resources/variants/mingda_magician_max_1.0.inst.cfg +++ b/resources/variants/mingda_magician_max_1.0.inst.cfg @@ -1,7 +1,7 @@ [general] name = 1.0mm Nozzle version = 4 -definition = mingda_MagicianMax +definition = mingda_magician_max [metadata] setting_version = 19 diff --git a/resources/variants/mingda_magician_pro_0.2.inst.cfg b/resources/variants/mingda_magician_pro_0.2.inst.cfg index dbf3a580fc..ab0621308a 100644 --- a/resources/variants/mingda_magician_pro_0.2.inst.cfg +++ b/resources/variants/mingda_magician_pro_0.2.inst.cfg @@ -1,7 +1,7 @@ [general] name = 0.2mm Nozzle version = 4 -definition = mingda_MagicianPro +definition = mingda_magician_pro [metadata] setting_version = 19 diff --git a/resources/variants/mingda_magician_pro_0.3.inst.cfg b/resources/variants/mingda_magician_pro_0.3.inst.cfg index 834f4183a1..b174d05c7a 100644 --- a/resources/variants/mingda_magician_pro_0.3.inst.cfg +++ b/resources/variants/mingda_magician_pro_0.3.inst.cfg @@ -1,7 +1,7 @@ [general] name = 0.3mm Nozzle version = 4 -definition = mingda_MagicianPro +definition = mingda_magician_pro [metadata] setting_version = 19 diff --git a/resources/variants/mingda_magician_pro_0.4.inst.cfg b/resources/variants/mingda_magician_pro_0.4.inst.cfg index 03d5d34eee..f66b5cc4cd 100644 --- a/resources/variants/mingda_magician_pro_0.4.inst.cfg +++ b/resources/variants/mingda_magician_pro_0.4.inst.cfg @@ -1,7 +1,7 @@ [general] name = 0.4mm Nozzle version = 4 -definition = mingda_MagicianPro +definition = mingda_magician_pro [metadata] setting_version = 19 diff --git a/resources/variants/mingda_magician_pro_0.5.inst.cfg b/resources/variants/mingda_magician_pro_0.5.inst.cfg index 310c6c6b91..2e9fda0dd1 100644 --- a/resources/variants/mingda_magician_pro_0.5.inst.cfg +++ b/resources/variants/mingda_magician_pro_0.5.inst.cfg @@ -1,7 +1,7 @@ [general] name = 0.5mm Nozzle version = 4 -definition = mingda_MagicianPro +definition = mingda_magician_pro [metadata] setting_version = 19 diff --git a/resources/variants/mingda_magician_pro_0.6.inst.cfg b/resources/variants/mingda_magician_pro_0.6.inst.cfg index 4cf6df4211..ef17bf0350 100644 --- a/resources/variants/mingda_magician_pro_0.6.inst.cfg +++ b/resources/variants/mingda_magician_pro_0.6.inst.cfg @@ -1,7 +1,7 @@ [general] name = 0.6mm Nozzle version = 4 -definition = mingda_MagicianPro +definition = mingda_magician_pro [metadata] setting_version = 19 diff --git a/resources/variants/mingda_magician_pro_0.8.inst.cfg b/resources/variants/mingda_magician_pro_0.8.inst.cfg index 7d63e98b85..7d489b1e7b 100644 --- a/resources/variants/mingda_magician_pro_0.8.inst.cfg +++ b/resources/variants/mingda_magician_pro_0.8.inst.cfg @@ -1,7 +1,7 @@ [general] name = 0.8mm Nozzle version = 4 -definition = mingda_MagicianPro +definition = mingda_magician_pro [metadata] setting_version = 19 diff --git a/resources/variants/mingda_magician_pro_1.0.inst.cfg b/resources/variants/mingda_magician_pro_1.0.inst.cfg index 2ca2c5058b..c57bab368e 100644 --- a/resources/variants/mingda_magician_pro_1.0.inst.cfg +++ b/resources/variants/mingda_magician_pro_1.0.inst.cfg @@ -1,7 +1,7 @@ [general] name = 1.0mm Nozzle version = 4 -definition = mingda_MagicianPro +definition = mingda_magician_pro [metadata] setting_version = 19 diff --git a/resources/variants/mingda_magician_x_0.2.inst.cfg b/resources/variants/mingda_magician_x_0.2.inst.cfg index e6b90ec4a7..133b164ec6 100644 --- a/resources/variants/mingda_magician_x_0.2.inst.cfg +++ b/resources/variants/mingda_magician_x_0.2.inst.cfg @@ -1,7 +1,7 @@ [general] name = 0.2mm Nozzle version = 4 -definition = mingda_MagicianX +definition = mingda_magician_x [metadata] setting_version = 19 diff --git a/resources/variants/mingda_magician_x_0.3.inst.cfg b/resources/variants/mingda_magician_x_0.3.inst.cfg index 5af7d03ffd..c161d04995 100644 --- a/resources/variants/mingda_magician_x_0.3.inst.cfg +++ b/resources/variants/mingda_magician_x_0.3.inst.cfg @@ -1,7 +1,7 @@ [general] name = 0.3mm Nozzle version = 4 -definition = mingda_MagicianX +definition = mingda_magician_x [metadata] setting_version = 19 diff --git a/resources/variants/mingda_magician_x_0.4.inst.cfg b/resources/variants/mingda_magician_x_0.4.inst.cfg index a22f2a5f82..88a8b5af25 100644 --- a/resources/variants/mingda_magician_x_0.4.inst.cfg +++ b/resources/variants/mingda_magician_x_0.4.inst.cfg @@ -1,7 +1,7 @@ [general] name = 0.4mm Nozzle version = 4 -definition = mingda_MagicianX +definition = mingda_magician_x [metadata] setting_version = 19 diff --git a/resources/variants/mingda_magician_x_0.5.inst.cfg b/resources/variants/mingda_magician_x_0.5.inst.cfg index 62fa1e923d..0601788476 100644 --- a/resources/variants/mingda_magician_x_0.5.inst.cfg +++ b/resources/variants/mingda_magician_x_0.5.inst.cfg @@ -1,7 +1,7 @@ [general] name = 0.5mm Nozzle version = 4 -definition = mingda_MagicianX +definition = mingda_magician_x [metadata] setting_version = 19 diff --git a/resources/variants/mingda_magician_x_0.6.inst.cfg b/resources/variants/mingda_magician_x_0.6.inst.cfg index f262890359..bfb6fbccb5 100644 --- a/resources/variants/mingda_magician_x_0.6.inst.cfg +++ b/resources/variants/mingda_magician_x_0.6.inst.cfg @@ -1,7 +1,7 @@ [general] name = 0.6mm Nozzle version = 4 -definition = mingda_MagicianX +definition = mingda_magician_x [metadata] setting_version = 19 diff --git a/resources/variants/mingda_magician_x_0.8.inst.cfg b/resources/variants/mingda_magician_x_0.8.inst.cfg index 1c53bc68c2..b502b4b617 100644 --- a/resources/variants/mingda_magician_x_0.8.inst.cfg +++ b/resources/variants/mingda_magician_x_0.8.inst.cfg @@ -1,7 +1,7 @@ [general] name = 0.8mm Nozzle version = 4 -definition = mingda_MagicianX +definition = mingda_magician_x [metadata] setting_version = 19 diff --git a/resources/variants/mingda_magician_x_1.0.inst.cfg b/resources/variants/mingda_magician_x_1.0.inst.cfg index cfb0377c6f..4b119508a1 100644 --- a/resources/variants/mingda_magician_x_1.0.inst.cfg +++ b/resources/variants/mingda_magician_x_1.0.inst.cfg @@ -1,7 +1,7 @@ [general] name = 1.0mm Nozzle version = 4 -definition = mingda_MagicianX +definition = mingda_magician_x [metadata] setting_version = 19