From cb59fec7d9f37888a85f72e16f67d01fc8b7b29c Mon Sep 17 00:00:00 2001 From: Arran Hobson Sayers Date: Thu, 5 Oct 2023 20:18:18 +0100 Subject: [PATCH 1/2] Add default Prusa i3 MK3 profiles --- .../Prusa/machine/Prusa MK3S 0.4 nozzle.json | 2 +- .../process/0.05mm UltraDetail @MK3.json | 40 +++++++ .../process/0.07mm UltraDetail @MK3.json | 40 +++++++ .../Prusa/process/0.10mm Detail @MK3.json | 40 +++++++ .../Prusa/process/0.15mm Quality @MK3.json | 40 +++++++ .../Prusa/process/0.15mm Speed @MK3.json | 40 +++++++ .../Prusa/process/0.20mm Quality @MK3.json | 41 +++++++ .../Prusa/process/0.20mm Speed @MK3.json | 40 +++++++ .../Prusa/process/0.20mm Standard @MK3S.json | 20 ---- .../Prusa/process/0.30mm Draft @MK3.json | 40 +++++++ .../Prusa/process/process_common_mk3.json | 109 ++++++++++++++++++ 11 files changed, 431 insertions(+), 21 deletions(-) create mode 100644 resources/profiles/Prusa/process/0.05mm UltraDetail @MK3.json create mode 100644 resources/profiles/Prusa/process/0.07mm UltraDetail @MK3.json create mode 100644 resources/profiles/Prusa/process/0.10mm Detail @MK3.json create mode 100644 resources/profiles/Prusa/process/0.15mm Quality @MK3.json create mode 100644 resources/profiles/Prusa/process/0.15mm Speed @MK3.json create mode 100644 resources/profiles/Prusa/process/0.20mm Quality @MK3.json create mode 100644 resources/profiles/Prusa/process/0.20mm Speed @MK3.json delete mode 100644 resources/profiles/Prusa/process/0.20mm Standard @MK3S.json create mode 100644 resources/profiles/Prusa/process/0.30mm Draft @MK3.json create mode 100644 resources/profiles/Prusa/process/process_common_mk3.json diff --git a/resources/profiles/Prusa/machine/Prusa MK3S 0.4 nozzle.json b/resources/profiles/Prusa/machine/Prusa MK3S 0.4 nozzle.json index 7461bee0b1..ba1f52a4c2 100644 --- a/resources/profiles/Prusa/machine/Prusa MK3S 0.4 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa MK3S 0.4 nozzle.json @@ -9,7 +9,7 @@ "default_filament_profile": [ "Prusa Generic PLA" ], - "default_print_profile": "0.20mm Standard @MK3S", + "default_print_profile": "0.20mm Speed @MK3", "nozzle_diameter": [ "0.4" ], diff --git a/resources/profiles/Prusa/process/0.05mm UltraDetail @MK3.json b/resources/profiles/Prusa/process/0.05mm UltraDetail @MK3.json new file mode 100644 index 0000000000..d9f89cde3e --- /dev/null +++ b/resources/profiles/Prusa/process/0.05mm UltraDetail @MK3.json @@ -0,0 +1,40 @@ +{ + "type": "process", + "print_settings_id": "0.05mm UltraDetail @MK3", + "name": "0.05mm UltraDetail @MK3", + "from": "system", + "instantiation": "true", + "inherits": "process_common_mk3", + "bottom_shell_layers": "10", + "bridge_acceleration": "300", + "bridge_flow": "0.6", + "bridge_speed": "25", + "gap_infill_speed": "20", + "inner_wall_acceleration": "300", + "inner_wall_line_width": "0.45", + "inner_wall_speed": "30", + "internal_solid_infill_line_width": "0.45", + "internal_solid_infill_speed": "30", + "layer_height": "0.05", + "line_width": "0.45", + "outer_wall_line_width": "0.45", + "outer_wall_speed": "20", + "raft_contact_distance": "0.1", + "small_perimeter_speed": "20", + "sparse_infill_acceleration": "800", + "sparse_infill_line_width": "0.45", + "sparse_infill_pattern": "gyroid", + "sparse_infill_speed": "30", + "support_base_pattern_spacing": "1.5", + "support_bottom_z_distance": "0.1", + "support_interface_speed": "24", + "support_line_width": "0.33", + "support_object_xy_distance": "0.27", + "support_speed": "30", + "support_top_z_distance": "0.1", + "thick_bridges": "1", + "top_shell_layers": "14", + "top_surface_line_width": "0.4", + "top_surface_speed": "20", + "wall_loops": "3" +} diff --git a/resources/profiles/Prusa/process/0.07mm UltraDetail @MK3.json b/resources/profiles/Prusa/process/0.07mm UltraDetail @MK3.json new file mode 100644 index 0000000000..a19ae009f4 --- /dev/null +++ b/resources/profiles/Prusa/process/0.07mm UltraDetail @MK3.json @@ -0,0 +1,40 @@ +{ + "type": "process", + "print_settings_id": "0.07mm UltraDetail @MK3", + "name": "0.32mm Standard @MK4", + "from": "system", + "instantiation": "true", + "inherits": "process_common_mk3", + "bottom_shell_layers": "8", + "bridge_acceleration": "300", + "bridge_flow": "0.6", + "bridge_speed": "25", + "gap_infill_speed": "20", + "inner_wall_acceleration": "300", + "inner_wall_line_width": "0.45", + "inner_wall_speed": "30", + "internal_solid_infill_line_width": "0.45", + "internal_solid_infill_speed": "40", + "layer_height": "0.07", + "line_width": "0.45", + "outer_wall_line_width": "0.45", + "outer_wall_speed": "20", + "raft_contact_distance": "0.1", + "small_perimeter_speed": "20", + "sparse_infill_acceleration": "800", + "sparse_infill_line_width": "0.45", + "sparse_infill_pattern": "gyroid", + "sparse_infill_speed": "40", + "support_base_pattern_spacing": "1.5", + "support_bottom_z_distance": "0.1", + "support_interface_speed": "32", + "support_line_width": "0.33", + "support_object_xy_distance": "0.27", + "support_speed": "40", + "support_top_z_distance": "0.1", + "thick_bridges": "1", + "top_shell_layers": "10", + "top_surface_line_width": "0.4", + "top_surface_speed": "30", + "wall_loops": "3" +} diff --git a/resources/profiles/Prusa/process/0.10mm Detail @MK3.json b/resources/profiles/Prusa/process/0.10mm Detail @MK3.json new file mode 100644 index 0000000000..eee3f0a898 --- /dev/null +++ b/resources/profiles/Prusa/process/0.10mm Detail @MK3.json @@ -0,0 +1,40 @@ +{ + "type": "process", + "print_settings_id": "0.10mm Detail @MK3", + "name": "0.10mm Detail @MK3", + "from": "system", + "instantiation": "true", + "inherits": "process_common_mk3", + "bottom_shell_layers": "7", + "bridge_acceleration": "800", + "bridge_flow": "1", + "bridge_speed": "20", + "gap_infill_speed": "40", + "inner_wall_acceleration": "600", + "inner_wall_line_width": "0.45", + "inner_wall_speed": "45", + "internal_solid_infill_line_width": "0.45", + "internal_solid_infill_speed": "80", + "layer_height": "0.1", + "line_width": "0.45", + "outer_wall_line_width": "0.45", + "outer_wall_speed": "25", + "raft_contact_distance": "0.15", + "small_perimeter_speed": "25", + "sparse_infill_acceleration": "1000", + "sparse_infill_line_width": "0.45", + "sparse_infill_pattern": "gyroid", + "sparse_infill_speed": "80", + "support_base_pattern_spacing": "2", + "support_bottom_z_distance": "0.17", + "support_interface_speed": "40", + "support_line_width": "0.35", + "support_object_xy_distance": "0.27", + "support_speed": "50", + "support_top_z_distance": "0.17", + "thick_bridges": "0", + "top_shell_layers": "8", + "top_surface_line_width": "0.4", + "top_surface_speed": "40", + "wall_loops": "3" +} diff --git a/resources/profiles/Prusa/process/0.15mm Quality @MK3.json b/resources/profiles/Prusa/process/0.15mm Quality @MK3.json new file mode 100644 index 0000000000..b225f261ce --- /dev/null +++ b/resources/profiles/Prusa/process/0.15mm Quality @MK3.json @@ -0,0 +1,40 @@ +{ + "type": "process", + "print_settings_id": "0.15mm Quality @MK3", + "name": "0.15mm Quality @MK3", + "from": "system", + "instantiation": "true", + "inherits": "process_common_mk3", + "bottom_shell_layers": "5", + "bridge_acceleration": "1000", + "bridge_flow": "1", + "bridge_speed": "25", + "gap_infill_speed": "40", + "inner_wall_acceleration": "800", + "inner_wall_line_width": "0.45", + "inner_wall_speed": "45", + "internal_solid_infill_line_width": "0.45", + "internal_solid_infill_speed": "80", + "layer_height": "0.15", + "line_width": "0.45", + "outer_wall_line_width": "0.45", + "outer_wall_speed": "25", + "raft_contact_distance": "0.2", + "small_perimeter_speed": "25", + "sparse_infill_acceleration": "1000", + "sparse_infill_line_width": "0.45", + "sparse_infill_pattern": "gyroid", + "sparse_infill_speed": "80", + "support_base_pattern_spacing": "2", + "support_bottom_z_distance": "0.2", + "support_interface_speed": "40", + "support_line_width": "0.35", + "support_object_xy_distance": "0.27", + "support_speed": "50", + "support_top_z_distance": "0.2", + "thick_bridges": "0", + "top_shell_layers": "6", + "top_surface_line_width": "0.4", + "top_surface_speed": "40", + "wall_loops": "2" +} diff --git a/resources/profiles/Prusa/process/0.15mm Speed @MK3.json b/resources/profiles/Prusa/process/0.15mm Speed @MK3.json new file mode 100644 index 0000000000..43d690b556 --- /dev/null +++ b/resources/profiles/Prusa/process/0.15mm Speed @MK3.json @@ -0,0 +1,40 @@ +{ + "type": "process", + "print_settings_id": "0.15mm Speed @MK3", + "name": "0.15mm Speed @MK3", + "from": "system", + "instantiation": "true", + "inherits": "process_common_mk3", + "bottom_shell_layers": "5", + "bridge_acceleration": "1000", + "bridge_flow": "1", + "bridge_speed": "25", + "gap_infill_speed": "40", + "inner_wall_acceleration": "800", + "inner_wall_line_width": "0.45", + "inner_wall_speed": "60", + "internal_solid_infill_line_width": "0.45", + "internal_solid_infill_speed": "200", + "layer_height": "0.15", + "line_width": "0.45", + "outer_wall_line_width": "0.45", + "outer_wall_speed": "35", + "raft_contact_distance": "0.2", + "small_perimeter_speed": "25", + "sparse_infill_acceleration": "1000", + "sparse_infill_line_width": "0.45", + "sparse_infill_pattern": "grid", + "sparse_infill_speed": "200", + "support_base_pattern_spacing": "2", + "support_bottom_z_distance": "0.2", + "support_interface_speed": "40", + "support_line_width": "0.35", + "support_object_xy_distance": "0.27", + "support_speed": "50", + "support_top_z_distance": "0.2", + "thick_bridges": "0", + "top_shell_layers": "6", + "top_surface_line_width": "0.4", + "top_surface_speed": "50", + "wall_loops": "2" +} diff --git a/resources/profiles/Prusa/process/0.20mm Quality @MK3.json b/resources/profiles/Prusa/process/0.20mm Quality @MK3.json new file mode 100644 index 0000000000..4e6ad95889 --- /dev/null +++ b/resources/profiles/Prusa/process/0.20mm Quality @MK3.json @@ -0,0 +1,41 @@ +{ + "type": "process", + "print_settings_id": "0.20mm Quality @MK3", + "name": "0.20mm Quality @MK3", + "from": "system", + "instantiation": "true", + "inherits": "process_common_mk3", + "bottom_shell_layers": "4", + "bridge_acceleration": "1000", + "bridge_flow": "0.95", + "bridge_speed": "25", + "gap_infill_speed": "40", + + "inner_wall_acceleration": "800", + "inner_wall_line_width": "0.45", + "inner_wall_speed": "45", + "internal_solid_infill_line_width": "0.45", + "internal_solid_infill_speed": "80", + "layer_height": "0.2", + "line_width": "0.45", + "outer_wall_line_width": "0.45", + "outer_wall_speed": "25", + "raft_contact_distance": "0.2", + "small_perimeter_speed": "25", + "sparse_infill_acceleration": "1000", + "sparse_infill_line_width": "0.45", + "sparse_infill_pattern": "gyroid", + "sparse_infill_speed": "80", + "support_base_pattern_spacing": "2", + "support_bottom_z_distance": "0.2", + "support_interface_speed": "40", + "support_line_width": "0.35", + "support_object_xy_distance": "0.27", + "support_speed": "50", + "support_top_z_distance": "0.2", + "thick_bridges": "0", + "top_shell_layers": "5", + "top_surface_line_width": "0.4", + "top_surface_speed": "40", + "wall_loops": "2" +} diff --git a/resources/profiles/Prusa/process/0.20mm Speed @MK3.json b/resources/profiles/Prusa/process/0.20mm Speed @MK3.json new file mode 100644 index 0000000000..778e05b6ff --- /dev/null +++ b/resources/profiles/Prusa/process/0.20mm Speed @MK3.json @@ -0,0 +1,40 @@ +{ + "type": "process", + "print_settings_id": "0.20mm Speed @MK3", + "name": "0.20mm Speed @MK3", + "from": "system", + "instantiation": "true", + "inherits": "process_common_mk3", + "bottom_shell_layers": "4", + "bridge_acceleration": "1000", + "bridge_flow": "0.95", + "bridge_speed": "25", + "gap_infill_speed": "40", + "inner_wall_acceleration": "800", + "inner_wall_line_width": "0.45", + "inner_wall_speed": "60", + "internal_solid_infill_line_width": "0.45", + "internal_solid_infill_speed": "200", + "layer_height": "0.2", + "line_width": "0.45", + "outer_wall_line_width": "0.45", + "outer_wall_speed": "35", + "raft_contact_distance": "0.2", + "small_perimeter_speed": "25", + "sparse_infill_acceleration": "1000", + "sparse_infill_line_width": "0.45", + "sparse_infill_pattern": "grid", + "sparse_infill_speed": "200", + "support_base_pattern_spacing": "2", + "support_bottom_z_distance": "0.2", + "support_interface_speed": "40", + "support_line_width": "0.35", + "support_object_xy_distance": "0.27", + "support_speed": "50", + "support_top_z_distance": "0.2", + "thick_bridges": "0", + "top_shell_layers": "5", + "top_surface_line_width": "0.4", + "top_surface_speed": "50", + "wall_loops": "2" +} diff --git a/resources/profiles/Prusa/process/0.20mm Standard @MK3S.json b/resources/profiles/Prusa/process/0.20mm Standard @MK3S.json deleted file mode 100644 index 661eba9ad5..0000000000 --- a/resources/profiles/Prusa/process/0.20mm Standard @MK3S.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "process", - "setting_id": "GP004", - "name": "0.20mm Standard @MK3S", - "from": "system", - "instantiation": "true", - "inherits": "fdm_process_common", - "initial_layer_speed": "20", - "initial_layer_infill_speed": "25", - "outer_wall_speed": "35", - "inner_wall_speed": "60", - "sparse_infill_speed": "200", - "internal_solid_infill_speed": "200", - "top_surface_speed": "50", - "gap_infill_speed": "40", - "travel_speed": "180", - "compatible_printers": [ - "Prusa MK3S 0.4 nozzle" - ] -} \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.30mm Draft @MK3.json b/resources/profiles/Prusa/process/0.30mm Draft @MK3.json new file mode 100644 index 0000000000..04d5006c21 --- /dev/null +++ b/resources/profiles/Prusa/process/0.30mm Draft @MK3.json @@ -0,0 +1,40 @@ +{ + "type": "process", + "print_settings_id": "0.30mm Draft @MK3", + "name": "0.30mm Draft @MK3", + "from": "system", + "instantiation": "true", + "inherits": "process_common_mk3", + "bottom_shell_layers": "3", + "bridge_acceleration": "1000", + "bridge_flow": "0.95", + "bridge_speed": "25", + "gap_infill_speed": "40", + "inner_wall_acceleration": "800", + "inner_wall_line_width": "0.5", + "inner_wall_speed": "50", + "internal_solid_infill_line_width": "0.5", + "internal_solid_infill_speed": "80", + "layer_height": "0.3", + "line_width": "0.5", + "outer_wall_line_width": "0.6", + "outer_wall_speed": "35", + "raft_contact_distance": "0.2", + "small_perimeter_speed": "30", + "sparse_infill_acceleration": "1000", + "sparse_infill_line_width": "0.5", + "sparse_infill_pattern": "grid", + "sparse_infill_speed": "85", + "support_base_pattern_spacing": "2", + "support_bottom_z_distance": "0.2", + "support_interface_speed": "36", + "support_line_width": "0.38", + "support_object_xy_distance": "0.36", + "support_speed": "45", + "support_top_z_distance": "0.2", + "thick_bridges": "0", + "top_shell_layers": "4", + "top_surface_line_width": "0.45", + "top_surface_speed": "40", + "wall_loops": "2" +} diff --git a/resources/profiles/Prusa/process/process_common_mk3.json b/resources/profiles/Prusa/process/process_common_mk3.json new file mode 100644 index 0000000000..7cfce02612 --- /dev/null +++ b/resources/profiles/Prusa/process/process_common_mk3.json @@ -0,0 +1,109 @@ +{ + "type": "process", + "name": "process_common_mk3", + "from": "system", + "bottom_shell_thickness": "0.5", + "bottom_surface_pattern": "monotonic", + "bridge_angle": "0", + "bridge_no_support": "0", + "brim_object_gap": "0.1", + "brim_type": "outer_only", + "brim_width": "0", + "compatible_printers": "", + "compatible_printers_condition": "printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.4", + "default_acceleration": "1000", + "detect_overhang_wall": "1", + "detect_thin_wall": "0", + "draft_shield": "0", + "enable_overhang_speed": "1", + "enable_prime_tower": "1", + "enable_support": "0", + "enforce_support_layers": "0", + "extra_perimeters_on_overhangs": "0", + "filename_format": "{input_filename_base}_{layer_height}mm_{printing_filament_types}_{printer_model}_{print_time}.gcode", + "fuzzy_skin": "none", + "fuzzy_skin_point_distance": "0.8", + "fuzzy_skin_thickness": "0.3", + "gcode_comments": "0", + "gcode_label_objects": "1", + "infill_anchor": "2.5", + "infill_anchor_max": "12", + "infill_combination": "1", + "infill_direction": "45", + "infill_wall_overlap": "10%", + "initial_layer_acceleration": "800", + "initial_layer_line_width": "0.42", + "initial_layer_print_height": "0.2", + "initial_layer_speed": "20", + "interface_shells": "0", + "internal_solid_infill_acceleration": "0", + "ironing_flow": "15%", + "ironing_spacing": "0.1", + "ironing_speed": "15", + "ironing_type": "top", + "is_custom_defined": "1", + "max_travel_detour_distance": "0", + "min_bead_width": "85%", + "min_feature_size": "25%", + "minimum_sparse_infill_area": "0", + "notes": [""], + "ooze_prevention": "0", + "outer_wall_acceleration": "0", + "overhang_1_4_speed": null, + "overhang_2_4_speed": null, + "overhang_3_4_speed": null, + "overhang_4_4_speed": null, + "post_process": [""], + "prime_tower_brim_width": "2", + "prime_tower_width": "60", + "print_sequence": "by layer", + "raft_expansion": "1.5", + "raft_first_layer_density": "90%", + "raft_first_layer_expansion": "3", + "raft_layers": "0", + "reduce_crossing_wall": "0", + "reduce_infill_retraction": "0", + "resolution": "0", + "seam_position": "aligned", + "skirt_distance": "2", + "skirt_height": "3", + "skirt_loops": "1", + "slice_closing_radius": "0.049", + "slicing_mode": "regular", + "sparse_infill_density": "15%", + "staggered_inner_seams": "0", + "standby_temperature_delta": "-5", + "support_angle": "0", + "support_base_pattern": "rectilinear", + "support_interface_bottom_layers": "0", + "support_interface_loop_pattern": "0", + "support_interface_pattern": "rectilinear", + "support_interface_spacing": "0.2", + "support_interface_top_layers": "2", + "support_on_build_plate_only": "0", + "support_style": "grid", + "support_threshold_angle": "50", + "support_type": "normal(auto)", + "top_shell_thickness": "0.7", + "top_surface_acceleration": "0", + "top_surface_pattern": "monotonicline", + "travel_acceleration": "0", + "travel_speed": "180", + "travel_speed_z": "12", + "tree_support_angle_slow": "30", + "tree_support_branch_angle": "40", + "tree_support_branch_diameter": "2", + "tree_support_branch_diameter_angle": "3", + "tree_support_branch_diameter_double_wall": "3", + "tree_support_tip_diameter": "0.6", + "tree_support_top_rate": "30%", + "version": "1.6.0.0", + "wall_distribution_count": "1", + "wall_generator": "arachne", + "wall_infill_order": "infill/outer wall/inner wall", + "wall_transition_angle": "10", + "wall_transition_filter_deviation": "25%", + "wall_transition_length": "100%", + "wipe_tower_no_sparse_layers": "0", + "xy_contour_compensation": "0" +} From 27f28170200f061d7c42137e4acf4318f6c11541 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Fri, 6 Oct 2023 18:32:48 +0800 Subject: [PATCH 2/2] Fix issues --- resources/profiles/Prusa.json | 36 +++++++++++++++++-- .../Prusa/machine/Prusa MK3S 0.4 nozzle.json | 4 +-- ...MK3.json => 0.05mm UltraDetail @MK3S.json} | 4 +-- ...MK3.json => 0.07mm UltraDetail @MK3S.json} | 4 +-- ...ail @MK3.json => 0.10mm Detail @MK3S.json} | 4 +-- ...ty @MK3.json => 0.15mm Quality @MK3S.json} | 4 +-- ...peed @MK3.json => 0.15mm Speed @MK3S.json} | 4 +-- ...ty @MK3.json => 0.20mm Quality @MK3S.json} | 4 +-- ...peed @MK3.json => 0.20mm Speed @MK3S.json} | 5 +-- .../Prusa/process/0.20mm Standard @MK3S.json | 20 +++++++++++ ...raft @MK3.json => 0.30mm Draft @MK3S.json} | 4 +-- .../Prusa/process/process_common_mk3.json | 5 +-- 12 files changed, 74 insertions(+), 24 deletions(-) rename resources/profiles/Prusa/process/{0.05mm UltraDetail @MK3.json => 0.05mm UltraDetail @MK3S.json} (92%) rename resources/profiles/Prusa/process/{0.07mm UltraDetail @MK3.json => 0.07mm UltraDetail @MK3S.json} (92%) rename resources/profiles/Prusa/process/{0.10mm Detail @MK3.json => 0.10mm Detail @MK3S.json} (93%) rename resources/profiles/Prusa/process/{0.15mm Quality @MK3.json => 0.15mm Quality @MK3S.json} (93%) rename resources/profiles/Prusa/process/{0.15mm Speed @MK3.json => 0.15mm Speed @MK3S.json} (93%) rename resources/profiles/Prusa/process/{0.20mm Quality @MK3.json => 0.20mm Quality @MK3S.json} (93%) rename resources/profiles/Prusa/process/{0.20mm Speed @MK3.json => 0.20mm Speed @MK3S.json} (90%) create mode 100644 resources/profiles/Prusa/process/0.20mm Standard @MK3S.json rename resources/profiles/Prusa/process/{0.30mm Draft @MK3.json => 0.30mm Draft @MK3S.json} (93%) diff --git a/resources/profiles/Prusa.json b/resources/profiles/Prusa.json index 4804beff57..cd01b944e5 100644 --- a/resources/profiles/Prusa.json +++ b/resources/profiles/Prusa.json @@ -26,13 +26,45 @@ "name": "process_common_mk4", "sub_path": "process/process_common_mk4.json" }, + { + "name": "process_common_mk3", + "sub_path": "process/process_common_mk3.json" + }, + { + "name": "0.05mm UltraDetail @MK3S", + "sub_path": "process/0.05mm UltraDetail @MK3S.json" + }, + { + "name": "0.07mm UltraDetail @MK3S", + "sub_path": "process/0.07mm UltraDetail @MK3S.json" + }, + { + "name": "0.10mm Detail @MK3S", + "sub_path": "process/0.10mm Detail @MK3S.json" + }, + { + "name": "0.15mm Quality @MK3S", + "sub_path": "process/0.15mm Quality @MK3S.json" + }, + { + "name": "0.15mm Speed @MK3S", + "sub_path": "process/0.15mm Speed @MK3S.json" + }, + { + "name": "0.20mm Quality @MK3S", + "sub_path": "process/0.20mm Quality @MK3S.json" + }, { "name": "0.20mm Standard @MK3S", "sub_path": "process/0.20mm Standard @MK3S.json" }, { - "name": "0.20mm Standard @MINI", - "sub_path": "process/0.20mm Standard @MINI.json" + "name": "0.20mm Speed @MK3S", + "sub_path": "process/0.20mm Speed @MK3S.json" + }, + { + "name": "0.30mm Draft @MK3S", + "sub_path": "process/0.30mm Draft @MK3S.json" }, { "name": "0.08mm Standard @MK4", diff --git a/resources/profiles/Prusa/machine/Prusa MK3S 0.4 nozzle.json b/resources/profiles/Prusa/machine/Prusa MK3S 0.4 nozzle.json index ba1f52a4c2..9f05eb7c8e 100644 --- a/resources/profiles/Prusa/machine/Prusa MK3S 0.4 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa MK3S 0.4 nozzle.json @@ -9,7 +9,7 @@ "default_filament_profile": [ "Prusa Generic PLA" ], - "default_print_profile": "0.20mm Speed @MK3", + "default_print_profile": "0.20mm Speed @MK3S", "nozzle_diameter": [ "0.4" ], @@ -42,7 +42,7 @@ "printable_height": "210", "machine_pause_gcode": "M601", "machine_start_gcode": "M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.13.0 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n{if filament_settings_id[initial_tool]=~/.*Prusament PA11.*/}\nG1 Z0.3 F720\nG1 Y-3 F1000 ; go outside print area\nG92 E0\nG1 X60 E9 F1000 ; intro line\nG1 X100 E9 F1000 ; intro line\n{else}\nG1 Z0.2 F720\nG1 Y-3 F1000 ; go outside print area\nG92 E0\nG1 X60 E9 F1000 ; intro line\nG1 X100 E12.5 F1000 ; intro line\n{endif}\nG92 E0\nM221 S{if layer_height<0.075}100{else}95{endif}", - "machine_end_gcode": "{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+1, max_print_height)} F720 ; Move print head up{endif}\nG1 X0 Y200 F3600 ; park\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+49, max_print_height)} F720 ; Move print head further up{endif}\nG4 ; wait\nM221 S100 ; reset flow\nM900 K0 ; reset LA\n{if print_settings_id=~/.*(DETAIL @MK3|QUALITY @MK3|@0.25 nozzle MK3).*/}M907 E538 ; reset extruder motor current{endif}\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nM84 ; disable motors\n; max_layer_z = [max_layer_z]", + "machine_end_gcode": "{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+1, max_print_height)} F720 ; Move print head up{endif}\nG1 X0 Y200 F3600 ; park\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+49, max_print_height)} F720 ; Move print head further up{endif}\nG4 ; wait\nM221 S100 ; reset flow\nM900 K0 ; reset LA\n{if print_settings_id=~/.*(DETAIL @MK3S|QUALITY @MK3S|@0.25 nozzle MK3).*/}M907 E538 ; reset extruder motor current{endif}\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nM84 ; disable motors\n; max_layer_z = [max_layer_z]", "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n", "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_PRUSA3D\nPRINTER_MODEL_MK3\n", diff --git a/resources/profiles/Prusa/process/0.05mm UltraDetail @MK3.json b/resources/profiles/Prusa/process/0.05mm UltraDetail @MK3S.json similarity index 92% rename from resources/profiles/Prusa/process/0.05mm UltraDetail @MK3.json rename to resources/profiles/Prusa/process/0.05mm UltraDetail @MK3S.json index d9f89cde3e..ab3a95683f 100644 --- a/resources/profiles/Prusa/process/0.05mm UltraDetail @MK3.json +++ b/resources/profiles/Prusa/process/0.05mm UltraDetail @MK3S.json @@ -1,7 +1,7 @@ { "type": "process", - "print_settings_id": "0.05mm UltraDetail @MK3", - "name": "0.05mm UltraDetail @MK3", + "print_settings_id": "0.05mm UltraDetail @MK3S", + "name": "0.05mm UltraDetail @MK3S", "from": "system", "instantiation": "true", "inherits": "process_common_mk3", diff --git a/resources/profiles/Prusa/process/0.07mm UltraDetail @MK3.json b/resources/profiles/Prusa/process/0.07mm UltraDetail @MK3S.json similarity index 92% rename from resources/profiles/Prusa/process/0.07mm UltraDetail @MK3.json rename to resources/profiles/Prusa/process/0.07mm UltraDetail @MK3S.json index a19ae009f4..2b99480459 100644 --- a/resources/profiles/Prusa/process/0.07mm UltraDetail @MK3.json +++ b/resources/profiles/Prusa/process/0.07mm UltraDetail @MK3S.json @@ -1,7 +1,7 @@ { "type": "process", - "print_settings_id": "0.07mm UltraDetail @MK3", - "name": "0.32mm Standard @MK4", + "print_settings_id": "0.07mm UltraDetail @MK3S", + "name": "0.07mm UltraDetail @MK3S", "from": "system", "instantiation": "true", "inherits": "process_common_mk3", diff --git a/resources/profiles/Prusa/process/0.10mm Detail @MK3.json b/resources/profiles/Prusa/process/0.10mm Detail @MK3S.json similarity index 93% rename from resources/profiles/Prusa/process/0.10mm Detail @MK3.json rename to resources/profiles/Prusa/process/0.10mm Detail @MK3S.json index eee3f0a898..b6b4251e7c 100644 --- a/resources/profiles/Prusa/process/0.10mm Detail @MK3.json +++ b/resources/profiles/Prusa/process/0.10mm Detail @MK3S.json @@ -1,7 +1,7 @@ { "type": "process", - "print_settings_id": "0.10mm Detail @MK3", - "name": "0.10mm Detail @MK3", + "print_settings_id": "0.10mm Detail @MK3S", + "name": "0.10mm Detail @MK3S", "from": "system", "instantiation": "true", "inherits": "process_common_mk3", diff --git a/resources/profiles/Prusa/process/0.15mm Quality @MK3.json b/resources/profiles/Prusa/process/0.15mm Quality @MK3S.json similarity index 93% rename from resources/profiles/Prusa/process/0.15mm Quality @MK3.json rename to resources/profiles/Prusa/process/0.15mm Quality @MK3S.json index b225f261ce..b62d8bd5b5 100644 --- a/resources/profiles/Prusa/process/0.15mm Quality @MK3.json +++ b/resources/profiles/Prusa/process/0.15mm Quality @MK3S.json @@ -1,7 +1,7 @@ { "type": "process", - "print_settings_id": "0.15mm Quality @MK3", - "name": "0.15mm Quality @MK3", + "print_settings_id": "0.15mm Quality @MK3S", + "name": "0.15mm Quality @MK3S", "from": "system", "instantiation": "true", "inherits": "process_common_mk3", diff --git a/resources/profiles/Prusa/process/0.15mm Speed @MK3.json b/resources/profiles/Prusa/process/0.15mm Speed @MK3S.json similarity index 93% rename from resources/profiles/Prusa/process/0.15mm Speed @MK3.json rename to resources/profiles/Prusa/process/0.15mm Speed @MK3S.json index 43d690b556..e56d6dfb8d 100644 --- a/resources/profiles/Prusa/process/0.15mm Speed @MK3.json +++ b/resources/profiles/Prusa/process/0.15mm Speed @MK3S.json @@ -1,7 +1,7 @@ { "type": "process", - "print_settings_id": "0.15mm Speed @MK3", - "name": "0.15mm Speed @MK3", + "print_settings_id": "0.15mm Speed @MK3S", + "name": "0.15mm Speed @MK3S", "from": "system", "instantiation": "true", "inherits": "process_common_mk3", diff --git a/resources/profiles/Prusa/process/0.20mm Quality @MK3.json b/resources/profiles/Prusa/process/0.20mm Quality @MK3S.json similarity index 93% rename from resources/profiles/Prusa/process/0.20mm Quality @MK3.json rename to resources/profiles/Prusa/process/0.20mm Quality @MK3S.json index 4e6ad95889..ce53887663 100644 --- a/resources/profiles/Prusa/process/0.20mm Quality @MK3.json +++ b/resources/profiles/Prusa/process/0.20mm Quality @MK3S.json @@ -1,7 +1,7 @@ { "type": "process", - "print_settings_id": "0.20mm Quality @MK3", - "name": "0.20mm Quality @MK3", + "print_settings_id": "0.20mm Quality @MK3S", + "name": "0.20mm Quality @MK3S", "from": "system", "instantiation": "true", "inherits": "process_common_mk3", diff --git a/resources/profiles/Prusa/process/0.20mm Speed @MK3.json b/resources/profiles/Prusa/process/0.20mm Speed @MK3S.json similarity index 90% rename from resources/profiles/Prusa/process/0.20mm Speed @MK3.json rename to resources/profiles/Prusa/process/0.20mm Speed @MK3S.json index 778e05b6ff..e832d59f37 100644 --- a/resources/profiles/Prusa/process/0.20mm Speed @MK3.json +++ b/resources/profiles/Prusa/process/0.20mm Speed @MK3S.json @@ -1,8 +1,9 @@ { "type": "process", - "print_settings_id": "0.20mm Speed @MK3", - "name": "0.20mm Speed @MK3", + "print_settings_id": "0.20mm Speed @MK3S", + "name": "0.20mm Speed @MK3S", "from": "system", + "renamed_from":"0.20mm Standard @MK3S", "instantiation": "true", "inherits": "process_common_mk3", "bottom_shell_layers": "4", diff --git a/resources/profiles/Prusa/process/0.20mm Standard @MK3S.json b/resources/profiles/Prusa/process/0.20mm Standard @MK3S.json new file mode 100644 index 0000000000..661eba9ad5 --- /dev/null +++ b/resources/profiles/Prusa/process/0.20mm Standard @MK3S.json @@ -0,0 +1,20 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.20mm Standard @MK3S", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "initial_layer_speed": "20", + "initial_layer_infill_speed": "25", + "outer_wall_speed": "35", + "inner_wall_speed": "60", + "sparse_infill_speed": "200", + "internal_solid_infill_speed": "200", + "top_surface_speed": "50", + "gap_infill_speed": "40", + "travel_speed": "180", + "compatible_printers": [ + "Prusa MK3S 0.4 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.30mm Draft @MK3.json b/resources/profiles/Prusa/process/0.30mm Draft @MK3S.json similarity index 93% rename from resources/profiles/Prusa/process/0.30mm Draft @MK3.json rename to resources/profiles/Prusa/process/0.30mm Draft @MK3S.json index 04d5006c21..50fff5aee5 100644 --- a/resources/profiles/Prusa/process/0.30mm Draft @MK3.json +++ b/resources/profiles/Prusa/process/0.30mm Draft @MK3S.json @@ -1,7 +1,7 @@ { "type": "process", - "print_settings_id": "0.30mm Draft @MK3", - "name": "0.30mm Draft @MK3", + "print_settings_id": "0.30mm Draft @MK3S", + "name": "0.30mm Draft @MK3S", "from": "system", "instantiation": "true", "inherits": "process_common_mk3", diff --git a/resources/profiles/Prusa/process/process_common_mk3.json b/resources/profiles/Prusa/process/process_common_mk3.json index 7cfce02612..2bed89d15b 100644 --- a/resources/profiles/Prusa/process/process_common_mk3.json +++ b/resources/profiles/Prusa/process/process_common_mk3.json @@ -2,6 +2,7 @@ "type": "process", "name": "process_common_mk3", "from": "system", + "instantiation": "false", "bottom_shell_thickness": "0.5", "bottom_surface_pattern": "monotonic", "bridge_angle": "0", @@ -49,10 +50,6 @@ "notes": [""], "ooze_prevention": "0", "outer_wall_acceleration": "0", - "overhang_1_4_speed": null, - "overhang_2_4_speed": null, - "overhang_3_4_speed": null, - "overhang_4_4_speed": null, "post_process": [""], "prime_tower_brim_width": "2", "prime_tower_width": "60",