From 1f95ac10a32f6eacf984c8dcbabe0665c227164f Mon Sep 17 00:00:00 2001 From: SoftFever <103989404+SoftFever@users.noreply.github.com> Date: Tue, 26 Jul 2022 23:34:00 +0800 Subject: [PATCH] refactor Voron configs a bit --- resources/profiles/BBL.json | 12 +- .../machine/Anycubic 4Max Pro 0.4 nozzle.json | 22 +--- .../BBL/machine/Voron 2.4 250 0.4 nozzle.json | 22 +--- .../BBL/machine/Voron 2.4 300 0.4 nozzle.json | 22 +--- .../BBL/machine/Voron 2.4 350 0.4 nozzle.json | 22 +--- .../BBL/machine/fdm_klipper_common.json | 24 ++++ .../BBL/process/0.08mm Extra Fine @Voron.json | 22 +--- .../BBL/process/0.12mm Fine @Voron.json | 20 +--- .../BBL/process/0.15mm Optimal @Voron.json | 11 ++ .../BBL/process/0.16mm Optimal @Voron.json | 23 ---- .../process/0.20mm Standard @A4MaxPro.json | 8 +- .../BBL/process/0.20mm Standard @Voron.json | 20 +--- .../BBL/process/0.24mm Draft @Voron.json | 21 +--- .../process/0.28mm Extra Draft @Voron.json | 21 +--- .../BBL/process/fdm_process_voron_common.json | 108 ++++++++++++++++++ 15 files changed, 191 insertions(+), 187 deletions(-) create mode 100644 resources/profiles/BBL/machine/fdm_klipper_common.json create mode 100644 resources/profiles/BBL/process/0.15mm Optimal @Voron.json delete mode 100644 resources/profiles/BBL/process/0.16mm Optimal @Voron.json create mode 100644 resources/profiles/BBL/process/fdm_process_voron_common.json diff --git a/resources/profiles/BBL.json b/resources/profiles/BBL.json index bdd18089997..4225c917f4e 100644 --- a/resources/profiles/BBL.json +++ b/resources/profiles/BBL.json @@ -119,6 +119,10 @@ "name": "0.40mm Standard @BBL X1C 0.8 nozzle", "sub_path": "process/0.40mm Standard @BBL X1C 0.8 nozzle.json" }, + { + "name": "fdm_process_voron_common", + "sub_path": "process/fdm_process_voron_common.json" + }, { "name": "0.08mm Extra Fine @Voron", "sub_path": "process/0.08mm Extra Fine @Voron.json" @@ -128,8 +132,8 @@ "sub_path": "process/0.12mm Fine @Voron.json" }, { - "name": "0.16mm Optimal @Voron", - "sub_path": "process/0.16mm Optimal @Voron.json" + "name": "0.15mm Optimal @Voron", + "sub_path": "process/0.15mm Optimal @Voron.json" }, { "name": "0.20mm Standard @Voron", @@ -403,6 +407,10 @@ "name": "Bambu Lab X1 Carbon 0.8 nozzle", "sub_path": "machine/Bambu Lab X1 Carbon 0.8 nozzle.json" }, + { + "name": "fdm_klipper_common", + "sub_path": "machine/fdm_klipper_common.json" + }, { "name": "Voron 2.4 250 0.4 nozzle", "sub_path": "machine/Voron 2.4 250 0.4 nozzle.json" diff --git a/resources/profiles/BBL/machine/Anycubic 4Max Pro 0.4 nozzle.json b/resources/profiles/BBL/machine/Anycubic 4Max Pro 0.4 nozzle.json index 47128a6f6ef..22571a0fb42 100644 --- a/resources/profiles/BBL/machine/Anycubic 4Max Pro 0.4 nozzle.json +++ b/resources/profiles/BBL/machine/Anycubic 4Max Pro 0.4 nozzle.json @@ -4,32 +4,14 @@ "name": "Anycubic 4Max Pro 0.4 nozzle", "from": "system", "instantiation": "true", - "inherits": "fdm_bbl_3dp_001_common", + "inherits": "fdm_klipper_common", "printer_model": "Anycubic 4Max Pro", - "default_filament_profile": [ - "Bambu PLA Basic @BBL X1" - ], - "default_print_profile": "0.20mm Standard @A4MaxPro", - "nozzle_diameter": [ - "0.4" - ], - "bed_exclude_area": [ - "0x0" - ], "printable_area": [ "0x0", "270x0", "270x205", "0x205" ], - "printable_height": "200", - "machine_start_gcode": "PRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer_single]", - "machine_end_gcode": "PRINT_END", - "layer_change_gcode": "", - "scan_first_layer": "0", - "machine_load_filament_time": "17", - "machine_unload_filament_time": "16", - "nozzle_type": "hardened_steel", - "auxiliary_fan": "0" + "printable_height": "200" } \ No newline at end of file diff --git a/resources/profiles/BBL/machine/Voron 2.4 250 0.4 nozzle.json b/resources/profiles/BBL/machine/Voron 2.4 250 0.4 nozzle.json index 51dca5803c5..ad09c744678 100644 --- a/resources/profiles/BBL/machine/Voron 2.4 250 0.4 nozzle.json +++ b/resources/profiles/BBL/machine/Voron 2.4 250 0.4 nozzle.json @@ -4,31 +4,13 @@ "name": "Voron 2.4 250 0.4 nozzle", "from": "system", "instantiation": "true", - "inherits": "fdm_bbl_3dp_001_common", + "inherits": "fdm_klipper_common", "printer_model": "Voron 2.4 250", - "default_filament_profile": [ - "Bambu PLA Basic @BBL X1" - ], - "default_print_profile": "0.20mm Standard @Voron", - "nozzle_diameter": [ - "0.4" - ], - "bed_exclude_area": [ - "0x0" - ], "printable_area": [ "0x0", "250x0", "250x250", "0x250" ], - "printable_height": "225", - "machine_start_gcode": "PRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer_single]", - "machine_end_gcode": "PRINT_END", - "layer_change_gcode": "", - "scan_first_layer": "0", - "machine_load_filament_time": "17", - "machine_unload_filament_time": "16", - "nozzle_type": "hardened_steel", - "auxiliary_fan": "0" + "printable_height": "225" } diff --git a/resources/profiles/BBL/machine/Voron 2.4 300 0.4 nozzle.json b/resources/profiles/BBL/machine/Voron 2.4 300 0.4 nozzle.json index 560ad97a940..630da11a0d3 100644 --- a/resources/profiles/BBL/machine/Voron 2.4 300 0.4 nozzle.json +++ b/resources/profiles/BBL/machine/Voron 2.4 300 0.4 nozzle.json @@ -4,31 +4,13 @@ "name": "Voron 2.4 300 0.4 nozzle", "from": "system", "instantiation": "true", - "inherits": "fdm_bbl_3dp_001_common", + "inherits": "fdm_klipper_common", "printer_model": "Voron 2.4 300", - "default_filament_profile": [ - "Bambu PLA Basic @BBL X1" - ], - "default_print_profile": "0.20mm Standard @Voron", - "nozzle_diameter": [ - "0.4" - ], - "bed_exclude_area": [ - "0x0" - ], "printable_area": [ "0x0", "300x0", "300x300", "0x300" ], - "printable_height": "275", - "machine_start_gcode": "PRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer_single]", - "machine_end_gcode": "PRINT_END", - "layer_change_gcode": "", - "scan_first_layer": "0", - "machine_load_filament_time": "17", - "machine_unload_filament_time": "16", - "nozzle_type": "hardened_steel", - "auxiliary_fan": "0" + "printable_height": "275" } diff --git a/resources/profiles/BBL/machine/Voron 2.4 350 0.4 nozzle.json b/resources/profiles/BBL/machine/Voron 2.4 350 0.4 nozzle.json index 0a2ec69d6aa..30dffc5dbfc 100644 --- a/resources/profiles/BBL/machine/Voron 2.4 350 0.4 nozzle.json +++ b/resources/profiles/BBL/machine/Voron 2.4 350 0.4 nozzle.json @@ -4,31 +4,13 @@ "name": "Voron 2.4 350 0.4 nozzle", "from": "system", "instantiation": "true", - "inherits": "fdm_bbl_3dp_001_common", + "inherits": "fdm_klipper_common", "printer_model": "Voron 2.4 350", - "default_filament_profile": [ - "Bambu PLA Basic @BBL X1" - ], - "default_print_profile": "0.20mm Standard @Voron", - "nozzle_diameter": [ - "0.4" - ], - "bed_exclude_area": [ - "0x0" - ], "printable_area": [ "0x0", "350x0", "350x350", "0x350" ], - "printable_height": "325", - "machine_start_gcode": "PRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer_single]", - "machine_end_gcode": "PRINT_END", - "layer_change_gcode": "", - "scan_first_layer": "0", - "machine_load_filament_time": "17", - "machine_unload_filament_time": "16", - "nozzle_type": "hardened_steel", - "auxiliary_fan": "0" + "printable_height": "325" } diff --git a/resources/profiles/BBL/machine/fdm_klipper_common.json b/resources/profiles/BBL/machine/fdm_klipper_common.json new file mode 100644 index 00000000000..6c99fb3bbe7 --- /dev/null +++ b/resources/profiles/BBL/machine/fdm_klipper_common.json @@ -0,0 +1,24 @@ +{ + "type": "machine", + "name": "fdm_klipper_common", + "from": "system", + "instantiation": "false", + "inherits": "fdm_bbl_3dp_001_common", + "default_filament_profile": [ + "Bambu PLA Basic @BBL X1C" + ], + "default_print_profile": "0.20mm Standard @Voron", + "nozzle_diameter": [ + "0.4" + ], + "bed_exclude_area": [ + "0x0" + ], + "machine_start_gcode": "PRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer_single]", + "machine_end_gcode": "PRINT_END", + "layer_change_gcode": "", + "scan_first_layer": "0", + "nozzle_type": "hardened_steel", + "auxiliary_fan": "0" + } + \ No newline at end of file diff --git a/resources/profiles/BBL/process/0.08mm Extra Fine @Voron.json b/resources/profiles/BBL/process/0.08mm Extra Fine @Voron.json index 520ed3dd9f6..aea877827c6 100644 --- a/resources/profiles/BBL/process/0.08mm Extra Fine @Voron.json +++ b/resources/profiles/BBL/process/0.08mm Extra Fine @Voron.json @@ -4,20 +4,8 @@ "name": "0.08mm Extra Fine @Voron", "from": "system", "instantiation": "true", - "inherits": "fdm_process_bbl_0.08", - "initial_layer_speed": "50", - "initial_layer_infill_speed": "105", - "outer_wall_speed": "120", - "inner_wall_speed": "200", - "sparse_infill_speed": "300", - "internal_solid_infill_speed": "200", - "top_surface_speed": "100", - "gap_infill_speed": "100", - "travel_speed": "350", - "compatible_printers": [ - "Voron 2.4 250 0.4 nozzle", - "Voron 2.4 300 0.4 nozzle", - "Voron 2.4 350 0.4 nozzle", - "Voron 0.1 0.4 nozzle" - ] -} + "inherits": "fdm_process_voron_common", + "layer_height": "0.08", + "bottom_shell_layers": "7", + "top_shell_layers": "9" +} \ No newline at end of file diff --git a/resources/profiles/BBL/process/0.12mm Fine @Voron.json b/resources/profiles/BBL/process/0.12mm Fine @Voron.json index ebd4249bf6f..8e47c2fbd0e 100644 --- a/resources/profiles/BBL/process/0.12mm Fine @Voron.json +++ b/resources/profiles/BBL/process/0.12mm Fine @Voron.json @@ -4,20 +4,8 @@ "name": "0.12mm Fine @Voron", "from": "system", "instantiation": "true", - "inherits": "fdm_process_bbl_0.12", - "initial_layer_speed": "50", - "initial_layer_infill_speed": "105", - "outer_wall_speed": "120", - "inner_wall_speed": "200", - "sparse_infill_speed": "300", - "internal_solid_infill_speed": "200", - "top_surface_speed": "100", - "gap_infill_speed": "100", - "travel_speed": "350", - "compatible_printers": [ - "Voron 2.4 250 0.4 nozzle", - "Voron 2.4 300 0.4 nozzle", - "Voron 2.4 350 0.4 nozzle", - "Voron 0.1 0.4 nozzle" - ] + "inherits": "fdm_process_voron_common", + "layer_height": "0.12", + "bottom_shell_layers": "5", + "top_shell_layers": "6" } diff --git a/resources/profiles/BBL/process/0.15mm Optimal @Voron.json b/resources/profiles/BBL/process/0.15mm Optimal @Voron.json new file mode 100644 index 00000000000..2b3fb0b0ac1 --- /dev/null +++ b/resources/profiles/BBL/process/0.15mm Optimal @Voron.json @@ -0,0 +1,11 @@ +{ + "type": "process", + "setting_id": "GP003", + "name": "0.15mm Optimal @Voron", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_voron_common", + "bottom_shell_layers": "4", + "top_shell_layers": "5", + "layer_height": "0.15" +} diff --git a/resources/profiles/BBL/process/0.16mm Optimal @Voron.json b/resources/profiles/BBL/process/0.16mm Optimal @Voron.json deleted file mode 100644 index 28c0be57d66..00000000000 --- a/resources/profiles/BBL/process/0.16mm Optimal @Voron.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "process", - "setting_id": "GP003", - "name": "0.16mm Optimal @Voron", - "from": "system", - "instantiation": "true", - "inherits": "fdm_process_bbl_0.16", - "initial_layer_speed": "50", - "initial_layer_infill_speed": "105", - "outer_wall_speed": "120", - "inner_wall_speed": "200", - "sparse_infill_speed": "300", - "internal_solid_infill_speed": "200", - "top_surface_speed": "100", - "gap_infill_speed": "100", - "travel_speed": "350", - "compatible_printers": [ - "Voron 2.4 250 0.4 nozzle", - "Voron 2.4 300 0.4 nozzle", - "Voron 2.4 350 0.4 nozzle", - "Voron 0.1 0.4 nozzle" - ] -} diff --git a/resources/profiles/BBL/process/0.20mm Standard @A4MaxPro.json b/resources/profiles/BBL/process/0.20mm Standard @A4MaxPro.json index 870b1d97546..d4684fc16be 100644 --- a/resources/profiles/BBL/process/0.20mm Standard @A4MaxPro.json +++ b/resources/profiles/BBL/process/0.20mm Standard @A4MaxPro.json @@ -7,13 +7,19 @@ "inherits": "fdm_process_bbl_0.20", "initial_layer_speed": "45", "initial_layer_infill_speed": "60", - "outer_wall_speed": "60", + "outer_wall_speed": "50", "inner_wall_speed": "80", "sparse_infill_speed": "80", "internal_solid_infill_speed": "80", "top_surface_speed": "50", "gap_infill_speed": "40", "travel_speed": "200", + "brim_type": "no_brim", + "default_acceleration": "1900", + "enable_prime_tower": "0", + "enable_support": "0", + "initial_layer_acceleration": "1900", + "top_surface_acceleration": "1900", "compatible_printers": [ "Anycubic 4Max Pro 0.4 nozzle" ] diff --git a/resources/profiles/BBL/process/0.20mm Standard @Voron.json b/resources/profiles/BBL/process/0.20mm Standard @Voron.json index 62b14d6d921..4464fd09a26 100644 --- a/resources/profiles/BBL/process/0.20mm Standard @Voron.json +++ b/resources/profiles/BBL/process/0.20mm Standard @Voron.json @@ -3,21 +3,9 @@ "setting_id": "GP004", "name": "0.20mm Standard @Voron", "from": "system", + "inherits": "fdm_process_voron_common", "instantiation": "true", - "inherits": "fdm_process_bbl_0.20", - "initial_layer_speed": "50", - "initial_layer_infill_speed": "105", - "outer_wall_speed": "120", - "inner_wall_speed": "200", - "sparse_infill_speed": "300", - "internal_solid_infill_speed": "200", - "top_surface_speed": "100", - "gap_infill_speed": "100", - "travel_speed": "350", - "compatible_printers": [ - "Voron 2.4 250 0.4 nozzle", - "Voron 2.4 300 0.4 nozzle", - "Voron 2.4 350 0.4 nozzle", - "Voron 0.1 0.4 nozzle" - ] + "layer_height": "0.2", + "bottom_shell_layers": "3", + "top_shell_layers": "4" } diff --git a/resources/profiles/BBL/process/0.24mm Draft @Voron.json b/resources/profiles/BBL/process/0.24mm Draft @Voron.json index 15a73229e62..23de2afb048 100644 --- a/resources/profiles/BBL/process/0.24mm Draft @Voron.json +++ b/resources/profiles/BBL/process/0.24mm Draft @Voron.json @@ -4,20 +4,9 @@ "name": "0.24mm Draft @Voron", "from": "system", "instantiation": "true", - "inherits": "fdm_process_bbl_0.24", - "initial_layer_speed": "50", - "initial_layer_infill_speed": "105", - "outer_wall_speed": "120", - "inner_wall_speed": "200", - "sparse_infill_speed": "300", - "internal_solid_infill_speed": "200", - "top_surface_speed": "100", - "gap_infill_speed": "100", - "travel_speed": "350", - "compatible_printers": [ - "Voron 2.4 250 0.4 nozzle", - "Voron 2.4 300 0.4 nozzle", - "Voron 2.4 350 0.4 nozzle", - "Voron 0.1 0.4 nozzle" - ] + "inherits": "fdm_process_voron_common", + "layer_height": "0.24", + "top_surface_line_width": "0.45", + "bottom_shell_layers": "3", + "top_shell_layers": "4" } diff --git a/resources/profiles/BBL/process/0.28mm Extra Draft @Voron.json b/resources/profiles/BBL/process/0.28mm Extra Draft @Voron.json index aefd27c4279..ff85fb5cc13 100644 --- a/resources/profiles/BBL/process/0.28mm Extra Draft @Voron.json +++ b/resources/profiles/BBL/process/0.28mm Extra Draft @Voron.json @@ -4,20 +4,9 @@ "name": "0.28mm Extra Draft @Voron", "from": "system", "instantiation": "true", - "inherits": "fdm_process_bbl_0.28", - "initial_layer_speed": "50", - "initial_layer_infill_speed": "105", - "outer_wall_speed": "120", - "inner_wall_speed": "200", - "sparse_infill_speed": "300", - "internal_solid_infill_speed": "200", - "top_surface_speed": "100", - "gap_infill_speed": "100", - "travel_speed": "350", - "compatible_printers": [ - "Voron 2.4 250 0.4 nozzle", - "Voron 2.4 300 0.4 nozzle", - "Voron 2.4 350 0.4 nozzle", - "Voron 0.1 0.4 nozzle" - ] + "inherits": "fdm_process_voron_common", + "layer_height": "0.28", + "top_surface_line_width": "0.45", + "bottom_shell_layers": "3", + "top_shell_layers": "4" } diff --git a/resources/profiles/BBL/process/fdm_process_voron_common.json b/resources/profiles/BBL/process/fdm_process_voron_common.json new file mode 100644 index 00000000000..cd27ff5b5d6 --- /dev/null +++ b/resources/profiles/BBL/process/fdm_process_voron_common.json @@ -0,0 +1,108 @@ +{ + "type": "process", + "name": "fdm_process_voron_common", + "from": "system", + "instantiation": "false", + "inherits": "fdm_process_common", + "adaptive_layer_height": "0", + "reduce_crossing_wall": "0", + "max_travel_detour_distance": "0", + "bottom_surface_pattern": "monotonic", + "bottom_shell_layers": "3", + "bottom_shell_thickness": "0", + "bridge_flow": "0.95", + "bridge_speed": "50", + "brim_width": "5", + "brim_object_gap": "0.1", + "compatible_printers_condition": "", + "print_sequence": "by layer", + "default_acceleration": "7000", + "top_surface_acceleration": "3000", + "bridge_no_support": "0", + "draft_shield": "disabled", + "elefant_foot_compensation": "0", + "enable_arc_fitting": "1", + "outer_wall_line_width": "0.4", + "wall_infill_order": "inner wall/outer wall/infill", + "line_width": "0.4", + "infill_direction": "45", + "sparse_infill_density": "15%", + "sparse_infill_pattern": "grid", + "initial_layer_acceleration": "500", + "initial_layer_line_width": "0.5", + "initial_layer_print_height": "0.2", + "infill_combination": "0", + "sparse_infill_line_width": "0.45", + "infill_wall_overlap": "25%", + "interface_shells": "0", + "ironing_flow": "10%", + "ironing_spacing": "0.15", + "ironing_speed": "30", + "ironing_type": "no ironing", + "layer_height": "0.2", + "reduce_infill_retraction": "1", + "filename_format": "{input_filename_base}_{filament_type[0]}_{print_time}.gcode", + "detect_overhang_wall": "1", + "overhang_1_4_speed": "0", + "overhang_2_4_speed": "50", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "10", + "inner_wall_line_width": "0.45", + "wall_loops": "2", + "print_settings_id": "", + "raft_layers": "0", + "seam_position": "aligned", + "skirt_distance": "2", + "skirt_height": "1", + "skirt_loops": "0", + "minimum_sparse_infill_area": "15", + "internal_solid_infill_line_width": "0.4", + "spiral_mode": "0", + "standby_temperature_delta": "-5", + "enable_support": "0", + "resolution": "0.012", + "support_type": "normal(auto)", + "support_on_build_plate_only": "0", + "support_top_z_distance": "0.2", + "support_filament": "0", + "support_line_width": "0.4", + "support_interface_loop_pattern": "0", + "support_interface_filament": "0", + "support_interface_top_layers": "2", + "support_interface_bottom_layers": "2", + "support_interface_spacing": "0.5", + "support_interface_speed": "80", + "support_base_pattern": "rectilinear", + "support_base_pattern_spacing": "2.5", + "support_speed": "150", + "support_threshold_angle": "30", + "support_object_xy_distance": "0.35", + "tree_support_branch_angle": "30", + "tree_support_wall_count": "0", + "tree_support_with_infill": "0", + "detect_thin_wall": "0", + "top_surface_pattern": "monotonicline", + "top_surface_line_width": "0.4", + "top_shell_layers": "3", + "top_shell_thickness": "0.8", + "initial_layer_speed": "50", + "initial_layer_infill_speed": "105", + "outer_wall_speed": "120", + "inner_wall_speed": "200", + "internal_solid_infill_speed": "200", + "top_surface_speed": "100", + "gap_infill_speed": "100", + "sparse_infill_speed": "200", + "travel_speed": "350", + "enable_prime_tower": "0", + "wipe_tower_no_sparse_layers": "0", + "prime_tower_width": "35", + "xy_hole_compensation": "0", + "xy_contour_compensation": "0", + "compatible_printers": [ + "Voron 2.4 250 0.4 nozzle", + "Voron 2.4 300 0.4 nozzle", + "Voron 2.4 350 0.4 nozzle", + "Voron 0.1 0.4 nozzle" + ] +}