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

ENH: align the filament type with app/machine/RFID 

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I534e6b619efbb7fe6b813bf51640f46066f378c5
This commit is contained in:
salt.wei 2022-08-02 12:16:51 +08:00 committed by Lane.Wei
parent f56e9b4b21
commit 97ffa093c3
7 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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.01.00.16", "version": "01.01.00.17",
"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": [

3
resources/profiles/BBL/filament/Generic PLA-CF.json
View File

@ -9,6 +9,9 @@
"filament_flow_ratio": [ "filament_flow_ratio": [
"0.95" "0.95"
], ],
"filament_type": [
"PLA-CF"
],
"filament_max_volumetric_speed": [ "filament_max_volumetric_speed": [
"12" "12"
], ],

2
resources/profiles/BBL/filament/fdm_filament_pet.json
View File

@ -35,7 +35,7 @@
"25" "25"
], ],
"filament_type": [ "filament_type": [
"PET" "PETG"
], ],
"filament_density": [ "filament_density": [
"1.27" "1.27"

2
src/libslic3r/Brim.cpp
View File

@ -641,7 +641,7 @@ double getadhesionCoeff(const PrintObject* printObject)
for (auto iter = extrudersFirstLayer.begin(); iter != extrudersFirstLayer.end(); iter++) for (auto iter = extrudersFirstLayer.begin(); iter != extrudersFirstLayer.end(); iter++)
if (modelVolume->extruder_id() == *iter) { if (modelVolume->extruder_id() == *iter) {
if (Model::extruderParamsMap.find(modelVolume->extruder_id()) != Model::extruderParamsMap.end()) 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; adhesionCoeff = 2;
} }
else if (Model::extruderParamsMap.at(modelVolume->extruder_id()).materialName == "TPU") { else if (Model::extruderParamsMap.at(modelVolume->extruder_id()).materialName == "TPU") {

2
src/libslic3r/Model.cpp
View File

@ -2851,7 +2851,7 @@ double getadhesionCoeff(const ModelVolumePtrs objectVolumes)
double adhesionCoeff = 1; double adhesionCoeff = 1;
for (const ModelVolume* modelVolume : objectVolumes) { for (const ModelVolume* modelVolume : objectVolumes) {
if (Model::extruderParamsMap.find(modelVolume->extruder_id()) != Model::extruderParamsMap.end()) 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; adhesionCoeff = 2;
} }
else if (Model::extruderParamsMap.at(modelVolume->extruder_id()).materialName == "TPU") { else if (Model::extruderParamsMap.at(modelVolume->extruder_id()).materialName == "TPU") {

6
src/libslic3r/Print.cpp
View File

@ -692,15 +692,15 @@ static StringObjectException layered_print_cleareance_valid(const Print &print,
//BBS //BBS
static std::map<std::string, bool> filament_is_high_temp { static std::map<std::string, bool> filament_is_high_temp {
{"PLA", false}, {"PLA", false},
{"PET", true}, {"PLA-CF", false},
{"PETG", true},
{"ABS", true}, {"ABS", true},
{"TPU", false}, {"TPU", false},
{"PA", true}, {"PA", true},
{"PA-CF", true}, {"PA-CF", true},
{"PET-CF", true}, {"PET-CF", true},
{"PC", true}, {"PC", true},
{"ASA", true}, {"ASA", true}
{"PVA", false}
}; };
//BBS: this function is used to check whether multi filament can be printed //BBS: this function is used to check whether multi filament can be printed

3
src/libslic3r/PrintConfig.cpp
View File

@ -955,11 +955,12 @@ void PrintConfigDef::init_fff_params()
def->enum_values.push_back("PLA"); def->enum_values.push_back("PLA");
def->enum_values.push_back("ABS"); def->enum_values.push_back("ABS");
def->enum_values.push_back("ASA"); 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("TPU");
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("PLA-CF");
def->enum_values.push_back("PET-CF"); def->enum_values.push_back("PET-CF");
def->enum_values.push_back("PVA"); def->enum_values.push_back("PVA");
def->mode = comSimple; def->mode = comSimple;