From c23aa5ca2283a11d2457d1666479e6d621d19aa6 Mon Sep 17 00:00:00 2001 From: highpower Date: Mon, 20 Feb 2023 20:49:28 -0800 Subject: [PATCH 1/6] add Snapmaker 2.0 Dual Extruder Definitions --- .../definitions/snapmaker2_A150_dual.def.json | 34 ++++++++++++++ .../definitions/snapmaker2_A250_dual.def.json | 33 ++++++++++++++ .../definitions/snapmaker2_A350_dual.def.json | 35 +++++++++++++++ .../definitions/snapmaker2_dual.def.json | 44 +++++++++++++++++++ .../snapmaker_dual_extruder_0.def.json | 21 +++++++++ .../snapmaker_dual_extruder_1.def.json | 22 ++++++++++ 6 files changed, 189 insertions(+) create mode 100644 resources/definitions/snapmaker2_A150_dual.def.json create mode 100644 resources/definitions/snapmaker2_A250_dual.def.json create mode 100644 resources/definitions/snapmaker2_A350_dual.def.json create mode 100644 resources/definitions/snapmaker2_dual.def.json create mode 100644 resources/extruders/snapmaker_dual_extruder_0.def.json create mode 100644 resources/extruders/snapmaker_dual_extruder_1.def.json diff --git a/resources/definitions/snapmaker2_A150_dual.def.json b/resources/definitions/snapmaker2_A150_dual.def.json new file mode 100644 index 0000000000..34a7c826e6 --- /dev/null +++ b/resources/definitions/snapmaker2_A150_dual.def.json @@ -0,0 +1,34 @@ +{ + "version": 2, + "name": "Snapmaker 2 A150 Dual Extruder", + "inherits": "snapmaker2_dual", + "metadata": + { + "visible": true, + "manufacturer": "Snapmaker", + "file_formats": "text/x-gcode", + "machine_extruder_trains": + { + "0": "snapmaker_dual_extruder_0", + "1": "snapmaker_dual_extruder_1" + }, + "quality_definition": "snapmaker2" + }, + "overrides": + { + "gantry_height": { "value": 27 }, + "machine_depth": { "default_value": 160 }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-67, 22], + [-67, -25], + [25.5, 22], + [25.5, -25] + ] + }, + "machine_height": { "default_value": 145 }, + "machine_name": { "default_value": "Snapmaker A150" }, + "machine_width": { "default_value": 160 } + } +} diff --git a/resources/definitions/snapmaker2_A250_dual.def.json b/resources/definitions/snapmaker2_A250_dual.def.json new file mode 100644 index 0000000000..0c8f5e5046 --- /dev/null +++ b/resources/definitions/snapmaker2_A250_dual.def.json @@ -0,0 +1,33 @@ +{ + "version": 2, + "name": "Snapmaker 2 A250 Dual Extruder", + "inherits": "snapmaker2_dual", + "metadata": + { + "visible": true, + "manufacturer": "Snapmaker", + "file_formats": "text/x-gcode", + "machine_extruder_trains": { + "0": "snapmaker_dual_extruder_0", + "1": "snapmaker_dual_extruder_1" + }, + "quality_definition": "snapmaker2" + }, + "overrides": + { + "gantry_height": { "value": 27 }, + "machine_depth": { "default_value": 250 }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-67, 22], + [-67, -25], + [25.5, 22], + [25.5, -25] + ] + }, + "machine_height": { "default_value": 235 }, + "machine_name": { "default_value": "Snapmaker A250" }, + "machine_width": { "default_value": 230 } + } +} diff --git a/resources/definitions/snapmaker2_A350_dual.def.json b/resources/definitions/snapmaker2_A350_dual.def.json new file mode 100644 index 0000000000..a227f46085 --- /dev/null +++ b/resources/definitions/snapmaker2_A350_dual.def.json @@ -0,0 +1,35 @@ +{ + "version": 2, + "name": "Snapmaker 2 A350 Dual Extruder", + "inherits": "snapmaker2_dual", + "metadata": + { + "visible": true, + "manufacturer": "Snapmaker", + "file_formats": "text/x-gcode", + "machine_extruder_trains": + { + "0": "snapmaker_dual_extruder_0", + "1": "snapmaker_dual_extruder_1" + + }, + "quality_definition": "snapmaker2" + }, + "overrides": + { + "gantry_height": { "value": 27 }, + "machine_depth": { "default_value": 350 }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-67, 22], + [-67, -25], + [25.5, 22], + [25.5, -25] + ] + }, + "machine_height": { "default_value": 330 }, + "machine_name": { "default_value": "Snapmaker A350" }, + "machine_width": { "default_value": 320 } + } +} diff --git a/resources/definitions/snapmaker2_dual.def.json b/resources/definitions/snapmaker2_dual.def.json new file mode 100644 index 0000000000..e6b78cb9e4 --- /dev/null +++ b/resources/definitions/snapmaker2_dual.def.json @@ -0,0 +1,44 @@ +{ + "version": 2, + "name": "Snapmaker 2", + "inherits": "fdmprinter", + "metadata": + { + "visible": false, + "manufacturer": "Snapmaker", + "file_formats": "text/x-gcode", + "exclude_materials": [], + "has_machine_quality": true, + "has_materials": true, + "machine_extruder_trains": + { + "0": "snapmaker_dual_extruder_0", + "1": "snapmaker_dual_extruder_1" + }, + "preferred_material": "generic_pla", + "preferred_quality_type": "normal" + }, + "overrides": + { + "default_material_print_temperature": { "default_value": 205 }, + "machine_acceleration": { "default_value": 1000 }, + "machine_buildplate_type": { "default_value": "aluminum" }, + "machine_end_gcode": { "default_value": "M104 S0 ;Extruder heater off\nM140 S0 ;Heated bed heater off\nG90 ;absolute positioning\nG92 E0 ;Retract the filament\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z{machine_height} E-1 F3000 ;move Z up a bit and retract filament even more\nG1 X0 F3000 ;move X to min endstops, so the head is out of the way\nG1 Y{machine_depth} F3000 ;so the head is out of the way and Plate is moved forward" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_heated_bed": { "default_value": true }, + "machine_max_acceleration_e": { "default_value": 1000 }, + "machine_max_acceleration_x": { "default_value": 1000 }, + "machine_max_acceleration_y": { "default_value": 1000 }, + "machine_max_acceleration_z": { "default_value": 1000 }, + "machine_name": { "default_value": "Snapmaker" }, + "machine_nozzle_size": { "default_value": 0.4 }, + "machine_start_gcode": { "default_value": "M104 S{material_print_temperature_layer_0} ;Set Hotend Temperature\nM140 S{material_bed_temperature_layer_0} ;Set Bed Temperature\nG28 ;home\nG90 ;absolute positioning\nG1 X-10 Y-10 F3000 ;Move to corner \nG1 Z0 F1800 ;Go to zero offset\nM109 S{material_print_temperature_layer_0} ;Wait for Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ;Wait for Bed Temperature\nG92 E0 ;Zero set extruder position\nG1 E20 F200 ;Feed filament to clear nozzle\nG92 E0 ;Zero set extruder position" }, + "material_bed_temp_prepend": { "default_value": false }, + "material_diameter": { "default_value": 1.75 }, + "material_print_temp_prepend": { "default_value": false }, + "retract_at_layer_change": { "default_value": false }, + "retraction_amount": { "default_value": 5 }, + "retraction_enable": { "default_value": true }, + "retraction_speed": { "default_value": 60 } + } +} diff --git a/resources/extruders/snapmaker_dual_extruder_0.def.json b/resources/extruders/snapmaker_dual_extruder_0.def.json new file mode 100644 index 0000000000..94da85710e --- /dev/null +++ b/resources/extruders/snapmaker_dual_extruder_0.def.json @@ -0,0 +1,21 @@ +{ + "version": 2, + "name": "Extruder Left", + "inherits": "fdmextruder", + "metadata": + { + "machine": "snapmaker2_dual", + "position": "1" + }, + "overrides": + { + "extruder_nr": + { + "default_value": 0, + "maximum_value": "1" + + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/snapmaker_dual_extruder_1.def.json b/resources/extruders/snapmaker_dual_extruder_1.def.json new file mode 100644 index 0000000000..272acc156e --- /dev/null +++ b/resources/extruders/snapmaker_dual_extruder_1.def.json @@ -0,0 +1,22 @@ +{ + "version": 2, + "name": "Extruder Right", + "inherits": "fdmextruder", + "metadata": + { + "machine": "snapmaker2_dual", + "position": "1" + }, + "overrides": + { + "extruder_nr": + { + "default_value": 1, + "maximum_value": "1" + + }, + "machine_extruder_cooling_fan_number": { "default_value": 1 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} From b91e319062d90ae81f3db2a7eb9d39914939d635 Mon Sep 17 00:00:00 2001 From: Hao Xu Date: Mon, 20 Feb 2023 21:45:00 -0800 Subject: [PATCH 2/6] Update resources/definitions/snapmaker2_dual.def.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- resources/definitions/snapmaker2_dual.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/snapmaker2_dual.def.json b/resources/definitions/snapmaker2_dual.def.json index e6b78cb9e4..224e2e6f3c 100644 --- a/resources/definitions/snapmaker2_dual.def.json +++ b/resources/definitions/snapmaker2_dual.def.json @@ -36,7 +36,7 @@ "material_bed_temp_prepend": { "default_value": false }, "material_diameter": { "default_value": 1.75 }, "material_print_temp_prepend": { "default_value": false }, - "retract_at_layer_change": { "default_value": false }, + "retraction_amount": { "default_value": 5 }, "retraction_enable": { "default_value": true }, "retraction_speed": { "default_value": 60 } From d3153764920d29d80fdeb2d4fe7bd2e6485883ba Mon Sep 17 00:00:00 2001 From: Hao Xu Date: Mon, 20 Feb 2023 21:45:06 -0800 Subject: [PATCH 3/6] Update resources/definitions/snapmaker2_dual.def.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- resources/definitions/snapmaker2_dual.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/snapmaker2_dual.def.json b/resources/definitions/snapmaker2_dual.def.json index 224e2e6f3c..ad15f1626d 100644 --- a/resources/definitions/snapmaker2_dual.def.json +++ b/resources/definitions/snapmaker2_dual.def.json @@ -38,7 +38,7 @@ "material_print_temp_prepend": { "default_value": false }, "retraction_amount": { "default_value": 5 }, - "retraction_enable": { "default_value": true }, + "retraction_speed": { "default_value": 60 } } } From f974ca467ac370192db3061b998b97d71210feb7 Mon Sep 17 00:00:00 2001 From: highpower Date: Mon, 20 Feb 2023 21:50:16 -0800 Subject: [PATCH 4/6] fix typo --- resources/extruders/snapmaker_dual_extruder_0.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/extruders/snapmaker_dual_extruder_0.def.json b/resources/extruders/snapmaker_dual_extruder_0.def.json index 94da85710e..6ff9bee4ba 100644 --- a/resources/extruders/snapmaker_dual_extruder_0.def.json +++ b/resources/extruders/snapmaker_dual_extruder_0.def.json @@ -5,7 +5,7 @@ "metadata": { "machine": "snapmaker2_dual", - "position": "1" + "position": "0" }, "overrides": { From 74800564387fb754ffbd998c07fc865f00099d13 Mon Sep 17 00:00:00 2001 From: highpower Date: Tue, 21 Feb 2023 15:42:05 -0800 Subject: [PATCH 5/6] Update snapmaker2_dual.def.json remove extra line left by the bot --- resources/definitions/snapmaker2_dual.def.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/resources/definitions/snapmaker2_dual.def.json b/resources/definitions/snapmaker2_dual.def.json index ad15f1626d..39c4d4a2cb 100644 --- a/resources/definitions/snapmaker2_dual.def.json +++ b/resources/definitions/snapmaker2_dual.def.json @@ -36,9 +36,7 @@ "material_bed_temp_prepend": { "default_value": false }, "material_diameter": { "default_value": 1.75 }, "material_print_temp_prepend": { "default_value": false }, - "retraction_amount": { "default_value": 5 }, - "retraction_speed": { "default_value": 60 } } } From 62ada238369d75ff1dd4459d4613e72faec20eb5 Mon Sep 17 00:00:00 2001 From: Hao Xu Date: Fri, 24 Feb 2023 15:36:30 -0800 Subject: [PATCH 6/6] Update snapmaker2_A250_dual.def.json --- resources/definitions/snapmaker2_A250_dual.def.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/definitions/snapmaker2_A250_dual.def.json b/resources/definitions/snapmaker2_A250_dual.def.json index 0c8f5e5046..4d63b3c813 100644 --- a/resources/definitions/snapmaker2_A250_dual.def.json +++ b/resources/definitions/snapmaker2_A250_dual.def.json @@ -7,7 +7,8 @@ "visible": true, "manufacturer": "Snapmaker", "file_formats": "text/x-gcode", - "machine_extruder_trains": { + "machine_extruder_trains": + { "0": "snapmaker_dual_extruder_0", "1": "snapmaker_dual_extruder_1" },