From 1c8c99a430b987a74a7aa666bc27767e51476029 Mon Sep 17 00:00:00 2001 From: tao wang Date: Thu, 10 Apr 2025 11:16:05 +0800 Subject: [PATCH] ENH:optimized filament unload process for ext pool jira:[STUDIO-11359] Change-Id: I6cc09effa916c576766f25091f0b70efbf7327fd --- src/slic3r/GUI/DeviceManager.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp index 85f70a1e2..b988c3e98 100644 --- a/src/slic3r/GUI/DeviceManager.cpp +++ b/src/slic3r/GUI/DeviceManager.cpp @@ -796,17 +796,22 @@ bool MachineObject::is_extrusion_cali_finished() void MachineObject::_parse_tray_now(std::string tray_now) { - m_tray_now = tray_now; if (tray_now.empty()) { return; } else { try { int tray_now_int = atoi(tray_now.c_str()); + if (tray_now_int == VIRTUAL_TRAY_MAIN_ID) { m_ams_id = "0"; m_tray_id = "0"; m_extder_data.extders[MAIN_NOZZLE_ID].snow.ams_id = ""; m_extder_data.extders[MAIN_NOZZLE_ID].snow.slot_id = ""; + + if (m_tray_now == std::to_string(VIRTUAL_TRAY_DEPUTY_ID)) { + m_extder_data.extders[MAIN_NOZZLE_ID].snow.ams_id = std::to_string(VIRTUAL_TRAY_MAIN_ID); + m_extder_data.extders[MAIN_NOZZLE_ID].snow.slot_id = "0"; + } } else if (tray_now_int == VIRTUAL_TRAY_DEPUTY_ID) { m_extder_data.extders[MAIN_NOZZLE_ID].snow.ams_id = std::to_string(VIRTUAL_TRAY_MAIN_ID); @@ -827,6 +832,8 @@ void MachineObject::_parse_tray_now(std::string tray_now) catch(...) { } } + + m_tray_now = tray_now; } Ams *MachineObject::get_curr_Ams()