From 270fff56f58a643792b76a2abbfb3160653e2f6e Mon Sep 17 00:00:00 2001 From: SoftFever Date: Sun, 13 Aug 2023 09:56:24 +0800 Subject: [PATCH] Fix Troodon2 klipper bug --- resources/profiles/Vivedino.json | 6 +- .../process/0.08mm Extra Fine @Troodon2.json | 2 +- .../process/0.12mm Fine @Troodon2.json | 2 +- .../process/0.15mm Optimal @Troodon2.json | 2 +- .../process/0.20mm Standard @Troodon2.json | 2 +- .../process/0.24mm Draft @Troodon2.json | 2 +- .../process/0.28mm Extra Draft @Troodon2.json | 2 +- .../process/fdm_process_klipper_common.json | 214 +++++++++--------- .../process/fdm_process_rrf_common.json | 108 --------- 9 files changed, 115 insertions(+), 225 deletions(-) delete mode 100644 resources/profiles/Vivedino/process/fdm_process_rrf_common.json diff --git a/resources/profiles/Vivedino.json b/resources/profiles/Vivedino.json index b379d36d9c..001f1f4b8e 100644 --- a/resources/profiles/Vivedino.json +++ b/resources/profiles/Vivedino.json @@ -1,6 +1,6 @@ { "name": "Vivedino", - "version": "01.06.00.00", + "version": "01.06.00.01", "force_update": "0", "description": "Vivedino configurations", "machine_model_list": [ @@ -22,10 +22,6 @@ "name": "fdm_process_klipper_common", "sub_path": "process/fdm_process_klipper_common.json" }, - { - "name": "fdm_process_rrf_common", - "sub_path": "process/fdm_process_rrf_common.json" - }, { "name": "0.08mm Extra Fine @Troodon2", "sub_path": "process/0.08mm Extra Fine @Troodon2.json" diff --git a/resources/profiles/Vivedino/process/0.08mm Extra Fine @Troodon2.json b/resources/profiles/Vivedino/process/0.08mm Extra Fine @Troodon2.json index 6f835e0eb1..bcfe9b2509 100644 --- a/resources/profiles/Vivedino/process/0.08mm Extra Fine @Troodon2.json +++ b/resources/profiles/Vivedino/process/0.08mm Extra Fine @Troodon2.json @@ -4,7 +4,7 @@ "name": "0.08mm Extra Fine @Troodon2", "from": "system", "instantiation": "true", - "inherits": "fdm_process_rrf_common", + "inherits": "fdm_process_klipper_common", "layer_height": "0.08", "bottom_shell_layers": "7", "top_shell_layers": "9" diff --git a/resources/profiles/Vivedino/process/0.12mm Fine @Troodon2.json b/resources/profiles/Vivedino/process/0.12mm Fine @Troodon2.json index 90ef92cdf5..7353490ac4 100644 --- a/resources/profiles/Vivedino/process/0.12mm Fine @Troodon2.json +++ b/resources/profiles/Vivedino/process/0.12mm Fine @Troodon2.json @@ -4,7 +4,7 @@ "name": "0.12mm Fine @Troodon2", "from": "system", "instantiation": "true", - "inherits": "fdm_process_rrf_common", + "inherits": "fdm_process_klipper_common", "layer_height": "0.12", "bottom_shell_layers": "5", "top_shell_layers": "6" diff --git a/resources/profiles/Vivedino/process/0.15mm Optimal @Troodon2.json b/resources/profiles/Vivedino/process/0.15mm Optimal @Troodon2.json index 881a39b42d..86ea214ba1 100644 --- a/resources/profiles/Vivedino/process/0.15mm Optimal @Troodon2.json +++ b/resources/profiles/Vivedino/process/0.15mm Optimal @Troodon2.json @@ -4,7 +4,7 @@ "name": "0.15mm Optimal @Troodon2", "from": "system", "instantiation": "true", - "inherits": "fdm_process_rrf_common", + "inherits": "fdm_process_klipper_common", "bottom_shell_layers": "4", "top_shell_layers": "5", "layer_height": "0.15" diff --git a/resources/profiles/Vivedino/process/0.20mm Standard @Troodon2.json b/resources/profiles/Vivedino/process/0.20mm Standard @Troodon2.json index ae41839a63..80331ef370 100644 --- a/resources/profiles/Vivedino/process/0.20mm Standard @Troodon2.json +++ b/resources/profiles/Vivedino/process/0.20mm Standard @Troodon2.json @@ -3,7 +3,7 @@ "setting_id": "GP004", "name": "0.20mm Standard @Troodon2", "from": "system", - "inherits": "fdm_process_rrf_common", + "inherits": "fdm_process_klipper_common", "instantiation": "true", "layer_height": "0.2", "bottom_shell_layers": "3", diff --git a/resources/profiles/Vivedino/process/0.24mm Draft @Troodon2.json b/resources/profiles/Vivedino/process/0.24mm Draft @Troodon2.json index 8162265291..1a51758af5 100644 --- a/resources/profiles/Vivedino/process/0.24mm Draft @Troodon2.json +++ b/resources/profiles/Vivedino/process/0.24mm Draft @Troodon2.json @@ -4,7 +4,7 @@ "name": "0.24mm Draft @Troodon2", "from": "system", "instantiation": "true", - "inherits": "fdm_process_rrf_common", + "inherits": "fdm_process_klipper_common", "layer_height": "0.24", "top_surface_line_width": "0.45", "bottom_shell_layers": "3", diff --git a/resources/profiles/Vivedino/process/0.28mm Extra Draft @Troodon2.json b/resources/profiles/Vivedino/process/0.28mm Extra Draft @Troodon2.json index 5199a4fa02..271a8480f3 100644 --- a/resources/profiles/Vivedino/process/0.28mm Extra Draft @Troodon2.json +++ b/resources/profiles/Vivedino/process/0.28mm Extra Draft @Troodon2.json @@ -4,7 +4,7 @@ "name": "0.28mm Extra Draft @Troodon2", "from": "system", "instantiation": "true", - "inherits": "fdm_process_rrf_common", + "inherits": "fdm_process_klipper_common", "layer_height": "0.28", "top_surface_line_width": "0.45", "bottom_shell_layers": "3", diff --git a/resources/profiles/Vivedino/process/fdm_process_klipper_common.json b/resources/profiles/Vivedino/process/fdm_process_klipper_common.json index 4bb5f01dd4..8f4936a889 100644 --- a/resources/profiles/Vivedino/process/fdm_process_klipper_common.json +++ b/resources/profiles/Vivedino/process/fdm_process_klipper_common.json @@ -1,108 +1,110 @@ { - "type": "process", - "name": "fdm_process_klipper_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": "5000", - "top_surface_acceleration": "3000", - "travel_acceleration": "7000", - "inner_wall_acceleration": "5000", - "outer_wall_acceleration": "3000", - "bridge_no_support": "0", - "draft_shield": "disabled", - "elefant_foot_compensation": "0", - "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": "3", - "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_style": "default", - "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": "45", - "tree_support_wall_count": "0", - "detect_thin_wall": "0", - "top_surface_pattern": "monotonic", - "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", - "enable_arc_fitting": "0", - "compatible_printers": [ - "Troodon 2.0 Klipper 0.4 nozzle" - ] + "type": "process", + "name": "fdm_process_klipper_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", + "ineternal_bridge_speed": "70", + "brim_width": "5", + "brim_object_gap": "0.1", + "compatible_printers_condition": "", + "print_sequence": "by layer", + "default_acceleration": "5000", + "top_surface_acceleration": "3000", + "travel_acceleration": "7000", + "inner_wall_acceleration": "5000", + "outer_wall_acceleration": "3000", + "bridge_no_support": "0", + "draft_shield": "disabled", + "elefant_foot_compensation": "0", + "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": "3", + "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_style": "default", + "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": "60", + "support_base_pattern": "rectilinear", + "support_base_pattern_spacing": "2.5", + "support_speed": "80", + "support_threshold_angle": "30", + "support_object_xy_distance": "0.35", + "tree_support_branch_angle": "45", + "tree_support_wall_count": "0", + "detect_thin_wall": "0", + "top_surface_pattern": "monotonic", + "top_surface_line_width": "0.4", + "top_shell_layers": "3", + "top_shell_thickness": "0.8", + "initial_layer_speed": "50", + "initial_layer_infill_speed": "80", + "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", + "enable_arc_fitting": "0", + "compatible_printers": [ + "Troodon 2.0 Klipper 0.4 nozzle", + "Troodon 2.0 RRF 0.4 nozzle" + ] } diff --git a/resources/profiles/Vivedino/process/fdm_process_rrf_common.json b/resources/profiles/Vivedino/process/fdm_process_rrf_common.json deleted file mode 100644 index a888287bd9..0000000000 --- a/resources/profiles/Vivedino/process/fdm_process_rrf_common.json +++ /dev/null @@ -1,108 +0,0 @@ -{ - "type": "process", - "name": "fdm_process_rrf_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": "1000", - "top_surface_acceleration": "1000", - "travel_acceleration": "1000", - "inner_wall_acceleration": "1000", - "outer_wall_acceleration": "1000", - "bridge_no_support": "0", - "draft_shield": "disabled", - "elefant_foot_compensation": "0", - "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": "3", - "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_style": "default", - "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": "40", - "support_base_pattern": "rectilinear", - "support_base_pattern_spacing": "2.5", - "support_speed": "60", - "support_threshold_angle": "30", - "support_object_xy_distance": "0.35", - "tree_support_branch_angle": "45", - "tree_support_wall_count": "0", - "detect_thin_wall": "0", - "top_surface_pattern": "monotonic", - "top_surface_line_width": "0.4", - "top_shell_layers": "3", - "top_shell_thickness": "0.8", - "initial_layer_speed": "45", - "initial_layer_infill_speed": "60", - "outer_wall_speed": "60", - "inner_wall_speed": "80", - "internal_solid_infill_speed": "80", - "top_surface_speed": "50", - "gap_infill_speed": "80", - "sparse_infill_speed": "80", - "travel_speed": "150", - "enable_prime_tower": "0", - "wipe_tower_no_sparse_layers": "0", - "prime_tower_width": "35", - "xy_hole_compensation": "0", - "xy_contour_compensation": "0", - "enable_arc_fitting": "0", - "compatible_printers": [ - "Troodon 2.0 RRF 0.4 nozzle" - ] -}