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

ENH: add tpu-ams type 

Jira: none

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I98c1c8a1e214b2fcb6b51857e6da3716b7aa04f8
This commit is contained in:
qing.zhang 2024-07-15 14:15:39 +08:00 committed by Lane.Wei
parent bcde272546
commit 47139ad690
6 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libslic3r/Brim.cpp
View File

@ -593,8 +593,8 @@ double getadhesionCoeff(const PrintObject* printObject)
if (Model::extruderParamsMap.at(modelVolume->extruder_id()).materialName == "PETG" ||
Model::extruderParamsMap.at(modelVolume->extruder_id()).materialName == "PCTG") {
adhesionCoeff = 2;
}
else if (Model::extruderParamsMap.at(modelVolume->extruder_id()).materialName == "TPU") {
} else if (Model::extruderParamsMap.at(modelVolume->extruder_id()).materialName == "TPU" ||
Model::extruderParamsMap.at(modelVolume->extruder_id()).materialName == "TPU-AMS") {
adhesionCoeff = 0.5;
}
}

4
src/libslic3r/Model.cpp
View File

@ -3704,7 +3704,7 @@ double Model::getThermalLength(const ModelVolume* modelVolumePtr) {
if (Model::extruderParamsMap.at(aa).materialName == "PC") {
thermalLength = 40;
}
if (Model::extruderParamsMap.at(aa).materialName == "TPU") {
if (Model::extruderParamsMap.at(aa).materialName == "TPU" || Model::extruderParamsMap.at(aa).materialName == "TPU-AMS") {
thermalLength = 1000;
}
@ -3777,7 +3777,7 @@ double getadhesionCoeff(const ModelVolumePtrs objectVolumes)
Model::extruderParamsMap.at(modelVolume->extruder_id()).materialName == "PCTG") {
adhesionCoeff = 2;
}
else if (Model::extruderParamsMap.at(modelVolume->extruder_id()).materialName == "TPU") {
else if (Model::extruderParamsMap.at(modelVolume->extruder_id()).materialName == "TPU" || Model::extruderParamsMap.at(modelVolume->extruder_id()).materialName == "TPU-AMS") {
adhesionCoeff = 0.5;
}
}

1
src/libslic3r/PrintConfig.cpp
View File

@ -1533,6 +1533,7 @@ void PrintConfigDef::init_fff_params()
def->enum_values.push_back("PETG");
def->enum_values.push_back("PCTG");
def->enum_values.push_back("TPU");
def->enum_values.push_back("TPU-AMS");
def->enum_values.push_back("PC");
def->enum_values.push_back("PA");
def->enum_values.push_back("PA-CF");

1
src/slic3r/GUI/ConfigManipulation.cpp
View File

@ -148,6 +148,7 @@ void ConfigManipulation::check_chamber_temperature(DynamicPrintConfig* config)
{"PLA-CF",45},
{"PVA",45},
{"TPU",50},
{"TPU-AMS",50},
{"PETG",55},
{"PCTG",55},
{"PETG-CF",55}

2
src/slic3r/GUI/CreatePresetsDialog.cpp
View File

@ -42,7 +42,7 @@ static const std::vector<std::string> filament_vendors = {"Polymaker", "OVERTURE
static const std::vector<std::string> filament_types = {"PLA", "PLA+", "PLA Tough", "PETG", "ABS", "ASA", "FLEX", "HIPS", "PA", "PACF",
"NYLON", "PVA", "PC", "PCABS", "PCTG", "PCCF", "PP", "PEI", "PET", "PETG",
"PETGCF", "PTBA", "PTBA90A", "PEEK", "TPU93A", "TPU75D", "TPU", "TPU92A", "TPU98A", "Misc",
"PETGCF", "PTBA", "PTBA90A", "PEEK", "TPU93A", "TPU75D", "TPU","TPU-AMS", "TPU92A", "TPU98A", "Misc",
"TPE", "GLAZE", "Nylon", "CPE", "METAL", "ABST", "Carbon Fiber"};
static const std::vector<std::string> printer_vendors = {"Anycubic", "Artillery", "BIBO", "BIQU", "Creality ENDER", "Creality CR", "Creality SERMOON",

2
src/slic3r/GUI/calib_dlg.cpp
View File

@ -260,7 +260,7 @@ Temp_Calibration_Dlg::Temp_Calibration_Dlg(wxWindow* parent, wxWindowID id, Plat
SetSizer(v_sizer);
wxBoxSizer* choice_sizer = new wxBoxSizer(wxHORIZONTAL);
wxString m_rbFilamentTypeChoices[] = {"PLA", "ABS/ASA", "PETG", "PCTG", "TPU", "PA-CF", "PET-CF", _L("Custom")};
wxString m_rbFilamentTypeChoices[] = {"PLA", "ABS/ASA", "PETG", "PCTG", "TPU", "TPU-AMS", "PA-CF", "PET-CF", _L("Custom")};
int m_rbFilamentTypeNChoices = sizeof(m_rbFilamentTypeChoices) / sizeof(wxString);
m_rbFilamentType = new wxRadioBox(this, wxID_ANY, _L("Filament type"), wxDefaultPosition, wxDefaultSize, m_rbFilamentTypeNChoices, m_rbFilamentTypeChoices, 2, wxRA_SPECIFY_COLS);
m_rbFilamentType->SetSelection(0);