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

NEW: add more filament types 

jira:[NEW]

Signed-off-by: XunZhangBambu <xun.zhang@bambulab.com>
Change-Id: Icbc27cf423ed7ab373107aa711430d6321105def
This commit is contained in:
XunZhangBambu 2024-02-29 17:22:20 +08:00 committed by Lane.Wei
parent dfcabdb39f
commit ad57d0845b
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
resources/info/filament_info.json
View File

@ -1,5 +1,5 @@
{ {
"version": "1.0.0.1", "version": "1.0.0.2",
"high_temp_filament": [ "high_temp_filament": [
"ABS", "ABS",
"ASA", "ASA",
@ -19,10 +19,18 @@
"TPU", "TPU",
"PLA-CF", "PLA-CF",
"PLA-AERO", "PLA-AERO",
"PVA" "PVA",
"BVOH"
], ],
"high_low_compatible_filament":[ "high_low_compatible_filament":[
"HIPS", "HIPS",
"PETG" "PETG",
"PE",
"PP",
"EVA",
"PE-CF",
"PP-CF",
"PP-GF",
"PHA"
] ]
} }

4
src/libslic3r/Print.cpp
View File

@ -2195,8 +2195,8 @@ FilamentTempType Print::get_filament_temp_type(const std::string& filament_type)
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","PA-GF","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","BVOH"};
filament_temp_type_map[HighLowCompatibleFilamentStr] = { "HIPS","PETG" }; filament_temp_type_map[HighLowCompatibleFilamentStr] = { "HIPS","PETG","PE","PP","EVA","PE-CF","PP-CF","PP-GF","PHA"};
} }
} }

9
src/libslic3r/PrintConfig.cpp
View File

@ -1467,6 +1467,15 @@ void PrintConfigDef::init_fff_params()
def->enum_values.push_back("PPS-CF"); def->enum_values.push_back("PPS-CF");
def->enum_values.push_back("PPA-CF"); def->enum_values.push_back("PPA-CF");
def->enum_values.push_back("PPA-GF"); def->enum_values.push_back("PPA-GF");
def->enum_values.push_back("PE");
def->enum_values.push_back("PP");
def->enum_values.push_back("EVA");
def->enum_values.push_back("PHA");
def->enum_values.push_back("BVOH");
def->enum_values.push_back("PE-CF");
def->enum_values.push_back("PP-CF");
def->enum_values.push_back("PP-GF");
def->mode = comSimple; def->mode = comSimple;
def->set_default_value(new ConfigOptionStrings { "PLA" }); def->set_default_value(new ConfigOptionStrings { "PLA" });