mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-07 06:57:36 -06:00
parent
37653324fa
commit
a16b8e4963
2 changed files with 2 additions and 1 deletions
|
@ -2520,7 +2520,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","PA-GF","PA6-CF","PET-CF","PPS","PPS-CF","PPA-GF","PPA-CF","ABS-Aero","ABS-GF"};
|
filament_temp_type_map[HighTempFilamentStr] = {"ABS","ASA","PC","PA","PA-CF","PA-GF","PA6-CF","PET-CF", "PETG-GF","PPS","PPS-CF","PPA-GF","PPA-CF","ABS-Aero","ABS-GF"};
|
||||||
filament_temp_type_map[LowTempFilamentStr] = {"PLA","TPU","PLA-CF","PLA-AERO","PVA","BVOH","SBS"};
|
filament_temp_type_map[LowTempFilamentStr] = {"PLA","TPU","PLA-CF","PLA-AERO","PVA","BVOH","SBS"};
|
||||||
filament_temp_type_map[HighLowCompatibleFilamentStr] = { "HIPS","PETG","PCTG","PE","PP","EVA","PE-CF","PP-CF","PP-GF","PHA"};
|
filament_temp_type_map[HighLowCompatibleFilamentStr] = { "HIPS","PETG","PCTG","PE","PP","EVA","PE-CF","PP-CF","PP-GF","PHA"};
|
||||||
}
|
}
|
||||||
|
|
|
@ -2235,6 +2235,7 @@ void PrintConfigDef::init_fff_params()
|
||||||
def->enum_values.push_back("PETG");
|
def->enum_values.push_back("PETG");
|
||||||
def->enum_values.push_back("PETG-CF");
|
def->enum_values.push_back("PETG-CF");
|
||||||
def->enum_values.push_back("PETG-CF10");
|
def->enum_values.push_back("PETG-CF10");
|
||||||
|
def->enum_values.push_back("PETG-GF");
|
||||||
def->enum_values.push_back("PHA");
|
def->enum_values.push_back("PHA");
|
||||||
def->enum_values.push_back("PLA");
|
def->enum_values.push_back("PLA");
|
||||||
def->enum_values.push_back("PLA-AERO");
|
def->enum_values.push_back("PLA-AERO");
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue