From 843f00f6ffce87d17235477a746d7ade3c52c1dc Mon Sep 17 00:00:00 2001 From: geeetech3d Date: Sat, 12 Mar 2022 09:46:29 +0800 Subject: [PATCH 1/2] add Mizar_S Profile --- .../definitions/geeetech_Mizar_S.def.json | 111 ++++++++++++++++++ .../geeetech_Mizar_S_extruder_0.def.json | 15 +++ 2 files changed, 126 insertions(+) create mode 100644 resources/definitions/geeetech_Mizar_S.def.json create mode 100644 resources/extruders/geeetech_Mizar_S_extruder_0.def.json diff --git a/resources/definitions/geeetech_Mizar_S.def.json b/resources/definitions/geeetech_Mizar_S.def.json new file mode 100644 index 0000000000..b8a88c51db --- /dev/null +++ b/resources/definitions/geeetech_Mizar_S.def.json @@ -0,0 +1,111 @@ +{ + "version": 2, + "name": "Mizar S", + "inherits": "fdmprinter", + "metadata": { + "author": "Barry Ding", + "manufacturer": "Geeetech", + "file_formats": "text/x-gcode", + "visible": true, + "machine_extruder_trains": { + "0": "geeetech_mizar_s_extruder_0" + } + }, + "overrides": { + "machine_name": { + "default_value": "Mizar S" + }, + "machine_start_gcode": { + "default_value": "G28 ;Home\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG1 Z15.0 F6000 ;Move the platform down 15mm\nG92 E0\nG1 F200 E3\nG92 E0" + }, + "machine_end_gcode": { + "default_value": "M104 S0;Cooling the heat end\nM140 S0;Cooling the heat bed\nG92 E1\nG1 E-1 F300\nG28 X0 Y0;Home X axis and Y axis\nM84" + }, + "machine_width": { + "default_value": 255 + }, + "machine_height": { + "default_value": 260 + }, + "machine_depth": { + "default_value": 255 + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_center_is_zero": { + "default_value": false + }, + "material_diameter": { + "default_value": 1.75 + }, + "machine_nozzle_size": { + "default_value": 0.4 + }, + "layer_height": { + "default_value": 0.1 + }, + "layer_height_0": { + "default_value": 0.3 + }, + "retraction_amount": { + "default_value": 2 + }, + "retraction_speed": { + "default_value": 25 + }, + "adhesion_type": { + "default_value": "skirt" + }, + "machine_head_with_fans_polygon": { + "default_value": [ + [-32, 38], + [30, 38], + [30, -55], + [-32, -55] + ] + }, + "gantry_height": { + "value": "260" + }, + "machine_max_feedrate_x": { + "default_value": 300 + }, + "machine_max_feedrate_y": { + "default_value": 300 + }, + "machine_max_feedrate_z": { + "default_value": 10 + }, + "machine_max_feedrate_e": { + "default_value": 50 + }, + "machine_max_acceleration_x": { + "default_value": 2000 + }, + "machine_max_acceleration_y": { + "default_value": 2000 + }, + "machine_max_acceleration_z": { + "default_value": 100 + }, + "machine_max_acceleration_e": { + "default_value": 10000 + }, + "machine_acceleration": { + "default_value": 2000 + }, + "machine_max_jerk_xy": { + "default_value": 10 + }, + "machine_max_jerk_z": { + "default_value": 1 + }, + "machine_max_jerk_e": { + "default_value": 5 + }, + "machine_gcode_flavor": { + "default_value": "Repetier" + } + } +} diff --git a/resources/extruders/geeetech_Mizar_S_extruder_0.def.json b/resources/extruders/geeetech_Mizar_S_extruder_0.def.json new file mode 100644 index 0000000000..bd64fc5353 --- /dev/null +++ b/resources/extruders/geeetech_Mizar_S_extruder_0.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "geeetech_mizar_s", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} From 748c51f32f3e3dd1cd6f008810f60348a1c5daa0 Mon Sep 17 00:00:00 2001 From: geeetech3d Date: Wed, 30 Mar 2022 10:53:22 +0800 Subject: [PATCH 2/2] add Mizar_S Profile2 --- .../definitions/geeetech_Mizar_S.def.json | 118 +++++------------- ...0.def.json => geeetech_Mizar_S_1.def.json} | 6 +- 2 files changed, 37 insertions(+), 87 deletions(-) rename resources/extruders/{geeetech_Mizar_S_extruder_0.def.json => geeetech_Mizar_S_1.def.json} (72%) diff --git a/resources/definitions/geeetech_Mizar_S.def.json b/resources/definitions/geeetech_Mizar_S.def.json index b8a88c51db..7cd7e42e68 100644 --- a/resources/definitions/geeetech_Mizar_S.def.json +++ b/resources/definitions/geeetech_Mizar_S.def.json @@ -1,26 +1,22 @@ { "version": 2, - "name": "Mizar S", + "name": "Geeetech Mizar_S", "inherits": "fdmprinter", "metadata": { - "author": "Barry Ding", + "visible": true, + "author": "Amit L", "manufacturer": "Geeetech", "file_formats": "text/x-gcode", - "visible": true, - "machine_extruder_trains": { - "0": "geeetech_mizar_s_extruder_0" + "has_materials": true, + "machine_extruder_trains": + { + "0": "geeetech_Mizar_S_1" } + }, + "overrides": { - "machine_name": { - "default_value": "Mizar S" - }, - "machine_start_gcode": { - "default_value": "G28 ;Home\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG1 Z15.0 F6000 ;Move the platform down 15mm\nG92 E0\nG1 F200 E3\nG92 E0" - }, - "machine_end_gcode": { - "default_value": "M104 S0;Cooling the heat end\nM140 S0;Cooling the heat bed\nG92 E1\nG1 E-1 F300\nG28 X0 Y0;Home X axis and Y axis\nM84" - }, + "machine_name": { "default_value": "Geeetech Mizar_S" }, "machine_width": { "default_value": 255 }, @@ -29,83 +25,35 @@ }, "machine_depth": { "default_value": 255 - }, - "machine_heated_bed": { - "default_value": true - }, + }, "machine_center_is_zero": { "default_value": false }, - "material_diameter": { - "default_value": 1.75 + "layer_height": { "default_value": 0.1 }, + "layer_height_0": { "default_value": 0.15 }, + "retraction_amount": { "default_value": 0.8 }, + "retraction_speed": { "default_value": 35 }, + "adhesion_type": { "default_value": "skirt" }, + "machine_head_with_fans_polygon": { "default_value": [[-31,31],[34,31],[34,-40],[-31,-40]] }, + "gantry_height": { "value": "28" }, + "machine_max_feedrate_z": { "default_value": 12 }, + "machine_max_feedrate_e": { "default_value": 120 }, + "machine_max_acceleration_z": { "default_value": 500 }, + "machine_acceleration": { "default_value": 1000 }, + "machine_max_jerk_xy": { "default_value": 10 }, + "machine_max_jerk_z": { "default_value": 0.2 }, + "machine_max_jerk_e": { "default_value": 2.5 }, + "machine_heated_bed": { "default_value": true }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_start_gcode": { + "default_value": "G28 ; Auto home\nG1 Z15 F300 ;Move up slightly\nM107 ;Off fans\nG90 ;Switch to absolute positioning\nM82 ;Extruder absolute mode\nG92 E0 ;Set position of extruder to 0\nG0 X10 Y20 F1500 ;Move to X10 Y20 at 1500mms\nG1 Z0.8 ;Move Z to 0.8\nG1 F300 X180 E40 ;Extrude a line of filament\nG1 F1200 Z2 ;Raise Z\nG92 E0 ;Set extruder position to zero\nG28 ;Auto home" }, - "machine_nozzle_size": { - "default_value": 0.4 + "machine_end_gcode": { + "default_value": "G91 ;Switch to relative positioning\nG1 E-1 ;Retract filament to lower pressure\nG0 X0 Y200 ;Move hotend to left and bed forward\nM104 S0 ;Cooldown hotend\nG90 ;Switch to absolute mode\nG92 E0 ;Set extruder to zero\nM140 S0 ;Cooldown bed\nM84 ; Disable steppers" }, - "layer_height": { - "default_value": 0.1 - }, - "layer_height_0": { - "default_value": 0.3 - }, - "retraction_amount": { - "default_value": 2 - }, - "retraction_speed": { - "default_value": 25 - }, - "adhesion_type": { - "default_value": "skirt" - }, - "machine_head_with_fans_polygon": { - "default_value": [ - [-32, 38], - [30, 38], - [30, -55], - [-32, -55] - ] - }, - "gantry_height": { - "value": "260" - }, - "machine_max_feedrate_x": { - "default_value": 300 - }, - "machine_max_feedrate_y": { - "default_value": 300 - }, - "machine_max_feedrate_z": { - "default_value": 10 - }, - "machine_max_feedrate_e": { - "default_value": 50 - }, - "machine_max_acceleration_x": { - "default_value": 2000 - }, - "machine_max_acceleration_y": { - "default_value": 2000 - }, - "machine_max_acceleration_z": { - "default_value": 100 - }, - "machine_max_acceleration_e": { - "default_value": 10000 - }, - "machine_acceleration": { - "default_value": 2000 - }, - "machine_max_jerk_xy": { - "default_value": 10 - }, - "machine_max_jerk_z": { + "machine_extruder_count": { "default_value": 1 - }, - "machine_max_jerk_e": { - "default_value": 5 - }, - "machine_gcode_flavor": { - "default_value": "Repetier" } + } } diff --git a/resources/extruders/geeetech_Mizar_S_extruder_0.def.json b/resources/extruders/geeetech_Mizar_S_1.def.json similarity index 72% rename from resources/extruders/geeetech_Mizar_S_extruder_0.def.json rename to resources/extruders/geeetech_Mizar_S_1.def.json index bd64fc5353..da4440cd87 100644 --- a/resources/extruders/geeetech_Mizar_S_extruder_0.def.json +++ b/resources/extruders/geeetech_Mizar_S_1.def.json @@ -1,15 +1,17 @@ { + "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", "metadata": { - "machine": "geeetech_mizar_s", + "machine": "geeetech_Mizar_S", "position": "0" }, "overrides": { - "extruder_nr": { "default_value": 0 }, + "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } + } }