From f2ed6d9054de18fd0842a850a69f5413c001acae Mon Sep 17 00:00:00 2001 From: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com> Date: Fri, 24 Sep 2021 11:08:39 -0300 Subject: [PATCH] Update Definitions and Extruders of Magna 2 230/300 dual Add start and end gcode for correct change of extruders CURA-8597 #10298 --- resources/definitions/hellbot_magna_2_230_dual.def.json | 5 ++--- resources/definitions/hellbot_magna_2_300_dual.def.json | 5 ++--- .../hellbot_magna_2_230_dual_extruder_0.def.json | 8 +++++++- .../hellbot_magna_2_230_dual_extruder_1.def.json | 8 +++++++- .../hellbot_magna_2_300_dual_extruder_0.def.json | 8 +++++++- .../hellbot_magna_2_300_dual_extruder_1.def.json | 8 +++++++- 6 files changed, 32 insertions(+), 10 deletions(-) diff --git a/resources/definitions/hellbot_magna_2_230_dual.def.json b/resources/definitions/hellbot_magna_2_230_dual.def.json index ad15ddf264..56b42a7929 100644 --- a/resources/definitions/hellbot_magna_2_230_dual.def.json +++ b/resources/definitions/hellbot_magna_2_230_dual.def.json @@ -39,11 +39,10 @@ "default_value": 2 }, "machine_start_gcode": { - "default_value": "G21\nG90\nM107\nG28 X0 Y0\nG28 Z0\nG1 Z15.0 F300\nT0\nG92 E0\nG1 F700 E-80\nT1\nG92 E0\nG1 F1000 X1 Y1 Z0.3\nG1 F600 X200 E60\nG1 F1000 Y3\nG1 F600 X1 E120\nT1\nG92 E0\nG28 X0 Y0\nG1 F700 E-80\nT0\nG92 E0" - }, + "default_value": "M104 T0 S{material_print_temperature}\nM104 T1 S{material_print_temperature}\nM109 T0 S{material_print_temperature}\nM109 T1 S{material_print_temperature}\nG21\nG90 \nG28 X0 Y0 \nG28 Z0 \nG1 Z15.0 F300 \nT0 \nG92 E0 \nG1 F700 E-80 \nT1 \nG92 E0 \nG1 F1000 X1 Y1 Z0.3 \nG1 F600 X200 E60 \nG1 F1000 Y3 \nG1 F600 X1 E120 \nT1 \nG92 E0 \nG28 X0 Y0 \nG1 F700 E-80 \nT0 \nG92 E0" + }, "machine_end_gcode": { "default_value": "M104 T0 S0\nM104 T1 S0\nM140 S0\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84" } - } } diff --git a/resources/definitions/hellbot_magna_2_300_dual.def.json b/resources/definitions/hellbot_magna_2_300_dual.def.json index cd94d03100..1917d4b0c1 100644 --- a/resources/definitions/hellbot_magna_2_300_dual.def.json +++ b/resources/definitions/hellbot_magna_2_300_dual.def.json @@ -39,11 +39,10 @@ "default_value": 2 }, "machine_start_gcode": { - "default_value": "G21\nG90\nM107\nG28 X0 Y0\nG28 Z0\nG1 Z15.0 F300\nT0\nG92 E0\nG1 F700 E-80\nT1\nG92 E0\nG1 F1000 X1 Y1 Z0.3\nG1 F600 X200 E60\nG1 F1000 Y3\nG1 F600 X1 E120\nT1\nG92 E0\nG28 X0 Y0\nG1 F700 E-80\nT0\nG92 E0" - }, + "default_value": "M104 T0 S{material_print_temperature}\nM104 T1 S{material_print_temperature}\nM109 T0 S{material_print_temperature}\nM109 T1 S{material_print_temperature}\nG21\nG90 \nG28 X0 Y0 \nG28 Z0 \nG1 Z15.0 F300 \nT0 \nG92 E0 \nG1 F700 E-80 \nT1 \nG92 E0 \nG1 F1000 X1 Y1 Z0.3 \nG1 F600 X200 E60 \nG1 F1000 Y3 \nG1 F600 X1 E120 \nT1 \nG92 E0 \nG28 X0 Y0 \nG1 F700 E-80 \nT0 \nG92 E0" + }, "machine_end_gcode": { "default_value": "M104 T0 S0\nM104 T1 S0\nM140 S0\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84" } - } } diff --git a/resources/extruders/hellbot_magna_2_230_dual_extruder_0.def.json b/resources/extruders/hellbot_magna_2_230_dual_extruder_0.def.json index b572ea4318..a043143f26 100644 --- a/resources/extruders/hellbot_magna_2_230_dual_extruder_0.def.json +++ b/resources/extruders/hellbot_magna_2_230_dual_extruder_0.def.json @@ -13,6 +13,12 @@ "maximum_value": "1" }, "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } + "material_diameter": { "default_value": 1.75 }, + "machine_extruder_start_code": { + "default_value": "T0 \nG92 E0 \nG1 F1000 E100 \nG92 E0 \nM104 S{material_print_temperature}" + }, + "machine_extruder_end_code": { + "default_value": "G92 E0 \nG1 F2500 E-5 \nG1 F2400 X230 Y200 \nG1 F3000 E-100 \nG92 E0 \nG90" + } } } diff --git a/resources/extruders/hellbot_magna_2_230_dual_extruder_1.def.json b/resources/extruders/hellbot_magna_2_230_dual_extruder_1.def.json index 398822b156..70650e6f1a 100644 --- a/resources/extruders/hellbot_magna_2_230_dual_extruder_1.def.json +++ b/resources/extruders/hellbot_magna_2_230_dual_extruder_1.def.json @@ -13,6 +13,12 @@ "maximum_value": "1" }, "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } + "material_diameter": { "default_value": 1.75 }, + "machine_extruder_start_code": { + "default_value": "T1 \nG92 E0 \nG1 F1000 E100 \nG92 E0 \nM104 S{material_print_temperature}" + }, + "machine_extruder_end_code": { + "default_value": "G92 E0 \nG1 F2500 E-5 \nG1 F2400 X230 Y200 \nG1 F3000 E-100 \nG92 E0 \nG90" + } } } diff --git a/resources/extruders/hellbot_magna_2_300_dual_extruder_0.def.json b/resources/extruders/hellbot_magna_2_300_dual_extruder_0.def.json index af68cc9422..b397e32789 100644 --- a/resources/extruders/hellbot_magna_2_300_dual_extruder_0.def.json +++ b/resources/extruders/hellbot_magna_2_300_dual_extruder_0.def.json @@ -13,6 +13,12 @@ "maximum_value": "1" }, "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } + "material_diameter": { "default_value": 1.75 }, + "machine_extruder_start_code": { + "default_value": "T0 \nG92 E0 \nG1 F1000 E100 \nG92 E0 \nM104 S{material_print_temperature}" + }, + "machine_extruder_end_code": { + "default_value": "G92 E0 \nG1 F2500 E-5 \nG1 F2400 X300 Y250 \nG1 F3000 E-100 \nG92 E0 \nG90" + } } } diff --git a/resources/extruders/hellbot_magna_2_300_dual_extruder_1.def.json b/resources/extruders/hellbot_magna_2_300_dual_extruder_1.def.json index 3585978d6e..618ed06d0b 100644 --- a/resources/extruders/hellbot_magna_2_300_dual_extruder_1.def.json +++ b/resources/extruders/hellbot_magna_2_300_dual_extruder_1.def.json @@ -13,6 +13,12 @@ "maximum_value": "1" }, "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } + "material_diameter": { "default_value": 1.75 }, + "machine_extruder_start_code": { + "default_value": "T1 \nG92 E0 \nG1 F1000 E100 \nG92 E0 \nM104 S{material_print_temperature}" + }, + "machine_extruder_end_code": { + "default_value": "G92 E0 \nG1 F2500 E-5 \nG1 F2400 X300 Y250 \nG1 F3000 E-100 \nG92 E0 \nG90" + } } }