From 1d77080421d59ea0eff61c215cad25be882c2b65 Mon Sep 17 00:00:00 2001
From: rtyr <36745189+rtyr@users.noreply.github.com>
Date: Fri, 14 Jan 2022 13:33:46 +0100
Subject: [PATCH] Added Artillery Hornet

Hornet profile based on https://github.com/slic3r/slic3r-profiles/pull/14
---
 resources/profiles/Artillery.idx |  2 +
 resources/profiles/Artillery.ini | 71 ++++++++++++++++++++++++--------
 2 files changed, 56 insertions(+), 17 deletions(-)

diff --git a/resources/profiles/Artillery.idx b/resources/profiles/Artillery.idx
index 0c45cb2e3..181f667e5 100644
--- a/resources/profiles/Artillery.idx
+++ b/resources/profiles/Artillery.idx
@@ -1,3 +1,5 @@
+min_slic3r_version = 2.4.1-alpha0
+0.0.5 Added Artillery Hornet
 min_slic3r_version = 2.3.1-beta
 0.0.4 Fixed first layer height in 0.28mm profile.
 0.0.3 Fixed Genius bed size.
diff --git a/resources/profiles/Artillery.ini b/resources/profiles/Artillery.ini
index 82c7daddc..734c584ef 100644
--- a/resources/profiles/Artillery.ini
+++ b/resources/profiles/Artillery.ini
@@ -1,9 +1,10 @@
 ###############
 # AUTHOR: Szabolcs Hornyak / design85@gmail.com
 # https://szabolcs.eu/2020/12/29/prusaslicer-sw-x1-genius/
-# Tested with PrusaSlicer 2.2, 2.3
 ###############
 
+## Artillery Hornet printer profile is based on PR https://github.com/slic3r/slic3r-profiles/pull/14 created by https://github.com/newbeetle
+
 # Print profiles for the Artillery printers.
 
 [vendor]
@@ -11,7 +12,7 @@
 name = Artillery
 # Configuration version of this file. Config file will only be installed, if the config_version differs.
 # This means, the server may force the PrusaSlicer configuration to be downgraded.
-config_version = 0.0.4
+config_version = 0.0.5
 # Where to get the updates from?
 config_update_url = https://files.prusa3d.com/wp-content/uploads/repository/PrusaSlicer-settings-master/live/Artillery/
 # changelog_url = https://files.prusa3d.com/?latest=slicer-profiles&lng=%1%
@@ -25,7 +26,7 @@ config_update_url = https://files.prusa3d.com/wp-content/uploads/repository/Prus
 #############
 
 [printer_model:X1]
-name = Sidewinder X1
+name = Artillery Sidewinder X1
 variants = 0.4
 technology = FFF
 bed_model = bed-x1.stl
@@ -33,13 +34,21 @@ bed_texture = bed-x1.png
 default_materials = Generic PLA @Artillery; Generic ABS @Artillery; Generic PETG @Artillery; Generic TPU @Artillery
 
 [printer_model:Genius]
-name = Genius
+name = Artillery Genius
 variants = 0.4
 technology = FFF
 bed_model = bed-genius.stl
 bed_texture = bed-genius.png
 default_materials = Generic PLA @Artillery; Generic ABS @Artillery; Generic PETG @Artillery; Generic TPU @Artillery
 
+[printer_model:Hornet]
+name = Artillery Hornet
+variants = 0.4
+technology = FFF
+bed_model = bed-hornet.stl
+bed_texture = bed-hornet.png
+default_materials = Generic PLA @Artillery; Generic ABS @Artillery; Generic PETG @Artillery; Generic TPU @Artillery
+
 # Common printer preset
 [printer:*common*]
 before_layer_gcode = ;BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0
@@ -53,6 +62,7 @@ extruder_colour = #FFFF00
 extruder_offset = 0x0
 gcode_flavor = marlin
 layer_gcode = ;AFTER_LAYER_CHANGE\n;[layer_z]
+machine_limits_usage = emit_to_gcode
 machine_max_acceleration_e = 5000,5000
 machine_max_acceleration_extruding = 1250,1250
 machine_max_acceleration_retracting = 1250,1250
