From 53a4de5674d9ef50c2ba0123ce56efbc18cbf14c Mon Sep 17 00:00:00 2001 From: XunZhangBambu Date: Wed, 21 Feb 2024 17:12:48 +0800 Subject: [PATCH] ENH: add new filament type PA-GF 1.Set Bambu PA6-GF type to PA-GF jira:[NEW] Signed-off-by: XunZhangBambu Change-Id: I79b4896ed9901e8525fd770f4a37713729b7e420 --- resources/info/filament_info.json | 1 + resources/profiles/BBL.json | 2 +- resources/profiles/BBL/filament/Bambu PA6-GF @base.json | 2 +- src/libslic3r/Print.cpp | 4 ++-- src/libslic3r/PrintConfig.cpp | 2 ++ 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/resources/info/filament_info.json b/resources/info/filament_info.json index 673e1a89a..1179a2f41 100644 --- a/resources/info/filament_info.json +++ b/resources/info/filament_info.json @@ -6,6 +6,7 @@ "PC", "PA", "PA-CF", + "PA-GF", "PA6-CF", "PET-CF", "PPS", diff --git a/resources/profiles/BBL.json b/resources/profiles/BBL.json index c7ce1c6fb..f98aba58c 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.08.00.23", + "version": "01.08.00.24", "force_update": "0", "description": "the initial version of BBL configurations", "machine_model_list": [ diff --git a/resources/profiles/BBL/filament/Bambu PA6-GF @base.json b/resources/profiles/BBL/filament/Bambu PA6-GF @base.json index 4922e82c3..24a6fa15b 100644 --- a/resources/profiles/BBL/filament/Bambu PA6-GF @base.json +++ b/resources/profiles/BBL/filament/Bambu PA6-GF @base.json @@ -24,7 +24,7 @@ "0.96" ], "filament_type": [ - "PA-CF" + "PA-GF" ], "filament_vendor": [ "Bambu Lab" diff --git a/src/libslic3r/Print.cpp b/src/libslic3r/Print.cpp index 83840abc5..5c9ee959d 100644 --- a/src/libslic3r/Print.cpp +++ b/src/libslic3r/Print.cpp @@ -2182,7 +2182,7 @@ FilamentTempType Print::get_filament_temp_type(const std::string& filament_type) try{ j = json::parse(in); in.close(); - auto&&high_temp_filament_arr =j[HighTempFilamentStr].get < std::vector>(); + auto&& high_temp_filament_arr =j[HighTempFilamentStr].get < std::vector>(); filament_temp_type_map[HighTempFilamentStr] = std::unordered_set(high_temp_filament_arr.begin(), high_temp_filament_arr.end()); auto&& low_temp_filament_arr = j[LowTempFilamentStr].get < std::vector>(); filament_temp_type_map[LowTempFilamentStr] = std::unordered_set(low_temp_filament_arr.begin(), low_temp_filament_arr.end()); @@ -2192,7 +2192,7 @@ FilamentTempType Print::get_filament_temp_type(const std::string& filament_type) catch (const json::parse_error& err){ in.close(); BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ": parse " << file_path.string() << " got a nlohmann::detail::parse_error, reason = " << err.what(); - filament_temp_type_map[HighTempFilamentStr] = {"ABS","ASA","PC","PA","PA-CF","PA6-CF","PET-CF","PPS","PPS-CF","PPA-GF","PPA-CF"}; + filament_temp_type_map[HighTempFilamentStr] = {"ABS","ASA","PC","PA","PA-CF","PA-GF","PA6-CF","PET-CF","PPS","PPS-CF","PPA-GF","PPA-CF"}; filament_temp_type_map[LowTempFilamentStr] = {"PLA","TPU","PLA-CF","PLA-AERO","PVA"}; filament_temp_type_map[HighLowCompatibleFilamentStr] = { "HIPS","PETG" }; } diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 99d53a1ee..216491660 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -1434,6 +1434,8 @@ void PrintConfigDef::init_fff_params() def->enum_values.push_back("PC"); def->enum_values.push_back("PA"); def->enum_values.push_back("PA-CF"); + def->enum_values.push_back("PA-GF"); + def->enum_values.push_back("PA6-CF"); def->enum_values.push_back("PLA-CF"); def->enum_values.push_back("PET-CF"); def->enum_values.push_back("PETG-CF");