ENH:optimized filament unload process for ext pool
jira:[STUDIO-11359] Change-Id: I6cc09effa916c576766f25091f0b70efbf7327fd
This commit is contained in:
parent
6c6b4b5b41
commit
1c8c99a430
|
@ -796,17 +796,22 @@ bool MachineObject::is_extrusion_cali_finished()
|
||||||
|
|
||||||
void MachineObject::_parse_tray_now(std::string tray_now)
|
void MachineObject::_parse_tray_now(std::string tray_now)
|
||||||
{
|
{
|
||||||
m_tray_now = tray_now;
|
|
||||||
if (tray_now.empty()) {
|
if (tray_now.empty()) {
|
||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
try {
|
try {
|
||||||
int tray_now_int = atoi(tray_now.c_str());
|
int tray_now_int = atoi(tray_now.c_str());
|
||||||
|
|
||||||
if (tray_now_int == VIRTUAL_TRAY_MAIN_ID) {
|
if (tray_now_int == VIRTUAL_TRAY_MAIN_ID) {
|
||||||
m_ams_id = "0";
|
m_ams_id = "0";
|
||||||
m_tray_id = "0";
|
m_tray_id = "0";
|
||||||
m_extder_data.extders[MAIN_NOZZLE_ID].snow.ams_id = "";
|
m_extder_data.extders[MAIN_NOZZLE_ID].snow.ams_id = "";
|
||||||
m_extder_data.extders[MAIN_NOZZLE_ID].snow.slot_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) {
|
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);
|
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(...) {
|
catch(...) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
m_tray_now = tray_now;
|
||||||
}
|
}
|
||||||
|
|
||||||
Ams *MachineObject::get_curr_Ams()
|
Ams *MachineObject::get_curr_Ams()
|
||||||
|
|
Loading…
Reference in New Issue