From a713573544236b81bdc8865ef1d786ee9a462cf4 Mon Sep 17 00:00:00 2001 From: "salt.wei" Date: Wed, 27 Jul 2022 18:19:11 +0800 Subject: [PATCH] ENH: add extruder offset for X1 and X1 carbon The extruder offset of X1 and X1C is (0,2). All generated gcode should minus this value. Also change the min speed of cooling buffer for better cooling for small area(from pineapple) Signed-off-by: salt.wei Change-Id: I06e58a26f8736ae24fa9da02477a9d19114daeca --- resources/profiles/BBL.json | 2 +- resources/profiles/BBL/filament/Bambu PLA Basic @base.json | 2 +- resources/profiles/BBL/filament/Bambu PLA Matte @base.json | 2 +- resources/profiles/BBL/filament/Generic PETG.json | 2 +- resources/profiles/BBL/filament/Generic PLA.json | 2 +- resources/profiles/BBL/filament/PolyTerra PLA @base.json | 2 +- resources/profiles/BBL/filament/fdm_filament_pla.json | 2 +- resources/profiles/BBL/machine/Bambu Lab X1 0.4 nozzle.json | 3 +++ .../BBL/machine/Bambu Lab X1 Carbon 0.4 nozzle.json | 3 +++ src/slic3r/GUI/Tab.cpp | 6 ++---- 10 files changed, 15 insertions(+), 11 deletions(-) diff --git a/resources/profiles/BBL.json b/resources/profiles/BBL.json index 736e4c08f..7d9eb5a7e 100644 --- a/resources/profiles/BBL.json +++ b/resources/profiles/BBL.json @@ -1,7 +1,7 @@ { "name": "Bambulab", "url": "http://www.bambulab.com/Parameters/vendor/BBL.json", - "version": "01.01.00.13", + "version": "01.01.00.14", "force_update": "0", "description": "the initial version of BBL configurations", "machine_model_list": [ diff --git a/resources/profiles/BBL/filament/Bambu PLA Basic @base.json b/resources/profiles/BBL/filament/Bambu PLA Basic @base.json index 9bb4ae56e..d450ad432 100644 --- a/resources/profiles/BBL/filament/Bambu PLA Basic @base.json +++ b/resources/profiles/BBL/filament/Bambu PLA Basic @base.json @@ -12,7 +12,7 @@ "25.4" ], "filament_flow_ratio": [ - "0.96" + "0.98" ], "filament_density": [ "1.26" diff --git a/resources/profiles/BBL/filament/Bambu PLA Matte @base.json b/resources/profiles/BBL/filament/Bambu PLA Matte @base.json index f49165d16..b6001992d 100644 --- a/resources/profiles/BBL/filament/Bambu PLA Matte @base.json +++ b/resources/profiles/BBL/filament/Bambu PLA Matte @base.json @@ -15,6 +15,6 @@ "1.32" ], "filament_flow_ratio": [ - "0.95" + "0.98" ] } diff --git a/resources/profiles/BBL/filament/Generic PETG.json b/resources/profiles/BBL/filament/Generic PETG.json index 576fe15b0..6bc8c2025 100644 --- a/resources/profiles/BBL/filament/Generic PETG.json +++ b/resources/profiles/BBL/filament/Generic PETG.json @@ -28,7 +28,7 @@ "40" ], "slow_down_min_speed": [ - "40" + "20" ], "slow_down_layer_time": [ "8" diff --git a/resources/profiles/BBL/filament/Generic PLA.json b/resources/profiles/BBL/filament/Generic PLA.json index f416abbe7..cf52396cf 100644 --- a/resources/profiles/BBL/filament/Generic PLA.json +++ b/resources/profiles/BBL/filament/Generic PLA.json @@ -7,7 +7,7 @@ "instantiation": "true", "inherits": "fdm_filament_pla", "filament_flow_ratio": [ - "0.95" + "0.98" ], "filament_max_volumetric_speed": [ "12" diff --git a/resources/profiles/BBL/filament/PolyTerra PLA @base.json b/resources/profiles/BBL/filament/PolyTerra PLA @base.json index 96b5f1672..40e3785d0 100644 --- a/resources/profiles/BBL/filament/PolyTerra PLA @base.json +++ b/resources/profiles/BBL/filament/PolyTerra PLA @base.json @@ -15,6 +15,6 @@ "1.24" ], "filament_flow_ratio": [ - "0.95" + "0.98" ] } diff --git a/resources/profiles/BBL/filament/fdm_filament_pla.json b/resources/profiles/BBL/filament/fdm_filament_pla.json index 388268d37..a3b8a8f88 100644 --- a/resources/profiles/BBL/filament/fdm_filament_pla.json +++ b/resources/profiles/BBL/filament/fdm_filament_pla.json @@ -74,7 +74,7 @@ "230" ], "slow_down_min_speed": [ - "50" + "20" ], "slow_down_layer_time": [ "4" diff --git a/resources/profiles/BBL/machine/Bambu Lab X1 0.4 nozzle.json b/resources/profiles/BBL/machine/Bambu Lab X1 0.4 nozzle.json index b82ede4af..ea7a12b48 100644 --- a/resources/profiles/BBL/machine/Bambu Lab X1 0.4 nozzle.json +++ b/resources/profiles/BBL/machine/Bambu Lab X1 0.4 nozzle.json @@ -13,6 +13,9 @@ "nozzle_diameter": [ "0.4" ], + "extruder_offset": [ + "0x2" + ], "bed_exclude_area": [ "0x0", "18x0", diff --git a/resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.4 nozzle.json b/resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.4 nozzle.json index 12540a441..ce65957dd 100644 --- a/resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.4 nozzle.json +++ b/resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.4 nozzle.json @@ -13,6 +13,9 @@ "nozzle_diameter": [ "0.4" ], + "extruder_offset": [ + "0x2" + ], "bed_exclude_area": [ "0x0", "18x0", diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index 6fd2a3fa0..638c7f18d 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -3173,10 +3173,8 @@ void TabPrinter::build_unregular_pages(bool from_initial_build/* = false*/) optgroup->append_single_option_line("min_layer_height", "", extruder_idx); optgroup->append_single_option_line("max_layer_height", "", extruder_idx); -#if 0 - //optgroup = page->new_optgroup(L("Position (for multi-extruder printers)"), -1, true); - //optgroup->append_single_option_line("extruder_offset", "", extruder_idx); -#endif + optgroup = page->new_optgroup(L("Position"), -1, true); + optgroup->append_single_option_line("extruder_offset", "", extruder_idx); //BBS: don't show retract related config menu in machine page optgroup = page->new_optgroup(L("Retraction"));