diff --git a/resources/definitions/tronxy_d01.def.json b/resources/definitions/tronxy_d01.def.json index f1c0c7d9ec..f939dcfc34 100644 --- a/resources/definitions/tronxy_d01.def.json +++ b/resources/definitions/tronxy_d01.def.json @@ -23,7 +23,7 @@ "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 }, diff --git a/resources/definitions/tronxy_x.def.json b/resources/definitions/tronxy_x.def.json index 3273d7dd41..caf6510a1d 100644 --- a/resources/definitions/tronxy_x.def.json +++ b/resources/definitions/tronxy_x.def.json @@ -162,6 +162,5 @@ "minimum_interface_area": { "value": 10 }, "top_bottom_thickness": {"value": "layer_height_0 + layer_height * 3" }, "wall_thickness": {"value": "line_width * 2" } - } } \ No newline at end of file diff --git a/resources/definitions/tronxy_x5sa.def.json b/resources/definitions/tronxy_x5sa.def.json index 194f9b156b..89a093de13 100644 --- a/resources/definitions/tronxy_x5sa.def.json +++ b/resources/definitions/tronxy_x5sa.def.json @@ -21,7 +21,7 @@ ] }, "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 4c55ac0995..26c64807c6 100644 --- a/resources/definitions/tronxy_x5sa_400.def.json +++ b/resources/definitions/tronxy_x5sa_400.def.json @@ -21,11 +21,11 @@ ] }, "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 \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_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 2bf4b09cd2..2856e09181 100644 --- a/resources/definitions/tronxy_x5sa_500.def.json +++ b/resources/definitions/tronxy_x5sa_500.def.json @@ -21,11 +21,11 @@ ] }, "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_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_xy2.def.json b/resources/definitions/tronxy_xy2.def.json index 92b66d6a27..15f0f11f26 100644 --- a/resources/definitions/tronxy_xy2.def.json +++ b/resources/definitions/tronxy_xy2.def.json @@ -21,7 +21,7 @@ ] }, "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" }, diff --git a/resources/definitions/tronxy_xy2pro.def.json b/resources/definitions/tronxy_xy2pro.def.json index 6c15048bf9..6e771fafd3 100644 --- a/resources/definitions/tronxy_xy2pro.def.json +++ b/resources/definitions/tronxy_xy2pro.def.json @@ -21,7 +21,7 @@ ] }, "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" }, diff --git a/resources/definitions/tronxy_xy3.def.json b/resources/definitions/tronxy_xy3.def.json index 35d2c8c693..5e0ada7916 100644 --- a/resources/definitions/tronxy_xy3.def.json +++ b/resources/definitions/tronxy_xy3.def.json @@ -21,10 +21,10 @@ ] }, "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 },