@@ -106,38 +116,65 @@ start_gcode = ; Initial setups\nG90 ; use absolute coordinates\nM83 ; extruder r
 inherits = *common*
 start_gcode = ; Initial setups\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM900 K0.12 ; K factor\nM900 W[extrusion_width] H[layer_height] D[filament_diameter]\nM200 D0 ; disable volumetric e\nM220 S100 ; reset speed factor to 100%\nM221 S100 ; reset extrusion rate to 100%\n\n; Set the heating\nM190 S[first_layer_bed_temperature] ; wait for bed to heat up\nM104 S[first_layer_temperature] ; start nozzle heating but don't wait\n\n; Home\nG1 Z3 F3000 ; move z up little to prevent scratching of surface\nG28 ; home all axes\nG1 X3 Y3 F5000 ; move to corner of the bed to avoid ooze over centre\n\n; Wait for final heating\nM109 S[first_layer_temperature] ; wait for the nozzle to heat up\nM190 S[first_layer_bed_temperature] ; wait for the bed to heat up\n\n;Auto bed Leveling\n@BEDLEVELVISUALIZER\nG29 ; ABL T\nM420 S1 Z3 ; reload and fade mesh bed leveling until it reach 3mm Z\n\n; Return to prime position, Prime line routine\nG92 E0 ; Reset Extruder\nG1 Z3 F3000 ; move z up little to prevent scratching of surface\nG1 X10 Y.5 Z0.25 F5000.0 ; Move to start position\nG1 X100 Y.5 Z0.25 F1500.0 E15 ; Draw the first line\nG1 X100 Y.2 Z0.25 F5000.0 ; Move to side a little\nG1 X10 Y.2 Z0.25 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nM221 S{if layer_height<0.075}100{else}95{endif}
 
-[printer:Sidewinder X1]
+[printer:*bowden*]
 inherits = *common_STOCK_FW*
+retract_length = 5
+retract_lift = 0.1
+retract_before_wipe = 50%
+default_filament_profile = Generic PLA @Artillery
+
+[printer:*0.4nozzle*]
+nozzle_diameter = 0.4
+max_layer_height = 0.32
+min_layer_height = 0.04
+printer_variant = 0.4
+default_print_profile = 0.20mm NORMAL @Artillery
+
+[printer:Artillery Sidewinder X1]
+inherits = *common_STOCK_FW*
+renamed_from = "Sidewinder X1"
 printer_model = X1
 printer_variant = 0.4
 bed_shape = 0x0,300x0,300x300,0x300
 max_print_height = 400
 printer_notes = Don't remove the following keywords! These keywords are used in the "compatible printer" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_Artillery\nPRINTER_MODEL_X1
 
-[printer:Sidewinder X1 BL-TOUCH]
+[printer:Artillery Sidewinder X1 BL-TOUCH]
 inherits = *common_UPD_FW*
+renamed_from = "Sidewinder X1 BL-TOUCH"
 printer_model = X1
 printer_variant = 0.4
 bed_shape = 0x0,300x0,300x300,0x300
 max_print_height = 400
 printer_notes = Don't remove the following keywords! These keywords are used in the "compatible printer" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_Artillery\nPRINTER_MODEL_X1
 
-[printer:Genius]
+[printer:Artillery Genius]
 inherits = *common_STOCK_FW*
+renamed_from = "Genius"
 printer_model = Genius
 printer_variant = 0.4
 bed_shape = 0x0,220x0,220x220,0x220
 max_print_height = 250
 printer_notes = Don't remove the following keywords! These keywords are used in the "compatible printer" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_Artillery\nPRINTER_MODEL_Genius
 
-[printer:Genius BL-TOUCH]
+[printer:Artillery Genius BL-TOUCH]
 inherits = *common_UPD_FW*
+renamed_from = "Genius BL-TOUCH"
 printer_model = Genius
 printer_variant = 0.4
 bed_shape = 0x0,220x0,220x220,0x220
 max_print_height = 250
 printer_notes = Don't remove the following keywords! These keywords are used in the "compatible printer" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_Artillery\nPRINTER_MODEL_Genius
 
