diff --git a/resources/profiles/Artillery/filament/Artillery ABS.json b/resources/profiles/Artillery/filament/Artillery ABS.json index f16424112..977451b6c 100644 --- a/resources/profiles/Artillery/filament/Artillery ABS.json +++ b/resources/profiles/Artillery/filament/Artillery ABS.json @@ -49,22 +49,31 @@ "240" ], "fan_max_speed": [ - "80" + "20" ], "fan_min_speed": [ - "60" + "10" ], "fan_cooling_layer_time": [ - "80" + "30" ], "slow_down_layer_time": [ - "8" + "3" ], "filament_max_volumetric_speed": [ - "18" + "16" ], "temperature_vitrification": [ "220" + ], + "overhang_fan_threshold": [ + "25%" + ], + "overhang_fan_speed": [ + "80" + ], + "close_fan_the_first_x_layers": [ + "3" ], "version": "2.0.2.0" } diff --git a/resources/profiles/Artillery/filament/Artillery PETG.json b/resources/profiles/Artillery/filament/Artillery PETG.json index c199304ca..5e5a6bef5 100644 --- a/resources/profiles/Artillery/filament/Artillery PETG.json +++ b/resources/profiles/Artillery/filament/Artillery PETG.json @@ -29,10 +29,10 @@ "0.4" ], "hot_plate_temp": [ - "90" + "70" ], "hot_plate_temp_initial_layer": [ - "90" + "70" ], "inherits": "Artillery Generic PLA", "name": "Artillery PETG", @@ -43,28 +43,37 @@ "250" ], "nozzle_temperature_range_high": [ - "250" + "270" ], "nozzle_temperature_range_low": [ - "220" + "230" ], "fan_max_speed": [ - "80" + "40" ], "fan_min_speed": [ - "60" + "10" ], "fan_cooling_layer_time": [ - "80" + "30" ], "slow_down_layer_time": [ - "8" + "12" ], "filament_max_volumetric_speed": [ - "18" + "9" ], "temperature_vitrification": [ "220" + ], + "close_fan_the_first_x_layers": [ + "3" + ], + "overhang_fan_threshold": [ + "10%" + ], + "overhang_fan_speed": [ + "90" ], "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 028520bde..f0953d71f 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Basic.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Basic.json @@ -49,7 +49,7 @@ "8" ], "filament_max_volumetric_speed": [ - "18" + "21" ], "temperature_vitrification": [ "190" diff --git a/resources/profiles/Artillery/filament/Artillery PLA Matte.json b/resources/profiles/Artillery/filament/Artillery PLA Matte.json index 8028bae90..ca2811a6c 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Matte.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Matte.json @@ -49,7 +49,7 @@ "8" ], "filament_max_volumetric_speed": [ - "18" + "22" ], "temperature_vitrification": [ "190" diff --git a/resources/profiles/Artillery/filament/Artillery PLA Silk.json b/resources/profiles/Artillery/filament/Artillery PLA Silk.json index a67d23e4f..8b6521d78 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Silk.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Silk.json @@ -49,7 +49,7 @@ "8" ], "filament_max_volumetric_speed": [ - "18" + "12" ], "temperature_vitrification": [ "190" diff --git a/resources/profiles/Artillery/filament/Artillery PLA Tough.json b/resources/profiles/Artillery/filament/Artillery PLA Tough.json index a5a73e4d4..3b41976c9 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Tough.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Tough.json @@ -31,10 +31,10 @@ "inherits": "Artillery Generic PLA", "name": "Artillery PLA Tough", "nozzle_temperature": [ - "210" + "220" ], "nozzle_temperature_initial_layer": [ - "210" + "220" ], "fan_max_speed": [ "80" @@ -49,10 +49,16 @@ "8" ], "filament_max_volumetric_speed": [ - "18" + "21" ], "temperature_vitrification": [ "190" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" ], "version": "2.0.2.0" } diff --git a/resources/profiles/Artillery/filament/Artillery TPU.json b/resources/profiles/Artillery/filament/Artillery TPU.json index ddab35334..7f149cfd8 100644 --- a/resources/profiles/Artillery/filament/Artillery TPU.json +++ b/resources/profiles/Artillery/filament/Artillery TPU.json @@ -29,10 +29,10 @@ "0.4" ], "hot_plate_temp": [ - "70" + "45" ], "hot_plate_temp_initial_layer": [ - "70" + "45" ], "inherits": "Artillery Generic PLA", "name": "Artillery TPU", @@ -49,22 +49,28 @@ "200" ], "fan_max_speed": [ - "80" + "100" ], "fan_min_speed": [ - "60" + "100" ], "fan_cooling_layer_time": [ - "80" + "100" ], "slow_down_layer_time": [ "8" ], "filament_max_volumetric_speed": [ - "18" + "3.6" ], "temperature_vitrification": [ "190" + ], + "filament_density": [ + "1.22" + ], + "overhang_fan_threshold": [ + "95%" ], "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 a0bb01efd..12353f4fd 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 @@ -123,8 +123,8 @@ "0", "0" ], - "machine_pause_gcode": "M0", - "machine_start_gcode": "M140 S60\nM104 S160\nM190 S[first_layer_bed_temperature]\nM109 S{temperature_vitrification[0]}\nM211 S0\nG1 Z-0.2 F1000\nG1 X285 F3600\nG1 X260 F3600\nG1 X285 F3600\nG1 X260 F3600\nG1 X230 F3600\nG1 X260 F3600\nG1 X230 F3600\nG1 X260 F3600\nG92 E0\nG1 Z1.0 F3000 ; move z up little to prevent scratching of surface\nG1 X180 Y303 Z0.1 F6000.0 ; move to start-line position\nG1 X70 Y303 Z0.1 F1000.0 E15.0 ; draw 1st line\nG1 X70 Y303 Z0.2 F1000.0 ; move to side a little\nG1 X180 Y303 Z0.2 F1000.0 E30.0 ; draw 2st line\nG92 E0 ; reset extruder\nG1 E-2 Z5 F1800 ; move z up little to prevent scratching of surface\nG92 E0\nG1 Y300 F1800\nM211 S1\nM140 S[first_layer_bed_temperature];\nM104 S[first_layer_temperature];", + "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_unload_filament_time": "0", "manual_filament_change": "0", "max_layer_height": [ 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 1159c5fa8..a58df16c2 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 @@ -126,8 +126,8 @@ "0", "0" ], - "machine_pause_gcode": "M0", - "machine_start_gcode": "M140 S60\nM104 S160\nM190 S[first_layer_bed_temperature]\nM109 S{temperature_vitrification[0]}\nM211 S0\nG1 Z-0.2 F1000\nG1 X225 F3600\nG1 X200 F3600\nG1 X225 F3600\nG1 X200 F3600\nG1 X160 F3600\nG1 X200 F3600\nG1 X160 F3600\nG1 X200 F3600\nG92 E0\nG1 Z1.0 F3000 ; move z up little to prevent scratching of surface\nG1 X180 Y243 Z0.1 F6000.0 ; move to start-line position\nG1 X70 Y243 Z0.1 F1000.0 E15.0 ; draw 1st line\nG1 X70 Y243 Z0.2 F1000.0 ; move to side a little\nG1 X180 Y243 Z0.2 F1000.0 E30.0 ; draw 2st line\nG92 E0 ; reset extruder\nG1 E-2 Z5 F1800 ; move z up little to prevent scratching of surface\nG92 E0\nG1 Y240 F1800\nM211 S1\nM140 S[first_layer_bed_temperature];\nM104 S[first_layer_temperature];", + "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_unload_filament_time": "0", "manual_filament_change": "0", "max_layer_height": [ 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 cb4cc5cd0..b4ffad9ee 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 @@ -126,8 +126,8 @@ "0", "0" ], - "machine_pause_gcode": "", - "machine_start_gcode": "M140 S60\nM104 S140\nM190 S60\nM109 S{temperature_vitrification[0]}\nG28;\nDRAW_LINE\nM140 S[first_layer_bed_temperature];\nM104 S[first_layer_temperature];", + "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_unload_filament_time": "0", "manual_filament_change": "0", "max_layer_height": [ 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 9802de101..151ac268f 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 @@ -126,8 +126,8 @@ "0", "0" ], - "machine_pause_gcode": "", - "machine_start_gcode": "M140 S60\nM104 S140\nM190 S60\nM109 S{temperature_vitrification[0]}\nG28;\nDRAW_LINE\nM140 S[first_layer_bed_temperature];\nM104 S[first_layer_temperature];", + "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_unload_filament_time": "0", "manual_filament_change": "0", "max_layer_height": [ diff --git a/resources/profiles/Artillery/process/0.20mm Standard @Artillery X3Plus 0.4 nozzle.json b/resources/profiles/Artillery/process/0.20mm Standard @Artillery X3Plus 0.4 nozzle.json index cd1de6b7e..9212dec2a 100644 --- a/resources/profiles/Artillery/process/0.20mm Standard @Artillery X3Plus 0.4 nozzle.json +++ b/resources/profiles/Artillery/process/0.20mm Standard @Artillery X3Plus 0.4 nozzle.json @@ -1,6 +1,7 @@ { "from": "system", "instantiation": "true", + "inherits": "fdm_process_common", "accel_to_decel_enable": "1", "accel_to_decel_factor": "50%", "alternate_extra_wall": "0", @@ -66,12 +67,12 @@ "infill_jerk": "9", "infill_wall_overlap": "15%", "initial_layer_acceleration": "500", - "initial_layer_infill_speed": "45", + "initial_layer_infill_speed": "30", "initial_layer_jerk": "9", "initial_layer_line_width": "0.5", "initial_layer_min_bead_width": "85%", "initial_layer_print_height": "0.25", - "initial_layer_speed": "45", + "initial_layer_speed": "30", "initial_layer_travel_speed": "100%", "inner_wall_acceleration": "0", "inner_wall_jerk": "9", @@ -156,7 +157,7 @@ "seam_slope_start_height": "0", "seam_slope_steps": "10", "seam_slope_type": "none", - "single_extruder_multi_material_priming": "0", + "single_extruder_multi_material_priming": "1", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", @@ -279,5 +280,6 @@ "70" ], "xy_contour_compensation": "0", - "xy_hole_compensation": "0" + "xy_hole_compensation": "0", + "top_bottom_infill_wall_overlap":"15%" } diff --git a/resources/profiles/Artillery/process/0.20mm Standard @Artillery X3Pro 0.4 nozzle.json b/resources/profiles/Artillery/process/0.20mm Standard @Artillery X3Pro 0.4 nozzle.json index bab2091fd..7f9ce95a6 100644 --- a/resources/profiles/Artillery/process/0.20mm Standard @Artillery X3Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/process/0.20mm Standard @Artillery X3Pro 0.4 nozzle.json @@ -1,6 +1,7 @@ { "from": "system", "instantiation": "true", + "inherits": "fdm_process_common", "accel_to_decel_enable": "1", "accel_to_decel_factor": "50%", "alternate_extra_wall": "0", @@ -66,12 +67,12 @@ "infill_jerk": "9", "infill_wall_overlap": "15%", "initial_layer_acceleration": "500", - "initial_layer_infill_speed": "35", + "initial_layer_infill_speed": "30", "initial_layer_jerk": "9", "initial_layer_line_width": "0.5", "initial_layer_min_bead_width": "85%", "initial_layer_print_height": "0.25", - "initial_layer_speed": "45", + "initial_layer_speed": "30", "initial_layer_travel_speed": "100%", "inner_wall_acceleration": "3000", "inner_wall_jerk": "9", @@ -156,7 +157,7 @@ "seam_slope_start_height": "0", "seam_slope_steps": "10", "seam_slope_type": "none", - "single_extruder_multi_material_priming": "0", + "single_extruder_multi_material_priming": "1", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", @@ -279,5 +280,6 @@ "70" ], "xy_contour_compensation": "0", - "xy_hole_compensation": "0" + "xy_hole_compensation": "0", + "top_bottom_infill_wall_overlap":"15%" } diff --git a/resources/profiles/Artillery/process/0.20mm Standard @Artillery X4Plus 0.4 nozzle.json b/resources/profiles/Artillery/process/0.20mm Standard @Artillery X4Plus 0.4 nozzle.json index e72063a41..8fc299a1a 100644 --- a/resources/profiles/Artillery/process/0.20mm Standard @Artillery X4Plus 0.4 nozzle.json +++ b/resources/profiles/Artillery/process/0.20mm Standard @Artillery X4Plus 0.4 nozzle.json @@ -1,6 +1,7 @@ { "from": "system", "instantiation": "true", + "inherits": "fdm_process_common", "accel_to_decel_enable": "1", "accel_to_decel_factor": "50%", "alternate_extra_wall": "0", @@ -66,12 +67,12 @@ "infill_jerk": "9", "infill_wall_overlap": "15%", "initial_layer_acceleration": "0", - "initial_layer_infill_speed": "50", + "initial_layer_infill_speed": "30", "initial_layer_jerk": "9", "initial_layer_line_width": "0.5", "initial_layer_min_bead_width": "85%", "initial_layer_print_height": "0.2", - "initial_layer_speed": "50", + "initial_layer_speed": "30", "initial_layer_travel_speed": "100%", "inner_wall_acceleration": "0", "inner_wall_jerk": "9", @@ -156,7 +157,7 @@ "seam_slope_start_height": "0", "seam_slope_steps": "10", "seam_slope_type": "none", - "single_extruder_multi_material_priming": "0", + "single_extruder_multi_material_priming": "1", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", @@ -279,5 +280,6 @@ "70" ], "xy_contour_compensation": "0", - "xy_hole_compensation": "0" + "xy_hole_compensation": "0", + "top_bottom_infill_wall_overlap":"15%" } \ No newline at end of file diff --git a/resources/profiles/Artillery/process/0.20mm Standard @Artillery X4Pro 0.4 nozzle.json b/resources/profiles/Artillery/process/0.20mm Standard @Artillery X4Pro 0.4 nozzle.json index 59b4db5f6..532b5b551 100644 --- a/resources/profiles/Artillery/process/0.20mm Standard @Artillery X4Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/process/0.20mm Standard @Artillery X4Pro 0.4 nozzle.json @@ -1,6 +1,7 @@ { "from": "system", "instantiation": "true", + "inherits": "fdm_process_common", "accel_to_decel_enable": "1", "accel_to_decel_factor": "50%", "alternate_extra_wall": "0", @@ -66,12 +67,12 @@ "infill_jerk": "9", "infill_wall_overlap": "15%", "initial_layer_acceleration": "0", - "initial_layer_infill_speed": "50", + "initial_layer_infill_speed": "30", "initial_layer_jerk": "9", "initial_layer_line_width": "0.5", "initial_layer_min_bead_width": "85%", "initial_layer_print_height": "0.2", - "initial_layer_speed": "50", + "initial_layer_speed": "30", "initial_layer_travel_speed": "100%", "inner_wall_acceleration": "0", "inner_wall_jerk": "9", @@ -156,7 +157,7 @@ "seam_slope_start_height": "0", "seam_slope_steps": "10", "seam_slope_type": "none", - "single_extruder_multi_material_priming": "0", + "single_extruder_multi_material_priming": "1", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", @@ -279,6 +280,7 @@ "70" ], "xy_contour_compensation": "0", - "xy_hole_compensation": "0" + "xy_hole_compensation": "0", + "top_bottom_infill_wall_overlap":"15%" }