diff --git a/resources/definitions/tronxy_d01.def.json b/resources/definitions/tronxy_d01.def.json index cb82aeeae5..a6e7350c06 100644 --- a/resources/definitions/tronxy_d01.def.json +++ b/resources/definitions/tronxy_d01.def.json @@ -20,10 +20,18 @@ [32, 45] ] }, - "machine_start_gcode": { - "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} 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" - }, + "gantry_height": { "value": 30 }, - "gantry_height": { "value": 30 } + "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} 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_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 8b6c56c925..decb49d3ee 100644 --- a/resources/definitions/tronxy_x.def.json +++ b/resources/definitions/tronxy_x.def.json @@ -32,10 +32,10 @@ "machine_max_feedrate_z": { "value": 10 }, "machine_max_feedrate_e": { "value": 50 }, - "machine_max_acceleration_x": { "value": 100 }, - "machine_max_acceleration_y": { "value": 100 }, - "machine_max_acceleration_z": { "value": 100 }, - "machine_max_acceleration_e": { "value": 100 }, + "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 }, @@ -46,8 +46,8 @@ "material_diameter": { "default_value": 1.75 }, - "acceleration_print": { "value": 100 }, - "acceleration_travel": { "value": 100 }, + "acceleration_print": { "value": "machine_acceleration" }, + "acceleration_travel": { "value": "machine_acceleration" }, "acceleration_travel_layer_0": { "value": "acceleration_travel" }, "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" }, diff --git a/resources/definitions/tronxy_x5sa.def.json b/resources/definitions/tronxy_x5sa.def.json index 299d0f80fe..6ac76b6c80 100644 --- a/resources/definitions/tronxy_x5sa.def.json +++ b/resources/definitions/tronxy_x5sa.def.json @@ -1,5 +1,5 @@ { - "name": "Tronxy X5SA", + "name": "Tronxy X5SA/X5ST/Pro", "version": 2, "inherits": "tronxy_x", "metadata": { @@ -20,8 +20,9 @@ [27, 45] ] }, - "machine_start_gcode": { "default_value": "; X5SA Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} 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 Y320.0 z0.3 F1500.0 E25 ; Draw the first line\nG1 X1.6 Y320.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 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\n\nG1 X0 Y0 ; Move to Zero\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" }, - "gantry_height": { "value": 40 } + "gantry_height": { "value": 40 }, + + "machine_start_gcode": { "default_value": "; X5SA Pro Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} 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 f42179ea69..2a63d1d6b2 100644 --- a/resources/definitions/tronxy_x5sa_400.def.json +++ b/resources/definitions/tronxy_x5sa_400.def.json @@ -1,5 +1,5 @@ { - "name": "Tronxy X5SA 400", + "name": "Tronxy X5SA/X5ST/Pro 400", "version": 2, "inherits": "tronxy_x", "metadata": { @@ -20,8 +20,14 @@ [27, 45] ] }, + "gantry_height": { "value": 40 }, + "machine_start_gcode": { "default_value": "; X5SA Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} 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 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\n\nG1 X0 Y0 ; Move to Zero\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" }, - "gantry_height": { "value": 40 } + "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": 100 }, + "machine_max_feedrate_y": { "value": 100 }, + "machine_max_feedrate_z": { "value": 20 }, + "machine_max_feedrate_e": { "value": 120 } } } diff --git a/resources/definitions/tronxy_x5sa_500.def.json b/resources/definitions/tronxy_x5sa_500.def.json index 80644d0a4d..c34c70714c 100644 --- a/resources/definitions/tronxy_x5sa_500.def.json +++ b/resources/definitions/tronxy_x5sa_500.def.json @@ -1,5 +1,5 @@ { - "name": "Tronxy X5SA 500", + "name": "Tronxy X5SA/X5ST/Pro 500", "version": 2, "inherits": "tronxy_x", "metadata": { @@ -20,8 +20,14 @@ [27, 45] ] }, - "machine_start_gcode": { "default_value": "; X5SA Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} 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 Y450.0 Z0.3 F1500.0 E25 ; Draw the first line\nG1 X1.6 Y450.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 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\n\nG1 X0 Y0 ; Move to Zero\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" }, - "gantry_height": { "value": 40 } + "gantry_height": { "value": 40 }, + + "machine_start_gcode": { "default_value": "; X5SA Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} 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_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_x5sa_pro.def.json b/resources/definitions/tronxy_x5sa_pro.def.json deleted file mode 100644 index 6a0e9d8ba0..0000000000 --- a/resources/definitions/tronxy_x5sa_pro.def.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "name": "Tronxy X5SA Pro", - "version": 2, - "inherits": "tronxy_x", - "metadata": { - "quality_definition": "tronxy_x", - "visible": true, - "author": "AdderMk2", - "platform": "tronxy.stl" - }, - "overrides": { - "machine_name": { "default_value": "Tronxy X5SA Pro" }, - "machine_width": { "default_value": 330 }, - "machine_depth": { "default_value": 330 }, - "machine_height": { "default_value": 400 }, - "machine_head_with_fans_polygon": { "default_value": [ - [-48, 45], - [-48, -30], - [27, -30], - [27, 45] - ] - }, - "machine_start_gcode": { "default_value": "; X5SA Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} 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 Y320.0 z0.3 F1500.0 E25 ; Draw the first line\nG1 X1.6 Y320.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 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\n\nG1 X0 Y0 ; Move to Zero\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" }, - "gantry_height": { "value": 40 } - } -} diff --git a/resources/definitions/tronxy_xy2.def.json b/resources/definitions/tronxy_xy2.def.json index 9c952fcb4b..f7f8e03e7f 100644 --- a/resources/definitions/tronxy_xy2.def.json +++ b/resources/definitions/tronxy_xy2.def.json @@ -10,8 +10,8 @@ }, "overrides": { "machine_name": { "default_value": "Tronxy XY-2" }, - "machine_width": { "default_value": 255 }, - "machine_depth": { "default_value": 255 }, + "machine_width": { "default_value": 220 }, + "machine_depth": { "default_value": 220 }, "machine_height": { "default_value": 260 }, "machine_head_with_fans_polygon": { "default_value": [ [-30, 45], @@ -20,10 +20,19 @@ [27, 45] ] }, - "machine_start_gcode": { - "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} 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" - }, + "gantry_height": { "value": 40 }, + + "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} 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" }, - "gantry_height": { "value": 40 } + "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 c592a6b781..8b3301c4b9 100644 --- a/resources/definitions/tronxy_xy2pro.def.json +++ b/resources/definitions/tronxy_xy2pro.def.json @@ -20,10 +20,24 @@ [27, 45] ] }, - "machine_start_gcode": { - "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} 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" - }, + "gantry_height": { "value": 40 }, + + "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} 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" }, - "gantry_height": { "value": 40 } + "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 71ba36a4fe..106250d6bd 100644 --- a/resources/definitions/tronxy_xy3.def.json +++ b/resources/definitions/tronxy_xy3.def.json @@ -20,10 +20,19 @@ [27, 45] ] }, - "machine_start_gcode": { - "default_value": "; XY-3 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} 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 Y280.0 Z0.3 F1500.0 E25 ; Draw the first line\nG1 X1.6 Y280.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" - }, - - "gantry_height": { "value": 30 } + "gantry_height": { "value": 30 }, + + "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} 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_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 } } }