From 1e67650f7792b115d3bffd382afa4e17639e3a70 Mon Sep 17 00:00:00 2001 From: 64bittuning <47930605+64bittuning@users.noreply.github.com> Date: Fri, 28 Jan 2022 15:03:18 -0500 Subject: [PATCH 1/6] Update existing profiles The Tronxy community has requested the removal of "max feedrate" settings in the slicer profile. The machines are usually run on one of three firmwares and these limitations really hinder slicer performance. --- resources/definitions/tronxy_d01.def.json | 10 +------- resources/definitions/tronxy_x5sa.def.json | 10 ++++---- .../definitions/tronxy_x5sa_400.def.json | 15 +++++------- .../definitions/tronxy_x5sa_500.def.json | 13 ++++------- resources/definitions/tronxy_xy2.def.json | 16 ++++--------- resources/definitions/tronxy_xy2pro.def.json | 23 ++++--------------- resources/definitions/tronxy_xy3.def.json | 18 ++++----------- 7 files changed, 32 insertions(+), 73 deletions(-) diff --git a/resources/definitions/tronxy_d01.def.json b/resources/definitions/tronxy_d01.def.json index ff8badd355..141414f85f 100644 --- a/resources/definitions/tronxy_d01.def.json +++ b/resources/definitions/tronxy_d01.def.json @@ -5,7 +5,6 @@ "metadata": { "quality_definition": "tronxy_x", "visible": true, - "author": "AdderMk2", "platform": "tronxy.stl" }, "overrides": { @@ -23,15 +22,8 @@ "gantry_height": { "value": 30 }, "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T0\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0} T0\nG28\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to preventscratching of Heat Bed\nG1 X1 Y20 Z0.3 F3600.0 ; Move to start position\nG1 X1 Y220.0 Z0.3 F1500.0 E25 ; Draw the first line\nG1 X1.6 Y220.0 Z0.3 F3600.0 ; Move to side a little\nG1 X1.6 Y20 Z0.3 F1500.0 E50 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F3600.0 ; Move over to prevent blob squish" }, + "machine_end_gcode": { "default_value": "M83 ; Set extrder to Relative\nG1 E-5 F3000 ; Retract 5mm of filament at 50mm/s\nG90 ; Set all axis to Absolute \nG1 X0 Y{machine_depth} ; Park print head\nG1 Z10 ; Move up 10mm\nM106 S0 ; Set fan speed to 0\nM104 S0 ; Set bed temp to 0\nM140 S0 ; Set Nozzle temp to 0\nM84 ; Disable all stepper motors\n" }, - "machine_max_feedrate_x": { "value": 150 }, - "machine_max_feedrate_y": { "value": 150 }, - "machine_max_feedrate_z": { "value": 20 }, - "machine_max_feedrate_e": { "value": 120 }, - "machine_max_acceleration_x": { "value": 150 }, - "machine_max_acceleration_y": { "value": 150 }, - "machine_max_acceleration_z": { "value": 150 }, - "machine_max_acceleration_e": { "value": 150 }, "machine_acceleration": { "value": 120 } } } diff --git a/resources/definitions/tronxy_x5sa.def.json b/resources/definitions/tronxy_x5sa.def.json index 0e70dd72b4..a4ca9a510a 100644 --- a/resources/definitions/tronxy_x5sa.def.json +++ b/resources/definitions/tronxy_x5sa.def.json @@ -1,11 +1,10 @@ { - "name": "Tronxy X5SA/X5ST/Pro", + "name": "Tronxy X5SA/X5ST/Pro/2E/D01 Plus", "version": 2, "inherits": "tronxy_x", "metadata": { "quality_definition": "tronxy_x", "visible": true, - "author": "AdderMk2", "platform": "tronxy.stl" }, "overrides": { @@ -21,8 +20,11 @@ ] }, "gantry_height": { "value": 40 }, + "retraction_amount": { "value": 4.5 }, - "machine_start_gcode": { "default_value": "; X5SA Pro Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T0\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0} T0\nG28\nG92 E0\n"}, - "machine_end_gcode": { "default_value": "G91\nG1 E-2 F3000\nG1 E-2 Z0.2 F1200\nG1 X5 Y5 F3600\nG1 Z10\nG90\nG1 X0 Y0\nM106 S0\nM104 S0\nM140 S0\n\nM84 X Y E\n" } + "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21 ; Set units to millimeters\nG90 ; Set all axis to Absolute\nM82 ; Set extrusion to Absolute\nM107 ; Disable all fans\nM190 S{material_bed_temperature_layer_0} ; Set bed temperature and wait\nG28 ; Home all axis\n; Uncomment the line below to enable ABL Mesh probing\n;G29 ; Probe bed mesh for ABL\n; For best results do not run nozzle heater while performing ABL\nG1 Z5.0 ; Raise nozzle to prevent scratching of heat bed\nG1 X0 Y0 ; Move nozzle to Home before heating\nM109 S{material_print_temperature_layer_0} T0 ; Set nozzle temp and wait\nG92 E0 ; Set Extruder position to zero\n; Uncomment the following lines to enable nozzle purge line along left edge of bed\n;G1 Z2.0 F3000 ; Raise Z axis\n;G1 X1.1 Y20 Z0.2 F3600.0 ; Move to purge line start position\n;G1 Y220 F1500.0 E10 ; Draw first purge line\n;G1 X1.4 F3600.0 ; Move to side\n;G1 Y20 F1500.0 E20 ; Draw second purge line\n;G92 E0 ; Reset Extruder\n;G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n;G1 X5 Y20 Z0.2 F3600.0 ; Move over to finish nozzle wipe\n;G92 E0\n"}, + "machine_end_gcode": { "default_value": "G91 ; Set Positioning to Relative\nM83 ; Set Extruder to Relative\nG92 E0 ; Reset Extruder\nG1 E-4 F3000 ; Retract 4mm of filament\nG1 Z0.2 ; Raise nozzle .2mm\nG90 ; Set positioning to absolute\nG1 X{machine_width} Y{machine_depth} ; Park print head\nG91 ; Set Positioning to RelativeG1 Z10 ; Raise nozzle 10mm\nM106 S0 ; Turn off part fan\nM104 S0 ; Set nozzle temp to zero\nM140 S0 ; set bed temp to zero\nM84 X Y Z E ; Disable X Y Z and E steppers\n" }, + + "machine_acceleration": { "value": 150 } } } diff --git a/resources/definitions/tronxy_x5sa_400.def.json b/resources/definitions/tronxy_x5sa_400.def.json index 5604b17619..d1448a3287 100644 --- a/resources/definitions/tronxy_x5sa_400.def.json +++ b/resources/definitions/tronxy_x5sa_400.def.json @@ -1,11 +1,10 @@ { - "name": "Tronxy X5SA/X5ST/Pro 400", + "name": "Tronxy X5SA/X5ST/Pro/2E 400mm", "version": 2, "inherits": "tronxy_x", "metadata": { "quality_definition": "tronxy_x", "visible": true, - "author": "AdderMk2", "platform": "tronxy.stl" }, "overrides": { @@ -21,13 +20,11 @@ ] }, "gantry_height": { "value": 40 }, + "retraction_amount": { "value": 6.5 }, - "machine_start_gcode": { "default_value": "; X5SA Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T0\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0} T0\nG28\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to preventscratching of Heat Bed\nG1 X1 Y20 Z0.3 F3600.0 ; Move to start position\nG1 X1 Y370.0 Z0.3 F1500.0 E25 ; Draw the first line\nG1 X1.6 Y370.0 Z0.3 F3600.0 ; Move to side a little\nG1 X1.6 Y20 Z0.3 F1500.0 E50 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F3600.0 ; Move over to prevent blob squish"}, - "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 \nG1 E-2 Z0.2 F2400 \nG1 X5 Y5 F3000\nG1 Z10\nG90\n\nG1 X0 Y0 \nM106 S0\nM104 S0\nM140 S0\n\nM84 X Y E \n" }, + "machine_start_gcode": { "default_value": "; X5SA Start Code\nG21 ; Set units to millimeters\nG90 ; Set all axis to Absolute\nM82 ; Set extrusion to Absolute\nM107 ; Disable all fans\nM190 S{material_bed_temperature_layer_0} ; Set bed temperature and wait\nG28 ; Home all axis\n; Uncomment the line below to enable ABL Mesh probing\n;G29 ; Probe bed mesh for ABL\n; For best results do not run nozzle heater while performing ABL\nG1 Z5.0 ; Raise nozzle to prevent scratching of heat bed\nG1 X0 Y0 ; Move nozzle to Home before heating\nM109 S{material_print_temperature_layer_0} T0 ; Set nozzle temp and wait\nG92 E0 ; Set Extruder position to zero\n; Uncomment the following lines to enable nozzle purge line along left edge of bed\n;G1 Z2.0 F3000 ; Raise Z axis\n;G1 X1.1 Y20 Z0.2 F3600.0 ; Move to purge line start position\n;G1 Y290 F1500.0 E15 ; Draw first purge line\n;G1 X1.4 F3600.0 ; Move to side\n;G1 Y20 F1500.0 E30 ; Draw second purge line\n;G92 E0 ; Reset Extruder\n;G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n;G1 X5 Y20 Z0.2 F3600.0 ; Move over to finish nozzle wipe\n;G92 E0\n"}, + "machine_end_gcode": { "default_value": "G91 ; Set Positioning to Relative\nM83 ; Set Extruder to Relative\nG92 E0 ; Reset Extruder\nG1 E-4 F3000 ; Retract 4mm of filament\nG1 Z0.2 ; Raise nozzle .2mm\nG90 ; Set positioning to absolute\nG1 X{machine_width} Y{machine_depth} ; Park print head\nG91 ; Set Positioning to RelativeG1 Z10 ; Raise nozzle 10mm\nM106 S0 ; Turn off part fan\nM104 S0 ; Set nozzle temp to zero\nM140 S0 ; set bed temp to zero\nM84 X Y Z E ; Disable X Y Z and E steppers\n" }, - "machine_max_feedrate_x": { "value": 100 }, - "machine_max_feedrate_y": { "value": 100 }, - "machine_max_feedrate_z": { "value": 20 }, - "machine_max_feedrate_e": { "value": 120 } + "machine_acceleration": { "value": 150 } } -} +} \ No newline at end of file diff --git a/resources/definitions/tronxy_x5sa_500.def.json b/resources/definitions/tronxy_x5sa_500.def.json index b68a954115..44f8d1ba1a 100644 --- a/resources/definitions/tronxy_x5sa_500.def.json +++ b/resources/definitions/tronxy_x5sa_500.def.json @@ -1,11 +1,10 @@ { - "name": "Tronxy X5SA/X5ST/Pro 500", + "name": "Tronxy X5SA/X5ST/Pro/2E 500mm", "version": 2, "inherits": "tronxy_x", "metadata": { "quality_definition": "tronxy_x", "visible": true, - "author": "AdderMk2", "platform": "tronxy.stl" }, "overrides": { @@ -21,13 +20,11 @@ ] }, "gantry_height": { "value": 40 }, + "retraction_amount": { "value": 6.5 }, - "machine_start_gcode": { "default_value": "; X5SA Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T0\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0} T0\nG28\nG92 E0\n "}, - "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 \nG1 E-2 Z0.2 F2400 \nG1 X5 Y5 F3000\nG1 Z10\nG90\n\nG1 X0 Y0 \nM106 S0\nM104 S0\nM140 S0\n\nM84 X Y E \n" }, + "machine_start_gcode": { "default_value": "; X5SA Start Code\nG21 ; Set units to millimeters\nG90 ; Set all axis to Absolute\nM82 ; Set extrusion to Absolute\nM107 ; Disable all fans\nM190 S{material_bed_temperature_layer_0} ; Set bed temperature and wait\nG28 ; Home all axis\n; Uncomment the line below to enable ABL Mesh probing\n;G29 ; Probe bed mesh for ABL\n; For best results do not run nozzle heater while performing ABL\nG1 Z5.0 ; Raise nozzle to prevent scratching of heat bed\nG1 X0 Y0 ; Move nozzle to Home before heating\nM109 S{material_print_temperature_layer_0} T0 ; Set nozzle temp and wait\nG92 E0 ; Set Extruder position to zero\n; Uncomment the following lines to enable nozzle purge line along left edge of bed\n;G1 Z2.0 F3000 ; Raise Z axis\n;G1 X1.1 Y20 Z0.2 F3600.0 ; Move to purge line start position\n;G1 Y290 F1500.0 E15 ; Draw first purge line\n;G1 X1.4 F3600.0 ; Move to side\n;G1 Y20 F1500.0 E30 ; Draw second purge line\n;G92 E0 ; Reset Extruder\n;G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n;G1 X5 Y20 Z0.2 F3600.0 ; Move over to finish nozzle wipe\n;G92 E0\n"}, + "machine_end_gcode": { "default_value": "G91 ; Set Positioning to Relative\nM83 ; Set Extruder to Relative\nG92 E0 ; Reset Extruder\nG1 E-4 F3000 ; Retract 4mm of filament\nG1 Z0.2 ; Raise nozzle .2mm\nG90 ; Set positioning to absolute\nG1 X{machine_width} Y{machine_depth} ; Park print head\nG91 ; Set Positioning to RelativeG1 Z10 ; Raise nozzle 10mm\nM106 S0 ; Turn off part fan\nM104 S0 ; Set nozzle temp to zero\nM140 S0 ; set bed temp to zero\nM84 X Y Z E ; Disable X Y Z and E steppers\n" }, - "machine_max_feedrate_x": { "value": 150 }, - "machine_max_feedrate_y": { "value": 150 }, - "machine_max_feedrate_z": { "value": 20 }, - "machine_max_feedrate_e": { "value": 120 } + "machine_acceleration": { "value": 150 } } } diff --git a/resources/definitions/tronxy_xy2.def.json b/resources/definitions/tronxy_xy2.def.json index eaae1dbb08..ce7966fc3b 100644 --- a/resources/definitions/tronxy_xy2.def.json +++ b/resources/definitions/tronxy_xy2.def.json @@ -5,7 +5,6 @@ "metadata": { "quality_definition": "tronxy_x", "visible": true, - "author": "AdderMk2", "platform": "tronxy.stl" }, "overrides": { @@ -21,18 +20,11 @@ ] }, "gantry_height": { "value": 40 }, + "retraction_amount": { "value": 4.5 }, - "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T0\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0} T0\nG28\nG92 E0\n"}, - "machine_end_gcode": { "default_value": "G91\nG1 E-2 F3000\nG1 E-2 Z0.2 F1200\nG1 X5 Y5 F3600\nG1 Z10\nG90\nG1 X0 Y{machine_depth}\nM106 S0 ;Turn-off fan\nM104 S0\nM140 S0\n\nM84 X Y E\n" }, + "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21 ; Set units to millimeters\nG90 ; Set all axis to Absolute\nM82 ; Set extrusion to Absolute\nM107 ; Disable all fans\nM190 S{material_bed_temperature_layer_0} ; Set bed temperature and wait\nG28 ; Home all axis\n; Uncomment the line below to enable ABL Mesh probing\n;G29 ; Probe bed mesh for ABL\n; For best results do not run nozzle heater while performing ABL\nG1 Z5.0 ; Raise nozzle to prevent scratching of heat bed\nG1 X0 Y0 ; Move nozzle to Home before heating\nM109 S{material_print_temperature_layer_0} T0 ; Set nozzle temp and wait\nG92 E0 ; Set Extruder position to zero\n; Uncomment the following lines to enable nozzle purge line along left edge of bed\n;G1 Z2.0 F3000 ; Raise Z axis\n;G1 X1.1 Y20 Z0.2 F3600.0 ; Move to purge line start position\n;G1 Y220 F1500.0 E10 ; Draw first purge line\n;G1 X1.4 F3600.0 ; Move to side\n;G1 Y20 F1500.0 E20 ; Draw second purge line\n;G92 E0 ; Reset Extruder\n;G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n;G1 X5 Y20 Z0.2 F3600.0 ; Move over to finish nozzle wipe\n;G92 E0\n"}, + "machine_end_gcode": { "default_value": "M83 ; Set extrder to Relative\nG1 E-5 F3000 ; Retract 5mm of filament at 50mm/s\nG90 ; Set all axis to Absolute \nG1 X0 Y{machine_depth} ; Park print head\nG1 Z10 ; Move up 10mm\nM106 S0 ; Set fan speed to 0\nM104 S0 ; Set bed temp to 0\nM140 S0 ; Set Nozzle temp to 0\nM84 ; Disable all stepper motors\n" }, - "machine_max_feedrate_x": { "value": 100 }, - "machine_max_feedrate_y": { "value": 100 }, - "machine_max_feedrate_z": { "value": 20 }, - "machine_max_feedrate_e": { "value": 120 }, - "machine_max_acceleration_x": { "value": 150 }, - "machine_max_acceleration_y": { "value": 150 }, - "machine_max_acceleration_z": { "value": 150 }, - "machine_max_acceleration_e": { "value": 150 }, - "machine_acceleration": { "value": 80 } + "machine_acceleration": { "value": 150 } } } diff --git a/resources/definitions/tronxy_xy2pro.def.json b/resources/definitions/tronxy_xy2pro.def.json index 59e727bbb0..fb2bd70ea3 100644 --- a/resources/definitions/tronxy_xy2pro.def.json +++ b/resources/definitions/tronxy_xy2pro.def.json @@ -1,11 +1,10 @@ { - "name": "Tronxy XY-2 Pro", + "name": "Tronxy XY-2 Pro/Pro 2E/XY3 SE", "version": 2, "inherits": "tronxy_x", "metadata": { "quality_definition": "tronxy_x", "visible": true, - "author": "AdderMk2", "platform": "tronxy.stl" }, "overrides": { @@ -21,23 +20,11 @@ ] }, "gantry_height": { "value": 40 }, + "retraction_amount": { "value": 4.5 }, - "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T0\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0} T0\nG28\nG92 E0\n"}, - "machine_end_gcode": { "default_value": "G91\nG1 E-2 F3000\nG1 E-2 Z0.2 F1200\nG1 X5 Y5 F3600\nG1 Z10\nG90\nG1 X0 Y{machine_depth}\nM106 S0\nM104 S0\nM140 S0\n\nM84 X Y E\n" }, + "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21 ; Set units to millimeters\nG90 ; Set all axis to Absolute\nM82 ; Set extrusion to Absolute\nM107 ; Disable all fans\nM190 S{material_bed_temperature_layer_0} ; Set bed temperature and wait\nG28 ; Home all axis\n; Uncomment the line below to enable ABL Mesh probing\n;G29 ; Probe bed mesh for ABL\n; For best results do not run nozzle heater while performing ABL\nG1 Z5.0 ; Raise nozzle to prevent scratching of heat bed\nG1 X0 Y0 ; Move nozzle to Home before heating\nM109 S{material_print_temperature_layer_0} T0 ; Set nozzle temp and wait\nG92 E0 ; Set Extruder position to zero\n; Uncomment the following lines to enable nozzle purge line along left edge of bed\n;G1 Z2.0 F3000 ; Raise Z axis\n;G1 X1.1 Y20 Z0.2 F3600.0 ; Move to purge line start position\n;G1 Y220 F1500.0 E10 ; Draw first purge line\n;G1 X1.4 F3600.0 ; Move to side\n;G1 Y20 F1500.0 E20 ; Draw second purge line\n;G92 E0 ; Reset Extruder\n;G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n;G1 X5 Y20 Z0.2 F3600.0 ; Move over to finish nozzle wipe\n;G92 E0\n"}, + "machine_end_gcode": { "default_value": "M83 ; Set extrder to Relative\nG1 E-5 F3000 ; Retract 5mm of filament at 50mm/s\nG90 ; Set all axis to Absolute \nG1 X0 Y{machine_depth} ; Park print head\nG1 Z10 ; Move up 10mm\nM106 S0 ; Set fan speed to 0\nM104 S0 ; Set bed temp to 0\nM140 S0 ; Set Nozzle temp to 0\nM84 ; Disable all stepper motors\n" }, - "machine_max_feedrate_x": { "value": 100 }, - "machine_max_feedrate_y": { "value": 100 }, - "machine_max_feedrate_z": { "value": 20 }, - "machine_max_feedrate_e": { "value": 120 }, - - "machine_max_acceleration_x": { "value": 120 }, - "machine_max_acceleration_y": { "value": 120 }, - "machine_max_acceleration_z": { "value": 120 }, - "machine_max_acceleration_e": { "value": 120 }, - "machine_acceleration": { "value": 150 }, - - "machine_max_jerk_xy": { "value": 20 }, - "machine_max_jerk_z": { "value": 0.4 }, - "machine_max_jerk_e": { "value": 5 } + "machine_acceleration": { "value": 150 } } } diff --git a/resources/definitions/tronxy_xy3.def.json b/resources/definitions/tronxy_xy3.def.json index db03c344f5..941ca7142f 100644 --- a/resources/definitions/tronxy_xy3.def.json +++ b/resources/definitions/tronxy_xy3.def.json @@ -1,11 +1,10 @@ { - "name": "Tronxy XY-3", + "name": "Tronxy XY-3/Pro", "version": 2, "inherits": "tronxy_x", "metadata": { "quality_definition": "tronxy_x", "visible": true, - "author": "AdderMk2", "platform": "tronxy.stl" }, "overrides": { @@ -21,18 +20,11 @@ ] }, "gantry_height": { "value": 30 }, + "retraction_amount": { "value": 5 }, - "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T0\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0} T0\nG28\nG92 E0\n"}, - "machine_end_gcode": { "default_value": "G91\nG1 E-2 F3000\nG1 E-2 Z0.2 F1200\nG1 X5 Y5 F3600\nG1 Z10\nG90\nG1 X0 Y{machine_depth}\nM106 S0\nM104 S0\nM140 S0\n\nM84 X Y E\n" }, + "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21 ; Set units to millimeters\nG90 ; Set all axis to Absolute\nM82 ; Set extrusion to Absolute\nM107 ; Disable all fans\nM190 S{material_bed_temperature_layer_0} ; Set bed temperature and wait\nG28 ; Home all axis\n; Uncomment the line below to enable ABL Mesh probing\n;G29 ; Probe bed mesh for ABL\n; For best results do not run nozzle heater while performing ABL\nG1 Z5.0 ; Raise nozzle to prevent scratching of heat bed\nG1 X0 Y0 ; Move nozzle to Home before heating\nM109 S{material_print_temperature_layer_0} T0 ; Set nozzle temp and wait\nG92 E0 ; Set Extruder position to zero\n; Uncomment the following lines to enable nozzle purge line along left edge of bed\n;G1 Z2.0 F3000 ; Raise Z axis\n;G1 X1.1 Y20 Z0.2 F3600.0 ; Move to purge line start position\n;G1 Y220 F1500.0 E10 ; Draw first purge line\n;G1 X1.4 F3600.0 ; Move to side\n;G1 Y20 F1500.0 E20 ; Draw second purge line\n;G92 E0 ; Reset Extruder\n;G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n;G1 X5 Y20 Z0.2 F3600.0 ; Move over to finish nozzle wipe\n;G92 E0\n"}, + "machine_end_gcode": { "default_value": "M83 ; Set extrder to Relative\nG1 E-5 F3000 ; Retract 5mm of filament at 50mm/s\nG90 ; Set all axis to Absolute \nG1 X0 Y{machine_depth} ; Park print head\nG1 Z10 ; Move up 10mm\nM106 S0 ; Set fan speed to 0\nM104 S0 ; Set bed temp to 0\nM140 S0 ; Set Nozzle temp to 0\nM84 ; Disable all stepper motors\n" }, - "machine_max_feedrate_x": { "value": 100 }, - "machine_max_feedrate_y": { "value": 100 }, - "machine_max_feedrate_z": { "value": 20 }, - "machine_max_feedrate_e": { "value": 120 }, - "machine_max_acceleration_x": { "value": 150 }, - "machine_max_acceleration_y": { "value": 150 }, - "machine_max_acceleration_z": { "value": 150 }, - "machine_max_acceleration_e": { "value": 150 }, - "machine_acceleration": { "value": 80 } + "machine_acceleration": { "value": 150 } } } From 66513096694bbbb001ac8967874cc3cd162ef5cc Mon Sep 17 00:00:00 2001 From: 64bittuning <47930605+64bittuning@users.noreply.github.com> Date: Fri, 28 Jan 2022 15:27:13 -0500 Subject: [PATCH 2/6] Resetting all files Going to open a bug report if these fail. --- resources/definitions/tronxy_d01.def.json | 10 +++++++- resources/definitions/tronxy_x5sa.def.json | 10 ++++---- .../definitions/tronxy_x5sa_400.def.json | 15 +++++++----- .../definitions/tronxy_x5sa_500.def.json | 13 +++++++---- resources/definitions/tronxy_xy2.def.json | 16 +++++++++---- resources/definitions/tronxy_xy2pro.def.json | 23 +++++++++++++++---- resources/definitions/tronxy_xy3.def.json | 18 +++++++++++---- 7 files changed, 73 insertions(+), 32 deletions(-) diff --git a/resources/definitions/tronxy_d01.def.json b/resources/definitions/tronxy_d01.def.json index 141414f85f..ff8badd355 100644 --- a/resources/definitions/tronxy_d01.def.json +++ b/resources/definitions/tronxy_d01.def.json @@ -5,6 +5,7 @@ "metadata": { "quality_definition": "tronxy_x", "visible": true, + "author": "AdderMk2", "platform": "tronxy.stl" }, "overrides": { @@ -22,8 +23,15 @@ "gantry_height": { "value": 30 }, "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T0\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0} T0\nG28\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to preventscratching of Heat Bed\nG1 X1 Y20 Z0.3 F3600.0 ; Move to start position\nG1 X1 Y220.0 Z0.3 F1500.0 E25 ; Draw the first line\nG1 X1.6 Y220.0 Z0.3 F3600.0 ; Move to side a little\nG1 X1.6 Y20 Z0.3 F1500.0 E50 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F3600.0 ; Move over to prevent blob squish" }, - "machine_end_gcode": { "default_value": "M83 ; Set extrder to Relative\nG1 E-5 F3000 ; Retract 5mm of filament at 50mm/s\nG90 ; Set all axis to Absolute \nG1 X0 Y{machine_depth} ; Park print head\nG1 Z10 ; Move up 10mm\nM106 S0 ; Set fan speed to 0\nM104 S0 ; Set bed temp to 0\nM140 S0 ; Set Nozzle temp to 0\nM84 ; Disable all stepper motors\n" }, + "machine_max_feedrate_x": { "value": 150 }, + "machine_max_feedrate_y": { "value": 150 }, + "machine_max_feedrate_z": { "value": 20 }, + "machine_max_feedrate_e": { "value": 120 }, + "machine_max_acceleration_x": { "value": 150 }, + "machine_max_acceleration_y": { "value": 150 }, + "machine_max_acceleration_z": { "value": 150 }, + "machine_max_acceleration_e": { "value": 150 }, "machine_acceleration": { "value": 120 } } } diff --git a/resources/definitions/tronxy_x5sa.def.json b/resources/definitions/tronxy_x5sa.def.json index a4ca9a510a..0e70dd72b4 100644 --- a/resources/definitions/tronxy_x5sa.def.json +++ b/resources/definitions/tronxy_x5sa.def.json @@ -1,10 +1,11 @@ { - "name": "Tronxy X5SA/X5ST/Pro/2E/D01 Plus", + "name": "Tronxy X5SA/X5ST/Pro", "version": 2, "inherits": "tronxy_x", "metadata": { "quality_definition": "tronxy_x", "visible": true, + "author": "AdderMk2", "platform": "tronxy.stl" }, "overrides": { @@ -20,11 +21,8 @@ ] }, "gantry_height": { "value": 40 }, - "retraction_amount": { "value": 4.5 }, - "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21 ; Set units to millimeters\nG90 ; Set all axis to Absolute\nM82 ; Set extrusion to Absolute\nM107 ; Disable all fans\nM190 S{material_bed_temperature_layer_0} ; Set bed temperature and wait\nG28 ; Home all axis\n; Uncomment the line below to enable ABL Mesh probing\n;G29 ; Probe bed mesh for ABL\n; For best results do not run nozzle heater while performing ABL\nG1 Z5.0 ; Raise nozzle to prevent scratching of heat bed\nG1 X0 Y0 ; Move nozzle to Home before heating\nM109 S{material_print_temperature_layer_0} T0 ; Set nozzle temp and wait\nG92 E0 ; Set Extruder position to zero\n; Uncomment the following lines to enable nozzle purge line along left edge of bed\n;G1 Z2.0 F3000 ; Raise Z axis\n;G1 X1.1 Y20 Z0.2 F3600.0 ; Move to purge line start position\n;G1 Y220 F1500.0 E10 ; Draw first purge line\n;G1 X1.4 F3600.0 ; Move to side\n;G1 Y20 F1500.0 E20 ; Draw second purge line\n;G92 E0 ; Reset Extruder\n;G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n;G1 X5 Y20 Z0.2 F3600.0 ; Move over to finish nozzle wipe\n;G92 E0\n"}, - "machine_end_gcode": { "default_value": "G91 ; Set Positioning to Relative\nM83 ; Set Extruder to Relative\nG92 E0 ; Reset Extruder\nG1 E-4 F3000 ; Retract 4mm of filament\nG1 Z0.2 ; Raise nozzle .2mm\nG90 ; Set positioning to absolute\nG1 X{machine_width} Y{machine_depth} ; Park print head\nG91 ; Set Positioning to RelativeG1 Z10 ; Raise nozzle 10mm\nM106 S0 ; Turn off part fan\nM104 S0 ; Set nozzle temp to zero\nM140 S0 ; set bed temp to zero\nM84 X Y Z E ; Disable X Y Z and E steppers\n" }, - - "machine_acceleration": { "value": 150 } + "machine_start_gcode": { "default_value": "; X5SA Pro Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T0\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0} T0\nG28\nG92 E0\n"}, + "machine_end_gcode": { "default_value": "G91\nG1 E-2 F3000\nG1 E-2 Z0.2 F1200\nG1 X5 Y5 F3600\nG1 Z10\nG90\nG1 X0 Y0\nM106 S0\nM104 S0\nM140 S0\n\nM84 X Y E\n" } } } diff --git a/resources/definitions/tronxy_x5sa_400.def.json b/resources/definitions/tronxy_x5sa_400.def.json index d1448a3287..5604b17619 100644 --- a/resources/definitions/tronxy_x5sa_400.def.json +++ b/resources/definitions/tronxy_x5sa_400.def.json @@ -1,10 +1,11 @@ { - "name": "Tronxy X5SA/X5ST/Pro/2E 400mm", + "name": "Tronxy X5SA/X5ST/Pro 400", "version": 2, "inherits": "tronxy_x", "metadata": { "quality_definition": "tronxy_x", "visible": true, + "author": "AdderMk2", "platform": "tronxy.stl" }, "overrides": { @@ -20,11 +21,13 @@ ] }, "gantry_height": { "value": 40 }, - "retraction_amount": { "value": 6.5 }, - "machine_start_gcode": { "default_value": "; X5SA Start Code\nG21 ; Set units to millimeters\nG90 ; Set all axis to Absolute\nM82 ; Set extrusion to Absolute\nM107 ; Disable all fans\nM190 S{material_bed_temperature_layer_0} ; Set bed temperature and wait\nG28 ; Home all axis\n; Uncomment the line below to enable ABL Mesh probing\n;G29 ; Probe bed mesh for ABL\n; For best results do not run nozzle heater while performing ABL\nG1 Z5.0 ; Raise nozzle to prevent scratching of heat bed\nG1 X0 Y0 ; Move nozzle to Home before heating\nM109 S{material_print_temperature_layer_0} T0 ; Set nozzle temp and wait\nG92 E0 ; Set Extruder position to zero\n; Uncomment the following lines to enable nozzle purge line along left edge of bed\n;G1 Z2.0 F3000 ; Raise Z axis\n;G1 X1.1 Y20 Z0.2 F3600.0 ; Move to purge line start position\n;G1 Y290 F1500.0 E15 ; Draw first purge line\n;G1 X1.4 F3600.0 ; Move to side\n;G1 Y20 F1500.0 E30 ; Draw second purge line\n;G92 E0 ; Reset Extruder\n;G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n;G1 X5 Y20 Z0.2 F3600.0 ; Move over to finish nozzle wipe\n;G92 E0\n"}, - "machine_end_gcode": { "default_value": "G91 ; Set Positioning to Relative\nM83 ; Set Extruder to Relative\nG92 E0 ; Reset Extruder\nG1 E-4 F3000 ; Retract 4mm of filament\nG1 Z0.2 ; Raise nozzle .2mm\nG90 ; Set positioning to absolute\nG1 X{machine_width} Y{machine_depth} ; Park print head\nG91 ; Set Positioning to RelativeG1 Z10 ; Raise nozzle 10mm\nM106 S0 ; Turn off part fan\nM104 S0 ; Set nozzle temp to zero\nM140 S0 ; set bed temp to zero\nM84 X Y Z E ; Disable X Y Z and E steppers\n" }, + "machine_start_gcode": { "default_value": "; X5SA Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T0\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0} T0\nG28\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to preventscratching of Heat Bed\nG1 X1 Y20 Z0.3 F3600.0 ; Move to start position\nG1 X1 Y370.0 Z0.3 F1500.0 E25 ; Draw the first line\nG1 X1.6 Y370.0 Z0.3 F3600.0 ; Move to side a little\nG1 X1.6 Y20 Z0.3 F1500.0 E50 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F3600.0 ; Move over to prevent blob squish"}, + "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 \nG1 E-2 Z0.2 F2400 \nG1 X5 Y5 F3000\nG1 Z10\nG90\n\nG1 X0 Y0 \nM106 S0\nM104 S0\nM140 S0\n\nM84 X Y E \n" }, - "machine_acceleration": { "value": 150 } + "machine_max_feedrate_x": { "value": 100 }, + "machine_max_feedrate_y": { "value": 100 }, + "machine_max_feedrate_z": { "value": 20 }, + "machine_max_feedrate_e": { "value": 120 } } -} \ No newline at end of file +} diff --git a/resources/definitions/tronxy_x5sa_500.def.json b/resources/definitions/tronxy_x5sa_500.def.json index 44f8d1ba1a..b68a954115 100644 --- a/resources/definitions/tronxy_x5sa_500.def.json +++ b/resources/definitions/tronxy_x5sa_500.def.json @@ -1,10 +1,11 @@ { - "name": "Tronxy X5SA/X5ST/Pro/2E 500mm", + "name": "Tronxy X5SA/X5ST/Pro 500", "version": 2, "inherits": "tronxy_x", "metadata": { "quality_definition": "tronxy_x", "visible": true, + "author": "AdderMk2", "platform": "tronxy.stl" }, "overrides": { @@ -20,11 +21,13 @@ ] }, "gantry_height": { "value": 40 }, - "retraction_amount": { "value": 6.5 }, - "machine_start_gcode": { "default_value": "; X5SA Start Code\nG21 ; Set units to millimeters\nG90 ; Set all axis to Absolute\nM82 ; Set extrusion to Absolute\nM107 ; Disable all fans\nM190 S{material_bed_temperature_layer_0} ; Set bed temperature and wait\nG28 ; Home all axis\n; Uncomment the line below to enable ABL Mesh probing\n;G29 ; Probe bed mesh for ABL\n; For best results do not run nozzle heater while performing ABL\nG1 Z5.0 ; Raise nozzle to prevent scratching of heat bed\nG1 X0 Y0 ; Move nozzle to Home before heating\nM109 S{material_print_temperature_layer_0} T0 ; Set nozzle temp and wait\nG92 E0 ; Set Extruder position to zero\n; Uncomment the following lines to enable nozzle purge line along left edge of bed\n;G1 Z2.0 F3000 ; Raise Z axis\n;G1 X1.1 Y20 Z0.2 F3600.0 ; Move to purge line start position\n;G1 Y290 F1500.0 E15 ; Draw first purge line\n;G1 X1.4 F3600.0 ; Move to side\n;G1 Y20 F1500.0 E30 ; Draw second purge line\n;G92 E0 ; Reset Extruder\n;G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n;G1 X5 Y20 Z0.2 F3600.0 ; Move over to finish nozzle wipe\n;G92 E0\n"}, - "machine_end_gcode": { "default_value": "G91 ; Set Positioning to Relative\nM83 ; Set Extruder to Relative\nG92 E0 ; Reset Extruder\nG1 E-4 F3000 ; Retract 4mm of filament\nG1 Z0.2 ; Raise nozzle .2mm\nG90 ; Set positioning to absolute\nG1 X{machine_width} Y{machine_depth} ; Park print head\nG91 ; Set Positioning to RelativeG1 Z10 ; Raise nozzle 10mm\nM106 S0 ; Turn off part fan\nM104 S0 ; Set nozzle temp to zero\nM140 S0 ; set bed temp to zero\nM84 X Y Z E ; Disable X Y Z and E steppers\n" }, + "machine_start_gcode": { "default_value": "; X5SA Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T0\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0} T0\nG28\nG92 E0\n "}, + "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 \nG1 E-2 Z0.2 F2400 \nG1 X5 Y5 F3000\nG1 Z10\nG90\n\nG1 X0 Y0 \nM106 S0\nM104 S0\nM140 S0\n\nM84 X Y E \n" }, - "machine_acceleration": { "value": 150 } + "machine_max_feedrate_x": { "value": 150 }, + "machine_max_feedrate_y": { "value": 150 }, + "machine_max_feedrate_z": { "value": 20 }, + "machine_max_feedrate_e": { "value": 120 } } } diff --git a/resources/definitions/tronxy_xy2.def.json b/resources/definitions/tronxy_xy2.def.json index ce7966fc3b..eaae1dbb08 100644 --- a/resources/definitions/tronxy_xy2.def.json +++ b/resources/definitions/tronxy_xy2.def.json @@ -5,6 +5,7 @@ "metadata": { "quality_definition": "tronxy_x", "visible": true, + "author": "AdderMk2", "platform": "tronxy.stl" }, "overrides": { @@ -20,11 +21,18 @@ ] }, "gantry_height": { "value": 40 }, - "retraction_amount": { "value": 4.5 }, - "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21 ; Set units to millimeters\nG90 ; Set all axis to Absolute\nM82 ; Set extrusion to Absolute\nM107 ; Disable all fans\nM190 S{material_bed_temperature_layer_0} ; Set bed temperature and wait\nG28 ; Home all axis\n; Uncomment the line below to enable ABL Mesh probing\n;G29 ; Probe bed mesh for ABL\n; For best results do not run nozzle heater while performing ABL\nG1 Z5.0 ; Raise nozzle to prevent scratching of heat bed\nG1 X0 Y0 ; Move nozzle to Home before heating\nM109 S{material_print_temperature_layer_0} T0 ; Set nozzle temp and wait\nG92 E0 ; Set Extruder position to zero\n; Uncomment the following lines to enable nozzle purge line along left edge of bed\n;G1 Z2.0 F3000 ; Raise Z axis\n;G1 X1.1 Y20 Z0.2 F3600.0 ; Move to purge line start position\n;G1 Y220 F1500.0 E10 ; Draw first purge line\n;G1 X1.4 F3600.0 ; Move to side\n;G1 Y20 F1500.0 E20 ; Draw second purge line\n;G92 E0 ; Reset Extruder\n;G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n;G1 X5 Y20 Z0.2 F3600.0 ; Move over to finish nozzle wipe\n;G92 E0\n"}, - "machine_end_gcode": { "default_value": "M83 ; Set extrder to Relative\nG1 E-5 F3000 ; Retract 5mm of filament at 50mm/s\nG90 ; Set all axis to Absolute \nG1 X0 Y{machine_depth} ; Park print head\nG1 Z10 ; Move up 10mm\nM106 S0 ; Set fan speed to 0\nM104 S0 ; Set bed temp to 0\nM140 S0 ; Set Nozzle temp to 0\nM84 ; Disable all stepper motors\n" }, + "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T0\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0} T0\nG28\nG92 E0\n"}, + "machine_end_gcode": { "default_value": "G91\nG1 E-2 F3000\nG1 E-2 Z0.2 F1200\nG1 X5 Y5 F3600\nG1 Z10\nG90\nG1 X0 Y{machine_depth}\nM106 S0 ;Turn-off fan\nM104 S0\nM140 S0\n\nM84 X Y E\n" }, - "machine_acceleration": { "value": 150 } + "machine_max_feedrate_x": { "value": 100 }, + "machine_max_feedrate_y": { "value": 100 }, + "machine_max_feedrate_z": { "value": 20 }, + "machine_max_feedrate_e": { "value": 120 }, + "machine_max_acceleration_x": { "value": 150 }, + "machine_max_acceleration_y": { "value": 150 }, + "machine_max_acceleration_z": { "value": 150 }, + "machine_max_acceleration_e": { "value": 150 }, + "machine_acceleration": { "value": 80 } } } diff --git a/resources/definitions/tronxy_xy2pro.def.json b/resources/definitions/tronxy_xy2pro.def.json index fb2bd70ea3..59e727bbb0 100644 --- a/resources/definitions/tronxy_xy2pro.def.json +++ b/resources/definitions/tronxy_xy2pro.def.json @@ -1,10 +1,11 @@ { - "name": "Tronxy XY-2 Pro/Pro 2E/XY3 SE", + "name": "Tronxy XY-2 Pro", "version": 2, "inherits": "tronxy_x", "metadata": { "quality_definition": "tronxy_x", "visible": true, + "author": "AdderMk2", "platform": "tronxy.stl" }, "overrides": { @@ -20,11 +21,23 @@ ] }, "gantry_height": { "value": 40 }, - "retraction_amount": { "value": 4.5 }, - "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21 ; Set units to millimeters\nG90 ; Set all axis to Absolute\nM82 ; Set extrusion to Absolute\nM107 ; Disable all fans\nM190 S{material_bed_temperature_layer_0} ; Set bed temperature and wait\nG28 ; Home all axis\n; Uncomment the line below to enable ABL Mesh probing\n;G29 ; Probe bed mesh for ABL\n; For best results do not run nozzle heater while performing ABL\nG1 Z5.0 ; Raise nozzle to prevent scratching of heat bed\nG1 X0 Y0 ; Move nozzle to Home before heating\nM109 S{material_print_temperature_layer_0} T0 ; Set nozzle temp and wait\nG92 E0 ; Set Extruder position to zero\n; Uncomment the following lines to enable nozzle purge line along left edge of bed\n;G1 Z2.0 F3000 ; Raise Z axis\n;G1 X1.1 Y20 Z0.2 F3600.0 ; Move to purge line start position\n;G1 Y220 F1500.0 E10 ; Draw first purge line\n;G1 X1.4 F3600.0 ; Move to side\n;G1 Y20 F1500.0 E20 ; Draw second purge line\n;G92 E0 ; Reset Extruder\n;G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n;G1 X5 Y20 Z0.2 F3600.0 ; Move over to finish nozzle wipe\n;G92 E0\n"}, - "machine_end_gcode": { "default_value": "M83 ; Set extrder to Relative\nG1 E-5 F3000 ; Retract 5mm of filament at 50mm/s\nG90 ; Set all axis to Absolute \nG1 X0 Y{machine_depth} ; Park print head\nG1 Z10 ; Move up 10mm\nM106 S0 ; Set fan speed to 0\nM104 S0 ; Set bed temp to 0\nM140 S0 ; Set Nozzle temp to 0\nM84 ; Disable all stepper motors\n" }, + "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T0\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0} T0\nG28\nG92 E0\n"}, + "machine_end_gcode": { "default_value": "G91\nG1 E-2 F3000\nG1 E-2 Z0.2 F1200\nG1 X5 Y5 F3600\nG1 Z10\nG90\nG1 X0 Y{machine_depth}\nM106 S0\nM104 S0\nM140 S0\n\nM84 X Y E\n" }, - "machine_acceleration": { "value": 150 } + "machine_max_feedrate_x": { "value": 100 }, + "machine_max_feedrate_y": { "value": 100 }, + "machine_max_feedrate_z": { "value": 20 }, + "machine_max_feedrate_e": { "value": 120 }, + + "machine_max_acceleration_x": { "value": 120 }, + "machine_max_acceleration_y": { "value": 120 }, + "machine_max_acceleration_z": { "value": 120 }, + "machine_max_acceleration_e": { "value": 120 }, + "machine_acceleration": { "value": 150 }, + + "machine_max_jerk_xy": { "value": 20 }, + "machine_max_jerk_z": { "value": 0.4 }, + "machine_max_jerk_e": { "value": 5 } } } diff --git a/resources/definitions/tronxy_xy3.def.json b/resources/definitions/tronxy_xy3.def.json index 941ca7142f..db03c344f5 100644 --- a/resources/definitions/tronxy_xy3.def.json +++ b/resources/definitions/tronxy_xy3.def.json @@ -1,10 +1,11 @@ { - "name": "Tronxy XY-3/Pro", + "name": "Tronxy XY-3", "version": 2, "inherits": "tronxy_x", "metadata": { "quality_definition": "tronxy_x", "visible": true, + "author": "AdderMk2", "platform": "tronxy.stl" }, "overrides": { @@ -20,11 +21,18 @@ ] }, "gantry_height": { "value": 30 }, - "retraction_amount": { "value": 5 }, - "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21 ; Set units to millimeters\nG90 ; Set all axis to Absolute\nM82 ; Set extrusion to Absolute\nM107 ; Disable all fans\nM190 S{material_bed_temperature_layer_0} ; Set bed temperature and wait\nG28 ; Home all axis\n; Uncomment the line below to enable ABL Mesh probing\n;G29 ; Probe bed mesh for ABL\n; For best results do not run nozzle heater while performing ABL\nG1 Z5.0 ; Raise nozzle to prevent scratching of heat bed\nG1 X0 Y0 ; Move nozzle to Home before heating\nM109 S{material_print_temperature_layer_0} T0 ; Set nozzle temp and wait\nG92 E0 ; Set Extruder position to zero\n; Uncomment the following lines to enable nozzle purge line along left edge of bed\n;G1 Z2.0 F3000 ; Raise Z axis\n;G1 X1.1 Y20 Z0.2 F3600.0 ; Move to purge line start position\n;G1 Y220 F1500.0 E10 ; Draw first purge line\n;G1 X1.4 F3600.0 ; Move to side\n;G1 Y20 F1500.0 E20 ; Draw second purge line\n;G92 E0 ; Reset Extruder\n;G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n;G1 X5 Y20 Z0.2 F3600.0 ; Move over to finish nozzle wipe\n;G92 E0\n"}, - "machine_end_gcode": { "default_value": "M83 ; Set extrder to Relative\nG1 E-5 F3000 ; Retract 5mm of filament at 50mm/s\nG90 ; Set all axis to Absolute \nG1 X0 Y{machine_depth} ; Park print head\nG1 Z10 ; Move up 10mm\nM106 S0 ; Set fan speed to 0\nM104 S0 ; Set bed temp to 0\nM140 S0 ; Set Nozzle temp to 0\nM84 ; Disable all stepper motors\n" }, + "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T0\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0} T0\nG28\nG92 E0\n"}, + "machine_end_gcode": { "default_value": "G91\nG1 E-2 F3000\nG1 E-2 Z0.2 F1200\nG1 X5 Y5 F3600\nG1 Z10\nG90\nG1 X0 Y{machine_depth}\nM106 S0\nM104 S0\nM140 S0\n\nM84 X Y E\n" }, - "machine_acceleration": { "value": 150 } + "machine_max_feedrate_x": { "value": 100 }, + "machine_max_feedrate_y": { "value": 100 }, + "machine_max_feedrate_z": { "value": 20 }, + "machine_max_feedrate_e": { "value": 120 }, + "machine_max_acceleration_x": { "value": 150 }, + "machine_max_acceleration_y": { "value": 150 }, + "machine_max_acceleration_z": { "value": 150 }, + "machine_max_acceleration_e": { "value": 150 }, + "machine_acceleration": { "value": 80 } } } From 556a451b9ec28bebdb3fb97dff56b5a7f4822978 Mon Sep 17 00:00:00 2001 From: 64bittuning <47930605+64bittuning@users.noreply.github.com> Date: Fri, 28 Jan 2022 15:48:52 -0500 Subject: [PATCH 3/6] There is a bug in the Repo tests, and I'm going to find it. Yep, this is getting upsetting. --- resources/definitions/tronxy_x5sa_500.def.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/resources/definitions/tronxy_x5sa_500.def.json b/resources/definitions/tronxy_x5sa_500.def.json index b68a954115..4ce8904b52 100644 --- a/resources/definitions/tronxy_x5sa_500.def.json +++ b/resources/definitions/tronxy_x5sa_500.def.json @@ -23,11 +23,7 @@ "gantry_height": { "value": 40 }, "machine_start_gcode": { "default_value": "; X5SA Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T0\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0} T0\nG28\nG92 E0\n "}, - "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 \nG1 E-2 Z0.2 F2400 \nG1 X5 Y5 F3000\nG1 Z10\nG90\n\nG1 X0 Y0 \nM106 S0\nM104 S0\nM140 S0\n\nM84 X Y E \n" }, + "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 \nG1 E-2 Z0.2 F2400 \nG1 X5 Y5 F3000\nG1 Z10\nG90\n\nG1 X0 Y0 \nM106 S0\nM104 S0\nM140 S0\n\nM84 X Y E \n" } - "machine_max_feedrate_x": { "value": 150 }, - "machine_max_feedrate_y": { "value": 150 }, - "machine_max_feedrate_z": { "value": 20 }, - "machine_max_feedrate_e": { "value": 120 } } } From 8198bc0db50f6da47c58f898f2a42bab6d739888 Mon Sep 17 00:00:00 2001 From: 64bittuning <47930605+64bittuning@users.noreply.github.com> Date: Fri, 28 Jan 2022 16:33:13 -0500 Subject: [PATCH 4/6] Submitting for approval Upon doing my research, I have seen several other people struggle with build issues. I feel at this time that I have done my due dilligence, and as long as my only failure is 14/15, I feel this PR is ready. --- resources/definitions/tronxy_d01.def.json | 10 +--- resources/definitions/tronxy_x.def.json | 59 ++++++++----------- resources/definitions/tronxy_x5sa.def.json | 10 ++-- .../definitions/tronxy_x5sa_400.def.json | 15 ++--- .../definitions/tronxy_x5sa_500.def.json | 9 +-- resources/definitions/tronxy_xy2.def.json | 16 ++--- resources/definitions/tronxy_xy2pro.def.json | 23 ++------ resources/definitions/tronxy_xy3.def.json | 18 ++---- .../definitions/tronxy_xy3proV2.def.json | 32 ++++++++++ .../extruders/tronxy_base_extruder_0.def.json | 7 ++- .../extruders/tronxy_base_extruder_1.def.json | 19 ++++++ resources/variants/tronxy_d01_0.2.inst.cfg | 2 + resources/variants/tronxy_d01_0.3.inst.cfg | 2 + resources/variants/tronxy_d01_0.4.inst.cfg | 2 + resources/variants/tronxy_d01_0.5.inst.cfg | 2 + resources/variants/tronxy_d01_0.6.inst.cfg | 2 + resources/variants/tronxy_d01_0.8.inst.cfg | 2 + resources/variants/tronxy_x5sa_0.2.inst.cfg | 2 + resources/variants/tronxy_x5sa_0.3.inst.cfg | 2 + resources/variants/tronxy_x5sa_0.4.inst.cfg | 2 + resources/variants/tronxy_x5sa_0.5.inst.cfg | 2 + resources/variants/tronxy_x5sa_0.6.inst.cfg | 2 + resources/variants/tronxy_x5sa_0.8.inst.cfg | 2 + .../variants/tronxy_x5sa_400_0.2.inst.cfg | 2 + .../variants/tronxy_x5sa_400_0.3.inst.cfg | 2 + .../variants/tronxy_x5sa_400_0.4.inst.cfg | 2 + .../variants/tronxy_x5sa_400_0.5.inst.cfg | 2 + .../variants/tronxy_x5sa_400_0.6.inst.cfg | 2 + .../variants/tronxy_x5sa_400_0.8.inst.cfg | 2 + .../variants/tronxy_x5sa_500_0.2.inst.cfg | 2 + .../variants/tronxy_x5sa_500_0.3.inst.cfg | 2 + .../variants/tronxy_x5sa_500_0.4.inst.cfg | 2 + .../variants/tronxy_x5sa_500_0.5.inst.cfg | 2 + .../variants/tronxy_x5sa_500_0.6.inst.cfg | 2 + .../variants/tronxy_x5sa_500_0.8.inst.cfg | 2 + resources/variants/tronxy_x_0.2.inst.cfg | 2 + resources/variants/tronxy_x_0.3.inst.cfg | 2 + resources/variants/tronxy_x_0.4.inst.cfg | 2 + resources/variants/tronxy_x_0.5.inst.cfg | 2 + resources/variants/tronxy_x_0.6.inst.cfg | 2 + resources/variants/tronxy_x_0.8.inst.cfg | 2 + resources/variants/tronxy_xy2_0.2.inst.cfg | 2 + resources/variants/tronxy_xy2_0.3.inst.cfg | 2 + resources/variants/tronxy_xy2_0.4.inst.cfg | 2 + resources/variants/tronxy_xy2_0.5.inst.cfg | 2 + resources/variants/tronxy_xy2_0.6.inst.cfg | 2 + resources/variants/tronxy_xy2_0.8.inst.cfg | 2 + resources/variants/tronxy_xy2pro_0.2.inst.cfg | 2 + resources/variants/tronxy_xy2pro_0.3.inst.cfg | 2 + resources/variants/tronxy_xy2pro_0.4.inst.cfg | 2 + resources/variants/tronxy_xy2pro_0.5.inst.cfg | 2 + resources/variants/tronxy_xy2pro_0.6.inst.cfg | 2 + resources/variants/tronxy_xy2pro_0.8.inst.cfg | 2 + resources/variants/tronxy_xy3_0.2.inst.cfg | 2 + resources/variants/tronxy_xy3_0.3.inst.cfg | 2 + resources/variants/tronxy_xy3_0.4.inst.cfg | 2 + resources/variants/tronxy_xy3_0.5.inst.cfg | 2 + resources/variants/tronxy_xy3_0.6.inst.cfg | 2 + resources/variants/tronxy_xy3_0.8.inst.cfg | 2 + .../variants/tronxy_xy3proV2_0.2.inst.cfg | 14 +++++ .../variants/tronxy_xy3proV2_0.3.inst.cfg | 14 +++++ .../variants/tronxy_xy3proV2_0.4.inst.cfg | 14 +++++ .../variants/tronxy_xy3proV2_0.5.inst.cfg | 14 +++++ .../variants/tronxy_xy3proV2_0.6.inst.cfg | 14 +++++ .../variants/tronxy_xy3proV2_0.8.inst.cfg | 14 +++++ 65 files changed, 294 insertions(+), 104 deletions(-) create mode 100644 resources/definitions/tronxy_xy3proV2.def.json create mode 100644 resources/extruders/tronxy_base_extruder_1.def.json create mode 100644 resources/variants/tronxy_xy3proV2_0.2.inst.cfg create mode 100644 resources/variants/tronxy_xy3proV2_0.3.inst.cfg create mode 100644 resources/variants/tronxy_xy3proV2_0.4.inst.cfg create mode 100644 resources/variants/tronxy_xy3proV2_0.5.inst.cfg create mode 100644 resources/variants/tronxy_xy3proV2_0.6.inst.cfg create mode 100644 resources/variants/tronxy_xy3proV2_0.8.inst.cfg diff --git a/resources/definitions/tronxy_d01.def.json b/resources/definitions/tronxy_d01.def.json index ff8badd355..141414f85f 100644 --- a/resources/definitions/tronxy_d01.def.json +++ b/resources/definitions/tronxy_d01.def.json @@ -5,7 +5,6 @@ "metadata": { "quality_definition": "tronxy_x", "visible": true, - "author": "AdderMk2", "platform": "tronxy.stl" }, "overrides": { @@ -23,15 +22,8 @@ "gantry_height": { "value": 30 }, "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T0\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0} T0\nG28\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to preventscratching of Heat Bed\nG1 X1 Y20 Z0.3 F3600.0 ; Move to start position\nG1 X1 Y220.0 Z0.3 F1500.0 E25 ; Draw the first line\nG1 X1.6 Y220.0 Z0.3 F3600.0 ; Move to side a little\nG1 X1.6 Y20 Z0.3 F1500.0 E50 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F3600.0 ; Move over to prevent blob squish" }, + "machine_end_gcode": { "default_value": "M83 ; Set extrder to Relative\nG1 E-5 F3000 ; Retract 5mm of filament at 50mm/s\nG90 ; Set all axis to Absolute \nG1 X0 Y{machine_depth} ; Park print head\nG1 Z10 ; Move up 10mm\nM106 S0 ; Set fan speed to 0\nM104 S0 ; Set bed temp to 0\nM140 S0 ; Set Nozzle temp to 0\nM84 ; Disable all stepper motors\n" }, - "machine_max_feedrate_x": { "value": 150 }, - "machine_max_feedrate_y": { "value": 150 }, - "machine_max_feedrate_z": { "value": 20 }, - "machine_max_feedrate_e": { "value": 120 }, - "machine_max_acceleration_x": { "value": 150 }, - "machine_max_acceleration_y": { "value": 150 }, - "machine_max_acceleration_z": { "value": 150 }, - "machine_max_acceleration_e": { "value": 150 }, "machine_acceleration": { "value": 120 } } } diff --git a/resources/definitions/tronxy_x.def.json b/resources/definitions/tronxy_x.def.json index 10b020267d..b7a0a94226 100644 --- a/resources/definitions/tronxy_x.def.json +++ b/resources/definitions/tronxy_x.def.json @@ -4,13 +4,14 @@ "inherits": "fdmprinter", "metadata": { "visible": false, - "author": "AdderMk2", + "author": "KV/AdderMk2", "manufacturer": "Tronxy", "file_formats": "text/x-gcode", "first_start_actions": ["MachineSettingsAction"], "machine_extruder_trains": { - "0": "tronxy_base_extruder_0" + "0": "tronxy_base_extruder_0", + "1": "tronxy_base_extruder_1" }, "has_materials": true, @@ -27,20 +28,6 @@ "machine_start_gcode": { "default_value": "G21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T0\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0} T0\nG28\nG92 E0\nG1 Z15.0 F{speed_travel_layer_0}\nG0 E3 F200\nG92 E0\n" }, "machine_end_gcode": { "default_value": "M107 T0\nM104 S0\nM104 S0 T1\nM140 S0\nG92 E0\nG91\nG1 E-1 F300 \nG1 Z+0.5 E-5 X-20 Y-20 F9000\nG28 X0 Y0\nM84 ;steppers off\nG90 ;absolute positioning\n" }, - "machine_max_feedrate_x": { "value": 100 }, - "machine_max_feedrate_y": { "value": 100 }, - "machine_max_feedrate_z": { "value": 10 }, - "machine_max_feedrate_e": { "value": 50 }, - - "machine_max_acceleration_x": { "value": 120 }, - "machine_max_acceleration_y": { "value": 120 }, - "machine_max_acceleration_z": { "value": 120 }, - "machine_max_acceleration_e": { "value": 120 }, - "machine_acceleration": { "value": 100 }, - - "machine_max_jerk_xy": { "value": 20 }, - "machine_max_jerk_z": { "value": 0.4 }, - "machine_max_jerk_e": { "value": 5 }, "machine_heated_bed": { "default_value": true }, @@ -51,7 +38,7 @@ "acceleration_travel_layer_0": { "value": "acceleration_travel" }, "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" }, - "jerk_print": { "value": 20 }, + "jerk_print": { "value": 12 }, "jerk_travel": { "value": "jerk_print" }, "jerk_travel_layer_0": { "value": "jerk_travel" }, @@ -60,10 +47,10 @@ "speed_print": { "value": 60.0 } , "speed_infill": { "value": "speed_print" }, - "speed_wall": { "value": "speed_print / 1.33" }, + "speed_wall": { "value": "speed_print *0.75" }, "speed_wall_0": { "value": "speed_wall" }, "speed_wall_x": { "value": "speed_wall" }, - "speed_topbottom": { "value": "speed_print / 1.5" }, + "speed_topbottom": { "value": "speed_print * 0.5" }, "speed_roofing": { "value": "speed_topbottom" }, "speed_travel": { "value": "60.0 if speed_print < 50 else 120.0 if speed_print > 80 else speed_print * 1.25" }, "speed_layer_0": { "value": 30.0 }, @@ -82,24 +69,25 @@ "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, - "material_flow": { "value": 100 }, + "material_flow": { "value": 96 }, - "z_seam_type": { "value": "'back'" }, - "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, + "z_seam_type": { "value": "'sharpest_corner'" }, + "z_seam_corner": { "value": "'z_seam_corner_inner'" }, "infill_sparse_density": { "value": "20" }, - "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 56 else 'cubic'" }, "infill_before_walls": { "value": false }, "infill_overlap": { "value": 30.0 }, "skin_overlap": { "value": 10.0 }, "infill_wipe_dist": { "value": 0.0 }, "wall_0_wipe_dist": { "value": 0.0 }, - "fill_outline_gaps": { "value": false }, - "filter_out_tiny_gaps": { "value": false }, + "fill_outline_gaps": { "value": true }, + "filter_out_tiny_gaps": { "value": true }, "retraction_speed": { "maximum_value_warning": "machine_max_feedrate_e", + "default_value": 45, "maximum_value": 200 }, "retraction_retract_speed": { @@ -111,17 +99,19 @@ "maximum_value": 200 }, - "retraction_hop_enabled": { "value": "False" }, + "retraction_hop_enabled": { "value": "True" }, "retraction_hop": { "value": 0.2 }, "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" }, "retraction_combing_max_distance": { "value": 30 }, - "travel_avoid_other_parts": { "value": true }, + "travel_avoid_other_parts": { "value": false }, "travel_avoid_supports": { "value": true }, "travel_retract_before_outer_wall": { "value": true }, "retraction_enable": { "value": true }, + "retract_at_layer_change": { "value": true }, "retraction_count_max": { "value": 100 }, - "retraction_extrusion_window": { "value": 10 }, + "retraction_extrusion_window": { "value": 5 }, + "retraction_hop_enabled": { "value": true }, "retraction_min_travel": { "value": 1.5 }, "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, @@ -141,24 +131,27 @@ "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width/2.0/layer_height)))" }, "support_pattern": { "value": "'zigzag'" }, - "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" }, + "support_infill_angles": { "value": [45] }, + "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 30" }, "support_use_towers": { "value": false }, - "support_xy_distance": { "value": "wall_line_width_0 * 2" }, + "support_xy_distance": { "value": "wall_line_width_0 * 3" }, "support_xy_distance_overhang": { "value": "wall_line_width_0" }, "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height*2" }, "support_xy_overrides_z": { "value": "'xy_overrides_z'" }, - "support_wall_count": { "value": 1 }, + "support_wall_count": { "value": 0 }, "support_brim_enable": { "value": true }, "support_brim_width": { "value": 4 }, - "support_interface_enable": { "value": true }, + "support_interface_enable": { "value": false }, "support_interface_height": { "value": "layer_height * 4" }, "support_interface_density": { "value": 33.333 }, "support_interface_pattern": { "value": "'grid'" }, "support_interface_skip_height": { "value": 0.2 }, "minimum_support_area": { "value": 2 }, "minimum_interface_area": { "value": 10 }, + "top_bottom_pattern": {"value": "'zigzag'" }, + "top_bottom_pattern_0": {"value": "'zigzag'" }, "top_bottom_thickness": {"value": "layer_height_0 + layer_height * 3" }, - "wall_thickness": {"value": "line_width * 2" } + "wall_line_count": {"value": "3" } } } \ No newline at end of file diff --git a/resources/definitions/tronxy_x5sa.def.json b/resources/definitions/tronxy_x5sa.def.json index 0e70dd72b4..a4ca9a510a 100644 --- a/resources/definitions/tronxy_x5sa.def.json +++ b/resources/definitions/tronxy_x5sa.def.json @@ -1,11 +1,10 @@ { - "name": "Tronxy X5SA/X5ST/Pro", + "name": "Tronxy X5SA/X5ST/Pro/2E/D01 Plus", "version": 2, "inherits": "tronxy_x", "metadata": { "quality_definition": "tronxy_x", "visible": true, - "author": "AdderMk2", "platform": "tronxy.stl" }, "overrides": { @@ -21,8 +20,11 @@ ] }, "gantry_height": { "value": 40 }, + "retraction_amount": { "value": 4.5 }, - "machine_start_gcode": { "default_value": "; X5SA Pro Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T0\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0} T0\nG28\nG92 E0\n"}, - "machine_end_gcode": { "default_value": "G91\nG1 E-2 F3000\nG1 E-2 Z0.2 F1200\nG1 X5 Y5 F3600\nG1 Z10\nG90\nG1 X0 Y0\nM106 S0\nM104 S0\nM140 S0\n\nM84 X Y E\n" } + "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21 ; Set units to millimeters\nG90 ; Set all axis to Absolute\nM82 ; Set extrusion to Absolute\nM107 ; Disable all fans\nM190 S{material_bed_temperature_layer_0} ; Set bed temperature and wait\nG28 ; Home all axis\n; Uncomment the line below to enable ABL Mesh probing\n;G29 ; Probe bed mesh for ABL\n; For best results do not run nozzle heater while performing ABL\nG1 Z5.0 ; Raise nozzle to prevent scratching of heat bed\nG1 X0 Y0 ; Move nozzle to Home before heating\nM109 S{material_print_temperature_layer_0} T0 ; Set nozzle temp and wait\nG92 E0 ; Set Extruder position to zero\n; Uncomment the following lines to enable nozzle purge line along left edge of bed\n;G1 Z2.0 F3000 ; Raise Z axis\n;G1 X1.1 Y20 Z0.2 F3600.0 ; Move to purge line start position\n;G1 Y220 F1500.0 E10 ; Draw first purge line\n;G1 X1.4 F3600.0 ; Move to side\n;G1 Y20 F1500.0 E20 ; Draw second purge line\n;G92 E0 ; Reset Extruder\n;G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n;G1 X5 Y20 Z0.2 F3600.0 ; Move over to finish nozzle wipe\n;G92 E0\n"}, + "machine_end_gcode": { "default_value": "G91 ; Set Positioning to Relative\nM83 ; Set Extruder to Relative\nG92 E0 ; Reset Extruder\nG1 E-4 F3000 ; Retract 4mm of filament\nG1 Z0.2 ; Raise nozzle .2mm\nG90 ; Set positioning to absolute\nG1 X{machine_width} Y{machine_depth} ; Park print head\nG91 ; Set Positioning to RelativeG1 Z10 ; Raise nozzle 10mm\nM106 S0 ; Turn off part fan\nM104 S0 ; Set nozzle temp to zero\nM140 S0 ; set bed temp to zero\nM84 X Y Z E ; Disable X Y Z and E steppers\n" }, + + "machine_acceleration": { "value": 150 } } } diff --git a/resources/definitions/tronxy_x5sa_400.def.json b/resources/definitions/tronxy_x5sa_400.def.json index 5604b17619..d1448a3287 100644 --- a/resources/definitions/tronxy_x5sa_400.def.json +++ b/resources/definitions/tronxy_x5sa_400.def.json @@ -1,11 +1,10 @@ { - "name": "Tronxy X5SA/X5ST/Pro 400", + "name": "Tronxy X5SA/X5ST/Pro/2E 400mm", "version": 2, "inherits": "tronxy_x", "metadata": { "quality_definition": "tronxy_x", "visible": true, - "author": "AdderMk2", "platform": "tronxy.stl" }, "overrides": { @@ -21,13 +20,11 @@ ] }, "gantry_height": { "value": 40 }, + "retraction_amount": { "value": 6.5 }, - "machine_start_gcode": { "default_value": "; X5SA Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T0\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0} T0\nG28\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to preventscratching of Heat Bed\nG1 X1 Y20 Z0.3 F3600.0 ; Move to start position\nG1 X1 Y370.0 Z0.3 F1500.0 E25 ; Draw the first line\nG1 X1.6 Y370.0 Z0.3 F3600.0 ; Move to side a little\nG1 X1.6 Y20 Z0.3 F1500.0 E50 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F3600.0 ; Move over to prevent blob squish"}, - "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 \nG1 E-2 Z0.2 F2400 \nG1 X5 Y5 F3000\nG1 Z10\nG90\n\nG1 X0 Y0 \nM106 S0\nM104 S0\nM140 S0\n\nM84 X Y E \n" }, + "machine_start_gcode": { "default_value": "; X5SA Start Code\nG21 ; Set units to millimeters\nG90 ; Set all axis to Absolute\nM82 ; Set extrusion to Absolute\nM107 ; Disable all fans\nM190 S{material_bed_temperature_layer_0} ; Set bed temperature and wait\nG28 ; Home all axis\n; Uncomment the line below to enable ABL Mesh probing\n;G29 ; Probe bed mesh for ABL\n; For best results do not run nozzle heater while performing ABL\nG1 Z5.0 ; Raise nozzle to prevent scratching of heat bed\nG1 X0 Y0 ; Move nozzle to Home before heating\nM109 S{material_print_temperature_layer_0} T0 ; Set nozzle temp and wait\nG92 E0 ; Set Extruder position to zero\n; Uncomment the following lines to enable nozzle purge line along left edge of bed\n;G1 Z2.0 F3000 ; Raise Z axis\n;G1 X1.1 Y20 Z0.2 F3600.0 ; Move to purge line start position\n;G1 Y290 F1500.0 E15 ; Draw first purge line\n;G1 X1.4 F3600.0 ; Move to side\n;G1 Y20 F1500.0 E30 ; Draw second purge line\n;G92 E0 ; Reset Extruder\n;G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n;G1 X5 Y20 Z0.2 F3600.0 ; Move over to finish nozzle wipe\n;G92 E0\n"}, + "machine_end_gcode": { "default_value": "G91 ; Set Positioning to Relative\nM83 ; Set Extruder to Relative\nG92 E0 ; Reset Extruder\nG1 E-4 F3000 ; Retract 4mm of filament\nG1 Z0.2 ; Raise nozzle .2mm\nG90 ; Set positioning to absolute\nG1 X{machine_width} Y{machine_depth} ; Park print head\nG91 ; Set Positioning to RelativeG1 Z10 ; Raise nozzle 10mm\nM106 S0 ; Turn off part fan\nM104 S0 ; Set nozzle temp to zero\nM140 S0 ; set bed temp to zero\nM84 X Y Z E ; Disable X Y Z and E steppers\n" }, - "machine_max_feedrate_x": { "value": 100 }, - "machine_max_feedrate_y": { "value": 100 }, - "machine_max_feedrate_z": { "value": 20 }, - "machine_max_feedrate_e": { "value": 120 } + "machine_acceleration": { "value": 150 } } -} +} \ No newline at end of file diff --git a/resources/definitions/tronxy_x5sa_500.def.json b/resources/definitions/tronxy_x5sa_500.def.json index 4ce8904b52..44f8d1ba1a 100644 --- a/resources/definitions/tronxy_x5sa_500.def.json +++ b/resources/definitions/tronxy_x5sa_500.def.json @@ -1,11 +1,10 @@ { - "name": "Tronxy X5SA/X5ST/Pro 500", + "name": "Tronxy X5SA/X5ST/Pro/2E 500mm", "version": 2, "inherits": "tronxy_x", "metadata": { "quality_definition": "tronxy_x", "visible": true, - "author": "AdderMk2", "platform": "tronxy.stl" }, "overrides": { @@ -21,9 +20,11 @@ ] }, "gantry_height": { "value": 40 }, + "retraction_amount": { "value": 6.5 }, - "machine_start_gcode": { "default_value": "; X5SA Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T0\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0} T0\nG28\nG92 E0\n "}, - "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 \nG1 E-2 Z0.2 F2400 \nG1 X5 Y5 F3000\nG1 Z10\nG90\n\nG1 X0 Y0 \nM106 S0\nM104 S0\nM140 S0\n\nM84 X Y E \n" } + "machine_start_gcode": { "default_value": "; X5SA Start Code\nG21 ; Set units to millimeters\nG90 ; Set all axis to Absolute\nM82 ; Set extrusion to Absolute\nM107 ; Disable all fans\nM190 S{material_bed_temperature_layer_0} ; Set bed temperature and wait\nG28 ; Home all axis\n; Uncomment the line below to enable ABL Mesh probing\n;G29 ; Probe bed mesh for ABL\n; For best results do not run nozzle heater while performing ABL\nG1 Z5.0 ; Raise nozzle to prevent scratching of heat bed\nG1 X0 Y0 ; Move nozzle to Home before heating\nM109 S{material_print_temperature_layer_0} T0 ; Set nozzle temp and wait\nG92 E0 ; Set Extruder position to zero\n; Uncomment the following lines to enable nozzle purge line along left edge of bed\n;G1 Z2.0 F3000 ; Raise Z axis\n;G1 X1.1 Y20 Z0.2 F3600.0 ; Move to purge line start position\n;G1 Y290 F1500.0 E15 ; Draw first purge line\n;G1 X1.4 F3600.0 ; Move to side\n;G1 Y20 F1500.0 E30 ; Draw second purge line\n;G92 E0 ; Reset Extruder\n;G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n;G1 X5 Y20 Z0.2 F3600.0 ; Move over to finish nozzle wipe\n;G92 E0\n"}, + "machine_end_gcode": { "default_value": "G91 ; Set Positioning to Relative\nM83 ; Set Extruder to Relative\nG92 E0 ; Reset Extruder\nG1 E-4 F3000 ; Retract 4mm of filament\nG1 Z0.2 ; Raise nozzle .2mm\nG90 ; Set positioning to absolute\nG1 X{machine_width} Y{machine_depth} ; Park print head\nG91 ; Set Positioning to RelativeG1 Z10 ; Raise nozzle 10mm\nM106 S0 ; Turn off part fan\nM104 S0 ; Set nozzle temp to zero\nM140 S0 ; set bed temp to zero\nM84 X Y Z E ; Disable X Y Z and E steppers\n" }, + "machine_acceleration": { "value": 150 } } } diff --git a/resources/definitions/tronxy_xy2.def.json b/resources/definitions/tronxy_xy2.def.json index eaae1dbb08..ce7966fc3b 100644 --- a/resources/definitions/tronxy_xy2.def.json +++ b/resources/definitions/tronxy_xy2.def.json @@ -5,7 +5,6 @@ "metadata": { "quality_definition": "tronxy_x", "visible": true, - "author": "AdderMk2", "platform": "tronxy.stl" }, "overrides": { @@ -21,18 +20,11 @@ ] }, "gantry_height": { "value": 40 }, + "retraction_amount": { "value": 4.5 }, - "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T0\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0} T0\nG28\nG92 E0\n"}, - "machine_end_gcode": { "default_value": "G91\nG1 E-2 F3000\nG1 E-2 Z0.2 F1200\nG1 X5 Y5 F3600\nG1 Z10\nG90\nG1 X0 Y{machine_depth}\nM106 S0 ;Turn-off fan\nM104 S0\nM140 S0\n\nM84 X Y E\n" }, + "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21 ; Set units to millimeters\nG90 ; Set all axis to Absolute\nM82 ; Set extrusion to Absolute\nM107 ; Disable all fans\nM190 S{material_bed_temperature_layer_0} ; Set bed temperature and wait\nG28 ; Home all axis\n; Uncomment the line below to enable ABL Mesh probing\n;G29 ; Probe bed mesh for ABL\n; For best results do not run nozzle heater while performing ABL\nG1 Z5.0 ; Raise nozzle to prevent scratching of heat bed\nG1 X0 Y0 ; Move nozzle to Home before heating\nM109 S{material_print_temperature_layer_0} T0 ; Set nozzle temp and wait\nG92 E0 ; Set Extruder position to zero\n; Uncomment the following lines to enable nozzle purge line along left edge of bed\n;G1 Z2.0 F3000 ; Raise Z axis\n;G1 X1.1 Y20 Z0.2 F3600.0 ; Move to purge line start position\n;G1 Y220 F1500.0 E10 ; Draw first purge line\n;G1 X1.4 F3600.0 ; Move to side\n;G1 Y20 F1500.0 E20 ; Draw second purge line\n;G92 E0 ; Reset Extruder\n;G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n;G1 X5 Y20 Z0.2 F3600.0 ; Move over to finish nozzle wipe\n;G92 E0\n"}, + "machine_end_gcode": { "default_value": "M83 ; Set extrder to Relative\nG1 E-5 F3000 ; Retract 5mm of filament at 50mm/s\nG90 ; Set all axis to Absolute \nG1 X0 Y{machine_depth} ; Park print head\nG1 Z10 ; Move up 10mm\nM106 S0 ; Set fan speed to 0\nM104 S0 ; Set bed temp to 0\nM140 S0 ; Set Nozzle temp to 0\nM84 ; Disable all stepper motors\n" }, - "machine_max_feedrate_x": { "value": 100 }, - "machine_max_feedrate_y": { "value": 100 }, - "machine_max_feedrate_z": { "value": 20 }, - "machine_max_feedrate_e": { "value": 120 }, - "machine_max_acceleration_x": { "value": 150 }, - "machine_max_acceleration_y": { "value": 150 }, - "machine_max_acceleration_z": { "value": 150 }, - "machine_max_acceleration_e": { "value": 150 }, - "machine_acceleration": { "value": 80 } + "machine_acceleration": { "value": 150 } } } diff --git a/resources/definitions/tronxy_xy2pro.def.json b/resources/definitions/tronxy_xy2pro.def.json index 59e727bbb0..fb2bd70ea3 100644 --- a/resources/definitions/tronxy_xy2pro.def.json +++ b/resources/definitions/tronxy_xy2pro.def.json @@ -1,11 +1,10 @@ { - "name": "Tronxy XY-2 Pro", + "name": "Tronxy XY-2 Pro/Pro 2E/XY3 SE", "version": 2, "inherits": "tronxy_x", "metadata": { "quality_definition": "tronxy_x", "visible": true, - "author": "AdderMk2", "platform": "tronxy.stl" }, "overrides": { @@ -21,23 +20,11 @@ ] }, "gantry_height": { "value": 40 }, + "retraction_amount": { "value": 4.5 }, - "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T0\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0} T0\nG28\nG92 E0\n"}, - "machine_end_gcode": { "default_value": "G91\nG1 E-2 F3000\nG1 E-2 Z0.2 F1200\nG1 X5 Y5 F3600\nG1 Z10\nG90\nG1 X0 Y{machine_depth}\nM106 S0\nM104 S0\nM140 S0\n\nM84 X Y E\n" }, + "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21 ; Set units to millimeters\nG90 ; Set all axis to Absolute\nM82 ; Set extrusion to Absolute\nM107 ; Disable all fans\nM190 S{material_bed_temperature_layer_0} ; Set bed temperature and wait\nG28 ; Home all axis\n; Uncomment the line below to enable ABL Mesh probing\n;G29 ; Probe bed mesh for ABL\n; For best results do not run nozzle heater while performing ABL\nG1 Z5.0 ; Raise nozzle to prevent scratching of heat bed\nG1 X0 Y0 ; Move nozzle to Home before heating\nM109 S{material_print_temperature_layer_0} T0 ; Set nozzle temp and wait\nG92 E0 ; Set Extruder position to zero\n; Uncomment the following lines to enable nozzle purge line along left edge of bed\n;G1 Z2.0 F3000 ; Raise Z axis\n;G1 X1.1 Y20 Z0.2 F3600.0 ; Move to purge line start position\n;G1 Y220 F1500.0 E10 ; Draw first purge line\n;G1 X1.4 F3600.0 ; Move to side\n;G1 Y20 F1500.0 E20 ; Draw second purge line\n;G92 E0 ; Reset Extruder\n;G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n;G1 X5 Y20 Z0.2 F3600.0 ; Move over to finish nozzle wipe\n;G92 E0\n"}, + "machine_end_gcode": { "default_value": "M83 ; Set extrder to Relative\nG1 E-5 F3000 ; Retract 5mm of filament at 50mm/s\nG90 ; Set all axis to Absolute \nG1 X0 Y{machine_depth} ; Park print head\nG1 Z10 ; Move up 10mm\nM106 S0 ; Set fan speed to 0\nM104 S0 ; Set bed temp to 0\nM140 S0 ; Set Nozzle temp to 0\nM84 ; Disable all stepper motors\n" }, - "machine_max_feedrate_x": { "value": 100 }, - "machine_max_feedrate_y": { "value": 100 }, - "machine_max_feedrate_z": { "value": 20 }, - "machine_max_feedrate_e": { "value": 120 }, - - "machine_max_acceleration_x": { "value": 120 }, - "machine_max_acceleration_y": { "value": 120 }, - "machine_max_acceleration_z": { "value": 120 }, - "machine_max_acceleration_e": { "value": 120 }, - "machine_acceleration": { "value": 150 }, - - "machine_max_jerk_xy": { "value": 20 }, - "machine_max_jerk_z": { "value": 0.4 }, - "machine_max_jerk_e": { "value": 5 } + "machine_acceleration": { "value": 150 } } } diff --git a/resources/definitions/tronxy_xy3.def.json b/resources/definitions/tronxy_xy3.def.json index db03c344f5..941ca7142f 100644 --- a/resources/definitions/tronxy_xy3.def.json +++ b/resources/definitions/tronxy_xy3.def.json @@ -1,11 +1,10 @@ { - "name": "Tronxy XY-3", + "name": "Tronxy XY-3/Pro", "version": 2, "inherits": "tronxy_x", "metadata": { "quality_definition": "tronxy_x", "visible": true, - "author": "AdderMk2", "platform": "tronxy.stl" }, "overrides": { @@ -21,18 +20,11 @@ ] }, "gantry_height": { "value": 30 }, + "retraction_amount": { "value": 5 }, - "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T0\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0} T0\nG28\nG92 E0\n"}, - "machine_end_gcode": { "default_value": "G91\nG1 E-2 F3000\nG1 E-2 Z0.2 F1200\nG1 X5 Y5 F3600\nG1 Z10\nG90\nG1 X0 Y{machine_depth}\nM106 S0\nM104 S0\nM140 S0\n\nM84 X Y E\n" }, + "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21 ; Set units to millimeters\nG90 ; Set all axis to Absolute\nM82 ; Set extrusion to Absolute\nM107 ; Disable all fans\nM190 S{material_bed_temperature_layer_0} ; Set bed temperature and wait\nG28 ; Home all axis\n; Uncomment the line below to enable ABL Mesh probing\n;G29 ; Probe bed mesh for ABL\n; For best results do not run nozzle heater while performing ABL\nG1 Z5.0 ; Raise nozzle to prevent scratching of heat bed\nG1 X0 Y0 ; Move nozzle to Home before heating\nM109 S{material_print_temperature_layer_0} T0 ; Set nozzle temp and wait\nG92 E0 ; Set Extruder position to zero\n; Uncomment the following lines to enable nozzle purge line along left edge of bed\n;G1 Z2.0 F3000 ; Raise Z axis\n;G1 X1.1 Y20 Z0.2 F3600.0 ; Move to purge line start position\n;G1 Y220 F1500.0 E10 ; Draw first purge line\n;G1 X1.4 F3600.0 ; Move to side\n;G1 Y20 F1500.0 E20 ; Draw second purge line\n;G92 E0 ; Reset Extruder\n;G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n;G1 X5 Y20 Z0.2 F3600.0 ; Move over to finish nozzle wipe\n;G92 E0\n"}, + "machine_end_gcode": { "default_value": "M83 ; Set extrder to Relative\nG1 E-5 F3000 ; Retract 5mm of filament at 50mm/s\nG90 ; Set all axis to Absolute \nG1 X0 Y{machine_depth} ; Park print head\nG1 Z10 ; Move up 10mm\nM106 S0 ; Set fan speed to 0\nM104 S0 ; Set bed temp to 0\nM140 S0 ; Set Nozzle temp to 0\nM84 ; Disable all stepper motors\n" }, - "machine_max_feedrate_x": { "value": 100 }, - "machine_max_feedrate_y": { "value": 100 }, - "machine_max_feedrate_z": { "value": 20 }, - "machine_max_feedrate_e": { "value": 120 }, - "machine_max_acceleration_x": { "value": 150 }, - "machine_max_acceleration_y": { "value": 150 }, - "machine_max_acceleration_z": { "value": 150 }, - "machine_max_acceleration_e": { "value": 150 }, - "machine_acceleration": { "value": 80 } + "machine_acceleration": { "value": 150 } } } diff --git a/resources/definitions/tronxy_xy3proV2.def.json b/resources/definitions/tronxy_xy3proV2.def.json new file mode 100644 index 0000000000..2be9a1998e --- /dev/null +++ b/resources/definitions/tronxy_xy3proV2.def.json @@ -0,0 +1,32 @@ +{ + "name": "Tronxy XY-3 Pro V2", + "version": 2, + "inherits": "tronxy_x", + "metadata": { + "quality_definition": "tronxy_x", + "visible": true, + "platform": "tronxy.stl" + }, + "overrides": { + "machine_name": { "default_value": "Tronxy XY-3" }, + "machine_width": { "default_value": 310 }, + "machine_depth": { "default_value": 310 }, + "machine_height": { "default_value": 330 }, + "machine_head_with_fans_polygon": { "default_value": [ + [-30, 45], + [-30, -30], + [27, -30], + [27, 45] + ] + }, + "gantry_height": { "value": 30 }, + "retraction_amount": { "value": 0.5 }, + "retraction_speed": { "value": 45 }, + + + "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21 ; Set units to millimeters\nG90 ; Set all axis to Absolute\nM82 ; Set extrusion to Absolute\nM107 ; Disable all fans\nM190 S{material_bed_temperature_layer_0} ; Set bed temperature and wait\nG28 ; Home all axis\n; Uncomment the line below to enable ABL Mesh probing\n;G29 ; Probe bed mesh for ABL\n; For best results do not run nozzle heater while performing ABL\nG1 Z5.0 ; Raise nozzle to prevent scratching of heat bed\nG1 X0 Y0 ; Move nozzle to Home before heating\nM109 S{material_print_temperature_layer_0} T0 ; Set nozzle temp and wait\nG92 E0 ; Set Extruder position to zero\n; Uncomment the following lines to enable nozzle purge line along left edge of bed\n;G1 Z2.0 F3000 ; Raise Z axis\n;G1 X1.1 Y20 Z0.2 F3600.0 ; Move to purge line start position\n;G1 Y220 F1500.0 E10 ; Draw first purge line\n;G1 X1.4 F3600.0 ; Move to side\n;G1 Y20 F1500.0 E20 ; Draw second purge line\n;G92 E0 ; Reset Extruder\n;G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n;G1 X5 Y20 Z0.2 F3600.0 ; Move over to finish nozzle wipe\n;G92 E0\n"}, + "machine_end_gcode": { "default_value": "M83 ; Set extrder to Relative\nG1 E-5 F3000 ; Retract 5mm of filament at 50mm/s\nG90 ; Set all axis to Absolute \nG1 X0 Y{machine_depth} ; Park print head\nG1 Z10 ; Move up 10mm\nM106 S0 ; Set fan speed to 0\nM104 S0 ; Set bed temp to 0\nM140 S0 ; Set Nozzle temp to 0\nM84 ; Disable all stepper motors\n" }, + + "machine_acceleration": { "value": 150 } + } +} diff --git a/resources/extruders/tronxy_base_extruder_0.def.json b/resources/extruders/tronxy_base_extruder_0.def.json index 2d4052a0ab..14acb5150a 100644 --- a/resources/extruders/tronxy_base_extruder_0.def.json +++ b/resources/extruders/tronxy_base_extruder_0.def.json @@ -8,9 +8,12 @@ }, "overrides": { - "extruder_nr": { "default_value": 0 }, + "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/tronxy_base_extruder_1.def.json b/resources/extruders/tronxy_base_extruder_1.def.json new file mode 100644 index 0000000000..3a5a35cd01 --- /dev/null +++ b/resources/extruders/tronxy_base_extruder_1.def.json @@ -0,0 +1,19 @@ +{ + "version": 2, + "name": "Extruder 2", + "inherits": "fdmextruder", + "metadata": { + "machine": "tronxy_x", + "position": "1" + }, + + "overrides": { + "extruder_nr": { + "default_value": 1, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + + } +} diff --git a/resources/variants/tronxy_d01_0.2.inst.cfg b/resources/variants/tronxy_d01_0.2.inst.cfg index b08a223384..d1b69df89b 100644 --- a/resources/variants/tronxy_d01_0.2.inst.cfg +++ b/resources/variants/tronxy_d01_0.2.inst.cfg @@ -10,3 +10,5 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.2 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_d01_0.3.inst.cfg b/resources/variants/tronxy_d01_0.3.inst.cfg index 67386d2c17..1a57e5d0d7 100644 --- a/resources/variants/tronxy_d01_0.3.inst.cfg +++ b/resources/variants/tronxy_d01_0.3.inst.cfg @@ -10,3 +10,5 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.3 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_d01_0.4.inst.cfg b/resources/variants/tronxy_d01_0.4.inst.cfg index c9ed6d80ab..9c7b4a1398 100644 --- a/resources/variants/tronxy_d01_0.4.inst.cfg +++ b/resources/variants/tronxy_d01_0.4.inst.cfg @@ -10,3 +10,5 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.4 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_d01_0.5.inst.cfg b/resources/variants/tronxy_d01_0.5.inst.cfg index 1bd4e3848b..30ecfddb89 100644 --- a/resources/variants/tronxy_d01_0.5.inst.cfg +++ b/resources/variants/tronxy_d01_0.5.inst.cfg @@ -10,3 +10,5 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.5 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_d01_0.6.inst.cfg b/resources/variants/tronxy_d01_0.6.inst.cfg index 5465c77b16..5cec27219d 100644 --- a/resources/variants/tronxy_d01_0.6.inst.cfg +++ b/resources/variants/tronxy_d01_0.6.inst.cfg @@ -10,3 +10,5 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.6 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_d01_0.8.inst.cfg b/resources/variants/tronxy_d01_0.8.inst.cfg index 40b31a6f8e..1b2b6699af 100644 --- a/resources/variants/tronxy_d01_0.8.inst.cfg +++ b/resources/variants/tronxy_d01_0.8.inst.cfg @@ -10,3 +10,5 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.8 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_x5sa_0.2.inst.cfg b/resources/variants/tronxy_x5sa_0.2.inst.cfg index 55f8695eed..dd3de2a6ae 100644 --- a/resources/variants/tronxy_x5sa_0.2.inst.cfg +++ b/resources/variants/tronxy_x5sa_0.2.inst.cfg @@ -10,3 +10,5 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.2 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_x5sa_0.3.inst.cfg b/resources/variants/tronxy_x5sa_0.3.inst.cfg index 7f9549a5d5..e4fe63257c 100644 --- a/resources/variants/tronxy_x5sa_0.3.inst.cfg +++ b/resources/variants/tronxy_x5sa_0.3.inst.cfg @@ -10,3 +10,5 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.3 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_x5sa_0.4.inst.cfg b/resources/variants/tronxy_x5sa_0.4.inst.cfg index e42f0d6c80..b133fe21fc 100644 --- a/resources/variants/tronxy_x5sa_0.4.inst.cfg +++ b/resources/variants/tronxy_x5sa_0.4.inst.cfg @@ -10,3 +10,5 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.4 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_x5sa_0.5.inst.cfg b/resources/variants/tronxy_x5sa_0.5.inst.cfg index fcb9f1ab3d..e4895a934e 100644 --- a/resources/variants/tronxy_x5sa_0.5.inst.cfg +++ b/resources/variants/tronxy_x5sa_0.5.inst.cfg @@ -10,3 +10,5 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.5 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_x5sa_0.6.inst.cfg b/resources/variants/tronxy_x5sa_0.6.inst.cfg index e51df80cba..0b98a970f8 100644 --- a/resources/variants/tronxy_x5sa_0.6.inst.cfg +++ b/resources/variants/tronxy_x5sa_0.6.inst.cfg @@ -10,3 +10,5 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.6 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_x5sa_0.8.inst.cfg b/resources/variants/tronxy_x5sa_0.8.inst.cfg index fb84e48d1b..3a020e8f19 100644 --- a/resources/variants/tronxy_x5sa_0.8.inst.cfg +++ b/resources/variants/tronxy_x5sa_0.8.inst.cfg @@ -10,3 +10,5 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.8 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_x5sa_400_0.2.inst.cfg b/resources/variants/tronxy_x5sa_400_0.2.inst.cfg index 7e0f7be01d..6359923337 100644 --- a/resources/variants/tronxy_x5sa_400_0.2.inst.cfg +++ b/resources/variants/tronxy_x5sa_400_0.2.inst.cfg @@ -10,3 +10,5 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.2 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_x5sa_400_0.3.inst.cfg b/resources/variants/tronxy_x5sa_400_0.3.inst.cfg index eb6f7312fa..278b13565d 100644 --- a/resources/variants/tronxy_x5sa_400_0.3.inst.cfg +++ b/resources/variants/tronxy_x5sa_400_0.3.inst.cfg @@ -10,3 +10,5 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.3 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_x5sa_400_0.4.inst.cfg b/resources/variants/tronxy_x5sa_400_0.4.inst.cfg index 6e3d7e727b..d4276e87cc 100644 --- a/resources/variants/tronxy_x5sa_400_0.4.inst.cfg +++ b/resources/variants/tronxy_x5sa_400_0.4.inst.cfg @@ -10,3 +10,5 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.4 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_x5sa_400_0.5.inst.cfg b/resources/variants/tronxy_x5sa_400_0.5.inst.cfg index 788c4c08b9..a9b69fc9e9 100644 --- a/resources/variants/tronxy_x5sa_400_0.5.inst.cfg +++ b/resources/variants/tronxy_x5sa_400_0.5.inst.cfg @@ -10,3 +10,5 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.5 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_x5sa_400_0.6.inst.cfg b/resources/variants/tronxy_x5sa_400_0.6.inst.cfg index 0dd8867967..86fb1433a8 100644 --- a/resources/variants/tronxy_x5sa_400_0.6.inst.cfg +++ b/resources/variants/tronxy_x5sa_400_0.6.inst.cfg @@ -10,3 +10,5 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.6 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_x5sa_400_0.8.inst.cfg b/resources/variants/tronxy_x5sa_400_0.8.inst.cfg index e10f453c00..de8ebae08e 100644 --- a/resources/variants/tronxy_x5sa_400_0.8.inst.cfg +++ b/resources/variants/tronxy_x5sa_400_0.8.inst.cfg @@ -10,3 +10,5 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.8 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_x5sa_500_0.2.inst.cfg b/resources/variants/tronxy_x5sa_500_0.2.inst.cfg index 0bba35ad2f..284667199e 100644 --- a/resources/variants/tronxy_x5sa_500_0.2.inst.cfg +++ b/resources/variants/tronxy_x5sa_500_0.2.inst.cfg @@ -10,3 +10,5 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.2 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_x5sa_500_0.3.inst.cfg b/resources/variants/tronxy_x5sa_500_0.3.inst.cfg index fefbae67fa..4ba6315d0c 100644 --- a/resources/variants/tronxy_x5sa_500_0.3.inst.cfg +++ b/resources/variants/tronxy_x5sa_500_0.3.inst.cfg @@ -10,3 +10,5 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.3 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_x5sa_500_0.4.inst.cfg b/resources/variants/tronxy_x5sa_500_0.4.inst.cfg index ae15082dbc..3d13c29e0e 100644 --- a/resources/variants/tronxy_x5sa_500_0.4.inst.cfg +++ b/resources/variants/tronxy_x5sa_500_0.4.inst.cfg @@ -10,3 +10,5 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.4 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_x5sa_500_0.5.inst.cfg b/resources/variants/tronxy_x5sa_500_0.5.inst.cfg index dbb9cae9d2..6243219b32 100644 --- a/resources/variants/tronxy_x5sa_500_0.5.inst.cfg +++ b/resources/variants/tronxy_x5sa_500_0.5.inst.cfg @@ -10,3 +10,5 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.5 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_x5sa_500_0.6.inst.cfg b/resources/variants/tronxy_x5sa_500_0.6.inst.cfg index bb9e7389a4..3d6482f24a 100644 --- a/resources/variants/tronxy_x5sa_500_0.6.inst.cfg +++ b/resources/variants/tronxy_x5sa_500_0.6.inst.cfg @@ -10,3 +10,5 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.6 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_x5sa_500_0.8.inst.cfg b/resources/variants/tronxy_x5sa_500_0.8.inst.cfg index 271f352796..3aacec33a1 100644 --- a/resources/variants/tronxy_x5sa_500_0.8.inst.cfg +++ b/resources/variants/tronxy_x5sa_500_0.8.inst.cfg @@ -10,3 +10,5 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.8 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_x_0.2.inst.cfg b/resources/variants/tronxy_x_0.2.inst.cfg index 8cbcc13763..39b6254f93 100644 --- a/resources/variants/tronxy_x_0.2.inst.cfg +++ b/resources/variants/tronxy_x_0.2.inst.cfg @@ -10,3 +10,5 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.2 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_x_0.3.inst.cfg b/resources/variants/tronxy_x_0.3.inst.cfg index 3049da49f8..7a07efea5a 100644 --- a/resources/variants/tronxy_x_0.3.inst.cfg +++ b/resources/variants/tronxy_x_0.3.inst.cfg @@ -10,3 +10,5 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.3 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_x_0.4.inst.cfg b/resources/variants/tronxy_x_0.4.inst.cfg index feddb1e979..4f86994ca9 100644 --- a/resources/variants/tronxy_x_0.4.inst.cfg +++ b/resources/variants/tronxy_x_0.4.inst.cfg @@ -10,3 +10,5 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.4 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_x_0.5.inst.cfg b/resources/variants/tronxy_x_0.5.inst.cfg index f02fcd696a..fcfcf044c0 100644 --- a/resources/variants/tronxy_x_0.5.inst.cfg +++ b/resources/variants/tronxy_x_0.5.inst.cfg @@ -10,3 +10,5 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.5 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_x_0.6.inst.cfg b/resources/variants/tronxy_x_0.6.inst.cfg index 65753c83b9..82b93615fb 100644 --- a/resources/variants/tronxy_x_0.6.inst.cfg +++ b/resources/variants/tronxy_x_0.6.inst.cfg @@ -10,3 +10,5 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.6 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_x_0.8.inst.cfg b/resources/variants/tronxy_x_0.8.inst.cfg index 2c6dfd07a3..f307a0a0e8 100644 --- a/resources/variants/tronxy_x_0.8.inst.cfg +++ b/resources/variants/tronxy_x_0.8.inst.cfg @@ -10,3 +10,5 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.8 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_xy2_0.2.inst.cfg b/resources/variants/tronxy_xy2_0.2.inst.cfg index ca493a9f6a..31d586e0e3 100644 --- a/resources/variants/tronxy_xy2_0.2.inst.cfg +++ b/resources/variants/tronxy_xy2_0.2.inst.cfg @@ -10,3 +10,5 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.2 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_xy2_0.3.inst.cfg b/resources/variants/tronxy_xy2_0.3.inst.cfg index 64df55280b..067972848b 100644 --- a/resources/variants/tronxy_xy2_0.3.inst.cfg +++ b/resources/variants/tronxy_xy2_0.3.inst.cfg @@ -10,3 +10,5 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.3 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_xy2_0.4.inst.cfg b/resources/variants/tronxy_xy2_0.4.inst.cfg index 2f214b623b..1205055e2c 100644 --- a/resources/variants/tronxy_xy2_0.4.inst.cfg +++ b/resources/variants/tronxy_xy2_0.4.inst.cfg @@ -10,3 +10,5 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.4 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_xy2_0.5.inst.cfg b/resources/variants/tronxy_xy2_0.5.inst.cfg index 9b318ae3d2..f8ca7b68ff 100644 --- a/resources/variants/tronxy_xy2_0.5.inst.cfg +++ b/resources/variants/tronxy_xy2_0.5.inst.cfg @@ -10,3 +10,5 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.5 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_xy2_0.6.inst.cfg b/resources/variants/tronxy_xy2_0.6.inst.cfg index bdbd7c48ac..9bf3f365a9 100644 --- a/resources/variants/tronxy_xy2_0.6.inst.cfg +++ b/resources/variants/tronxy_xy2_0.6.inst.cfg @@ -10,3 +10,5 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.6 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_xy2_0.8.inst.cfg b/resources/variants/tronxy_xy2_0.8.inst.cfg index 311130c94f..a4cae0e925 100644 --- a/resources/variants/tronxy_xy2_0.8.inst.cfg +++ b/resources/variants/tronxy_xy2_0.8.inst.cfg @@ -10,3 +10,5 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.8 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_xy2pro_0.2.inst.cfg b/resources/variants/tronxy_xy2pro_0.2.inst.cfg index 9597d7902f..2301d166d1 100644 --- a/resources/variants/tronxy_xy2pro_0.2.inst.cfg +++ b/resources/variants/tronxy_xy2pro_0.2.inst.cfg @@ -10,3 +10,5 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.2 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_xy2pro_0.3.inst.cfg b/resources/variants/tronxy_xy2pro_0.3.inst.cfg index ed3938433b..b3b20419df 100644 --- a/resources/variants/tronxy_xy2pro_0.3.inst.cfg +++ b/resources/variants/tronxy_xy2pro_0.3.inst.cfg @@ -10,3 +10,5 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.3 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_xy2pro_0.4.inst.cfg b/resources/variants/tronxy_xy2pro_0.4.inst.cfg index 215e84871e..c450cc95df 100644 --- a/resources/variants/tronxy_xy2pro_0.4.inst.cfg +++ b/resources/variants/tronxy_xy2pro_0.4.inst.cfg @@ -10,3 +10,5 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.4 +zig_zaggify_infill = True +retraction_combing = noskin diff --git a/resources/variants/tronxy_xy2pro_0.5.inst.cfg b/resources/variants/tronxy_xy2pro_0.5.inst.cfg index ce3b620d66..d123c4856e 100644 --- a/resources/variants/tronxy_xy2pro_0.5.inst.cfg +++ b/resources/variants/tronxy_xy2pro_0.5.inst.cfg @@ -10,3 +10,5 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.5 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_xy2pro_0.6.inst.cfg b/resources/variants/tronxy_xy2pro_0.6.inst.cfg index c86876db45..a8a27dd9ef 100644 --- a/resources/variants/tronxy_xy2pro_0.6.inst.cfg +++ b/resources/variants/tronxy_xy2pro_0.6.inst.cfg @@ -10,3 +10,5 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.6 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_xy2pro_0.8.inst.cfg b/resources/variants/tronxy_xy2pro_0.8.inst.cfg index b09028a679..10cd9b080f 100644 --- a/resources/variants/tronxy_xy2pro_0.8.inst.cfg +++ b/resources/variants/tronxy_xy2pro_0.8.inst.cfg @@ -10,3 +10,5 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.8 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_xy3_0.2.inst.cfg b/resources/variants/tronxy_xy3_0.2.inst.cfg index 8892b5977a..ae3fc395ae 100644 --- a/resources/variants/tronxy_xy3_0.2.inst.cfg +++ b/resources/variants/tronxy_xy3_0.2.inst.cfg @@ -10,3 +10,5 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.2 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_xy3_0.3.inst.cfg b/resources/variants/tronxy_xy3_0.3.inst.cfg index 83d1a90354..abb921cb5d 100644 --- a/resources/variants/tronxy_xy3_0.3.inst.cfg +++ b/resources/variants/tronxy_xy3_0.3.inst.cfg @@ -10,3 +10,5 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.3 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_xy3_0.4.inst.cfg b/resources/variants/tronxy_xy3_0.4.inst.cfg index b895a08a80..9003eafdb9 100644 --- a/resources/variants/tronxy_xy3_0.4.inst.cfg +++ b/resources/variants/tronxy_xy3_0.4.inst.cfg @@ -10,3 +10,5 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.4 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_xy3_0.5.inst.cfg b/resources/variants/tronxy_xy3_0.5.inst.cfg index 335236a668..86ff191408 100644 --- a/resources/variants/tronxy_xy3_0.5.inst.cfg +++ b/resources/variants/tronxy_xy3_0.5.inst.cfg @@ -10,3 +10,5 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.5 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_xy3_0.6.inst.cfg b/resources/variants/tronxy_xy3_0.6.inst.cfg index 8569852dfa..3796d52e78 100644 --- a/resources/variants/tronxy_xy3_0.6.inst.cfg +++ b/resources/variants/tronxy_xy3_0.6.inst.cfg @@ -10,3 +10,5 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.6 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_xy3_0.8.inst.cfg b/resources/variants/tronxy_xy3_0.8.inst.cfg index cb087394c2..74674b5809 100644 --- a/resources/variants/tronxy_xy3_0.8.inst.cfg +++ b/resources/variants/tronxy_xy3_0.8.inst.cfg @@ -10,3 +10,5 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.8 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_xy3proV2_0.2.inst.cfg b/resources/variants/tronxy_xy3proV2_0.2.inst.cfg new file mode 100644 index 0000000000..0ccda6bfd5 --- /dev/null +++ b/resources/variants/tronxy_xy3proV2_0.2.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = tronxy_xy3proV2 + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_xy3proV2_0.3.inst.cfg b/resources/variants/tronxy_xy3proV2_0.3.inst.cfg new file mode 100644 index 0000000000..674549c6fa --- /dev/null +++ b/resources/variants/tronxy_xy3proV2_0.3.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = tronxy_xy3proV2 + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_xy3proV2_0.4.inst.cfg b/resources/variants/tronxy_xy3proV2_0.4.inst.cfg new file mode 100644 index 0000000000..7a9b15c2f1 --- /dev/null +++ b/resources/variants/tronxy_xy3proV2_0.4.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = tronxy_xy3proV2 + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_xy3proV2_0.5.inst.cfg b/resources/variants/tronxy_xy3proV2_0.5.inst.cfg new file mode 100644 index 0000000000..d618f01e35 --- /dev/null +++ b/resources/variants/tronxy_xy3proV2_0.5.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = tronxy_xy3proV2 + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_xy3proV2_0.6.inst.cfg b/resources/variants/tronxy_xy3proV2_0.6.inst.cfg new file mode 100644 index 0000000000..3527fddd4f --- /dev/null +++ b/resources/variants/tronxy_xy3proV2_0.6.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = tronxy_xy3proV2 + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file diff --git a/resources/variants/tronxy_xy3proV2_0.8.inst.cfg b/resources/variants/tronxy_xy3proV2_0.8.inst.cfg new file mode 100644 index 0000000000..c1f996366e --- /dev/null +++ b/resources/variants/tronxy_xy3proV2_0.8.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = tronxy_xy3proV2 + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 +zig_zaggify_infill = True +retraction_combing = noskin \ No newline at end of file From 1bea19169dcc2898a518509e06ee76e08e4ace79 Mon Sep 17 00:00:00 2001 From: 64bittuning <47930605+64bittuning@users.noreply.github.com> Date: Sat, 29 Jan 2022 00:21:44 -0500 Subject: [PATCH 5/6] Start code revisions During a supplementary review, the start codes were found to be mislabeled. This has been corrected. --- resources/definitions/tronxy_d01.def.json | 2 +- resources/definitions/tronxy_x5sa.def.json | 2 +- resources/definitions/tronxy_xy2.def.json | 2 +- resources/definitions/tronxy_xy2pro.def.json | 2 +- resources/definitions/tronxy_xy3.def.json | 2 +- resources/definitions/tronxy_xy3proV2.def.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/definitions/tronxy_d01.def.json b/resources/definitions/tronxy_d01.def.json index 141414f85f..6a752656f7 100644 --- a/resources/definitions/tronxy_d01.def.json +++ b/resources/definitions/tronxy_d01.def.json @@ -21,7 +21,7 @@ }, "gantry_height": { "value": 30 }, - "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T0\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0} T0\nG28\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to preventscratching of Heat Bed\nG1 X1 Y20 Z0.3 F3600.0 ; Move to start position\nG1 X1 Y220.0 Z0.3 F1500.0 E25 ; Draw the first line\nG1 X1.6 Y220.0 Z0.3 F3600.0 ; Move to side a little\nG1 X1.6 Y20 Z0.3 F1500.0 E50 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F3600.0 ; Move over to prevent blob squish" }, + "machine_start_gcode": { "default_value": "; D01 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T0\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0} T0\nG28\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to preventscratching of Heat Bed\nG1 X1 Y20 Z0.3 F3600.0 ; Move to start position\nG1 X1 Y200.0 Z0.3 F1500.0 E25 ; Draw the first line\nG1 X1.6 Y200.0 Z0.3 F3600.0 ; Move to side a little\nG1 X1.6 Y20 Z0.3 F1500.0 E50 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F3600.0 ; Move over to prevent blob squish" }, "machine_end_gcode": { "default_value": "M83 ; Set extrder to Relative\nG1 E-5 F3000 ; Retract 5mm of filament at 50mm/s\nG90 ; Set all axis to Absolute \nG1 X0 Y{machine_depth} ; Park print head\nG1 Z10 ; Move up 10mm\nM106 S0 ; Set fan speed to 0\nM104 S0 ; Set bed temp to 0\nM140 S0 ; Set Nozzle temp to 0\nM84 ; Disable all stepper motors\n" }, "machine_acceleration": { "value": 120 } diff --git a/resources/definitions/tronxy_x5sa.def.json b/resources/definitions/tronxy_x5sa.def.json index a4ca9a510a..ba0b9a92e0 100644 --- a/resources/definitions/tronxy_x5sa.def.json +++ b/resources/definitions/tronxy_x5sa.def.json @@ -22,7 +22,7 @@ "gantry_height": { "value": 40 }, "retraction_amount": { "value": 4.5 }, - "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21 ; Set units to millimeters\nG90 ; Set all axis to Absolute\nM82 ; Set extrusion to Absolute\nM107 ; Disable all fans\nM190 S{material_bed_temperature_layer_0} ; Set bed temperature and wait\nG28 ; Home all axis\n; Uncomment the line below to enable ABL Mesh probing\n;G29 ; Probe bed mesh for ABL\n; For best results do not run nozzle heater while performing ABL\nG1 Z5.0 ; Raise nozzle to prevent scratching of heat bed\nG1 X0 Y0 ; Move nozzle to Home before heating\nM109 S{material_print_temperature_layer_0} T0 ; Set nozzle temp and wait\nG92 E0 ; Set Extruder position to zero\n; Uncomment the following lines to enable nozzle purge line along left edge of bed\n;G1 Z2.0 F3000 ; Raise Z axis\n;G1 X1.1 Y20 Z0.2 F3600.0 ; Move to purge line start position\n;G1 Y220 F1500.0 E10 ; Draw first purge line\n;G1 X1.4 F3600.0 ; Move to side\n;G1 Y20 F1500.0 E20 ; Draw second purge line\n;G92 E0 ; Reset Extruder\n;G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n;G1 X5 Y20 Z0.2 F3600.0 ; Move over to finish nozzle wipe\n;G92 E0\n"}, + "machine_start_gcode": { "default_value": "; X5SA Start Code\nG21 ; Set units to millimeters\nG90 ; Set all axis to Absolute\nM82 ; Set extrusion to Absolute\nM107 ; Disable all fans\nM190 S{material_bed_temperature_layer_0} ; Set bed temperature and wait\nG28 ; Home all axis\n; Uncomment the line below to enable ABL Mesh probing\n;G29 ; Probe bed mesh for ABL\n; For best results do not run nozzle heater while performing ABL\nG1 Z5.0 ; Raise nozzle to prevent scratching of heat bed\nG1 X0 Y0 ; Move nozzle to Home before heating\nM109 S{material_print_temperature_layer_0} T0 ; Set nozzle temp and wait\nG92 E0 ; Set Extruder position to zero\n; Uncomment the following lines to enable nozzle purge line along left edge of bed\n;G1 Z2.0 F3000 ; Raise Z axis\n;G1 X1.1 Y20 Z0.2 F3600.0 ; Move to purge line start position\n;G1 Y220 F1500.0 E10 ; Draw first purge line\n;G1 X1.4 F3600.0 ; Move to side\n;G1 Y20 F1500.0 E20 ; Draw second purge line\n;G92 E0 ; Reset Extruder\n;G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n;G1 X5 Y20 Z0.2 F3600.0 ; Move over to finish nozzle wipe\n;G92 E0\n"}, "machine_end_gcode": { "default_value": "G91 ; Set Positioning to Relative\nM83 ; Set Extruder to Relative\nG92 E0 ; Reset Extruder\nG1 E-4 F3000 ; Retract 4mm of filament\nG1 Z0.2 ; Raise nozzle .2mm\nG90 ; Set positioning to absolute\nG1 X{machine_width} Y{machine_depth} ; Park print head\nG91 ; Set Positioning to RelativeG1 Z10 ; Raise nozzle 10mm\nM106 S0 ; Turn off part fan\nM104 S0 ; Set nozzle temp to zero\nM140 S0 ; set bed temp to zero\nM84 X Y Z E ; Disable X Y Z and E steppers\n" }, "machine_acceleration": { "value": 150 } diff --git a/resources/definitions/tronxy_xy2.def.json b/resources/definitions/tronxy_xy2.def.json index ce7966fc3b..7894141b9d 100644 --- a/resources/definitions/tronxy_xy2.def.json +++ b/resources/definitions/tronxy_xy2.def.json @@ -22,7 +22,7 @@ "gantry_height": { "value": 40 }, "retraction_amount": { "value": 4.5 }, - "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21 ; Set units to millimeters\nG90 ; Set all axis to Absolute\nM82 ; Set extrusion to Absolute\nM107 ; Disable all fans\nM190 S{material_bed_temperature_layer_0} ; Set bed temperature and wait\nG28 ; Home all axis\n; Uncomment the line below to enable ABL Mesh probing\n;G29 ; Probe bed mesh for ABL\n; For best results do not run nozzle heater while performing ABL\nG1 Z5.0 ; Raise nozzle to prevent scratching of heat bed\nG1 X0 Y0 ; Move nozzle to Home before heating\nM109 S{material_print_temperature_layer_0} T0 ; Set nozzle temp and wait\nG92 E0 ; Set Extruder position to zero\n; Uncomment the following lines to enable nozzle purge line along left edge of bed\n;G1 Z2.0 F3000 ; Raise Z axis\n;G1 X1.1 Y20 Z0.2 F3600.0 ; Move to purge line start position\n;G1 Y220 F1500.0 E10 ; Draw first purge line\n;G1 X1.4 F3600.0 ; Move to side\n;G1 Y20 F1500.0 E20 ; Draw second purge line\n;G92 E0 ; Reset Extruder\n;G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n;G1 X5 Y20 Z0.2 F3600.0 ; Move over to finish nozzle wipe\n;G92 E0\n"}, + "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21 ; Set units to millimeters\nG90 ; Set all axis to Absolute\nM82 ; Set extrusion to Absolute\nM107 ; Disable all fans\nM190 S{material_bed_temperature_layer_0} ; Set bed temperature and wait\nG28 ; Home all axis\nG1 Z5.0 ; Raise nozzle to prevent scratching of heat bed\nG1 X0 Y0 ; Move nozzle to Home before heating\nM109 S{material_print_temperature_layer_0} T0 ; Set nozzle temp and wait\nG92 E0 ; Set Extruder position to zero\n; Uncomment the following lines to enable nozzle purge line along left edge of bed\n;G1 Z2.0 F3000 ; Raise Z axis\n;G1 X1.1 Y20 Z0.2 F3600.0 ; Move to purge line start position\n;G1 Y220 F1500.0 E10 ; Draw first purge line\n;G1 X1.4 F3600.0 ; Move to side\n;G1 Y20 F1500.0 E20 ; Draw second purge line\n;G92 E0 ; Reset Extruder\n;G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n;G1 X5 Y20 Z0.2 F3600.0 ; Move over to finish nozzle wipe\n;G92 E0\n"}, "machine_end_gcode": { "default_value": "M83 ; Set extrder to Relative\nG1 E-5 F3000 ; Retract 5mm of filament at 50mm/s\nG90 ; Set all axis to Absolute \nG1 X0 Y{machine_depth} ; Park print head\nG1 Z10 ; Move up 10mm\nM106 S0 ; Set fan speed to 0\nM104 S0 ; Set bed temp to 0\nM140 S0 ; Set Nozzle temp to 0\nM84 ; Disable all stepper motors\n" }, "machine_acceleration": { "value": 150 } diff --git a/resources/definitions/tronxy_xy2pro.def.json b/resources/definitions/tronxy_xy2pro.def.json index fb2bd70ea3..ed16c34352 100644 --- a/resources/definitions/tronxy_xy2pro.def.json +++ b/resources/definitions/tronxy_xy2pro.def.json @@ -22,7 +22,7 @@ "gantry_height": { "value": 40 }, "retraction_amount": { "value": 4.5 }, - "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21 ; Set units to millimeters\nG90 ; Set all axis to Absolute\nM82 ; Set extrusion to Absolute\nM107 ; Disable all fans\nM190 S{material_bed_temperature_layer_0} ; Set bed temperature and wait\nG28 ; Home all axis\n; Uncomment the line below to enable ABL Mesh probing\n;G29 ; Probe bed mesh for ABL\n; For best results do not run nozzle heater while performing ABL\nG1 Z5.0 ; Raise nozzle to prevent scratching of heat bed\nG1 X0 Y0 ; Move nozzle to Home before heating\nM109 S{material_print_temperature_layer_0} T0 ; Set nozzle temp and wait\nG92 E0 ; Set Extruder position to zero\n; Uncomment the following lines to enable nozzle purge line along left edge of bed\n;G1 Z2.0 F3000 ; Raise Z axis\n;G1 X1.1 Y20 Z0.2 F3600.0 ; Move to purge line start position\n;G1 Y220 F1500.0 E10 ; Draw first purge line\n;G1 X1.4 F3600.0 ; Move to side\n;G1 Y20 F1500.0 E20 ; Draw second purge line\n;G92 E0 ; Reset Extruder\n;G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n;G1 X5 Y20 Z0.2 F3600.0 ; Move over to finish nozzle wipe\n;G92 E0\n"}, + "machine_start_gcode": { "default_value": "; XY-2 Pro Start Code\nG21 ; Set units to millimeters\nG90 ; Set all axis to Absolute\nM82 ; Set extrusion to Absolute\nM107 ; Disable all fans\nM190 S{material_bed_temperature_layer_0} ; Set bed temperature and wait\nG28 ; Home all axis\n; Uncomment the line below to enable ABL Mesh probing\n;G29 ; Probe bed mesh for ABL\n; For best results do not run nozzle heater while performing ABL\nG1 Z5.0 ; Raise nozzle to prevent scratching of heat bed\nG1 X0 Y0 ; Move nozzle to Home before heating\nM109 S{material_print_temperature_layer_0} T0 ; Set nozzle temp and wait\nG92 E0 ; Set Extruder position to zero\n; Uncomment the following lines to enable nozzle purge line along left edge of bed\n;G1 Z2.0 F3000 ; Raise Z axis\n;G1 X1.1 Y20 Z0.2 F3600.0 ; Move to purge line start position\n;G1 Y220 F1500.0 E10 ; Draw first purge line\n;G1 X1.4 F3600.0 ; Move to side\n;G1 Y20 F1500.0 E20 ; Draw second purge line\n;G92 E0 ; Reset Extruder\n;G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n;G1 X5 Y20 Z0.2 F3600.0 ; Move over to finish nozzle wipe\n;G92 E0\n"}, "machine_end_gcode": { "default_value": "M83 ; Set extrder to Relative\nG1 E-5 F3000 ; Retract 5mm of filament at 50mm/s\nG90 ; Set all axis to Absolute \nG1 X0 Y{machine_depth} ; Park print head\nG1 Z10 ; Move up 10mm\nM106 S0 ; Set fan speed to 0\nM104 S0 ; Set bed temp to 0\nM140 S0 ; Set Nozzle temp to 0\nM84 ; Disable all stepper motors\n" }, "machine_acceleration": { "value": 150 } diff --git a/resources/definitions/tronxy_xy3.def.json b/resources/definitions/tronxy_xy3.def.json index 941ca7142f..345def8926 100644 --- a/resources/definitions/tronxy_xy3.def.json +++ b/resources/definitions/tronxy_xy3.def.json @@ -22,7 +22,7 @@ "gantry_height": { "value": 30 }, "retraction_amount": { "value": 5 }, - "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21 ; Set units to millimeters\nG90 ; Set all axis to Absolute\nM82 ; Set extrusion to Absolute\nM107 ; Disable all fans\nM190 S{material_bed_temperature_layer_0} ; Set bed temperature and wait\nG28 ; Home all axis\n; Uncomment the line below to enable ABL Mesh probing\n;G29 ; Probe bed mesh for ABL\n; For best results do not run nozzle heater while performing ABL\nG1 Z5.0 ; Raise nozzle to prevent scratching of heat bed\nG1 X0 Y0 ; Move nozzle to Home before heating\nM109 S{material_print_temperature_layer_0} T0 ; Set nozzle temp and wait\nG92 E0 ; Set Extruder position to zero\n; Uncomment the following lines to enable nozzle purge line along left edge of bed\n;G1 Z2.0 F3000 ; Raise Z axis\n;G1 X1.1 Y20 Z0.2 F3600.0 ; Move to purge line start position\n;G1 Y220 F1500.0 E10 ; Draw first purge line\n;G1 X1.4 F3600.0 ; Move to side\n;G1 Y20 F1500.0 E20 ; Draw second purge line\n;G92 E0 ; Reset Extruder\n;G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n;G1 X5 Y20 Z0.2 F3600.0 ; Move over to finish nozzle wipe\n;G92 E0\n"}, + "machine_start_gcode": { "default_value": "; XY-3 Start Code\nG21 ; Set units to millimeters\nG90 ; Set all axis to Absolute\nM82 ; Set extrusion to Absolute\nM107 ; Disable all fans\nM190 S{material_bed_temperature_layer_0} ; Set bed temperature and wait\nG28 ; Home all axis\n; Uncomment the line below to enable ABL Mesh probing\n;G29 ; Probe bed mesh for ABL\n; For best results do not run nozzle heater while performing ABL\nG1 Z5.0 ; Raise nozzle to prevent scratching of heat bed\nG1 X0 Y0 ; Move nozzle to Home before heating\nM109 S{material_print_temperature_layer_0} T0 ; Set nozzle temp and wait\nG92 E0 ; Set Extruder position to zero\n; Uncomment the following lines to enable nozzle purge line along left edge of bed\n;G1 Z2.0 F3000 ; Raise Z axis\n;G1 X1.1 Y20 Z0.2 F3600.0 ; Move to purge line start position\n;G1 Y220 F1500.0 E10 ; Draw first purge line\n;G1 X1.4 F3600.0 ; Move to side\n;G1 Y20 F1500.0 E20 ; Draw second purge line\n;G92 E0 ; Reset Extruder\n;G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n;G1 X5 Y20 Z0.2 F3600.0 ; Move over to finish nozzle wipe\n;G92 E0\n"}, "machine_end_gcode": { "default_value": "M83 ; Set extrder to Relative\nG1 E-5 F3000 ; Retract 5mm of filament at 50mm/s\nG90 ; Set all axis to Absolute \nG1 X0 Y{machine_depth} ; Park print head\nG1 Z10 ; Move up 10mm\nM106 S0 ; Set fan speed to 0\nM104 S0 ; Set bed temp to 0\nM140 S0 ; Set Nozzle temp to 0\nM84 ; Disable all stepper motors\n" }, "machine_acceleration": { "value": 150 } diff --git a/resources/definitions/tronxy_xy3proV2.def.json b/resources/definitions/tronxy_xy3proV2.def.json index 2be9a1998e..841c159375 100644 --- a/resources/definitions/tronxy_xy3proV2.def.json +++ b/resources/definitions/tronxy_xy3proV2.def.json @@ -24,7 +24,7 @@ "retraction_speed": { "value": 45 }, - "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21 ; Set units to millimeters\nG90 ; Set all axis to Absolute\nM82 ; Set extrusion to Absolute\nM107 ; Disable all fans\nM190 S{material_bed_temperature_layer_0} ; Set bed temperature and wait\nG28 ; Home all axis\n; Uncomment the line below to enable ABL Mesh probing\n;G29 ; Probe bed mesh for ABL\n; For best results do not run nozzle heater while performing ABL\nG1 Z5.0 ; Raise nozzle to prevent scratching of heat bed\nG1 X0 Y0 ; Move nozzle to Home before heating\nM109 S{material_print_temperature_layer_0} T0 ; Set nozzle temp and wait\nG92 E0 ; Set Extruder position to zero\n; Uncomment the following lines to enable nozzle purge line along left edge of bed\n;G1 Z2.0 F3000 ; Raise Z axis\n;G1 X1.1 Y20 Z0.2 F3600.0 ; Move to purge line start position\n;G1 Y220 F1500.0 E10 ; Draw first purge line\n;G1 X1.4 F3600.0 ; Move to side\n;G1 Y20 F1500.0 E20 ; Draw second purge line\n;G92 E0 ; Reset Extruder\n;G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n;G1 X5 Y20 Z0.2 F3600.0 ; Move over to finish nozzle wipe\n;G92 E0\n"}, + "machine_start_gcode": { "default_value": "; XY-3 Pro Start Code\nG21 ; Set units to millimeters\nG90 ; Set all axis to Absolute\nM82 ; Set extrusion to Absolute\nM107 ; Disable all fans\nM190 S{material_bed_temperature_layer_0} ; Set bed temperature and wait\nG28 ; Home all axis\n; Uncomment the line below to enable ABL Mesh probing\n;G29 ; Probe bed mesh for ABL\n; For best results do not run nozzle heater while performing ABL\nG1 Z5.0 ; Raise nozzle to prevent scratching of heat bed\nG1 X0 Y0 ; Move nozzle to Home before heating\nM109 S{material_print_temperature_layer_0} T0 ; Set nozzle temp and wait\nG92 E0 ; Set Extruder position to zero\n; Uncomment the following lines to enable nozzle purge line along left edge of bed\n;G1 Z2.0 F3000 ; Raise Z axis\n;G1 X1.1 Y20 Z0.2 F3600.0 ; Move to purge line start position\n;G1 Y220 F1500.0 E10 ; Draw first purge line\n;G1 X1.4 F3600.0 ; Move to side\n;G1 Y20 F1500.0 E20 ; Draw second purge line\n;G92 E0 ; Reset Extruder\n;G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n;G1 X5 Y20 Z0.2 F3600.0 ; Move over to finish nozzle wipe\n;G92 E0\n"}, "machine_end_gcode": { "default_value": "M83 ; Set extrder to Relative\nG1 E-5 F3000 ; Retract 5mm of filament at 50mm/s\nG90 ; Set all axis to Absolute \nG1 X0 Y{machine_depth} ; Park print head\nG1 Z10 ; Move up 10mm\nM106 S0 ; Set fan speed to 0\nM104 S0 ; Set bed temp to 0\nM140 S0 ; Set Nozzle temp to 0\nM84 ; Disable all stepper motors\n" }, "machine_acceleration": { "value": 150 } From 49ed4be4acf961324a460244d478c1747d21003b Mon Sep 17 00:00:00 2001 From: 64bittuning <47930605+64bittuning@users.noreply.github.com> Date: Tue, 1 Feb 2022 15:22:16 -0500 Subject: [PATCH 6/6] Added omitted line material_flow_layer_0 was mistakenly omitted from the previous file push. --- resources/definitions/tronxy_x.def.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/definitions/tronxy_x.def.json b/resources/definitions/tronxy_x.def.json index b7a0a94226..98832a636c 100644 --- a/resources/definitions/tronxy_x.def.json +++ b/resources/definitions/tronxy_x.def.json @@ -69,7 +69,8 @@ "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, - "material_flow": { "value": 96 }, + "material_flow": { "value": 95 }, + "material_flow_layer_0": { "value": 95 }, "z_seam_type": { "value": "'sharpest_corner'" }, "z_seam_corner": { "value": "'z_seam_corner_inner'" },