From 6e34ecd749141969a059d6296c64e53e114f266e Mon Sep 17 00:00:00 2001 From: "xun.zhang" Date: Wed, 7 Jun 2023 16:10:17 +0800 Subject: [PATCH] ENH:update PETG/PTEG-CF fan_threshold Change-Id: Iffdffd936f249dd763ab7ebad0b7622d1eb504af --- resources/profiles/BBL.json | 2 +- resources/profiles/BBL/filament/Bambu PETG Basic @base.json | 2 +- resources/profiles/BBL/filament/Bambu PETG-CF @base.json | 2 +- resources/profiles/BBL/filament/Generic PETG @base.json | 2 +- resources/profiles/BBL/filament/Generic PETG-CF @base.json | 2 +- src/libslic3r/PrintConfig.cpp | 6 ++++-- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/resources/profiles/BBL.json b/resources/profiles/BBL.json index 935760d95..5cb1b5542 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.06.00.09", + "version": "01.06.00.10", "force_update": "0", "description": "the initial version of BBL configurations", "machine_model_list": [ diff --git a/resources/profiles/BBL/filament/Bambu PETG Basic @base.json b/resources/profiles/BBL/filament/Bambu PETG Basic @base.json index 3bff7953b..4c0ccd83d 100644 --- a/resources/profiles/BBL/filament/Bambu PETG Basic @base.json +++ b/resources/profiles/BBL/filament/Bambu PETG Basic @base.json @@ -12,7 +12,7 @@ "90" ], "overhang_fan_threshold": [ - "25%" + "10%" ], "fan_max_speed": [ "40" diff --git a/resources/profiles/BBL/filament/Bambu PETG-CF @base.json b/resources/profiles/BBL/filament/Bambu PETG-CF @base.json index 8aae53d2f..f0627b0f0 100644 --- a/resources/profiles/BBL/filament/Bambu PETG-CF @base.json +++ b/resources/profiles/BBL/filament/Bambu PETG-CF @base.json @@ -12,7 +12,7 @@ "75" ], "overhang_fan_threshold": [ - "25%" + "10%" ], "overhang_fan_speed": [ "90" diff --git a/resources/profiles/BBL/filament/Generic PETG @base.json b/resources/profiles/BBL/filament/Generic PETG @base.json index 6873567e0..2308488ea 100644 --- a/resources/profiles/BBL/filament/Generic PETG @base.json +++ b/resources/profiles/BBL/filament/Generic PETG @base.json @@ -12,7 +12,7 @@ "90" ], "overhang_fan_threshold": [ - "25%" + "10%" ], "fan_max_speed": [ "90" diff --git a/resources/profiles/BBL/filament/Generic PETG-CF @base.json b/resources/profiles/BBL/filament/Generic PETG-CF @base.json index 3312cb204..c4c96b813 100644 --- a/resources/profiles/BBL/filament/Generic PETG-CF @base.json +++ b/resources/profiles/BBL/filament/Generic PETG-CF @base.json @@ -12,7 +12,7 @@ "75" ], "overhang_fan_threshold": [ - "25%" + "10%" ], "overhang_fan_speed": [ "90" diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 6b615647e..00f071e3a 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -264,7 +264,7 @@ CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(ForwardCompatibilitySubstitutionRule) static const t_config_enum_values s_keys_map_OverhangFanThreshold = { { "0%", Overhang_threshold_none }, - { "5%", Overhang_threshold_1_4 }, + { "10%", Overhang_threshold_1_4 }, { "25%", Overhang_threshold_2_4 }, { "50%", Overhang_threshold_3_4 }, { "75%", Overhang_threshold_4_4 }, @@ -655,7 +655,7 @@ void PrintConfigDef::init_fff_params() def->enum_keys_map = &ConfigOptionEnum::get_enum_values(); def->mode = comAdvanced; def->enum_values.emplace_back("0%"); - def->enum_values.emplace_back("5%"); + def->enum_values.emplace_back("10%"); def->enum_values.emplace_back("25%"); def->enum_values.emplace_back("50%"); def->enum_values.emplace_back("75%"); @@ -4021,6 +4021,8 @@ void PrintConfigDef::handle_legacy(t_config_option_key &opt_key, std::string &va ReplaceString(value, split_key, copy_key); } } + } else if (opt_key == "overhang_fan_threshold" && value == "5%") { + value = "10%"; } // Ignore the following obsolete configuration keys: