From 47139ad690a3a3c1360af6d83df1900cb34fbdce Mon Sep 17 00:00:00 2001 From: "qing.zhang" Date: Mon, 15 Jul 2024 14:15:39 +0800 Subject: [PATCH] ENH: add tpu-ams type Jira: none Signed-off-by: qing.zhang Change-Id: I98c1c8a1e214b2fcb6b51857e6da3716b7aa04f8 --- src/libslic3r/Brim.cpp | 4 ++-- src/libslic3r/Model.cpp | 4 ++-- src/libslic3r/PrintConfig.cpp | 1 + src/slic3r/GUI/ConfigManipulation.cpp | 1 + src/slic3r/GUI/CreatePresetsDialog.cpp | 2 +- src/slic3r/GUI/calib_dlg.cpp | 2 +- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/libslic3r/Brim.cpp b/src/libslic3r/Brim.cpp index 47f0e42fe..c0f8d958c 100644 --- a/src/libslic3r/Brim.cpp +++ b/src/libslic3r/Brim.cpp @@ -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; } } diff --git a/src/libslic3r/Model.cpp b/src/libslic3r/Model.cpp index 562c47247..a1bf6bad1 100644 --- a/src/libslic3r/Model.cpp +++ b/src/libslic3r/Model.cpp @@ -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; } } diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index f8f528abb..4714c582f 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -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"); diff --git a/src/slic3r/GUI/ConfigManipulation.cpp b/src/slic3r/GUI/ConfigManipulation.cpp index 84e91d176..2e71ef8bd 100644 --- a/src/slic3r/GUI/ConfigManipulation.cpp +++ b/src/slic3r/GUI/ConfigManipulation.cpp @@ -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} diff --git a/src/slic3r/GUI/CreatePresetsDialog.cpp b/src/slic3r/GUI/CreatePresetsDialog.cpp index 4124be25b..f92ef7efe 100644 --- a/src/slic3r/GUI/CreatePresetsDialog.cpp +++ b/src/slic3r/GUI/CreatePresetsDialog.cpp @@ -42,7 +42,7 @@ static const std::vector filament_vendors = {"Polymaker", "OVERTURE static const std::vector 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 printer_vendors = {"Anycubic", "Artillery", "BIBO", "BIQU", "Creality ENDER", "Creality CR", "Creality SERMOON", diff --git a/src/slic3r/GUI/calib_dlg.cpp b/src/slic3r/GUI/calib_dlg.cpp index 48e76676f..bf0297cf2 100644 --- a/src/slic3r/GUI/calib_dlg.cpp +++ b/src/slic3r/GUI/calib_dlg.cpp @@ -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);