mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-16 18:12:10 +00:00
FIX: support external filament with multi-printer
Jira: [STUDIO-13091] Change-Id: I1f4cb255520f7216c67fc94466e9aa95d88240bd (cherry picked from commit 79ce3efc76f29df088f8cb4645aefc82fbf53036)
This commit is contained in:
@@ -513,8 +513,39 @@ BBL::PrintParams SendMultiMachinePage::request_params(MachineObject* obj)
|
||||
params.ams_mapping_info = mapping_info;
|
||||
}
|
||||
else {
|
||||
params.ams_mapping = "";
|
||||
params.ams_mapping_info = "";
|
||||
std::string temp;
|
||||
std::string ams_array;
|
||||
std::string ams_array2;
|
||||
std::string mapping_info;
|
||||
|
||||
// change to old version
|
||||
for(auto &info : m_ams_mapping_result){
|
||||
info.tray_id = VIRTUAL_TRAY_DEPUTY_ID;
|
||||
info.ams_id = VIRTUAL_AMS_DEPUTY_ID_STR;
|
||||
info.slot_id = "0";
|
||||
}
|
||||
get_ams_mapping_result(ams_array, temp, mapping_info);
|
||||
|
||||
// change to new version
|
||||
for(auto &info : m_ams_mapping_result){
|
||||
info.tray_id = VIRTUAL_TRAY_DEPUTY_ID;
|
||||
info.ams_id = VIRTUAL_AMS_MAIN_ID_STR;
|
||||
info.slot_id = "0";
|
||||
}
|
||||
temp.clear();
|
||||
mapping_info.clear();
|
||||
get_ams_mapping_result(temp, ams_array2, mapping_info);
|
||||
|
||||
// restore
|
||||
for(auto &info : m_ams_mapping_result){
|
||||
info.tray_id = 0;
|
||||
info.ams_id = "";
|
||||
info.slot_id = "";
|
||||
}
|
||||
|
||||
params.ams_mapping = ams_array;
|
||||
params.ams_mapping2 = ams_array2;
|
||||
params.ams_mapping_info = mapping_info;
|
||||
}
|
||||
|
||||
params.connection_type = obj->connection_type();
|
||||
|
||||
Reference in New Issue
Block a user