From f25f3e2e94ac4fb1c23d15e54f4f01813f31ecf2 Mon Sep 17 00:00:00 2001
From: Shape6253 <126673246+Shape6253@users.noreply.github.com>
Date: Fri, 19 Jan 2024 14:07:35 +0100
Subject: [PATCH] Add Artillery filaments

---
 live/Artillery/0.0.8.ini | 259 +++++++++++++++++++++++++++++++++++----
 1 file changed, 237 insertions(+), 22 deletions(-)

diff --git a/live/Artillery/0.0.8.ini b/live/Artillery/0.0.8.ini
index 79e44f0..53062e7 100644
--- a/live/Artillery/0.0.8.ini
+++ b/live/Artillery/0.0.8.ini
@@ -54,40 +54,40 @@ name = Artillery Sidewinder X3 Plus
 variants = 0.4
 technology = FFF
 bed_model = bed-x3-plus.stl
-bed_texture = bed_x3.png
-default_materials = 
+bed_texture = bed-x1.png
+default_materials = Artillery ABS @X3; Artillery PETG @X3; Artillery PLA @X3; Artillery PLA HS @X3; Artillery PLA Silk @X3; Artillery TPU @X3
 
 [printer_model:X3 Pro]
 name = Artillery Sidewinder X3 Pro
 variants = 0.4
 technology = FFF
-bed_model = bed-x3-pro.stl
-bed_texture = bed_x3.png
-default_materials = 
+bed_model = 
+bed_texture = 
+default_materials = Artillery ABS @X3; Artillery PETG @X3; Artillery PLA @X3; Artillery PLA HS @X3; Artillery PLA Silk @X3; Artillery TPU @X3
 
 [printer_model:X4 Plus]
 name = Artillery Sidewinder X4 Plus
 variants = 0.4
 technology = FFF
 bed_model = bed-x4-plus.stl
-bed_texture = bed_x4.png
-default_materials = 
+bed_texture = bed-x1.png
+default_materials = Artillery ABS @X4; Artillery PETG @X4; Artillery PLA & PLA HS @X4; Artillery PLA+ @X4; Artillery PLA Silk @X4; Artillery TPU @X4
 
 [printer_model:X4 Pro]
 name = Artillery Sidewinder X4 Pro
 variants = 0.4
 technology = FFF
-bed_model = bed-x4-pro.stl
-bed_texture = bed_x4.png
-default_materials = 
+bed_model = 
+bed_texture = 
+default_materials = Artillery ABS @X4; Artillery PETG @X4; Artillery PLA & PLA HS @X4; Artillery PLA+ @X4; Artillery PLA Silk @X4; Artillery TPU @X4
 
 [printer_model:X4 Max]
 name = Artillery Sidewinder X4 Max
 variants = 0.4
 technology = FFF
-bed_model = bed-x4-max.stl
-bed_texture = bed_x4.png
-default_materials = 
+bed_model = 
+bed_texture = 
+default_materials = Artillery ABS @X4; Artillery PETG @X4; Artillery PLA & PLA HS @X4; Artillery PLA+ @X4; Artillery PLA Silk @X4; Artillery TPU @X4
 
 # Common printer preset
 [printer:*common*]
@@ -177,8 +177,6 @@ between_objects_gcode =
 color_change_gcode = M600
 cooling_tube_length = 5
 cooling_tube_retraction = 91.5
-default_filament_profile = 
-default_print_profile = 
 deretract_speed = 0
 extra_loading_move = -2
 extruder_colour = ""
@@ -231,6 +229,8 @@ z_offset = 0
 
 [printer:*common_X3*]
 inherits = *common_X3_X4*
+default_filament_profile = Artillery PLA @X3
+default_print_profile = Default X3 PLA/PLA_HS @Artillery
 end_gcode = 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\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n
 gcode_flavor = marlin2
 machine_max_acceleration_travel = 3000,1250
@@ -246,11 +246,13 @@ machine_max_jerk_x = 10,10
 machine_max_jerk_y = 10,10
 retract_before_travel = 2
 retract_speed = 40
-start_gcode = 
+start_gcode = G12 C2\nG92 E0 ; reset extruder\nG28 Z\nG1 Z1.0 F3000 ; move z up little to prevent scratching of surface\nG1 X2 Y20 Z0.3 F5000.0 ; move to start-line position\nG1 X2 Y200.0 Z0.3 F1500.0 E15 ; draw 1st line\nG1 X2 Y200.0 Z0.4 F5000.0 ; move to side a little\nG1 X2 Y20 Z0.4 F1500.0 E30 ; draw 2nd line\nG92 E0 ;\nG1 Z1.0 F3000;
 use_relative_e_distances = 0
 
 [printer:*common_X4*]
 inherits = *common_X3_X4*
+default_filament_profile = Artillery PLA & PLA HS @X4
+default_print_profile = 
 gcode_flavor = klipper
 machine_max_acceleration_travel = 1500,1250
 machine_max_acceleration_x = 10000,1000
