From 88d5dd2a4f7063a5ae29f75c90705aed65fc95f9 Mon Sep 17 00:00:00 2001
From: Shape6253 <126673246+Shape6253@users.noreply.github.com>
Date: Fri, 19 Jan 2024 21:35:09 +0100
Subject: [PATCH] START_GCODE update; filament/print ordering

---
 live/Artillery/0.0.8.ini | 112 ++++++++++++++++++++++++++++-----------
 1 file changed, 81 insertions(+), 31 deletions(-)

diff --git a/live/Artillery/0.0.8.ini b/live/Artillery/0.0.8.ini
index e12ea63..3463ca3 100644
--- a/live/Artillery/0.0.8.ini
+++ b/live/Artillery/0.0.8.ini
@@ -179,7 +179,7 @@ cooling_tube_length = 5
 cooling_tube_retraction = 91.5
 deretract_speed = 0
 extra_loading_move = -2
-extruder_colour = ""
+extruder_colour = #FFFF00
 extruder_offset = 0x0
 high_current_on_filament_swap = 0
 host_type = prusalink
@@ -230,7 +230,7 @@ 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
+default_print_profile = ArtillerySlicer 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,7 +246,7 @@ machine_max_jerk_x = 10,10
 machine_max_jerk_y = 10,10
 retract_before_travel = 2
 retract_speed = 40
-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;
+start_gcode = M104 S210 ; set temperature \nM109 S210 ; set temperature and wait for it to be reached\nG21 ; set units to millimeters\nG90 ; use absolute coordinates\nM82 ; use absolute distances for extrusion\nG92 E0 \nG12 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*]
@@ -261,7 +261,7 @@ machine_max_feedrate_x = 500,500
 machine_max_feedrate_y = 500,500
 retract_before_travel = 1.5
 retract_speed = 20
-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
+start_gcode = G28;\nM109 S210 ; set temperature and wait for it to be reached \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]
@@ -325,7 +325,7 @@ max_print_height = 260
 inherits = *common_X4*
 printer_model = X4 Plus
 bed_shape = 0x0,300x0,300x300,0x300
-default_print_profile = Default X4 Plus PETG/PLA/PLA+ @Artillery
+default_print_profile = ArtillerySlicer X4 Plus PETG/PLA/PLA+ @Artillery
 machine_max_feedrate_e = 100,120
 machine_max_feedrate_z = 13,12
 machine_max_jerk_e = 10,2.5
@@ -338,7 +338,7 @@ end_gcode = G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2
 inherits = *common_X4*
 printer_model = X4 Pro
 bed_shape = 0x0,240x0,240x240,0x240
-default_print_profile = Default X4 Pro PETG/PLA/PLA+ @Artillery
+default_print_profile = ArtillerySlicer X4 Pro PETG/PLA/PLA+ @Artillery
 machine_max_feedrate_e = 120,120
 machine_max_feedrate_z = 13,13
 machine_max_jerk_e = 2.5,2.5
@@ -351,7 +351,7 @@ end_gcode = G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2
 inherits = *common_X4*
 printer_model = X4 Max
 bed_shape = 0x0,500x0,500x500,0x500
-default_print_profile = Default X4 Max PETG/PLA/PLA+ @Artillery
+default_print_profile = ArtillerySlicer X4 Max PETG/PLA/PLA+ @Artillery
 machine_max_feedrate_e = 100,120
 machine_max_feedrate_z = 13,12
 machine_max_jerk_e = 10,2.5
@@ -361,7 +361,7 @@ max_print_height = 500
 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 Z1 ;Raise Z more\nG90 ;Absolute positionning\nG1 X5 Y480 F3000;\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z
 
 ###########
-## PRINT ##
+## PRINT ##'
 ###########
 # Common print preset
 [print:*common*]
@@ -651,6 +651,16 @@ notes =
 only_retract_when_crossing_perimeters = 0
 ooze_prevention = 0
 output_filename_format = {input_filename_base}_{layer_height}mm_{filament_type[0]}_{printer_model}_{print_time}.gcode
+perimeter_acceleration = 1500
+perimeter_speed = 120
+seam_position = rear
+skirts = 0
+skirt_distance = 0
+solid_infill_extrusion_width = 0.45
+support_material_extrusion_width = 0.35
+top_infill_extrusion_width = 0.4
+travel_acceleration = 3000
+travel_speed = 250
 external_perimeter_extrusion_width = 0.4
 
 [print:*common_x3*]
