From 200111e2745b0b8e9a65c968aa49b6e1fba58ae4 Mon Sep 17 00:00:00 2001 From: Kaz <455143715@qq.com> Date: Mon, 28 Oct 2019 10:59:23 +0800 Subject: [PATCH 1/6] Add files via upload makeblock definition file --- resources/definitions/makeblock.def.json | 68 ++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 resources/definitions/makeblock.def.json diff --git a/resources/definitions/makeblock.def.json b/resources/definitions/makeblock.def.json new file mode 100644 index 0000000000..e3206aa178 --- /dev/null +++ b/resources/definitions/makeblock.def.json @@ -0,0 +1,68 @@ +{ + "version": 2, + "name": "Makeblock", + "inherits": "fdmprinter", + "metadata": { + "author": "Makeblock", + "manufacturer": "Makeblock", + "visible": true, + "file_formats": "application/gzip;text/x-gcode", + "has_machine_quality": true, + "preferred_quality_type": "normal", + "machine_extruder_trains": { + "0": "makeblock_extruder_0" + } + }, + "overrides": { + "machine_name": { + "default_value": "makeblock" + }, + "machine_width": { + "default_value": 225 + }, + "machine_depth": { + "default_value": 225 + }, + "machine_height": { + "default_value": 300 + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_head_with_fans_polygon": { + "default_value": [ + [ + 0, + 0 + ], + [ + 0, + 0 + ], + [ + 0, + 0 + ], + [ + 0, + 0 + ] + ] + }, + "machine_gcode_flavor": { + "default_value": "Marlin" + }, + "gantry_height": { + "default_value": 0 + }, + "machine_extruder_count": { + "default_value": 1 + }, + "machine_start_gcode": { + "default_value": "G28 ;Home\nM43 E1\nG92 E0\nG1 F600 E20\nG92 E0\nG1 F300 E-20\nG1 F3000 X32 Y55\nG38.2 F480 Z-20\nG92 Z0\nG1 F300 Z5\nG1 F2000 X20 Y20\nG1 F300 Z0\nG1 F2000 X20 Y15\nG1 F2000 X20 Y20\nG1 F300 X20 Y15\nG1 F300 Z0\n;G29\nG1 F2000 X30 Y60\nG38.2 F200 Z-20\nG92 Z0\nG1 F300 Z0.45\nG1 F3000 X25 Y25\nG92 X0 Y0 Z0\nG1 Z20\nG1 F300 E2\nG92 E0\n;Prime the extruder" + }, + "machine_end_gcode": { + "default_value": "M104 S0\nM140 S0\nM107\n;Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84" + } + } +} From eb6247620df4141695f2e13dfd59712979192df8 Mon Sep 17 00:00:00 2001 From: Kaz <455143715@qq.com> Date: Mon, 28 Oct 2019 11:00:17 +0800 Subject: [PATCH 2/6] Add files via upload makeblock extruders file --- .../extruders/makeblock_extruder_0.def.json | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 resources/extruders/makeblock_extruder_0.def.json diff --git a/resources/extruders/makeblock_extruder_0.def.json b/resources/extruders/makeblock_extruder_0.def.json new file mode 100644 index 0000000000..138ae09a0b --- /dev/null +++ b/resources/extruders/makeblock_extruder_0.def.json @@ -0,0 +1,21 @@ +{ + "id": "makeblock_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "makeblock", + "position": "0" + }, + "overrides": { + "extruder_nr": { + "default_value": 0 + }, + "machine_nozzle_size": { + "default_value": 0.4 + }, + "material_diameter": { + "default_value": 1.75 + } + } +} \ No newline at end of file From 31edf4e60be62589b8dc1ecdadf7ea1090d1895c Mon Sep 17 00:00:00 2001 From: Kaz <455143715@qq.com> Date: Mon, 28 Oct 2019 11:00:55 +0800 Subject: [PATCH 3/6] Add files via upload makeblock quality file --- .../makeblock/makeblock_pla_normal.inst.cfg | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 resources/quality/makeblock/makeblock_pla_normal.inst.cfg diff --git a/resources/quality/makeblock/makeblock_pla_normal.inst.cfg b/resources/quality/makeblock/makeblock_pla_normal.inst.cfg new file mode 100644 index 0000000000..5bcfc58f63 --- /dev/null +++ b/resources/quality/makeblock/makeblock_pla_normal.inst.cfg @@ -0,0 +1,20 @@ +[general] +version = 4 +name = Fine +definition = makeblock + +[metadata] +setting_version = 6 +type = quality +quality_type = normal +weight = 0 +material = generic_pla + +[values] +default_material_print_temperature = 190 +material_initial_print_temperature = 190 +material_final_print_temperature = 185 +material_flow = 94 +retraction_speed = 55 +skirt_line_count = 2 +adhesion_type = skirt \ No newline at end of file From 6a028ac6ecf78cc3fd65806fc0f8dcad3380a10c Mon Sep 17 00:00:00 2001 From: Kaz <455143715@qq.com> Date: Thu, 31 Oct 2019 17:32:32 +0800 Subject: [PATCH 4/6] Update makeblock.def.json update start gcode and end gcode --- resources/definitions/makeblock.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/makeblock.def.json b/resources/definitions/makeblock.def.json index e3206aa178..5697a42a73 100644 --- a/resources/definitions/makeblock.def.json +++ b/resources/definitions/makeblock.def.json @@ -59,10 +59,10 @@ "default_value": 1 }, "machine_start_gcode": { - "default_value": "G28 ;Home\nM43 E1\nG92 E0\nG1 F600 E20\nG92 E0\nG1 F300 E-20\nG1 F3000 X32 Y55\nG38.2 F480 Z-20\nG92 Z0\nG1 F300 Z5\nG1 F2000 X20 Y20\nG1 F300 Z0\nG1 F2000 X20 Y15\nG1 F2000 X20 Y20\nG1 F300 X20 Y15\nG1 F300 Z0\n;G29\nG1 F2000 X30 Y60\nG38.2 F200 Z-20\nG92 Z0\nG1 F300 Z0.45\nG1 F3000 X25 Y25\nG92 X0 Y0 Z0\nG1 Z20\nG1 F300 E2\nG92 E0\n;Prime the extruder" + "default_value": "; Mcreate Start Gcode \nG28 ; Home all axes \nG92 E0 ; Reset Extruder\nG1 X0 Y0 Z15 F3000.0 ; Move to start position \nG1 E10 F400 ;load filament \nG1 E2 F400 ;retarct filament \nG92 E0 ; Reset Extruder \nG1 X0 Y130 Z15 F3000.0 \nG12 ; clean nozzle \nG1 X0 Y0 Z0.3 F3000.0 ; Move to start position \nG1 E9.0 F400 ;loadsome filament \nG92 E0 ; Reset Extruder \n; End of start GCode" }, "machine_end_gcode": { - "default_value": "M104 S0\nM140 S0\nM107\n;Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84" + "default_value": "; Mcreate end Gcode \nG4 ; Wait command in buffer have finished \nG92 E0 \nG1 E-2 F300; retract filament \nG28 X Z; home x z axis \nG1 F3000 Y220;Move Heat Bed to the front for easy print removal \nM104 S0; Turn off the nozzle heat \nM140 S0; Turn off the bed heat \nM107 ; Turn off the Fan \nM84 ; Disable stepper motors \n; End of GCode" } } } From 2818a24516bdc1c1c7ad45c7ee49583731abb573 Mon Sep 17 00:00:00 2001 From: Kaz Date: Fri, 1 Nov 2019 11:40:39 +0800 Subject: [PATCH 5/6] Update Makeblock mCreate define files name --- .../{makeblock.def.json => makeblock_mcreate.def.json} | 6 +++--- ...der_0.def.json => makeblock_mcreate_extruder_0.def.json} | 4 ++-- ...ormal.inst.cfg => makeblock_mcreate_pla_normal.inst.cfg} | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) rename resources/definitions/{makeblock.def.json => makeblock_mcreate.def.json} (94%) rename resources/extruders/{makeblock_extruder_0.def.json => makeblock_mcreate_extruder_0.def.json} (90%) rename resources/quality/makeblock/{makeblock_pla_normal.inst.cfg => makeblock_mcreate_pla_normal.inst.cfg} (86%) diff --git a/resources/definitions/makeblock.def.json b/resources/definitions/makeblock_mcreate.def.json similarity index 94% rename from resources/definitions/makeblock.def.json rename to resources/definitions/makeblock_mcreate.def.json index 5697a42a73..db66ee4be5 100644 --- a/resources/definitions/makeblock.def.json +++ b/resources/definitions/makeblock_mcreate.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "Makeblock", + "name": "Makeblock mCreate", "inherits": "fdmprinter", "metadata": { "author": "Makeblock", @@ -10,12 +10,12 @@ "has_machine_quality": true, "preferred_quality_type": "normal", "machine_extruder_trains": { - "0": "makeblock_extruder_0" + "0": "makeblock_mcreate_extruder_0" } }, "overrides": { "machine_name": { - "default_value": "makeblock" + "default_value": "Makeblock mCreate" }, "machine_width": { "default_value": 225 diff --git a/resources/extruders/makeblock_extruder_0.def.json b/resources/extruders/makeblock_mcreate_extruder_0.def.json similarity index 90% rename from resources/extruders/makeblock_extruder_0.def.json rename to resources/extruders/makeblock_mcreate_extruder_0.def.json index 138ae09a0b..aba794f40d 100644 --- a/resources/extruders/makeblock_extruder_0.def.json +++ b/resources/extruders/makeblock_mcreate_extruder_0.def.json @@ -4,7 +4,7 @@ "name": "Extruder 1", "inherits": "fdmextruder", "metadata": { - "machine": "makeblock", + "machine": "makeblock_mcreate", "position": "0" }, "overrides": { @@ -18,4 +18,4 @@ "default_value": 1.75 } } -} \ No newline at end of file +} diff --git a/resources/quality/makeblock/makeblock_pla_normal.inst.cfg b/resources/quality/makeblock/makeblock_mcreate_pla_normal.inst.cfg similarity index 86% rename from resources/quality/makeblock/makeblock_pla_normal.inst.cfg rename to resources/quality/makeblock/makeblock_mcreate_pla_normal.inst.cfg index 5bcfc58f63..661695cca0 100644 --- a/resources/quality/makeblock/makeblock_pla_normal.inst.cfg +++ b/resources/quality/makeblock/makeblock_mcreate_pla_normal.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Fine -definition = makeblock +definition = makeblock_mcreate [metadata] setting_version = 6 @@ -17,4 +17,4 @@ material_final_print_temperature = 185 material_flow = 94 retraction_speed = 55 skirt_line_count = 2 -adhesion_type = skirt \ No newline at end of file +adhesion_type = skirt From a5aa4c75bac7a63ae7b413f47bdd9962d303ae93 Mon Sep 17 00:00:00 2001 From: Kaz <455143715@qq.com> Date: Fri, 8 Nov 2019 14:11:34 +0800 Subject: [PATCH 6/6] update gantry_height --- resources/definitions/makeblock_mcreate.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/makeblock_mcreate.def.json b/resources/definitions/makeblock_mcreate.def.json index db66ee4be5..a5cd2453ad 100644 --- a/resources/definitions/makeblock_mcreate.def.json +++ b/resources/definitions/makeblock_mcreate.def.json @@ -53,7 +53,7 @@ "default_value": "Marlin" }, "gantry_height": { - "default_value": 0 + "default_value": 15.0 }, "machine_extruder_count": { "default_value": 1