@@ -260,7 +262,7 @@ machine_max_feedrate_x = 500,500
 machine_max_feedrate_y = 500,500
 retract_before_travel = 1.5
 retract_speed = 20
-start_gcode = G28;
+start_gcode = G28; \nG92 E0 ; reset extruder\nG1 Z1.0 F3000 ; move z up little to prevent scratching of surface\nG1 X2 Y20 Z0.3 F5000.0 ; move to start-line position\nG1 X2 Y200.0 Z0.3 F1500.0 E15 ; draw 1st line\nG1 X2 Y200.0 Z0.4 F5000.0 ; move to side a little\nG1 X2 Y20 Z0.4 F1500.0 E15 ; draw 2nd line\nG92 E0 ; reset extruder\nG1 E-2 Z10.0 F3000 ; move z up little to prevent scratching of surface\nG92 E0\nNOZZLE_WIPE
 use_relative_e_distances = 1
 
 [printer:Artillery Sidewinder X1]
@@ -646,11 +648,12 @@ mmu_segmented_region_max_width = 0
 notes =
 only_retract_when_crossing_perimeters = 0
 ooze_prevention = 0
-output_filename_format =
+output_filename_format = {input_filename_base}_{layer_height}mm_{filament_type[0]}_{printer_model}_{print_time}.gcode
 external_perimeter_extrusion_width = 0.4
 
 [print:*common_x3*]
 inherits = *common_x3_x4*
+compatible_printers_condition = printer_model=~/(X3).*/ and nozzle_diameter[0]==0.4
 avoid_crossing_perimeters = 0
 bridge_acceleration = 1000
 default_acceleration = 3000
@@ -663,21 +666,26 @@ first_layer_extrusion_width = 0.42
 infill_overlap = 25%
 max_print_speed = 400
 
+[print:*common_x4*]
+inherits = *common_x3_x4*
+bridge_acceleration = 3000
+external_perimeter_acceleration = 3000
+first_layer_acceleration = 3000
+first_layer_extrusion_width = 0.5
+infill_overlap = 75%
+
 [print:Default X3 ABS/PETG/PLA_Silk @Artillery]
 inherits = *common_x3*
-compatible_printers_condition = printer_model=~/(X3).*/ and nozzle_diameter[0]==0.4
 external_perimeter_speed = 50%
 infill_speed = 150
 
 [print:Default X3 PLA/PLA_HS @Artillery]
 inherits = *common_x3*
-compatible_printers_condition = printer_model=~/(X3).*/ and nozzle_diameter[0]==0.4
 external_perimeter_speed = 50%
 infill_speed = 200
 
 [print:Default X3 TPU @Artillery]
 inherits = *common_x3*
-compatible_printers_condition = printer_model=~/(X3).*/ and nozzle_diameter[0]==0.4
 external_perimeter_speed = 30
 infill_speed = 30
 
@@ -700,6 +708,81 @@ min_print_speed = 15
 slowdown_below_layer_time = 15
 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_Artillery.*/
 
+
+# Common filament preset
+[filament:*common_x3_x4*]
+bridge_fan_speed = 100
+compatible_printers =
+compatible_printers_condition =
+compatible_prints =
+compatible_prints_condition =
+cooling = 1
+enable_dynamic_fan_speeds = 0
+end_filament_gcode = "; Filament-specific end gcode \n;END gcode for filament\n"
+extrusion_multiplier = 1
+fan_always_on = 1
+fan_below_layer_time = 60
+filament_colour = #E2E2E2
+filament_cooling_final_speed = 3.4
+filament_cooling_initial_speed = 2.2
+filament_cooling_moves = 4
+filament_cost = 0
+filament_deretract_speed = nil
+filament_diameter = 1.75
+filament_load_time = 0
+filament_loading_speed = 28
+filament_loading_speed_start = 3
+filament_minimal_purge_on_wipe_tower = 15
+filament_multitool_ramming = 0
+filament_multitool_ramming_flow = 10
+filament_multitool_ramming_volume = 10
+filament_notes = ""
+filament_ramming_parameters = "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6"
+filament_retract_before_wipe = nil
+filament_retract_layer_change = nil
+filament_retract_length_toolchange = nil
+filament_retract_lift = 0.1
+filament_retract_lift_above = nil
+filament_retract_lift_below = nil
+filament_retract_restart_extra = nil
+filament_retract_restart_extra_toolchange = nil
+filament_settings_id = ""
+filament_soluble = 0
+filament_spool_weight = 0
+filament_toolchange_delay = 0
+filament_unload_time = 0
+filament_unloading_speed = 90
+filament_unloading_speed_start = 100
+filament_vendor = Artillery
+full_fan_speed_layer = 0
+idle_temperature = nil
+inherits =
+max_fan_speed = 100
+min_fan_speed = 100
+min_print_speed = 10
+overhang_fan_speed_0 = 0
+overhang_fan_speed_1 = 0
+overhang_fan_speed_2 = 0
+overhang_fan_speed_3 = 0
+slowdown_below_layer_time = 5
+start_filament_gcode = ; Filament gcode
+
+[filament:*common_x3*]
+inherits = *common_x3_x4*
+disable_fan_first_layers = 2
+filament_max_volumetric_speed = 0
+filament_retract_before_travel = 1
+filament_wipe = nil
+compatible_printers_condition = printer_model=~/(X3).*/ and nozzle_diameter[0]==0.4
+
+[filament:*common_x4*]
+inherits = *common_x3_x4*
+disable_fan_first_layers = 1
+filament_retract_before_travel = 2
+filament_retract_speed = 40
+filament_wipe = 1
+compatible_printers_condition = printer_model=~/(X4).*/ and nozzle_diameter[0]==0.4
+
 [filament:*PLA*]
 inherits = *common*
 bed_temperature = 60
@@ -854,4 +937,136 @@ temperature = 230
 first_layer_bed_temperature = 30
 bed_temperature = 30
 filament_retract_length = 0
-extrusion_multiplier = 1.16
\ No newline at end of file
+extrusion_multiplier = 1.16
+
+[filament:Artillery ABS @X3]
+inherits = *common_x3*
+bed_temperature = 100
+filament_density = 1.04
+filament_retract_length = 1
+filament_retract_speed = 40
+filament_type = ABS
+first_layer_bed_temperature = 100
+first_layer_temperature = 260
+temperature = 250
+
+[filament:Artillery PETG @X3]
+inherits = *common_x3*
+bed_temperature = 90
+filament_density = 1.26
+filament_retract_length = 1.1
+filament_retract_speed = 40
+filament_type = PETG
+first_layer_bed_temperature = 90
+first_layer_temperature = 250
+temperature = 245
+
+[filament:Artillery PLA @X3]
+inherits = *common_x3*
+bed_temperature = 60
+filament_density = 1.2
+filament_retract_length = 1
+filament_retract_speed = 60
+filament_type = PLA
+first_layer_bed_temperature = 60
+first_layer_temperature = 210
+temperature = 210
+
+[filament:Artillery PLA HS @X3]
+inherits = *common_x3*
+bed_temperature = 60
+filament_density = 1.2
+filament_retract_length = 1.2
+filament_retract_speed = 60
+filament_type = PLA HS
+first_layer_bed_temperature = 60
+first_layer_temperature = 210
+temperature = 210
+
+[filament:Artillery PLA Silk @X3]
+inherits = *common_x3*
+bed_temperature = 70
+filament_density = 1.2
+filament_retract_length = 1
+filament_retract_speed = 40
+filament_type = PLA Silk
+first_layer_bed_temperature = 70
+first_layer_temperature = 210
+temperature = 210
+
+[filament:Artillery TPU @X3]
+inherits = *common_x3*
+bed_temperature = 70
+filament_density = 1.21
+filament_retract_length = 0.8
+filament_retract_speed = 40
+filament_type = TPU
+first_layer_bed_temperature = 70
+first_layer_temperature = 210
+temperature = 210
+
+[filament:Artillery ABS @X4]
+inherits = *common_x4*
+bed_temperature = 100
+filament_density = 1.04
+filament_max_volumetric_speed = 20
+filament_retract_length = 1.3
+filament_type = ABS
+first_layer_bed_temperature = 100
+first_layer_temperature = 260
+temperature = 260
+
+[filament:Artillery PETG @X4]
+inherits = *common_x4*
+bed_temperature = 90
+filament_density = 1.26
+filament_max_volumetric_speed = 20
+filament_retract_length = 1.3
+filament_type = PETG
+first_layer_bed_temperature = 90
+first_layer_temperature = 250
+temperature = 250
+
+[filament:Artillery PLA & PLA HS @X4]
+inherits = *common_x4*
+bed_temperature = 60
+filament_density = 1.2
+filament_max_volumetric_speed = 20
+filament_retract_length = 1.3
+filament_type = PLA
+first_layer_bed_temperature = 60
+first_layer_temperature = 210
+temperature = 210
+
+[filament:Artillery PLA+ @X4]
+inherits = *common_x4*
+bed_temperature = 60
+filament_density = 1.25
+filament_max_volumetric_speed = 20
+filament_retract_length = 1.3
+filament_type = PLA+
+first_layer_bed_temperature = 60
+first_layer_temperature = 210
+temperature = 210
+
+[filament:Artillery PLA Silk @X4]
+inherits = *common_x4*
+bed_temperature = 60
+filament_density = 1.2
+filament_max_volumetric_speed = 20
+filament_retract_length = 1.2
+filament_type = PLA Silk
+first_layer_bed_temperature = 70
+first_layer_temperature = 215
+temperature = 215
+
+[filament:Artillery TPU @X4]
+inherits = *common_x4*
+bed_temperature = 70
+filament_density = 1.21
+filament_max_volumetric_speed = 4
+filament_retract_length = 1.5
+filament_type = TPU
+first_layer_bed_temperature = 70
+first_layer_temperature = 215
+temperature = 215