From 02a4c9069cf68aeaddb23c22376c43fc4b0acb1d Mon Sep 17 00:00:00 2001 From: Dylan <331506+macdylan@users.noreply.github.com> Date: Fri, 21 Jun 2024 17:46:47 +0800 Subject: [PATCH] Fix Snapmaker profiles (#5763) * update snapmaker profiles - add BracingKit for Snapmaker 2 - add Artisan profiles * remove key * fix compatible_printers * remove pva for single extruder * fix ci * Fix compatible_printers * Revert specific parameters --- .../filament/Snapmaker PET @Dual.json | 4 ++- .../filament/Snapmaker PET @base.json | 3 +-- .../filament/Snapmaker PVA @0.2 nozzle.json | 5 +++- .../Snapmaker/filament/Snapmaker PVA.json | 27 ++++++++++++++++++- ...08 Extra Fine @Snapmaker (0.4 nozzle).json | 2 +- ... Fine @Snapmaker Artisan (0.4 nozzle).json | 2 +- ...Extra Fine @Snapmaker J1 (0.4 nozzle).json | 2 +- .../0.12 Fine @Snapmaker (0.4 nozzle).json | 2 +- ... Fine @Snapmaker Artisan (0.4 nozzle).json | 2 +- .../0.12 Fine @Snapmaker J1 (0.4 nozzle).json | 2 +- .../0.16 Optimal @Snapmaker (0.4 nozzle).json | 2 +- ...timal @Snapmaker Artisan (0.4 nozzle).json | 2 +- ...16 Optimal @Snapmaker J1 (0.4 nozzle).json | 2 +- .../0.24 Draft @Snapmaker (0.4 nozzle).json | 2 +- ...Draft @Snapmaker Artisan (0.4 nozzle).json | 2 +- ...0.24 Draft @Snapmaker J1 (0.4 nozzle).json | 2 +- ...enchy @Snapmaker Artisan (0.4 nozzle).json | 2 +- ....25 Benchy @Snapmaker J1 (0.4 nozzle).json | 2 +- ...8 Extra Draft @Snapmaker (0.4 nozzle).json | 2 +- ...Draft @Snapmaker Artisan (0.4 nozzle).json | 2 +- ...xtra Draft @Snapmaker J1 (0.4 nozzle).json | 2 +- .../Snapmaker/process/fdm_process_common.json | 4 +-- 22 files changed, 53 insertions(+), 24 deletions(-) diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PET @Dual.json b/resources/profiles/Snapmaker/filament/Snapmaker PET @Dual.json index a77525a0e..801cb64b0 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PET @Dual.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PET @Dual.json @@ -5,5 +5,7 @@ "name": "Snapmaker PET @Dual", "setting_id": "145337790", "inherits": "Snapmaker Dual PET @base", - "compatible_printers": "" + "compatible_printers": [ + "Snapmaker A250 Dual (0.8 nozzle)" + ] } \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PET @base.json b/resources/profiles/Snapmaker/filament/Snapmaker PET @base.json index fd188706a..47594a10d 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PET @base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PET @base.json @@ -4,6 +4,5 @@ "instantiation": "false", "name": "Snapmaker PET @base", "filament_id": "2549587591", - "inherits": "fdm_filament_pet", - "compatible_printers": "" + "inherits": "fdm_filament_pet" } \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PVA @0.2 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PVA @0.2 nozzle.json index 521a5d53d..18b8430d1 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PVA @0.2 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PVA @0.2 nozzle.json @@ -4,5 +4,8 @@ "instantiation": "true", "name": "Snapmaker PVA @0.2 nozzle", "setting_id": "1131479069", - "inherits": "Snapmaker PVA @base" + "inherits": "Snapmaker PVA @base", + "compatible_printers": [ + "Snapmaker A250 (0.2 nozzle)" + ] } \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PVA.json b/resources/profiles/Snapmaker/filament/Snapmaker PVA.json index b49e2cfb4..0a44bae8e 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PVA.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PVA.json @@ -5,5 +5,30 @@ "name": "Snapmaker PVA", "setting_id": "3741816734", "inherits": "Snapmaker PVA @base", - "compatible_printers": "" + "compatible_printers": [ + "Snapmaker A250 (0.4 nozzle)", + "Snapmaker A250 (0.6 nozzle)", + "Snapmaker A250 (0.8 nozzle)", + "Snapmaker A250 BKit (0.4 nozzle)", + "Snapmaker A250 BKit (0.6 nozzle)", + "Snapmaker A250 BKit (0.8 nozzle)", + "Snapmaker A250 QS+B Kit (0.4 nozzle)", + "Snapmaker A250 QS+B Kit (0.6 nozzle)", + "Snapmaker A250 QS+B Kit (0.8 nozzle)", + "Snapmaker A250 QSKit (0.4 nozzle)", + "Snapmaker A250 QSKit (0.6 nozzle)", + "Snapmaker A250 QSKit (0.8 nozzle)", + "Snapmaker A350 (0.4 nozzle)", + "Snapmaker A350 (0.6 nozzle)", + "Snapmaker A350 (0.8 nozzle)", + "Snapmaker A350 BKit (0.4 nozzle)", + "Snapmaker A350 BKit (0.6 nozzle)", + "Snapmaker A350 BKit (0.8 nozzle)", + "Snapmaker A350 QS+B Kit (0.4 nozzle)", + "Snapmaker A350 QS+B Kit (0.6 nozzle)", + "Snapmaker A350 QS+B Kit (0.8 nozzle)", + "Snapmaker A350 QSKit (0.4 nozzle)", + "Snapmaker A350 QSKit (0.6 nozzle)", + "Snapmaker A350 QSKit (0.8 nozzle)" + ] } \ No newline at end of file diff --git a/resources/profiles/Snapmaker/process/0.08 Extra Fine @Snapmaker (0.4 nozzle).json b/resources/profiles/Snapmaker/process/0.08 Extra Fine @Snapmaker (0.4 nozzle).json index dd1be72ed..a081fe766 100644 --- a/resources/profiles/Snapmaker/process/0.08 Extra Fine @Snapmaker (0.4 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.08 Extra Fine @Snapmaker (0.4 nozzle).json @@ -29,7 +29,7 @@ "ironing_flow": "8%", "layer_height": "0.08", "initial_layer_print_height": "0.1", - "support_threshold_angle": "30", + "support_threshold_angle": "15", "top_shell_layers": "9", "gap_infill_speed": "85", "initial_layer_infill_speed": "65", diff --git a/resources/profiles/Snapmaker/process/0.08 Extra Fine @Snapmaker Artisan (0.4 nozzle).json b/resources/profiles/Snapmaker/process/0.08 Extra Fine @Snapmaker Artisan (0.4 nozzle).json index 3b160147b..22bdb6cb0 100644 --- a/resources/profiles/Snapmaker/process/0.08 Extra Fine @Snapmaker Artisan (0.4 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.08 Extra Fine @Snapmaker Artisan (0.4 nozzle).json @@ -14,7 +14,7 @@ "ironing_flow": "8%", "layer_height": "0.08", "initial_layer_print_height": "0.1", - "support_threshold_angle": "30", + "support_threshold_angle": "15", "top_shell_layers": "5", "initial_layer_infill_speed": "80", "inner_wall_speed": "145", diff --git a/resources/profiles/Snapmaker/process/0.08 Extra Fine @Snapmaker J1 (0.4 nozzle).json b/resources/profiles/Snapmaker/process/0.08 Extra Fine @Snapmaker J1 (0.4 nozzle).json index c93c20378..eaf51d4cd 100644 --- a/resources/profiles/Snapmaker/process/0.08 Extra Fine @Snapmaker J1 (0.4 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.08 Extra Fine @Snapmaker J1 (0.4 nozzle).json @@ -14,7 +14,7 @@ "ironing_flow": "8%", "layer_height": "0.08", "initial_layer_print_height": "0.1", - "support_threshold_angle": "30", + "support_threshold_angle": "15", "top_shell_layers": "5", "initial_layer_infill_speed": "80", "inner_wall_speed": "145", diff --git a/resources/profiles/Snapmaker/process/0.12 Fine @Snapmaker (0.4 nozzle).json b/resources/profiles/Snapmaker/process/0.12 Fine @Snapmaker (0.4 nozzle).json index 554733174..24216b3c5 100644 --- a/resources/profiles/Snapmaker/process/0.12 Fine @Snapmaker (0.4 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.12 Fine @Snapmaker (0.4 nozzle).json @@ -30,7 +30,7 @@ "top_shell_layers": "5", "top_shell_thickness": "0.6", "bridge_flow": "1", - "support_threshold_angle": "30", + "support_threshold_angle": "20", "initial_layer_infill_speed": "65", "outer_wall_speed": "75", "inner_wall_speed": "120", diff --git a/resources/profiles/Snapmaker/process/0.12 Fine @Snapmaker Artisan (0.4 nozzle).json b/resources/profiles/Snapmaker/process/0.12 Fine @Snapmaker Artisan (0.4 nozzle).json index 162610719..41cfa41d2 100644 --- a/resources/profiles/Snapmaker/process/0.12 Fine @Snapmaker Artisan (0.4 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.12 Fine @Snapmaker Artisan (0.4 nozzle).json @@ -14,7 +14,7 @@ "top_shell_layers": "5", "top_shell_thickness": "0.6", "bridge_flow": "1", - "support_threshold_angle": "30", + "support_threshold_angle": "20", "initial_layer_infill_speed": "80", "inner_wall_speed": "145", "internal_solid_infill_speed": "150" diff --git a/resources/profiles/Snapmaker/process/0.12 Fine @Snapmaker J1 (0.4 nozzle).json b/resources/profiles/Snapmaker/process/0.12 Fine @Snapmaker J1 (0.4 nozzle).json index be2dd48af..1ff762933 100644 --- a/resources/profiles/Snapmaker/process/0.12 Fine @Snapmaker J1 (0.4 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.12 Fine @Snapmaker J1 (0.4 nozzle).json @@ -14,7 +14,7 @@ "top_shell_layers": "5", "top_shell_thickness": "0.6", "bridge_flow": "1", - "support_threshold_angle": "30", + "support_threshold_angle": "20", "initial_layer_infill_speed": "80", "inner_wall_speed": "145", "internal_solid_infill_speed": "150" diff --git a/resources/profiles/Snapmaker/process/0.16 Optimal @Snapmaker (0.4 nozzle).json b/resources/profiles/Snapmaker/process/0.16 Optimal @Snapmaker (0.4 nozzle).json index e8b091eb7..119ae1e3e 100644 --- a/resources/profiles/Snapmaker/process/0.16 Optimal @Snapmaker (0.4 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.16 Optimal @Snapmaker (0.4 nozzle).json @@ -29,7 +29,7 @@ "bottom_shell_layers": "4", "top_shell_thickness": "0.6", "bridge_flow": "1", - "support_threshold_angle": "30", + "support_threshold_angle": "25", "initial_layer_infill_speed": "65", "outer_wall_speed": "80", "inner_wall_speed": "100", diff --git a/resources/profiles/Snapmaker/process/0.16 Optimal @Snapmaker Artisan (0.4 nozzle).json b/resources/profiles/Snapmaker/process/0.16 Optimal @Snapmaker Artisan (0.4 nozzle).json index ea9ab92b4..e2547e522 100644 --- a/resources/profiles/Snapmaker/process/0.16 Optimal @Snapmaker Artisan (0.4 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.16 Optimal @Snapmaker Artisan (0.4 nozzle).json @@ -14,7 +14,7 @@ "top_shell_layers": "5", "top_shell_thickness": "0.6", "bridge_flow": "1", - "support_threshold_angle": "30", + "support_threshold_angle": "25", "initial_layer_infill_speed": "80", "inner_wall_speed": "145" } \ No newline at end of file diff --git a/resources/profiles/Snapmaker/process/0.16 Optimal @Snapmaker J1 (0.4 nozzle).json b/resources/profiles/Snapmaker/process/0.16 Optimal @Snapmaker J1 (0.4 nozzle).json index d303e2e5d..77a170ef6 100644 --- a/resources/profiles/Snapmaker/process/0.16 Optimal @Snapmaker J1 (0.4 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.16 Optimal @Snapmaker J1 (0.4 nozzle).json @@ -14,7 +14,7 @@ "top_shell_layers": "5", "top_shell_thickness": "0.6", "bridge_flow": "1", - "support_threshold_angle": "30", + "support_threshold_angle": "25", "initial_layer_infill_speed": "80", "inner_wall_speed": "145" } \ No newline at end of file diff --git a/resources/profiles/Snapmaker/process/0.24 Draft @Snapmaker (0.4 nozzle).json b/resources/profiles/Snapmaker/process/0.24 Draft @Snapmaker (0.4 nozzle).json index 8f94f6c47..17089131e 100644 --- a/resources/profiles/Snapmaker/process/0.24 Draft @Snapmaker (0.4 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.24 Draft @Snapmaker (0.4 nozzle).json @@ -28,7 +28,7 @@ "top_surface_line_width": "0.45", "top_shell_layers": "3", "top_shell_thickness": "0.6", - "support_threshold_angle": "30", + "support_threshold_angle": "35", "initial_layer_infill_speed": "65", "outer_wall_speed": "90", "inner_wall_speed": "100", diff --git a/resources/profiles/Snapmaker/process/0.24 Draft @Snapmaker Artisan (0.4 nozzle).json b/resources/profiles/Snapmaker/process/0.24 Draft @Snapmaker Artisan (0.4 nozzle).json index c8486952a..43947ed42 100644 --- a/resources/profiles/Snapmaker/process/0.24 Draft @Snapmaker Artisan (0.4 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.24 Draft @Snapmaker Artisan (0.4 nozzle).json @@ -13,6 +13,6 @@ "top_surface_line_width": "0.45", "top_shell_layers": "3", "top_shell_thickness": "0.6", - "support_threshold_angle": "30", + "support_threshold_angle": "35", "initial_layer_infill_speed": "65" } \ No newline at end of file diff --git a/resources/profiles/Snapmaker/process/0.24 Draft @Snapmaker J1 (0.4 nozzle).json b/resources/profiles/Snapmaker/process/0.24 Draft @Snapmaker J1 (0.4 nozzle).json index 0fd04fa64..23877e116 100644 --- a/resources/profiles/Snapmaker/process/0.24 Draft @Snapmaker J1 (0.4 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.24 Draft @Snapmaker J1 (0.4 nozzle).json @@ -13,6 +13,6 @@ "top_surface_line_width": "0.45", "top_shell_layers": "3", "top_shell_thickness": "0.6", - "support_threshold_angle": "30", + "support_threshold_angle": "35", "initial_layer_infill_speed": "65" } \ No newline at end of file diff --git a/resources/profiles/Snapmaker/process/0.25 Benchy @Snapmaker Artisan (0.4 nozzle).json b/resources/profiles/Snapmaker/process/0.25 Benchy @Snapmaker Artisan (0.4 nozzle).json index ab306e914..6cb96ddab 100644 --- a/resources/profiles/Snapmaker/process/0.25 Benchy @Snapmaker Artisan (0.4 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.25 Benchy @Snapmaker Artisan (0.4 nozzle).json @@ -31,7 +31,7 @@ "ensure_vertical_shell_thickness": "none", "filename_format": "ArtisanBenchy_{print_time}.gcode", "sparse_infill_density": "10%", - "sparse_infill_pattern": "crosshatch", + "sparse_infill_pattern": "alignedrectilinear", "wall_generator": "classic", "seam_position": "nearest", "wall_loops": "2", diff --git a/resources/profiles/Snapmaker/process/0.25 Benchy @Snapmaker J1 (0.4 nozzle).json b/resources/profiles/Snapmaker/process/0.25 Benchy @Snapmaker J1 (0.4 nozzle).json index 3e8f9db16..da364c6b5 100644 --- a/resources/profiles/Snapmaker/process/0.25 Benchy @Snapmaker J1 (0.4 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.25 Benchy @Snapmaker J1 (0.4 nozzle).json @@ -30,7 +30,7 @@ "ensure_vertical_shell_thickness": "none", "filename_format": "J1Benchy_{print_time}.gcode", "sparse_infill_density": "10%", - "sparse_infill_pattern": "crosshatch", + "sparse_infill_pattern": "alignedrectilinear", "wall_generator": "classic", "seam_position": "nearest", "wall_loops": "2", diff --git a/resources/profiles/Snapmaker/process/0.28 Extra Draft @Snapmaker (0.4 nozzle).json b/resources/profiles/Snapmaker/process/0.28 Extra Draft @Snapmaker (0.4 nozzle).json index 8e9da23b2..1fa3b0654 100644 --- a/resources/profiles/Snapmaker/process/0.28 Extra Draft @Snapmaker (0.4 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.28 Extra Draft @Snapmaker (0.4 nozzle).json @@ -28,7 +28,7 @@ "top_surface_line_width": "0.45", "top_shell_layers": "3", "top_shell_thickness": "0.6", - "support_threshold_angle": "30", + "support_threshold_angle": "40", "wall_loops": "2", "initial_layer_infill_speed": "65", "outer_wall_speed": "85", diff --git a/resources/profiles/Snapmaker/process/0.28 Extra Draft @Snapmaker Artisan (0.4 nozzle).json b/resources/profiles/Snapmaker/process/0.28 Extra Draft @Snapmaker Artisan (0.4 nozzle).json index 10d275908..0780fd81b 100644 --- a/resources/profiles/Snapmaker/process/0.28 Extra Draft @Snapmaker Artisan (0.4 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.28 Extra Draft @Snapmaker Artisan (0.4 nozzle).json @@ -13,7 +13,7 @@ "top_surface_line_width": "0.45", "top_shell_layers": "3", "top_shell_thickness": "0.6", - "support_threshold_angle": "30", + "support_threshold_angle": "40", "wall_loops": "2", "initial_layer_infill_speed": "65" } \ No newline at end of file diff --git a/resources/profiles/Snapmaker/process/0.28 Extra Draft @Snapmaker J1 (0.4 nozzle).json b/resources/profiles/Snapmaker/process/0.28 Extra Draft @Snapmaker J1 (0.4 nozzle).json index 2060ea021..b18c01c85 100644 --- a/resources/profiles/Snapmaker/process/0.28 Extra Draft @Snapmaker J1 (0.4 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.28 Extra Draft @Snapmaker J1 (0.4 nozzle).json @@ -13,7 +13,7 @@ "top_surface_line_width": "0.45", "top_shell_layers": "3", "top_shell_thickness": "0.6", - "support_threshold_angle": "30", + "support_threshold_angle": "40", "wall_loops": "2", "initial_layer_infill_speed": "65" } \ No newline at end of file diff --git a/resources/profiles/Snapmaker/process/fdm_process_common.json b/resources/profiles/Snapmaker/process/fdm_process_common.json index e894e7f0d..f35f39ffb 100644 --- a/resources/profiles/Snapmaker/process/fdm_process_common.json +++ b/resources/profiles/Snapmaker/process/fdm_process_common.json @@ -56,14 +56,14 @@ "print_flow_ratio": "1", "wall_loops": "3", "detect_thin_wall": "0", - "top_surface_pattern": "monotonicline", + "top_surface_pattern": "monotonic", "top_shell_layers": "4", "top_shell_thickness": "0.8", "bottom_surface_pattern": "monotonic", "bottom_shell_layers": "3", "bottom_shell_thickness": "0", "sparse_infill_density": "15%", - "sparse_infill_pattern": "crosshatch", + "sparse_infill_pattern": "cubic", "filter_out_gap_fill": "0", "infill_wall_overlap": "15%", "infill_direction": "45",