mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ENH: add new filament type PA-GF 

1.Set Bambu PA6-GF type to PA-GF

jira:[NEW]

Signed-off-by: XunZhangBambu <xun.zhang@bambulab.com>
Change-Id: I79b4896ed9901e8525fd770f4a37713729b7e420
This commit is contained in:
XunZhangBambu 2024-02-21 17:12:48 +08:00 committed by Lane.Wei
parent 698e1ae63c
commit 53a4de5674
5 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
resources/info/filament_info.json
View File

@ -6,6 +6,7 @@
"PC", "PC",
"PA", "PA",
"PA-CF", "PA-CF",
"PA-GF",
"PA6-CF", "PA6-CF",
"PET-CF", "PET-CF",
"PPS", "PPS",

2
resources/profiles/BBL.json
View File

@ -1,7 +1,7 @@
{ {
"name": "Bambulab", "name": "Bambulab",
"url": "http://www.bambulab.com/Parameters/vendor/BBL.json", "url": "http://www.bambulab.com/Parameters/vendor/BBL.json",
"version": "01.08.00.23", "version": "01.08.00.24",
"force_update": "0", "force_update": "0",
"description": "the initial version of BBL configurations", "description": "the initial version of BBL configurations",
"machine_model_list": [ "machine_model_list": [

2
resources/profiles/BBL/filament/Bambu PA6-GF @base.json
View File

@ -24,7 +24,7 @@
"0.96" "0.96"
], ],
"filament_type": [ "filament_type": [
"PA-CF" "PA-GF"
], ],
"filament_vendor": [ "filament_vendor": [
"Bambu Lab" "Bambu Lab"

4
src/libslic3r/Print.cpp
View File

@ -2182,7 +2182,7 @@ FilamentTempType Print::get_filament_temp_type(const std::string& filament_type)
try{ try{
j = json::parse(in); j = json::parse(in);
in.close(); in.close();
auto&&high_temp_filament_arr =j[HighTempFilamentStr].get < std::vector<std::string>>(); auto&& high_temp_filament_arr =j[HighTempFilamentStr].get < std::vector<std::string>>();
filament_temp_type_map[HighTempFilamentStr] = std::unordered_set<std::string>(high_temp_filament_arr.begin(), high_temp_filament_arr.end()); filament_temp_type_map[HighTempFilamentStr] = std::unordered_set<std::string>(high_temp_filament_arr.begin(), high_temp_filament_arr.end());
auto&& low_temp_filament_arr = j[LowTempFilamentStr].get < std::vector<std::string>>(); auto&& low_temp_filament_arr = j[LowTempFilamentStr].get < std::vector<std::string>>();
filament_temp_type_map[LowTempFilamentStr] = std::unordered_set<std::string>(low_temp_filament_arr.begin(), low_temp_filament_arr.end()); filament_temp_type_map[LowTempFilamentStr] = std::unordered_set<std::string>(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){ catch (const json::parse_error& err){
in.close(); in.close();
BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ": parse " << file_path.string() << " got a nlohmann::detail::parse_error, reason = " << err.what(); 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[LowTempFilamentStr] = {"PLA","TPU","PLA-CF","PLA-AERO","PVA"};
filament_temp_type_map[HighLowCompatibleFilamentStr] = { "HIPS","PETG" }; filament_temp_type_map[HighLowCompatibleFilamentStr] = { "HIPS","PETG" };
} }

2
src/libslic3r/PrintConfig.cpp
View File

@ -1434,6 +1434,8 @@ void PrintConfigDef::init_fff_params()
def->enum_values.push_back("PC"); def->enum_values.push_back("PC");
def->enum_values.push_back("PA"); def->enum_values.push_back("PA");
def->enum_values.push_back("PA-CF"); 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("PLA-CF");
def->enum_values.push_back("PET-CF"); def->enum_values.push_back("PET-CF");
def->enum_values.push_back("PETG-CF"); def->enum_values.push_back("PETG-CF");