diff --git a/resources/info/filament_info.json b/resources/info/filament_info.json index e35756cb0..1f11536da 100644 --- a/resources/info/filament_info.json +++ b/resources/info/filament_info.json @@ -15,7 +15,7 @@ "PPA-CF", "PPA-GF", "ABS-GF", - "ASA-Aero" + "ASA-AERO" ], "low_temp_filament": [ "PLA", diff --git a/resources/profiles/BBL.json b/resources/profiles/BBL.json index f10d76c11..7ac16de47 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": "02.00.00.42", + "version": "02.00.00.43", "force_update": "0", "description": "the initial version of BBL configurations", "machine_model_list": [ diff --git a/resources/profiles/BBL/filament/Bambu ASA-Aero @base.json b/resources/profiles/BBL/filament/Bambu ASA-Aero @base.json index 4cfe7de30..d09d4cb92 100644 --- a/resources/profiles/BBL/filament/Bambu ASA-Aero @base.json +++ b/resources/profiles/BBL/filament/Bambu ASA-Aero @base.json @@ -31,7 +31,7 @@ "1.5" ], "filament_type": [ - "ASA-Aero" + "ASA-AERO" ], "filament_vendor": [ "Bambu Lab" diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index c3b0d5d85..4136ab0fa 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -1838,7 +1838,7 @@ void PrintConfigDef::init_fff_params() def->enum_values.push_back("PPA-CF"); def->enum_values.push_back("PPA-GF"); def->enum_values.push_back("ABS-GF"); - def->enum_values.push_back("ASA-Aero"); + def->enum_values.push_back("ASA-AERO"); def->enum_values.push_back("PE"); def->enum_values.push_back("PP"); def->enum_values.push_back("EVA"); @@ -5469,6 +5469,29 @@ void PrintConfigDef::handle_legacy(t_config_option_key &opt_key, std::string &va } else if (opt_key == "filament_map_mode") { if (value == "Auto") value = "Auto For Flush"; } + else if (opt_key == "filament_type"){ + std::vector type_list; + std::stringstream ss(value); + std::string token; + bool rebuild_value = false; + while (std::getline(ss, token, ';')) { + if (token.size() >= 2 && token.front() == '"' && token.back() == '"') + token = token.substr(1, token.size() - 2); + if (token == "ASA-Aero") { + token = "ASA-AERO"; + rebuild_value = true; + } + type_list.emplace_back(token); + } + if (rebuild_value) { + value.clear(); + for (size_t idx = 0; idx < type_list.size(); ++idx) { + if (idx != 0) + value += ';'; + value += "\"" + type_list[idx] + "\""; + } + } + } // Ignore the following obsolete configuration keys: static std::set ignore = {