+[printer:Artillery Hornet]
+inherits = *bowden*
+printer_model = Hornet
+printer_variant = 0.4
+bed_shape = 0x0,220x0,220x220,0x220
+max_print_height = 250
+machine_limits_usage = time_estimate_only
+printer_notes = Don't remove the following keywords! These keywords are used in the "compatible printer" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_Artillery\nPRINTER_MODEL_Hornet\nPRINTER_HAS_Bowden
+
 ###########
 ## PRINT ##
 ###########
@@ -308,19 +345,19 @@ top_solid_layers = 4
 
 [print:0.08mm SUPERDETAIL @Artillery]
 inherits = *0.08mm*
-compatible_printers_condition = printer_model=~/(X1|Genius).*/ and nozzle_diameter[0]==0.4
+compatible_printers_condition = printer_model=~/(X1|Genius|Hornet).*/ and nozzle_diameter[0]==0.4
 
 [print:0.10mm HIGHDETAIL @Artillery]
 inherits = *0.10mm*
-compatible_printers_condition = printer_model=~/(X1|Genius).*/ and nozzle_diameter[0]==0.4
+compatible_printers_condition = printer_model=~/(X1|Genius|Hornet).*/ and nozzle_diameter[0]==0.4
 
 [print:0.12mm DETAIL @Artillery]
 inherits = *0.12mm*
-compatible_printers_condition = printer_model=~/(X1|Genius).*/ and nozzle_diameter[0]==0.4
+compatible_printers_condition = printer_model=~/(X1|Genius|Hornet).*/ and nozzle_diameter[0]==0.4
 
 [print:0.16mm OPTIMAL @Artillery]
 inherits = *0.16mm*
-compatible_printers_condition = printer_model=~/(X1|Genius).*/ and nozzle_diameter[0]==0.4
+compatible_printers_condition = printer_model=~/(X1|Genius|Hornet).*/ and nozzle_diameter[0]==0.4
 
 [print:0.20mm SLOW @Artillery]
 inherits = *0.20mm*
@@ -334,11 +371,11 @@ solid_infill_speed = 50
 top_solid_infill_speed = 25
 first_layer_speed = 15
 travel_speed = 100
-compatible_printers_condition = printer_model=~/(X1|Genius).*/ and nozzle_diameter[0]==0.4
+compatible_printers_condition = printer_model=~/(X1|Genius|Hornet).*/ and nozzle_diameter[0]==0.4
 
 [print:0.20mm NORMAL @Artillery]
 inherits = *0.20mm*
-compatible_printers_condition = printer_model=~/(X1|Genius).*/ and nozzle_diameter[0]==0.4
+compatible_printers_condition = printer_model=~/(X1|Genius|Hornet).*/ and nozzle_diameter[0]==0.4
 
 [print:0.20mm SPEED @Artillery]
 inherits = *0.20mm*
@@ -353,15 +390,15 @@ perimeters = 2
 solid_infill_speed = 150
 top_solid_infill_speed = 50
 travel_speed = 170
-compatible_printers_condition = printer_model=~/(X1|Genius).*/ and nozzle_diameter[0]==0.4
+compatible_printers_condition = printer_model=~/(X1|Genius|Hornet).*/ and nozzle_diameter[0]==0.4
 
 [print:0.24mm DRAFT @Artillery]
 inherits = *0.24mm*
-compatible_printers_condition = printer_model=~/(X1|Genius).*/ and nozzle_diameter[0]==0.4
+compatible_printers_condition = printer_model=~/(X1|Genius|Hornet).*/ and nozzle_diameter[0]==0.4
 
 [print:0.28mm SUPERDRAFT @Artillery]
 inherits = *0.28mm*
-compatible_printers_condition = printer_model=~/(X1|Genius).*/ and nozzle_diameter[0]==0.4
+compatible_printers_condition = printer_model=~/(X1|Genius|Hornet).*/ and nozzle_diameter[0]==0.4
 
 ###############
 ## FILAMENTS ##