@@ -667,18 +677,21 @@ first_layer_acceleration = 0
 first_layer_extrusion_width = 0.42
 infill_overlap = 25%
 max_print_speed = 400
+solid_infill_speed = 150
+top_solid_infill_speed = 150
 
-[print:Default X3 ABS/PETG/PLA_Silk @Artillery]
+
+[print:ArtillerySlicer X3 ABS/PETG/PLA_Silk @Artillery]
 inherits = *common_x3*
 external_perimeter_speed = 50%
 infill_speed = 150
 
-[print:Default X3 PLA/PLA_HS @Artillery]
+[print:ArtillerySlicer X3 PLA/PLA_HS @Artillery]
 inherits = *common_x3*
 external_perimeter_speed = 50%
 infill_speed = 200
 
-[print:Default X3 TPU @Artillery]
+[print:ArtillerySlicer X3 TPU @Artillery]
 inherits = *common_x3*
 external_perimeter_speed = 30
 infill_speed = 30
@@ -710,65 +723,89 @@ compatible_printers_condition = printer_model=~/(X4 Pro).*/ and nozzle_diameter[
 external_perimeter_speed = 50%
 max_print_speed = 300
 
-[print:Default X4 Max ABS @Artillery]
+[print:ArtillerySlicer X4 Max ABS @Artillery]
 inherits = *common_x4_max*; common_x4_ABS_PETG_PLA
 avoid_crossing_perimeters = 0
 infill_speed = 100
+solid_infill_speed = 100
+top_solid_infill_speed = 100
 
-[print:Default X4 Plus ABS @Artillery]
+[print:ArtillerySlicer X4 Plus ABS @Artillery]
 inherits = *common_x4_plus*; common_x4_ABS_PETG_PLA
 avoid_crossing_perimeters = 0
 infill_speed = 100
+solid_infill_speed = 150
+top_solid_infill_speed = 150
 
-[print:Default X4 Pro ABS @Artillery]
+[print:ArtillerySlicer X4 Pro ABS @Artillery]
 inherits = *common_x4_pro*; common_x4_ABS_PETG_PLA
 avoid_crossing_perimeters = 0
 infill_speed = 100
+solid_infill_speed = 200
+top_solid_infill_speed = 200
 
-[print:Default X4 Max PETG/PLA/PLA+ @Artillery]
+[print:ArtillerySlicer X4 Max PETG/PLA/PLA+ @Artillery]
 inherits = *common_x4_max*; common_x4_ABS_PETG_PLA
 avoid_crossing_perimeters = 0
 infill_speed = 150
+solid_infill_speed = 100
+top_solid_infill_speed = 100
 
-[print:Default X4 Plus PETG/PLA/PLA+ @Artillery]
+[print:ArtillerySlicer X4 Plus PETG/PLA/PLA+ @Artillery]
 inherits = *common_x4_plus*; common_x4_ABS_PETG_PLA
 avoid_crossing_perimeters = 0
 infill_speed = 150
+solid_infill_speed = 150
+top_solid_infill_speed = 150
 
-[print:Default X4 Pro PETG/PLA/PLA+ @Artillery]
+[print:ArtillerySlicer X4 Pro PETG/PLA/PLA+ @Artillery]
 inherits = *common_x4_pro*; common_x4_ABS_PETG_PLA
 avoid_crossing_perimeters = 0
 infill_speed = 300
+solid_infill_speed = 200
+top_solid_infill_speed = 200
 
-[print:Default X4 Max PLA HS @Artillery]
+[print:ArtillerySlicer X4 Max PLA HS @Artillery]
 inherits = *common_x4_max*; common_x4_ABS_PETG_PLA
 avoid_crossing_perimeters = 1
 infill_speed = 150
+solid_infill_speed = 100
+top_solid_infill_speed = 100
 
-[print:Default X4 Plus PLA HS @Artillery]
+[print:ArtillerySlicer X4 Plus PLA HS @Artillery]
 inherits = *common_x4_plus*; common_x4_ABS_PETG_PLA
 avoid_crossing_perimeters = 1
 infill_speed = 150
+solid_infill_speed = 150
+top_solid_infill_speed = 150
 
-[print:Default X4 Pro PLA HS @Artillery]
+[print:ArtillerySlicer X4 Pro PLA HS @Artillery]
 inherits = *common_x4_pro*; common_x4_ABS_PETG_PLA
 avoid_crossing_perimeters = 1
 infill_speed = 300
+solid_infill_speed = 200
+top_solid_infill_speed = 200
 
-[print:Default X4 Max PLA Silk @Artillery]
+[print:ArtillerySlicer X4 Max PLA Silk @Artillery]
 inherits = *common_x4_max*; common_x4_ABS_PETG_PLA
 avoid_crossing_perimeters = 0
 infill_speed = 150
+solid_infill_speed = 100
+top_solid_infill_speed = 100
 
-[print:Default X4 Plus PLA Silk @Artillery]
+[print:ArtillerySlicer X4 Plus PLA Silk @Artillery]
 inherits = *common_x4_plus*; common_x4_ABS_PETG_PLA
 avoid_crossing_perimeters = 0
 infill_speed = 150
+solid_infill_speed = 150
+top_solid_infill_speed = 150
 
-[print:Default X4 Pro PLA Silk @Artillery]
+[print:ArtillerySlicer X4 Pro PLA Silk @Artillery]
 inherits = *common_x4_pro*; common_x4_ABS_PETG_PLA
 avoid_crossing_perimeters = 0
 infill_speed = 150
+solid_infill_speed = 200
+top_solid_infill_speed = 200
 
 [print:*common_x4_TPU*]
 avoid_crossing_perimeters = 0
@@ -777,14 +814,16 @@ external_perimeter_speed = 30
 fill_density = 15%
 infill_speed = 30
 max_print_speed = 60
+solid_infill_speed = 30
+top_solid_infill_speed = 30
 
-[print:Default X4 Max TPU @Artillery]
+[print:ArtillerySlicer X4 Max TPU @Artillery]
 inherits = *common_x4_max*; common_x4_TPU
 
-[print:Default X4 Plus TPU @Artillery]
+[print:ArtillerySlicer X4 Plus TPU @Artillery]
 inherits = *common_x4_plus*; common_x4_TPU
 
-[print:Default X4 Pro TPU @Artillery]
+[print:ArtillerySlicer X4 Pro TPU @Artillery]
 inherits = *common_x4_pro*; common_x4_TPU
 
 ###############
@@ -812,7 +851,6 @@ compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_Artillery.*/
 bridge_fan_speed = 100
 compatible_printers =
 compatible_printers_condition =
-compatible_prints =
 compatible_prints_condition =
 cooling = 1
 enable_dynamic_fan_speeds = 0
@@ -1040,6 +1078,7 @@ extrusion_multiplier = 1.16
 [filament:Artillery ABS @X3]
 inherits = *common_x3*
 bed_temperature = 100
+compatible_prints = ArtillerySlicer X3 ABS/PETG/PLA_Silk @Artillery
 filament_density = 1.04
 filament_retract_length = 1
 filament_retract_speed = 40
@@ -1051,6 +1090,7 @@ temperature = 250
 [filament:Artillery PETG @X3]
 inherits = *common_x3*
 bed_temperature = 90
+compatible_prints = ArtillerySlicer X3 ABS/PETG/PLA_Silk @Artillery
 filament_density = 1.26
 filament_retract_length = 1.1
 filament_retract_speed = 40
@@ -1062,6 +1102,7 @@ temperature = 245
 [filament:Artillery PLA @X3]
 inherits = *common_x3*
 bed_temperature = 60
+compatible_prints = ArtillerySlicer X3 PLA/PLA_HS @Artillery
 filament_density = 1.2
 filament_retract_length = 1
 filament_retract_speed = 60
@@ -1073,10 +1114,11 @@ temperature = 210
 [filament:Artillery PLA HS @X3]
 inherits = *common_x3*
 bed_temperature = 60
+compatible_prints = ArtillerySlicer X3 PLA/PLA_HS @Artillery
 filament_density = 1.2
 filament_retract_length = 1.2
 filament_retract_speed = 60
-filament_type = PLA HS
+filament_type = PLA
 first_layer_bed_temperature = 60
 first_layer_temperature = 210
 temperature = 210
@@ -1084,10 +1126,11 @@ temperature = 210
 [filament:Artillery PLA Silk @X3]
 inherits = *common_x3*
 bed_temperature = 70
+compatible_prints = ArtillerySlicer X3 ABS/PETG/PLA_Silk @Artillery
 filament_density = 1.2
 filament_retract_length = 1
 filament_retract_speed = 40
-filament_type = PLA Silk
+filament_type = PLA
 first_layer_bed_temperature = 70
 first_layer_temperature = 210
 temperature = 210
@@ -1095,6 +1138,7 @@ temperature = 210
 [filament:Artillery TPU @X3]
 inherits = *common_x3*
 bed_temperature = 70
+compatible_prints = ArtillerySlicer X3 TPU @Artillery
 filament_density = 1.21
 filament_retract_length = 0.8
 filament_retract_speed = 40
@@ -1106,6 +1150,7 @@ temperature = 210
 [filament:Artillery ABS @X4]
 inherits = *common_x4*
 bed_temperature = 100
+compatible_prints = ArtillerySlicer X4 Max ABS @Artillery; ArtillerySlicer X4 Plus ABS @Artillery; ArtillerySlicer X4 Pro ABS @Artillery
 filament_density = 1.04
 filament_max_volumetric_speed = 20
 filament_retract_length = 1.3
@@ -1117,6 +1162,7 @@ temperature = 260
 [filament:Artillery PETG @X4]
 inherits = *common_x4*
 bed_temperature = 90
+compatible_prints = ArtillerySlicer X4 Max PETG/PLA/PLA+ @Artillery; ArtillerySlicer X4 Plus PETG/PLA/PLA+ @Artillery; ArtillerySlicer X4 Pro PETG/PLA/PLA+ @Artillery
 filament_density = 1.26
 filament_max_volumetric_speed = 20
 filament_retract_length = 1.3
@@ -1127,6 +1173,7 @@ temperature = 250
 
 [filament:Artillery PLA & PLA HS @X4]
 inherits = *common_x4*
+compatible_prints = ArtillerySlicer X4 Max PETG/PLA/PLA+ @Artillery; ArtillerySlicer X4 Plus PETG/PLA/PLA+ @Artillery; ArtillerySlicer X4 Pro PETG/PLA/PLA+ @Artillery; ArtillerySlicer X4 Max PLA HS @Artillery; ArtillerySlicer X4 Plus PLA HS @Artillery; ArtillerySlicer X4 Pro PLA HS @Artillery
 bed_temperature = 60
 filament_density = 1.2
 filament_max_volumetric_speed = 20
@@ -1139,10 +1186,11 @@ temperature = 210
 [filament:Artillery PLA+ @X4]
 inherits = *common_x4*
 bed_temperature = 60
+compatible_prints = ArtillerySlicer X4 Max PETG/PLA/PLA+ @Artillery; ArtillerySlicer X4 Plus PETG/PLA/PLA+ @Artillery; ArtillerySlicer X4 Pro PETG/PLA/PLA+ @Artillery
 filament_density = 1.25
 filament_max_volumetric_speed = 20
 filament_retract_length = 1.3
-filament_type = PLA+
+filament_type = PLA
 first_layer_bed_temperature = 60
 first_layer_temperature = 210
 temperature = 210
@@ -1150,10 +1198,11 @@ temperature = 210
 [filament:Artillery PLA Silk @X4]
 inherits = *common_x4*
 bed_temperature = 60
+compatible_prints = ArtillerySlicer X4 Max PLA Silk @Artillery; ArtillerySlicer X4 Plus PLA Silk @Artillery; ArtillerySlicer X4 Pro PLA Silk @Artillery
 filament_density = 1.2
 filament_max_volumetric_speed = 20
 filament_retract_length = 1.2
-filament_type = PLA Silk
+filament_type = PLA
 first_layer_bed_temperature = 70
 first_layer_temperature = 215
 temperature = 215
@@ -1161,6 +1210,7 @@ temperature = 215
 [filament:Artillery TPU @X4]
 inherits = *common_x4*
 bed_temperature = 70
+compatible_prints = ArtillerySlicer X4 Max TPU @Artillery; ArtillerySlicer X4 Plus TPU @Artillery; ArtillerySlicer X4 Pro TPU @Artillery
 filament_density = 1.21
 filament_max_volumetric_speed = 4
 filament_retract_length = 1.5