diff options
Diffstat (limited to 'resources/profiles/Artillery.ini')
| -rw-r--r-- | resources/profiles/Artillery.ini | 86 |
1 files changed, 0 insertions, 86 deletions
diff --git a/resources/profiles/Artillery.ini b/resources/profiles/Artillery.ini index 8827c890a..734c584ef 100644 --- a/resources/profiles/Artillery.ini +++ b/resources/profiles/Artillery.ini @@ -1,16 +1,10 @@ ############### # AUTHOR: Szabolcs Hornyak / design85@gmail.com # https://szabolcs.eu/2020/12/29/prusaslicer-sw-x1-genius/ -<<<<<<< HEAD -# 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 ->>>>>>> master # Print profiles for the Artillery printers. [vendor] @@ -18,11 +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. -<<<<<<< HEAD -config_version = 0.0.3 -======= config_version = 0.0.5 ->>>>>>> master # 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% @@ -36,11 +26,7 @@ config_update_url = https://files.prusa3d.com/wp-content/uploads/repository/Prus ############# [printer_model:X1] -<<<<<<< HEAD -name = Sidewinder X1 -======= name = Artillery Sidewinder X1 ->>>>>>> master variants = 0.4 technology = FFF bed_model = bed-x1.stl @@ -48,19 +34,13 @@ bed_texture = bed-x1.png default_materials = Generic PLA @Artillery; Generic ABS @Artillery; Generic PETG @Artillery; Generic TPU @Artillery [printer_model:Genius] -<<<<<<< HEAD -name = Genius -======= name = Artillery Genius ->>>>>>> master 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 -<<<<<<< HEAD -======= [printer_model:Hornet] name = Artillery Hornet variants = 0.4 @@ -69,7 +49,6 @@ bed_model = bed-hornet.stl bed_texture = bed-hornet.png default_materials = Generic PLA @Artillery; Generic ABS @Artillery; Generic PETG @Artillery; Generic TPU @Artillery ->>>>>>> master # Common printer preset [printer:*common*] before_layer_gcode = ;BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0 @@ -83,10 +62,7 @@ extruder_colour = #FFFF00 extruder_offset = 0x0 gcode_flavor = marlin layer_gcode = ;AFTER_LAYER_CHANGE\n;[layer_z] -<<<<<<< HEAD -======= machine_limits_usage = emit_to_gcode ->>>>>>> master machine_max_acceleration_e = 5000,5000 machine_max_acceleration_extruding = 1250,1250 machine_max_acceleration_retracting = 1250,1250 @@ -140,10 +116,6 @@ 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} -<<<<<<< HEAD -[printer:Sidewinder X1] -inherits = *common_STOCK_FW* -======= [printer:*bowden*] inherits = *common_STOCK_FW* retract_length = 5 @@ -161,57 +133,39 @@ default_print_profile = 0.20mm NORMAL @Artillery [printer:Artillery Sidewinder X1] inherits = *common_STOCK_FW* renamed_from = "Sidewinder X1" ->>>>>>> master 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 -<<<<<<< HEAD -[printer:Sidewinder X1 BL-TOUCH] -inherits = *common_UPD_FW* -======= [printer:Artillery Sidewinder X1 BL-TOUCH] inherits = *common_UPD_FW* renamed_from = "Sidewinder X1 BL-TOUCH" ->>>>>>> master 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 -<<<<<<< HEAD -[printer:Genius] -inherits = *common_STOCK_FW* -======= [printer:Artillery Genius] inherits = *common_STOCK_FW* renamed_from = "Genius" ->>>>>>> master 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 -<<<<<<< HEAD -[printer:Genius BL-TOUCH] -inherits = *common_UPD_FW* -======= [printer:Artillery Genius BL-TOUCH] inherits = *common_UPD_FW* renamed_from = "Genius BL-TOUCH" ->>>>>>> master 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 -<<<<<<< HEAD -======= [printer:Artillery Hornet] inherits = *bowden* printer_model = Hornet @@ -221,7 +175,6 @@ 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 ->>>>>>> master ########### ## PRINT ## ########### @@ -384,10 +337,7 @@ top_solid_layers = 4 [print:*0.28mm*] inherits = *common* layer_height = 0.28 -<<<<<<< HEAD -======= first_layer_height = 0.36 ->>>>>>> master top_infill_extrusion_width = 0.45 first_layer_extrusion_width = 0.75 bottom_solid_layers = 3 @@ -395,21 +345,6 @@ top_solid_layers = 4 [print:0.08mm SUPERDETAIL @Artillery] inherits = *0.08mm* -<<<<<<< HEAD -compatible_printers_condition = printer_model=~/(X1|Genius).*/ 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 - -[print:0.12mm DETAIL @Artillery] -inherits = *0.12mm* -compatible_printers_condition = printer_model=~/(X1|Genius).*/ 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.10mm HIGHDETAIL @Artillery] @@ -423,7 +358,6 @@ compatible_printers_condition = printer_model=~/(X1|Genius|Hornet).*/ and nozzle [print:0.16mm OPTIMAL @Artillery] inherits = *0.16mm* compatible_printers_condition = printer_model=~/(X1|Genius|Hornet).*/ and nozzle_diameter[0]==0.4 ->>>>>>> master [print:0.20mm SLOW @Artillery] inherits = *0.20mm* @@ -437,19 +371,11 @@ solid_infill_speed = 50 top_solid_infill_speed = 25 first_layer_speed = 15 travel_speed = 100 -<<<<<<< HEAD -compatible_printers_condition = printer_model=~/(X1|Genius).*/ 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 NORMAL @Artillery] inherits = *0.20mm* compatible_printers_condition = printer_model=~/(X1|Genius|Hornet).*/ and nozzle_diameter[0]==0.4 ->>>>>>> master [print:0.20mm SPEED @Artillery] inherits = *0.20mm* @@ -464,17 +390,6 @@ perimeters = 2 solid_infill_speed = 150 top_solid_infill_speed = 50 travel_speed = 170 -<<<<<<< HEAD -compatible_printers_condition = printer_model=~/(X1|Genius).*/ 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 - -[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 [print:0.24mm DRAFT @Artillery] @@ -484,7 +399,6 @@ compatible_printers_condition = printer_model=~/(X1|Genius|Hornet).*/ and nozzle [print:0.28mm SUPERDRAFT @Artillery] inherits = *0.28mm* compatible_printers_condition = printer_model=~/(X1|Genius|Hornet).*/ and nozzle_diameter[0]==0.4 ->>>>>>> master ############### ## FILAMENTS ## |