diff --git a/resources/printers/filaments_blacklist.json b/resources/printers/filaments_blacklist.json index 14f8f94af1..29c131e259 100644 --- a/resources/printers/filaments_blacklist.json +++ b/resources/printers/filaments_blacklist.json @@ -8,6 +8,16 @@ "slot": "ams", "description": "TPU is not supported by AMS." }, + { + "type": "TPU", + "action": "warning", + "description": "Please cold pull before printing TPU to avoid clogging. You may use cold pull maintenance on the printer." + }, + { + "type": "TPU-AMS", + "action": "warning", + "description": "Please cold pull before printing TPU to avoid clogging. You may use cold pull maintenance on the printer." + }, { "type": "PVA", "action": "warning", diff --git a/src/slic3r/GUI/DeviceCore/DevFilaBlackList.cpp b/src/slic3r/GUI/DeviceCore/DevFilaBlackList.cpp index 74c73be032..41b4a11097 100644 --- a/src/slic3r/GUI/DeviceCore/DevFilaBlackList.cpp +++ b/src/slic3r/GUI/DeviceCore/DevFilaBlackList.cpp @@ -171,6 +171,7 @@ void check_filaments(std::string model_id, // Using in description L("TPU is not supported by AMS."); + L("Please cold pull before printing TPU to avoid clogging. You may use cold pull maintenance on the printer."); L("Damp PVA will become flexible and get stuck inside AMS, please take care to dry it before use."); L("Damp PVA is flexible and may get stuck in extruder. Dry it before use."); L("The rough surface of PLA Glow can accelerate wear on the AMS system, particularly on the internal components of the AMS Lite."); diff --git a/src/slic3r/GUI/PrePrintChecker.cpp b/src/slic3r/GUI/PrePrintChecker.cpp index 1b041bc1f9..83d558f896 100644 --- a/src/slic3r/GUI/PrePrintChecker.cpp +++ b/src/slic3r/GUI/PrePrintChecker.cpp @@ -47,7 +47,6 @@ std::string PrePrintChecker::get_print_status_info(PrintDialogStatus status) case PrintStatusTimelapseWarning: return "PrintStatusTimelapseWarning"; case PrintStatusMixAmsAndVtSlotWarning: return "PrintStatusMixAmsAndVtSlotWarning"; case PrintStatusWarningKvalueNotUsed: return "PrintStatusWarningKvalueNotUsed"; - case PrintStatusWarningTpuRightColdPulling: return "PrintStatusWarningTpuRightColdPulling"; case PrintStatusHasFilamentInBlackListWarning: return "PrintStatusHasFilamentInBlackListWarning"; case PrintStatusFilamentWarningHighChamberTemp: return "PrintStatusFilamentWarningHighChamberTemp"; case PrintStatusFilamentWarningHighChamberTempCloseDoor: return "PrintStatusFilamentWarningHighChamberTempCloseDoor"; @@ -90,7 +89,6 @@ wxString PrePrintChecker::get_pre_state_msg(PrintDialogStatus status) case PrintStatusTPUUnsupportAutoCali: return _L("TPU 90A/TPU 85A is too soft and does not support automatic Flow Dynamics calibration."); case PrintStatusWarningKvalueNotUsed: return _L("Set dynamic flow calibration to 'OFF' to enable custom dynamic flow value."); case PrintStatusNotSupportedPrintAll: return _L("This printer does not support printing all plates"); - case PrintStatusWarningTpuRightColdPulling: return _L("Please cold pull before printing TPU to avoid clogging. You may use cold pull maintenance on the printer."); } return wxEmptyString; } diff --git a/src/slic3r/GUI/PrePrintChecker.hpp b/src/slic3r/GUI/PrePrintChecker.hpp index adb54dd3fc..2683cc1872 100644 --- a/src/slic3r/GUI/PrePrintChecker.hpp +++ b/src/slic3r/GUI/PrePrintChecker.hpp @@ -94,7 +94,6 @@ enum PrintDialogStatus : unsigned int { // Warnings for filament PrintStatusFilamentWarningBegin, PrintStatusWarningKvalueNotUsed, - PrintStatusWarningTpuRightColdPulling, PrintStatusHasFilamentInBlackListWarning, PrintStatusFilamentWarningHighChamberTemp, PrintStatusFilamentWarningHighChamberTempCloseDoor, diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index ee214516b7..031f3ec8cc 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -1695,9 +1695,6 @@ void SelectMachineDialog::show_status(PrintDialogStatus status, std::vectorGetExtderSystem()->GetTotalExtderCount() == 2) { - for (const FilamentInfo& item : m_ams_mapping_result) { - if (item.ams_id.empty()) continue; - if (item.type.compare("TPU") != 0 && item.type.compare("TPU-AMS") != 0) { continue; } - - int extruder_id = obj_->get_extruder_id_by_ams_id(item.ams_id); - if (extruder_id == MAIN_EXTRUDER_ID) { - show_status(PrintDialogStatus::PrintStatusWarningTpuRightColdPulling); - break; - } - } - } - /*Check high temperture slicing*/ if (m_print_type == PrintFromType::FROM_NORMAL) { std::set high_temp_filaments;