diff --git a/resources/profiles/Artillery/artillery_sidewinderx4plus_buildplate_model.stl b/resources/profiles/Artillery/artillery_sidewinderx4plus_buildplate_model.stl index c20701eaeb..1159922005 100644 Binary files a/resources/profiles/Artillery/artillery_sidewinderx4plus_buildplate_model.stl and b/resources/profiles/Artillery/artillery_sidewinderx4plus_buildplate_model.stl differ diff --git a/resources/profiles/Artillery/artillery_sidewinderx4pro_buildplate_model.stl b/resources/profiles/Artillery/artillery_sidewinderx4pro_buildplate_model.stl index dc21edb824..092e17b5ce 100644 Binary files a/resources/profiles/Artillery/artillery_sidewinderx4pro_buildplate_model.stl and b/resources/profiles/Artillery/artillery_sidewinderx4pro_buildplate_model.stl differ diff --git a/resources/profiles/Artillery/filament/Artillery ABS.json b/resources/profiles/Artillery/filament/Artillery ABS.json index 977451b6c2..1e49b383ef 100644 --- a/resources/profiles/Artillery/filament/Artillery ABS.json +++ b/resources/profiles/Artillery/filament/Artillery ABS.json @@ -74,6 +74,12 @@ ], "close_fan_the_first_x_layers": [ "3" + ], + "enable_pressure_advance": [ + "1" + ], + "pressure_advance": [ + "0.05" ], "version": "2.0.2.0" } diff --git a/resources/profiles/Artillery/filament/Artillery PETG.json b/resources/profiles/Artillery/filament/Artillery PETG.json index 5e5a6bef53..81f5ea07b8 100644 --- a/resources/profiles/Artillery/filament/Artillery PETG.json +++ b/resources/profiles/Artillery/filament/Artillery PETG.json @@ -74,6 +74,12 @@ ], "overhang_fan_speed": [ "90" + ], + "enable_pressure_advance": [ + "1" + ], + "pressure_advance": [ + "0.05" ], "version": "2.0.2.0" } diff --git a/resources/profiles/Artillery/filament/Artillery PLA Basic.json b/resources/profiles/Artillery/filament/Artillery PLA Basic.json index f0953d71fc..2bf66529a3 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Basic.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Basic.json @@ -53,6 +53,12 @@ ], "temperature_vitrification": [ "190" + ], + "enable_pressure_advance": [ + "1" + ], + "pressure_advance": [ + "0.046" ], "version": "2.0.2.0" } diff --git a/resources/profiles/Artillery/filament/Artillery PLA Matte.json b/resources/profiles/Artillery/filament/Artillery PLA Matte.json index ca2811a6cf..73313c4b2a 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Matte.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Matte.json @@ -53,6 +53,12 @@ ], "temperature_vitrification": [ "190" + ], + "enable_pressure_advance": [ + "1" + ], + "pressure_advance": [ + "0.046" ], "version": "2.0.2.0" } diff --git a/resources/profiles/Artillery/filament/Artillery PLA Silk.json b/resources/profiles/Artillery/filament/Artillery PLA Silk.json index 8b6521d783..81a37fd9b8 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Silk.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Silk.json @@ -53,6 +53,12 @@ ], "temperature_vitrification": [ "190" + ], + "enable_pressure_advance": [ + "1" + ], + "pressure_advance": [ + "0.046" ], "version": "2.0.2.0" } diff --git a/resources/profiles/Artillery/filament/Artillery PLA Tough.json b/resources/profiles/Artillery/filament/Artillery PLA Tough.json index 3b41976c91..a4178368af 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Tough.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Tough.json @@ -59,6 +59,12 @@ ], "hot_plate_temp_initial_layer": [ "65" + ], + "enable_pressure_advance": [ + "1" + ], + "pressure_advance": [ + "0.046" ], "version": "2.0.2.0" } diff --git a/resources/profiles/Artillery/filament/Artillery TPU.json b/resources/profiles/Artillery/filament/Artillery TPU.json index 7f149cfd8e..184e10e8ac 100644 --- a/resources/profiles/Artillery/filament/Artillery TPU.json +++ b/resources/profiles/Artillery/filament/Artillery TPU.json @@ -71,6 +71,12 @@ ], "overhang_fan_threshold": [ "95%" + ], + "enable_pressure_advance": [ + "1" + ], + "pressure_advance": [ + "0.06" ], "version": "2.0.2.0" } diff --git a/resources/profiles/Artillery/machine/Artillery Sidewinder X3 Plus 0.4 nozzle.json b/resources/profiles/Artillery/machine/Artillery Sidewinder X3 Plus 0.4 nozzle.json index 12353f4fdc..d1e6d9b6a0 100644 --- a/resources/profiles/Artillery/machine/Artillery Sidewinder X3 Plus 0.4 nozzle.json +++ b/resources/profiles/Artillery/machine/Artillery Sidewinder X3 Plus 0.4 nozzle.json @@ -137,7 +137,7 @@ "0.4" ], "nozzle_hrc": "0", - "nozzle_type": "hardened_steel", + "nozzle_type": "brass", "nozzle_volume": "0", "parking_pos_retraction": "92", "preferred_orientation": "0", diff --git a/resources/profiles/Artillery/machine/Artillery Sidewinder X3 Pro 0.4 nozzle.json b/resources/profiles/Artillery/machine/Artillery Sidewinder X3 Pro 0.4 nozzle.json index a58df16c22..42b0fcbc56 100644 --- a/resources/profiles/Artillery/machine/Artillery Sidewinder X3 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/machine/Artillery Sidewinder X3 Pro 0.4 nozzle.json @@ -137,7 +137,7 @@ "0.08" ], "nozzle_hrc": "0", - "nozzle_type": "hardened_steel", + "nozzle_type": "brass", "nozzle_volume": "0", "parking_pos_retraction": "92", "preferred_orientation": "0", diff --git a/resources/profiles/Artillery/machine/Artillery Sidewinder X4 Plus 0.4 nozzle.json b/resources/profiles/Artillery/machine/Artillery Sidewinder X4 Plus 0.4 nozzle.json index b4ffad9ee5..e914ad2c99 100644 --- a/resources/profiles/Artillery/machine/Artillery Sidewinder X4 Plus 0.4 nozzle.json +++ b/resources/profiles/Artillery/machine/Artillery Sidewinder X4 Plus 0.4 nozzle.json @@ -56,7 +56,7 @@ "host_type": "octoprint", "is_custom_defined": "0", "layer_change_gcode": "G92 E0", - "machine_end_gcode": "G91 ;Relative positioning\nG1 E-1 F2700 ;Retract a bit\nG1 E-1 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z1 ;Raise Z more\nG90 ;Absolute positionning\nG1 X5 Y280 F3000 ;Wipe out\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z", + "machine_end_gcode": "G91 ;Relative positioning\nG1 E-1 F2700 ;Retract a bit\nG1 E-1 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z1 ;Raise Z more\nG90 ;Absolute positionning\nG1 X-5 Y305 F3000 ;Wipe out\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z", "machine_load_filament_time": "0", "machine_max_acceleration_e": [ "6000", @@ -127,7 +127,7 @@ "0" ], "machine_pause_gcode": "M600", - "machine_start_gcode": "M140 S60\nM104 S140\nM190 S[first_layer_bed_temperature]\nM109 S{temperature_vitrification[0]}\nG28;\nNOZZLE_WIPE\nM140 S[first_layer_bed_temperature];\nM104 S[first_layer_temperature];\nDRAW_LINE_ONLY", + "machine_start_gcode": "M104 S140\nM190 S[first_layer_bed_temperature]\nM109 S{temperature_vitrification[0]}\nG28;\nG1 X230 Y300 Z10 F5000\nSET_KINEMATIC_POSITION Y=0\nG1 Y20 F4000\nG1 X230 F4000\nG1 Z-1 F600 \nG1 X270 F4000\nG1 Y25 F4000\nG1 X230 F4000\nG92 E0\nG1 Z10 F1200\nG1 Y0 F5000\nG1 E-1 F3000\nM400\nSET_KINEMATIC_POSITION Y=300\nG92 E-1\nM140 S[first_layer_bed_temperature];\nM104 S[first_layer_temperature];\nG1 X0 Y0.8 Z0.8 F18000\nG92 E0\nG1 X0 Y0.8 Z0.3 E8 F600\nG92 E0\nG1 X200 Y0.8 Z0.3 F1800.0 E20.0;draw line\nG92 E0\nG1 X200 Y0 Z0.3 F1800.0 E0.08;draw line\nG92 E0\nG1 X100 Y0 Z0.3 F1800.0 E10.0;draw line\nG92 E0\nG1 X100 Y1.6 Z0.3 F1800.0 E0.16;draw line\nG92 E0\nG1 X180 Y1.6 Z0.3 F1800.0 E8;draw line\nG92 E0\nG1 X180 Y0 Z0.3 F1800.0 E0.16;draw line\nG92 E0\nG1 E-1 Z5 F18000\nG92 E0", "machine_unload_filament_time": "0", "manual_filament_change": "0", "max_layer_height": [ @@ -137,7 +137,7 @@ "0.08" ], "nozzle_hrc": "0", - "nozzle_type": "hardened_steel", + "nozzle_type": "brass", "nozzle_volume": "0", "parking_pos_retraction": "92", "preferred_orientation": "0", @@ -146,8 +146,8 @@ "printable_area": [ "0x0", "300x0", - "300x300", - "0x300" + "300x310", + "0x310" ], "printable_height": "400", "printer_notes": "", diff --git a/resources/profiles/Artillery/machine/Artillery Sidewinder X4 Pro 0.4 nozzle.json b/resources/profiles/Artillery/machine/Artillery Sidewinder X4 Pro 0.4 nozzle.json index 151ac268f9..1e4826ea5b 100644 --- a/resources/profiles/Artillery/machine/Artillery Sidewinder X4 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/machine/Artillery Sidewinder X4 Pro 0.4 nozzle.json @@ -56,7 +56,7 @@ "host_type": "octoprint", "is_custom_defined": "0", "layer_change_gcode": "G92 E0", - "machine_end_gcode": "G91 ;Relative positioning\nG1 E-1 F2700 ;Retract a bit\nG1 E-1 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z1 ;Raise Z more\nG90 ;Absolute positionning\nG1 X5 Y200 F3000 ;Wipe out\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z", + "machine_end_gcode": "G91 ;Relative positioning\nG1 E-1 F2700 ;Retract a bit\nG1 E-1 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z1 ;Raise Z more\nG90 ;Absolute positionning\nG1 X-5 Y250 F3000 ;Wipe out\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z", "machine_load_filament_time": "0", "machine_max_acceleration_e": [ "5000", @@ -127,7 +127,7 @@ "0" ], "machine_pause_gcode": "M600", - "machine_start_gcode": "M140 S60\nM104 S140\nM190 S[first_layer_bed_temperature]\nM109 S{temperature_vitrification[0]}\nG28;\nNOZZLE_WIPE\nM140 S[first_layer_bed_temperature];\nM104 S[first_layer_temperature];\nDRAW_LINE_ONLY", + "machine_start_gcode": "M104 S140\nM190 S[first_layer_bed_temperature]\nM109 S{temperature_vitrification[0]}\nG28;\nG1 X180 Y247 Z10 F5000\nSET_KINEMATIC_POSITION Y=0\nG1 Y11 F4000\nG1 X180 F4000\nG1 Z-1 F600 \nG1 X230 F4000\nG1 Y15 F4000\nG1 X180 F4000\nG92 E0\nG1 Z10 F1200\nG1 Y0 F5000\nG1 E-1 F3000\nM400\nSET_KINEMATIC_POSITION Y=247\nG92 E-1\nM140 S[first_layer_bed_temperature];\nM104 S[first_layer_temperature];\nG1 X0 Y0.8 Z0.8 F18000\nG92 E0\nG1 X0 Y0.8 Z0.3 E8 F600\nG92 E0\nG1 X170 Y0.8 Z0.3 F1800.0 E17.0;draw line\nG92 E0\nG1 X170 Y0 Z0.3 F1800.0 E0.08;draw line\nG92 E0\nG1 X70 Y0 Z0.3 F1800.0 E10.0;draw line\nG92 E0\nG1 X70 Y1.6 Z0.3 F1800.0 E0.16;draw line\nG92 E0\nG1 X150 Y1.6 Z0.3 F1800.0 E8;draw line\nG92 E0\nG1 X150 Y0 Z0.3 F1800.0 E0.16;draw line\nG92 E0\nG1 E-1 Z5 F18000\nG92 E0\n", "machine_unload_filament_time": "0", "manual_filament_change": "0", "max_layer_height": [ @@ -137,7 +137,7 @@ "0.08" ], "nozzle_hrc": "0", - "nozzle_type": "hardened_steel", + "nozzle_type": "brass", "nozzle_volume": "0", "parking_pos_retraction": "92", "preferred_orientation": "0", @@ -146,8 +146,8 @@ "printable_area": [ "0x0", "240x0", - "240x240", - "0x240" + "240x250", + "0x250" ], "printable_height": "260", "printer_notes": "",