diff --git a/resources/profiles/Artillery.json b/resources/profiles/Artillery.json index 45d9681d53..bf3e903fd5 100644 --- a/resources/profiles/Artillery.json +++ b/resources/profiles/Artillery.json @@ -4,19 +4,51 @@ "force_update": "0", "description": "Artillery configurations", "machine_model_list": [ + { + "name": "Artillery Genius", + "sub_path": "machine/Artillery Genius.json" + }, { "name": "Artillery Sidewinder X2", "sub_path": "machine/Artillery Sidewinder X2.json" + }, + { + "name": "Artillery Hornet", + "sub_path": "machine/Artillery Hornet.json" } ], "process_list": [ { "name": "fdm_process_common", "sub_path": "process/fdm_process_common.json" + }, + { + "name": "0.15mm Optimal @Artillery Genius", + "sub_path": "process/0.15mm Optimal @Artillery Genius.json" + }, + { + "name": "0.16mm Optimal @Artillery Hornet", + "sub_path": "process/0.16mm Optimal @Artillery Hornet.json" + }, + { + "name": "0.20mm Standard @Artillery Genius", + "sub_path": "process/0.20mm Standard @Artillery Genius.json" }, { - "name": "0.20mm Standard @Artillery", - "sub_path": "process/0.20mm Standard @Artillery.json" + "name": "0.20mm Standard @Artillery X2", + "sub_path": "process/0.20mm Standard @Artillery X2.json" + }, + { + "name": "0.20mm Standard @Artillery Hornet", + "sub_path": "process/0.20mm Standard @Artillery Hornet.json" + }, + { + "name": "0.25mm Draft @Artillery Genius", + "sub_path": "process/0.25mm Draft @Artillery Genius.json" + }, + { + "name": "0.24mm Draft @Artillery Hornet", + "sub_path": "process/0.24mm Draft @Artillery Hornet.json" } ], "filament_list": [ @@ -73,10 +105,18 @@ { "name": "fdm_machine_common", "sub_path": "machine/fdm_machine_common.json" + }, + { + "name": "Artillery Genius 0.4 nozzle", + "sub_path": "machine/Artillery Genius 0.4 nozzle.json" }, { "name": "Artillery Sidewinder X2 0.4 nozzle", "sub_path": "machine/Artillery Sidewinder X2 0.4 nozzle.json" + }, + { + "name": "Artillery Hornet 0.4 nozzle", + "sub_path": "machine/Artillery Hornet 0.4 nozzle.json" } ] } diff --git a/resources/profiles/Artillery/artillery_genius_buildplate_model.stl b/resources/profiles/Artillery/artillery_genius_buildplate_model.stl new file mode 100644 index 0000000000..09314026ae Binary files /dev/null and b/resources/profiles/Artillery/artillery_genius_buildplate_model.stl differ diff --git a/resources/profiles/Artillery/artillery_genius_buildplate_texture.png b/resources/profiles/Artillery/artillery_genius_buildplate_texture.png new file mode 100644 index 0000000000..ab2a8a2e90 Binary files /dev/null and b/resources/profiles/Artillery/artillery_genius_buildplate_texture.png differ diff --git a/resources/profiles/Artillery/artillery_hornet_buildplate_model.stl b/resources/profiles/Artillery/artillery_hornet_buildplate_model.stl new file mode 100644 index 0000000000..09314026ae Binary files /dev/null and b/resources/profiles/Artillery/artillery_hornet_buildplate_model.stl differ diff --git a/resources/profiles/Artillery/artillery_hornet_buildplate_texture.png b/resources/profiles/Artillery/artillery_hornet_buildplate_texture.png new file mode 100644 index 0000000000..ab2a8a2e90 Binary files /dev/null and b/resources/profiles/Artillery/artillery_hornet_buildplate_texture.png differ diff --git a/resources/profiles/Artillery/artillery_sidewinderx2_buildplate_model.stl b/resources/profiles/Artillery/artillery_sidewinderx2_buildplate_model.stl new file mode 100644 index 0000000000..f99bd8dfc2 Binary files /dev/null and b/resources/profiles/Artillery/artillery_sidewinderx2_buildplate_model.stl differ diff --git a/resources/profiles/Artillery/artillery_sidewinderx2_buildplate_texture.png b/resources/profiles/Artillery/artillery_sidewinderx2_buildplate_texture.png new file mode 100644 index 0000000000..1b6ddf7482 Binary files /dev/null and b/resources/profiles/Artillery/artillery_sidewinderx2_buildplate_texture.png differ diff --git a/resources/profiles/Artillery/filament/Artillery Generic ABS.json b/resources/profiles/Artillery/filament/Artillery Generic ABS.json index a21362ce1f..470e835c69 100644 --- a/resources/profiles/Artillery/filament/Artillery Generic ABS.json +++ b/resources/profiles/Artillery/filament/Artillery Generic ABS.json @@ -13,6 +13,8 @@ "12" ], "compatible_printers": [ - "Artillery Sidewinder X2 0.4 nozzle" + "Artillery Genius 0.4 nozzle", + "Artillery Sidewinder X2 0.4 nozzle", + "Artillery Hornet 0.4 nozzle" ] } diff --git a/resources/profiles/Artillery/filament/Artillery Generic ASA.json b/resources/profiles/Artillery/filament/Artillery Generic ASA.json index 972ff85ea1..968ec22b20 100644 --- a/resources/profiles/Artillery/filament/Artillery Generic ASA.json +++ b/resources/profiles/Artillery/filament/Artillery Generic ASA.json @@ -13,6 +13,8 @@ "12" ], "compatible_printers": [ - "Artillery Sidewinder X2 0.4 nozzle" + "Artillery Genius 0.4 nozzle", + "Artillery Sidewinder X2 0.4 nozzle", + "Artillery Hornet 0.4 nozzle" ] } diff --git a/resources/profiles/Artillery/filament/Artillery Generic PETG.json b/resources/profiles/Artillery/filament/Artillery Generic PETG.json index f6df1f1ab8..2237b070cd 100644 --- a/resources/profiles/Artillery/filament/Artillery Generic PETG.json +++ b/resources/profiles/Artillery/filament/Artillery Generic PETG.json @@ -43,6 +43,8 @@ "; filament start gcode\n" ], "compatible_printers": [ - "Artillery Sidewinder X2 0.4 nozzle" + "Artillery Genius 0.4 nozzle", + "Artillery Sidewinder X2 0.4 nozzle", + "Artillery Hornet 0.4 nozzle" ] } diff --git a/resources/profiles/Artillery/filament/Artillery Generic PLA-CF.json b/resources/profiles/Artillery/filament/Artillery Generic PLA-CF.json index f17a04ebe7..0d33140b85 100644 --- a/resources/profiles/Artillery/filament/Artillery Generic PLA-CF.json +++ b/resources/profiles/Artillery/filament/Artillery Generic PLA-CF.json @@ -19,6 +19,8 @@ "7" ], "compatible_printers": [ - "Artillery Sidewinder X2 0.4 nozzle" + "Artillery Genius 0.4 nozzle", + "Artillery Sidewinder X2 0.4 nozzle", + "Artillery Hornet 0.4 nozzle" ] } diff --git a/resources/profiles/Artillery/filament/Artillery Generic PLA.json b/resources/profiles/Artillery/filament/Artillery Generic PLA.json index f42b25efe3..cb4777aa8b 100644 --- a/resources/profiles/Artillery/filament/Artillery Generic PLA.json +++ b/resources/profiles/Artillery/filament/Artillery Generic PLA.json @@ -16,6 +16,8 @@ "8" ], "compatible_printers": [ - "Artillery Sidewinder X2 0.4 nozzle" + "Artillery Genius 0.4 nozzle", + "Artillery Sidewinder X2 0.4 nozzle", + "Artillery Hornet 0.4 nozzle" ] } diff --git a/resources/profiles/Artillery/filament/Artillery Generic TPU.json b/resources/profiles/Artillery/filament/Artillery Generic TPU.json index 6574da9abb..18461fb71a 100644 --- a/resources/profiles/Artillery/filament/Artillery Generic TPU.json +++ b/resources/profiles/Artillery/filament/Artillery Generic TPU.json @@ -10,6 +10,8 @@ "3.2" ], "compatible_printers": [ - "Artillery Sidewinder X2 0.4 nozzle" + "Artillery Genius 0.4 nozzle", + "Artillery Sidewinder X2 0.4 nozzle", + "Artillery Hornet 0.4 nozzle" ] } diff --git a/resources/profiles/Artillery/machine/Artillery Genius 0.4 nozzle.json b/resources/profiles/Artillery/machine/Artillery Genius 0.4 nozzle.json new file mode 100644 index 0000000000..08bb8356c9 --- /dev/null +++ b/resources/profiles/Artillery/machine/Artillery Genius 0.4 nozzle.json @@ -0,0 +1,114 @@ +{ + "type": "machine", + "setting_id": "GM003", + "name": "Artillery Genius 0.4 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_machine_common", + "printer_model": "Artillery Genius", + "default_print_profile": "0.20mm Standard @Artillery Genius", + "nozzle_diameter": [ + "0.4" + ], + "bed_exclude_area": [ + "0x0" + ], + "printable_area": [ + "0x0", + "230x0", + "230x230", + "0x230" + ], + "printable_height": "250", + "nozzle_type": "hardened_steel", + "auxiliary_fan": "0", + "machine_max_acceleration_extruding": [ + "1000", + "1250" + ], + "machine_max_acceleration_retracting": [ + "1000", + "1250" + ], + "machine_max_acceleration_travel": [ + "1000", + "1250" + ], + "machine_max_acceleration_x": [ + "2000", + "1000" + ], + "machine_max_acceleration_y": [ + "2000", + "1000" + ], + "machine_max_acceleration_z": [ + "500", + "200" + ], + "machine_max_speed_e": [ + "120", + "120" + ], + "machine_max_speed_x": [ + "500", + "200" + ], + "machine_max_speed_y": [ + "500", + "200" + ], + "machine_max_speed_z": [ + "12", + "12" + ], + "machine_max_jerk_e": [ + "3", + "2.5" + ], + "machine_max_jerk_x": [ + "7", + "10" + ], + "machine_max_jerk_y": [ + "7", + "10" + ], + "machine_max_jerk_z": [ + "0.2", + "0.4" + ], + "max_layer_height": [ + "0.28" + ], + "min_layer_height": [ + "0.08" + ], + "printer_settings_id": "Artillery", + "retraction_minimum_travel": [ + "2" + ], + "retract_before_wipe": [ + "0%" + ], + "retraction_length": [ + "2.2" + ], + "retract_length_toolchange": [ + "10" + ], + "deretraction_speed": [ + "0" + ], + "single_extruder_multi_material": "0", + "change_filament_gcode": "", + "machine_pause_gcode": "M0", + "default_filament_profile": [ + "Artillery Generic PLA" + ], + "machine_start_gcode": "M83; extruder relative mode\nG28; home all axes\nM109 S[nozzle_temperature_initial_layer]; hotend temperature\nM140 S[hot_plate_temp_initial_layer]; heatbed temperature\nM190 S[hot_plate_temp_initial_layer]; wait for the bed to heat up\nM109 S[nozzle_temperature_initial_layer]; wait for the extruder to heat up\nG92 E0; reset extruder\nG1 X20 Y5 Z0.3 F5000.0; move to start-line position\nG1 Z0.3 F1000; print height\nG1 X200 Y5 F1500.0 E15; draw 1st line\nG1 X200 Y5.3 Z0.3 F5000.0; move to side a little\nG1 X5.3 Y5.3 Z0.3 F1500.0 E30; draw 2nd line\nG1 Z3 F3000; move z up little to prevent scratching of surface", + "machine_end_gcode": "G91; Relative positionning\nG1 E-2 Z0.2 F2400; Retract and raise Z\nG1 X5 Y5 F3000; Wipe out\nG1 Z10; Raise Z more\nG90; Absolute positionning\nG1 X0 Y100; Present print\nM106 S0; Turn-off fan\nM104 S0; Turn-off hotend\nM140 S0; Turn-off bed\nM84 X Y E; Disable all steppers but Z", + "layer_change_gcode": "", + "scan_first_layer": "0" + } + diff --git a/resources/profiles/Artillery/machine/Artillery Genius.json b/resources/profiles/Artillery/machine/Artillery Genius.json new file mode 100644 index 0000000000..e5e4bc9141 --- /dev/null +++ b/resources/profiles/Artillery/machine/Artillery Genius.json @@ -0,0 +1,12 @@ +{ + "type": "machine_model", + "name": "Artillery Genius", + "model_id": "Artillery-Genius", + "nozzle_diameter": "0.4", + "machine_tech": "FFF", + "family": "Artillery", + "bed_model": "artillery_genius_buildplate_model.stl", + "bed_texture": "artillery_genius_buildplate_texture.png", + "hotend_model": "", + "default_materials": "Artillery Generic ABS;Artillery Generic PLA;Artillery Generic PLA-CF;Artillery Generic PETG;Artillery Generic TPU;Artillery Generic ASA" +} diff --git a/resources/profiles/Artillery/machine/Artillery Hornet 0.4 nozzle.json b/resources/profiles/Artillery/machine/Artillery Hornet 0.4 nozzle.json new file mode 100644 index 0000000000..4ed9c1dc55 --- /dev/null +++ b/resources/profiles/Artillery/machine/Artillery Hornet 0.4 nozzle.json @@ -0,0 +1,115 @@ +{ + "type": "machine", + "setting_id": "GM003", + "name": "Artillery Hornet 0.4 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_machine_common", + "printer_model": "Artillery Hornet", + "default_print_profile": "0.20mm Standard @Artillery Hornet", + "nozzle_diameter": [ + "0.4" + ], + "bed_exclude_area": [ + "0x0" + ], + "printable_area": [ + "0x0", + "230x0", + "230x230", + "0x230" + ], + "printable_height": "250", + "nozzle_type": "hardened_steel", + "auxiliary_fan": "0", + "machine_max_acceleration_extruding": [ + "1000", + "1250" + ], + "machine_max_acceleration_retracting": [ + "1000", + "1250" + ], + "machine_max_acceleration_travel": [ + "1000", + "1250" + ], + "machine_max_acceleration_x": [ + "2000", + "1000" + ], + "machine_max_acceleration_y": [ + "2000", + "1000" + ], + "machine_max_acceleration_z": [ + "500", + "200" + ], + "machine_max_speed_e": [ + "120", + "120" + ], + "machine_max_speed_x": [ + "500", + "200" + ], + "machine_max_speed_y": [ + "500", + "200" + ], + "machine_max_speed_z": [ + "12", + "12" + ], + "machine_max_jerk_e": [ + "3", + "2.5" + ], + "machine_max_jerk_x": [ + "7", + "10" + ], + "machine_max_jerk_y": [ + "7", + "10" + ], + "machine_max_jerk_z": [ + "0.2", + "0.4" + ], + "max_layer_height": [ + "0.28" + ], + "min_layer_height": [ + "0.08" + ], + "printer_settings_id": "Artillery", + "retraction_minimum_travel": [ + "2" + ], + "retract_before_wipe": [ + "0%" + ], + "retraction_length": [ + "2.2" + ], + "retract_length_toolchange": [ + "10" + ], + "deretraction_speed": [ + "0" + ], + "single_extruder_multi_material": "0", + "change_filament_gcode": "", + "machine_pause_gcode": "M0", + "default_filament_profile": [ + "Artillery Generic PLA" + ], + "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing and auto bed leveling\nM140 S{hot_plate_temp_initial_layer[0]} ; set final bed temp\nG4 S30 ; allow partial nozzle warmup\nG28 ; home all axis\nG29 ; auto bed levelling\nG1 Z50 F240\nG1 X2.0 Y10 F3000\nM104 S{nozzle_temperature_initial_layer[0]} ; set final nozzle temp\nM190 S{hot_plate_temp_initial_layer[0]} ; wait for bed temp to stabilize\nM109 S{nozzle_temperature_initial_layer[0]} ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 X2.0 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 Y140 F5000\nG92 E0\nG1 X2.3 Y10 E10 F1200 ; prime the nozzle\nG92 E0", + "machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.85} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < printable_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors", + "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\nG92 E0\n;[layer_z]\n\n", + "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", + "scan_first_layer": "0" + } + diff --git a/resources/profiles/Artillery/machine/Artillery Hornet.json b/resources/profiles/Artillery/machine/Artillery Hornet.json new file mode 100644 index 0000000000..77450f8723 --- /dev/null +++ b/resources/profiles/Artillery/machine/Artillery Hornet.json @@ -0,0 +1,12 @@ +{ + "type": "machine_model", + "name": "Artillery Hornet", + "model_id": "Artillery-Hornet", + "nozzle_diameter": "0.4", + "machine_tech": "FFF", + "family": "Artillery", + "bed_model": "artillery_hornet_buildplate_model.stl", + "bed_texture": "artillery_hornet_buildplate_texture.png", + "hotend_model": "", + "default_materials": "Artillery Generic ABS;Artillery Generic PLA;Artillery Generic PLA-CF;Artillery Generic PETG;Artillery Generic TPU;Artillery Generic ASA" +} diff --git a/resources/profiles/Artillery/machine/Artillery Sidewinder X2 0.4 nozzle.json b/resources/profiles/Artillery/machine/Artillery Sidewinder X2 0.4 nozzle.json index 96e1b01e91..d8c398cd17 100644 --- a/resources/profiles/Artillery/machine/Artillery Sidewinder X2 0.4 nozzle.json +++ b/resources/profiles/Artillery/machine/Artillery Sidewinder X2 0.4 nozzle.json @@ -6,7 +6,7 @@ "instantiation": "true", "inherits": "fdm_machine_common", "printer_model": "Artillery Sidewinder X2", - "default_print_profile": "0.20mm Standard @Artillery", + "default_print_profile": "0.20mm Standard @Artillery X2", "nozzle_diameter": [ "0.4" ], diff --git a/resources/profiles/Artillery/machine/Artillery Sidewinder X2.json b/resources/profiles/Artillery/machine/Artillery Sidewinder X2.json index 7dae3dfa6d..5ecf49df93 100644 --- a/resources/profiles/Artillery/machine/Artillery Sidewinder X2.json +++ b/resources/profiles/Artillery/machine/Artillery Sidewinder X2.json @@ -5,8 +5,8 @@ "nozzle_diameter": "0.4", "machine_tech": "FFF", "family": "Artillery", - "bed_model": "", - "bed_texture": "SW-x2.png", + "bed_model": "artillery_sidewinderx2_buildplate_model.stl", + "bed_texture": "artillery_sidewinderx2_buildplate_texture.png", "hotend_model": "", "default_materials": "Artillery Generic ABS;Artillery Generic PLA;Artillery Generic PLA-CF;Artillery Generic PETG;Artillery Generic TPU;Artillery Generic ASA" } diff --git a/resources/profiles/Artillery/process/0.15mm Optimal @Artillery Genius.json b/resources/profiles/Artillery/process/0.15mm Optimal @Artillery Genius.json new file mode 100644 index 0000000000..c50debc45d --- /dev/null +++ b/resources/profiles/Artillery/process/0.15mm Optimal @Artillery Genius.json @@ -0,0 +1,108 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.15mm Optimal @Artillery Genius", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "adaptive_layer_height": "1", + "reduce_crossing_wall": "0", + "layer_height": "0.15", + "max_travel_detour_distance": "0", + "bottom_surface_pattern": "monotonic", + "bottom_shell_layers": "7", + "bottom_shell_thickness": "0", + "bridge_flow": "1", + "bridge_speed": "70", + "brim_width": "0", + "brim_object_gap": "0", + "compatible_printers_condition": "", + "print_sequence": "by layer", + "default_acceleration": "0", + "top_surface_acceleration": "0", + "bridge_no_support": "0", + "draft_shield": "disabled", + "elefant_foot_compensation": "0", + "enable_arc_fitting": "0", + "outer_wall_line_width": "0.4", + "wall_infill_order": "inner wall/outer wall/infill", + "line_width": "0.5", + "infill_direction": "45", + "sparse_infill_density": "15%", + "sparse_infill_pattern": "grid", + "initial_layer_acceleration": "0", + "travel_acceleration": "0", + "inner_wall_acceleration": "0", + "initial_layer_line_width": "0.5", + "initial_layer_print_height": "0.25", + "infill_combination": "0", + "sparse_infill_line_width": "0.45", + "infill_wall_overlap": "15%", + "interface_shells": "0", + "ironing_flow": "15%", + "ironing_spacing": "0.1", + "ironing_speed": "15", + "ironing_type": "top", + "reduce_infill_retraction": "1", + "filename_format": "[input_filename_base].gcode", + "detect_overhang_wall": "1", + "overhang_1_4_speed": "0", + "overhang_2_4_speed": "20", + "overhang_3_4_speed": "15", + "overhang_4_4_speed": "10", + "inner_wall_line_width": "0.45", + "wall_loops": "4", + "print_settings_id": "", + "raft_layers": "0", + "seam_position": "aligned", + "skirt_distance": "6", + "skirt_height": "1", + "skirt_loops": "3", + "minimum_sparse_infill_area": "10", + "internal_solid_infill_line_width": "0", + "spiral_mode": "0", + "standby_temperature_delta": "-5", + "enable_support": "0", + "resolution": "0.012", + "support_type": "normal(auto)", + "support_style": "grid", + "support_on_build_plate_only": "0", + "support_top_z_distance": "0.15", + "support_filament": "0", + "support_line_width": "0.4", + "support_interface_loop_pattern": "1", + "support_interface_filament": "0", + "support_interface_top_layers": "3", + "support_interface_bottom_layers": "-1", + "support_interface_spacing": "1", + "support_interface_speed": "100%", + "support_base_pattern": "rectilinear", + "support_base_pattern_spacing": "2.5", + "support_speed": "60", + "support_threshold_angle": "0", + "support_object_xy_distance": "50%", + "tree_support_branch_angle": "40", + "tree_support_wall_count": "0", + "detect_thin_wall": "1", + "top_surface_pattern": "monotonic", + "top_surface_line_width": "0.4", + "top_shell_layers": "4", + "top_shell_thickness": "0.8", + "initial_layer_speed": "35%", + "initial_layer_infill_speed": "35%", + "outer_wall_speed": "60", + "inner_wall_speed": "60", + "internal_solid_infill_speed": "30", + "top_surface_speed": "30", + "gap_infill_speed": "30", + "sparse_infill_speed": "60", + "travel_speed": "110", + "enable_prime_tower": "0", + "wipe_tower_no_sparse_layers": "0", + "prime_tower_width": "60", + "xy_hole_compensation": "0", + "xy_contour_compensation": "0", + "compatible_printers": [ + "Artillery Genius 0.4 nozzle" + ] +} diff --git a/resources/profiles/Artillery/process/0.16mm Optimal @Artillery Hornet.json b/resources/profiles/Artillery/process/0.16mm Optimal @Artillery Hornet.json new file mode 100644 index 0000000000..1ced316a58 --- /dev/null +++ b/resources/profiles/Artillery/process/0.16mm Optimal @Artillery Hornet.json @@ -0,0 +1,108 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.16mm Optimal @Artillery Hornet", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "adaptive_layer_height": "1", + "reduce_crossing_wall": "0", + "layer_height": "0.16", + "max_travel_detour_distance": "0", + "bottom_surface_pattern": "monotonic", + "bottom_shell_layers": "7", + "bottom_shell_thickness": "0", + "bridge_flow": "1", + "bridge_speed": "70", + "brim_width": "0", + "brim_object_gap": "0", + "compatible_printers_condition": "", + "print_sequence": "by layer", + "default_acceleration": "500", + "top_surface_acceleration": "0", + "bridge_no_support": "0", + "draft_shield": "disabled", + "elefant_foot_compensation": "0", + "enable_arc_fitting": "0", + "outer_wall_line_width": "0.4", + "wall_infill_order": "inner wall/outer wall/infill", + "line_width": "0.5", + "infill_direction": "45", + "sparse_infill_density": "15%", + "sparse_infill_pattern": "grid", + "initial_layer_acceleration": "0", + "travel_acceleration": "0", + "inner_wall_acceleration": "0", + "initial_layer_line_width": "0.5", + "initial_layer_print_height": "0.25", + "infill_combination": "0", + "sparse_infill_line_width": "0.45", + "infill_wall_overlap": "15%", + "interface_shells": "0", + "ironing_flow": "15%", + "ironing_spacing": "0.1", + "ironing_speed": "15", + "ironing_type": "top", + "reduce_infill_retraction": "1", + "filename_format": "[input_filename_base].gcode", + "detect_overhang_wall": "1", + "overhang_1_4_speed": "0", + "overhang_2_4_speed": "20", + "overhang_3_4_speed": "15", + "overhang_4_4_speed": "10", + "inner_wall_line_width": "0.45", + "wall_loops": "4", + "print_settings_id": "", + "raft_layers": "0", + "seam_position": "aligned", + "skirt_distance": "6", + "skirt_height": "1", + "skirt_loops": "3", + "minimum_sparse_infill_area": "10", + "internal_solid_infill_line_width": "0", + "spiral_mode": "0", + "standby_temperature_delta": "-5", + "enable_support": "0", + "resolution": "0.012", + "support_type": "normal(auto)", + "support_style": "grid", + "support_on_build_plate_only": "0", + "support_top_z_distance": "0.16", + "support_filament": "0", + "support_line_width": "0.4", + "support_interface_loop_pattern": "1", + "support_interface_filament": "0", + "support_interface_top_layers": "3", + "support_interface_bottom_layers": "-1", + "support_interface_spacing": "1", + "support_interface_speed": "100%", + "support_base_pattern": "rectilinear", + "support_base_pattern_spacing": "2.5", + "support_speed": "40", + "support_threshold_angle": "0", + "support_object_xy_distance": "50%", + "tree_support_branch_angle": "40", + "tree_support_wall_count": "0", + "detect_thin_wall": "1", + "top_surface_pattern": "monotonic", + "top_surface_line_width": "0.4", + "top_shell_layers": "4", + "top_shell_thickness": "0.8", + "initial_layer_speed": "35%", + "initial_layer_infill_speed": "35%", + "outer_wall_speed": "60", + "inner_wall_speed": "60", + "internal_solid_infill_speed": "30", + "top_surface_speed": "30", + "gap_infill_speed": "30", + "sparse_infill_speed": "60", + "travel_speed": "150", + "enable_prime_tower": "0", + "wipe_tower_no_sparse_layers": "0", + "prime_tower_width": "60", + "xy_hole_compensation": "0", + "xy_contour_compensation": "0", + "compatible_printers": [ + "Artillery Hornet 0.4 nozzle" + ] +} diff --git a/resources/profiles/Artillery/process/0.20mm Standard @Artillery Genius.json b/resources/profiles/Artillery/process/0.20mm Standard @Artillery Genius.json new file mode 100644 index 0000000000..9f1b4e5bd1 --- /dev/null +++ b/resources/profiles/Artillery/process/0.20mm Standard @Artillery Genius.json @@ -0,0 +1,108 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.20mm Standard @Artillery Genius", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "adaptive_layer_height": "1", + "reduce_crossing_wall": "0", + "layer_height": "0.2", + "max_travel_detour_distance": "0", + "bottom_surface_pattern": "monotonic", + "bottom_shell_layers": "7", + "bottom_shell_thickness": "0", + "bridge_flow": "1", + "bridge_speed": "70", + "brim_width": "0", + "brim_object_gap": "0", + "compatible_printers_condition": "", + "print_sequence": "by layer", + "default_acceleration": "0", + "top_surface_acceleration": "0", + "bridge_no_support": "0", + "draft_shield": "disabled", + "elefant_foot_compensation": "0", + "enable_arc_fitting": "0", + "outer_wall_line_width": "0.4", + "wall_infill_order": "inner wall/outer wall/infill", + "line_width": "0.5", + "infill_direction": "45", + "sparse_infill_density": "15%", + "sparse_infill_pattern": "grid", + "initial_layer_acceleration": "0", + "travel_acceleration": "0", + "inner_wall_acceleration": "0", + "initial_layer_line_width": "0.5", + "initial_layer_print_height": "0.25", + "infill_combination": "0", + "sparse_infill_line_width": "0.45", + "infill_wall_overlap": "15%", + "interface_shells": "0", + "ironing_flow": "15%", + "ironing_spacing": "0.1", + "ironing_speed": "15", + "ironing_type": "top", + "reduce_infill_retraction": "1", + "filename_format": "[input_filename_base].gcode", + "detect_overhang_wall": "1", + "overhang_1_4_speed": "0", + "overhang_2_4_speed": "20", + "overhang_3_4_speed": "15", + "overhang_4_4_speed": "10", + "inner_wall_line_width": "0.45", + "wall_loops": "4", + "print_settings_id": "", + "raft_layers": "0", + "seam_position": "aligned", + "skirt_distance": "6", + "skirt_height": "1", + "skirt_loops": "3", + "minimum_sparse_infill_area": "10", + "internal_solid_infill_line_width": "0", + "spiral_mode": "0", + "standby_temperature_delta": "-5", + "enable_support": "0", + "resolution": "0.012", + "support_type": "normal(auto)", + "support_style": "grid", + "support_on_build_plate_only": "0", + "support_top_z_distance": "0.2", + "support_filament": "0", + "support_line_width": "0.4", + "support_interface_loop_pattern": "1", + "support_interface_filament": "0", + "support_interface_top_layers": "3", + "support_interface_bottom_layers": "-1", + "support_interface_spacing": "1", + "support_interface_speed": "100%", + "support_base_pattern": "rectilinear", + "support_base_pattern_spacing": "2.5", + "support_speed": "60", + "support_threshold_angle": "0", + "support_object_xy_distance": "50%", + "tree_support_branch_angle": "40", + "tree_support_wall_count": "0", + "detect_thin_wall": "1", + "top_surface_pattern": "monotonic", + "top_surface_line_width": "0.4", + "top_shell_layers": "4", + "top_shell_thickness": "0.8", + "initial_layer_speed": "35%", + "initial_layer_infill_speed": "35%", + "outer_wall_speed": "60", + "inner_wall_speed": "60", + "internal_solid_infill_speed": "30", + "top_surface_speed": "30", + "gap_infill_speed": "30", + "sparse_infill_speed": "60", + "travel_speed": "110", + "enable_prime_tower": "0", + "wipe_tower_no_sparse_layers": "0", + "prime_tower_width": "60", + "xy_hole_compensation": "0", + "xy_contour_compensation": "0", + "compatible_printers": [ + "Artillery Genius 0.4 nozzle" + ] +} diff --git a/resources/profiles/Artillery/process/0.20mm Standard @Artillery Hornet.json b/resources/profiles/Artillery/process/0.20mm Standard @Artillery Hornet.json new file mode 100644 index 0000000000..f15a3c56ff --- /dev/null +++ b/resources/profiles/Artillery/process/0.20mm Standard @Artillery Hornet.json @@ -0,0 +1,108 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.20mm Standard @Artillery Hornet", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "adaptive_layer_height": "1", + "reduce_crossing_wall": "0", + "layer_height": "0.2", + "max_travel_detour_distance": "0", + "bottom_surface_pattern": "monotonic", + "bottom_shell_layers": "7", + "bottom_shell_thickness": "0", + "bridge_flow": "1", + "bridge_speed": "70", + "brim_width": "0", + "brim_object_gap": "0", + "compatible_printers_condition": "", + "print_sequence": "by layer", + "default_acceleration": "500", + "top_surface_acceleration": "0", + "bridge_no_support": "0", + "draft_shield": "disabled", + "elefant_foot_compensation": "0", + "enable_arc_fitting": "0", + "outer_wall_line_width": "0.4", + "wall_infill_order": "inner wall/outer wall/infill", + "line_width": "0.5", + "infill_direction": "45", + "sparse_infill_density": "15%", + "sparse_infill_pattern": "grid", + "initial_layer_acceleration": "0", + "travel_acceleration": "0", + "inner_wall_acceleration": "0", + "initial_layer_line_width": "0.5", + "initial_layer_print_height": "0.25", + "infill_combination": "0", + "sparse_infill_line_width": "0.45", + "infill_wall_overlap": "15%", + "interface_shells": "0", + "ironing_flow": "15%", + "ironing_spacing": "0.1", + "ironing_speed": "15", + "ironing_type": "top", + "reduce_infill_retraction": "1", + "filename_format": "[input_filename_base].gcode", + "detect_overhang_wall": "1", + "overhang_1_4_speed": "0", + "overhang_2_4_speed": "20", + "overhang_3_4_speed": "15", + "overhang_4_4_speed": "10", + "inner_wall_line_width": "0.45", + "wall_loops": "4", + "print_settings_id": "", + "raft_layers": "0", + "seam_position": "aligned", + "skirt_distance": "6", + "skirt_height": "1", + "skirt_loops": "3", + "minimum_sparse_infill_area": "10", + "internal_solid_infill_line_width": "0", + "spiral_mode": "0", + "standby_temperature_delta": "-5", + "enable_support": "0", + "resolution": "0.012", + "support_type": "normal(auto)", + "support_style": "grid", + "support_on_build_plate_only": "0", + "support_top_z_distance": "0.2", + "support_filament": "0", + "support_line_width": "0.4", + "support_interface_loop_pattern": "1", + "support_interface_filament": "0", + "support_interface_top_layers": "3", + "support_interface_bottom_layers": "-1", + "support_interface_spacing": "1", + "support_interface_speed": "100%", + "support_base_pattern": "rectilinear", + "support_base_pattern_spacing": "2.5", + "support_speed": "40", + "support_threshold_angle": "0", + "support_object_xy_distance": "50%", + "tree_support_branch_angle": "40", + "tree_support_wall_count": "0", + "detect_thin_wall": "1", + "top_surface_pattern": "monotonic", + "top_surface_line_width": "0.4", + "top_shell_layers": "4", + "top_shell_thickness": "0.8", + "initial_layer_speed": "35%", + "initial_layer_infill_speed": "35%", + "outer_wall_speed": "60", + "inner_wall_speed": "60", + "internal_solid_infill_speed": "30", + "top_surface_speed": "30", + "gap_infill_speed": "30", + "sparse_infill_speed": "60", + "travel_speed": "150", + "enable_prime_tower": "0", + "wipe_tower_no_sparse_layers": "0", + "prime_tower_width": "60", + "xy_hole_compensation": "0", + "xy_contour_compensation": "0", + "compatible_printers": [ + "Artillery Hornet 0.4 nozzle" + ] +} diff --git a/resources/profiles/Artillery/process/0.20mm Standard @Artillery.json b/resources/profiles/Artillery/process/0.20mm Standard @Artillery X2.json similarity index 95% rename from resources/profiles/Artillery/process/0.20mm Standard @Artillery.json rename to resources/profiles/Artillery/process/0.20mm Standard @Artillery X2.json index 62ef368a9d..deda996e28 100644 --- a/resources/profiles/Artillery/process/0.20mm Standard @Artillery.json +++ b/resources/profiles/Artillery/process/0.20mm Standard @Artillery X2.json @@ -1,7 +1,7 @@ { "type": "process", "setting_id": "GP004", - "name": "0.20mm Standard @Artillery", + "name": "0.20mm Standard @Artillery X2", "from": "system", "instantiation": "true", "inherits": "fdm_process_common", diff --git a/resources/profiles/Artillery/process/0.24mm Draft @Artillery Hornet.json b/resources/profiles/Artillery/process/0.24mm Draft @Artillery Hornet.json new file mode 100644 index 0000000000..90ae0bb24d --- /dev/null +++ b/resources/profiles/Artillery/process/0.24mm Draft @Artillery Hornet.json @@ -0,0 +1,108 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.24mm Draft @Artillery Hornet", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "adaptive_layer_height": "1", + "reduce_crossing_wall": "0", + "layer_height": "0.24", + "max_travel_detour_distance": "0", + "bottom_surface_pattern": "monotonic", + "bottom_shell_layers": "7", + "bottom_shell_thickness": "0", + "bridge_flow": "1", + "bridge_speed": "70", + "brim_width": "0", + "brim_object_gap": "0", + "compatible_printers_condition": "", + "print_sequence": "by layer", + "default_acceleration": "500", + "top_surface_acceleration": "0", + "bridge_no_support": "0", + "draft_shield": "disabled", + "elefant_foot_compensation": "0", + "enable_arc_fitting": "0", + "outer_wall_line_width": "0.4", + "wall_infill_order": "inner wall/outer wall/infill", + "line_width": "0.5", + "infill_direction": "45", + "sparse_infill_density": "15%", + "sparse_infill_pattern": "grid", + "initial_layer_acceleration": "0", + "travel_acceleration": "0", + "inner_wall_acceleration": "0", + "initial_layer_line_width": "0.5", + "initial_layer_print_height": "0.25", + "infill_combination": "0", + "sparse_infill_line_width": "0.45", + "infill_wall_overlap": "15%", + "interface_shells": "0", + "ironing_flow": "15%", + "ironing_spacing": "0.1", + "ironing_speed": "15", + "ironing_type": "top", + "reduce_infill_retraction": "1", + "filename_format": "[input_filename_base].gcode", + "detect_overhang_wall": "1", + "overhang_1_4_speed": "0", + "overhang_2_4_speed": "20", + "overhang_3_4_speed": "15", + "overhang_4_4_speed": "10", + "inner_wall_line_width": "0.45", + "wall_loops": "4", + "print_settings_id": "", + "raft_layers": "0", + "seam_position": "aligned", + "skirt_distance": "6", + "skirt_height": "1", + "skirt_loops": "3", + "minimum_sparse_infill_area": "10", + "internal_solid_infill_line_width": "0", + "spiral_mode": "0", + "standby_temperature_delta": "-5", + "enable_support": "0", + "resolution": "0.012", + "support_type": "normal(auto)", + "support_style": "grid", + "support_on_build_plate_only": "0", + "support_top_z_distance": "0.24", + "support_filament": "0", + "support_line_width": "0.4", + "support_interface_loop_pattern": "1", + "support_interface_filament": "0", + "support_interface_top_layers": "3", + "support_interface_bottom_layers": "-1", + "support_interface_spacing": "1", + "support_interface_speed": "100%", + "support_base_pattern": "rectilinear", + "support_base_pattern_spacing": "2.5", + "support_speed": "40", + "support_threshold_angle": "0", + "support_object_xy_distance": "50%", + "tree_support_branch_angle": "40", + "tree_support_wall_count": "0", + "detect_thin_wall": "1", + "top_surface_pattern": "monotonic", + "top_surface_line_width": "0.4", + "top_shell_layers": "4", + "top_shell_thickness": "0.8", + "initial_layer_speed": "35%", + "initial_layer_infill_speed": "35%", + "outer_wall_speed": "60", + "inner_wall_speed": "60", + "internal_solid_infill_speed": "30", + "top_surface_speed": "30", + "gap_infill_speed": "30", + "sparse_infill_speed": "60", + "travel_speed": "150", + "enable_prime_tower": "0", + "wipe_tower_no_sparse_layers": "0", + "prime_tower_width": "60", + "xy_hole_compensation": "0", + "xy_contour_compensation": "0", + "compatible_printers": [ + "Artillery Hornet 0.4 nozzle" + ] +} diff --git a/resources/profiles/Artillery/process/0.25mm Draft @Artillery Genius.json b/resources/profiles/Artillery/process/0.25mm Draft @Artillery Genius.json new file mode 100644 index 0000000000..07442b3821 --- /dev/null +++ b/resources/profiles/Artillery/process/0.25mm Draft @Artillery Genius.json @@ -0,0 +1,108 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.25mm Draft @Artillery Genius", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "adaptive_layer_height": "1", + "reduce_crossing_wall": "0", + "layer_height": "0.25", + "max_travel_detour_distance": "0", + "bottom_surface_pattern": "monotonic", + "bottom_shell_layers": "7", + "bottom_shell_thickness": "0", + "bridge_flow": "1", + "bridge_speed": "70", + "brim_width": "0", + "brim_object_gap": "0", + "compatible_printers_condition": "", + "print_sequence": "by layer", + "default_acceleration": "0", + "top_surface_acceleration": "0", + "bridge_no_support": "0", + "draft_shield": "disabled", + "elefant_foot_compensation": "0", + "enable_arc_fitting": "0", + "outer_wall_line_width": "0.4", + "wall_infill_order": "inner wall/outer wall/infill", + "line_width": "0.5", + "infill_direction": "45", + "sparse_infill_density": "15%", + "sparse_infill_pattern": "grid", + "initial_layer_acceleration": "0", + "travel_acceleration": "0", + "inner_wall_acceleration": "0", + "initial_layer_line_width": "0.5", + "initial_layer_print_height": "0.25", + "infill_combination": "0", + "sparse_infill_line_width": "0.45", + "infill_wall_overlap": "15%", + "interface_shells": "0", + "ironing_flow": "15%", + "ironing_spacing": "0.1", + "ironing_speed": "15", + "ironing_type": "top", + "reduce_infill_retraction": "1", + "filename_format": "[input_filename_base].gcode", + "detect_overhang_wall": "1", + "overhang_1_4_speed": "0", + "overhang_2_4_speed": "20", + "overhang_3_4_speed": "15", + "overhang_4_4_speed": "10", + "inner_wall_line_width": "0.45", + "wall_loops": "4", + "print_settings_id": "", + "raft_layers": "0", + "seam_position": "aligned", + "skirt_distance": "6", + "skirt_height": "1", + "skirt_loops": "3", + "minimum_sparse_infill_area": "10", + "internal_solid_infill_line_width": "0", + "spiral_mode": "0", + "standby_temperature_delta": "-5", + "enable_support": "0", + "resolution": "0.012", + "support_type": "normal(auto)", + "support_style": "grid", + "support_on_build_plate_only": "0", + "support_top_z_distance": "0.25", + "support_filament": "0", + "support_line_width": "0.4", + "support_interface_loop_pattern": "1", + "support_interface_filament": "0", + "support_interface_top_layers": "3", + "support_interface_bottom_layers": "-1", + "support_interface_spacing": "1", + "support_interface_speed": "100%", + "support_base_pattern": "rectilinear", + "support_base_pattern_spacing": "2.5", + "support_speed": "60", + "support_threshold_angle": "0", + "support_object_xy_distance": "50%", + "tree_support_branch_angle": "40", + "tree_support_wall_count": "0", + "detect_thin_wall": "1", + "top_surface_pattern": "monotonic", + "top_surface_line_width": "0.4", + "top_shell_layers": "4", + "top_shell_thickness": "0.8", + "initial_layer_speed": "35%", + "initial_layer_infill_speed": "35%", + "outer_wall_speed": "60", + "inner_wall_speed": "60", + "internal_solid_infill_speed": "30", + "top_surface_speed": "30", + "gap_infill_speed": "30", + "sparse_infill_speed": "60", + "travel_speed": "110", + "enable_prime_tower": "0", + "wipe_tower_no_sparse_layers": "0", + "prime_tower_width": "60", + "xy_hole_compensation": "0", + "xy_contour_compensation": "0", + "compatible_printers": [ + "Artillery Genius 0.4 nozzle" + ] +} diff --git a/resources/web/image/printer/Artillery Genius_cover.png b/resources/web/image/printer/Artillery Genius_cover.png new file mode 100644 index 0000000000..eca6bc15c0 Binary files /dev/null and b/resources/web/image/printer/Artillery Genius_cover.png differ diff --git a/resources/web/image/printer/Artillery Hornet_cover.png b/resources/web/image/printer/Artillery Hornet_cover.png new file mode 100644 index 0000000000..4e96f87f77 Binary files /dev/null and b/resources/web/image/printer/Artillery Hornet_cover.png differ diff --git a/resources/web/image/printer/Artillery Sidewinder X2_cover.png b/resources/web/image/printer/Artillery Sidewinder X2_cover.png index 4b6fee2796..2e9b4171fe 100644 Binary files a/resources/web/image/printer/Artillery Sidewinder X2_cover.png and b/resources/web/image/printer/Artillery Sidewinder X2_cover.png differ