diff --git a/resources/profiles/BBL.json b/resources/profiles/BBL.json index f8d734952..533da1819 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.01.00.16", + "version": "01.01.00.17", "force_update": "0", "description": "the initial version of BBL configurations", "machine_model_list": [ diff --git a/resources/profiles/BBL/filament/Generic PLA-CF.json b/resources/profiles/BBL/filament/Generic PLA-CF.json index 518fcba86..c1ae7e465 100644 --- a/resources/profiles/BBL/filament/Generic PLA-CF.json +++ b/resources/profiles/BBL/filament/Generic PLA-CF.json @@ -9,6 +9,9 @@ "filament_flow_ratio": [ "0.95" ], + "filament_type": [ + "PLA-CF" + ], "filament_max_volumetric_speed": [ "12" ], diff --git a/resources/profiles/BBL/filament/fdm_filament_pet.json b/resources/profiles/BBL/filament/fdm_filament_pet.json index 449046fd3..b7f725968 100644 --- a/resources/profiles/BBL/filament/fdm_filament_pet.json +++ b/resources/profiles/BBL/filament/fdm_filament_pet.json @@ -35,7 +35,7 @@ "25" ], "filament_type": [ - "PET" + "PETG" ], "filament_density": [ "1.27" diff --git a/src/libslic3r/Brim.cpp b/src/libslic3r/Brim.cpp index c130d4822..de6486869 100644 --- a/src/libslic3r/Brim.cpp +++ b/src/libslic3r/Brim.cpp @@ -641,7 +641,7 @@ double getadhesionCoeff(const PrintObject* printObject) for (auto iter = extrudersFirstLayer.begin(); iter != extrudersFirstLayer.end(); iter++) if (modelVolume->extruder_id() == *iter) { if (Model::extruderParamsMap.find(modelVolume->extruder_id()) != Model::extruderParamsMap.end()) - if (Model::extruderParamsMap.at(modelVolume->extruder_id()).materialName == "PET") { + if (Model::extruderParamsMap.at(modelVolume->extruder_id()).materialName == "PETG") { adhesionCoeff = 2; } else if (Model::extruderParamsMap.at(modelVolume->extruder_id()).materialName == "TPU") { diff --git a/src/libslic3r/Model.cpp b/src/libslic3r/Model.cpp index 34a97cf9c..349e8f513 100644 --- a/src/libslic3r/Model.cpp +++ b/src/libslic3r/Model.cpp @@ -2851,7 +2851,7 @@ double getadhesionCoeff(const ModelVolumePtrs objectVolumes) double adhesionCoeff = 1; for (const ModelVolume* modelVolume : objectVolumes) { if (Model::extruderParamsMap.find(modelVolume->extruder_id()) != Model::extruderParamsMap.end()) - if (Model::extruderParamsMap.at(modelVolume->extruder_id()).materialName == "PET") { + if (Model::extruderParamsMap.at(modelVolume->extruder_id()).materialName == "PETG") { adhesionCoeff = 2; } else if (Model::extruderParamsMap.at(modelVolume->extruder_id()).materialName == "TPU") { diff --git a/src/libslic3r/Print.cpp b/src/libslic3r/Print.cpp index f11989634..710c74b18 100644 --- a/src/libslic3r/Print.cpp +++ b/src/libslic3r/Print.cpp @@ -692,15 +692,15 @@ static StringObjectException layered_print_cleareance_valid(const Print &print, //BBS static std::map filament_is_high_temp { {"PLA", false}, - {"PET", true}, + {"PLA-CF", false}, + {"PETG", true}, {"ABS", true}, {"TPU", false}, {"PA", true}, {"PA-CF", true}, {"PET-CF", true}, {"PC", true}, - {"ASA", true}, - {"PVA", false} + {"ASA", true} }; //BBS: this function is used to check whether multi filament can be printed diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 6033d3fd0..39d5fbf13 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -955,11 +955,12 @@ void PrintConfigDef::init_fff_params() def->enum_values.push_back("PLA"); def->enum_values.push_back("ABS"); def->enum_values.push_back("ASA"); - def->enum_values.push_back("PET"); + def->enum_values.push_back("PETG"); def->enum_values.push_back("TPU"); def->enum_values.push_back("PC"); def->enum_values.push_back("PA"); def->enum_values.push_back("PA-CF"); + def->enum_values.push_back("PLA-CF"); def->enum_values.push_back("PET-CF"); def->enum_values.push_back("PVA"); def->mode = comSimple;