juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-20 11:53:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: the use ams flag is incorrect for cali

Browse Source 
github: 7998
Change-Id: I6511969ad50db0d3cf01ecbe8261e461092da1e3
(cherry picked from commit d25405ed8d85e4a80822dddab515795984d7b924)
(cherry picked from commit af7a8350e3726aa7d122eaaefc089bd440433e76)
This commit is contained in:
zhimin.zeng
2025-08-27 14:08:02 +08:00
committed by Noisyfox
parent 1653cb0bda
commit 0a09c32e31
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/slic3r/Utils/CalibUtils.cpp
View File

@@ -1807,7 +1807,7 @@ void CalibUtils::send_to_print(const CalibInfo &calib_info, wxString &error_mess
print_job->task_ams_mapping = "[" + select_ams + "]"; print_job->task_ams_mapping = "[" + select_ams + "]";
print_job->task_ams_mapping_info = ""; print_job->task_ams_mapping_info = "";
print_job->task_use_ams = devPrinterUtil::IsVirtualSlot(select_ams); print_job->task_use_ams = !devPrinterUtil::IsVirtualSlot(select_ams);
std::string new_ams_mapping = "[{\"ams_id\":" + std::to_string(calib_info.ams_id) + ", \"slot_id\":" + std::to_string(calib_info.slot_id) + "}]"; std::string new_ams_mapping = "[{\"ams_id\":" + std::to_string(calib_info.ams_id) + ", \"slot_id\":" + std::to_string(calib_info.slot_id) + "}]";
print_job->task_ams_mapping2 = new_ams_mapping; print_job->task_ams_mapping2 = new_ams_mapping;
@@ -1920,11 +1920,12 @@ void CalibUtils::send_to_print(const std::vector<CalibInfo> &calib_infos, wxStri
print_job->task_ams_mapping_info = ""; print_job->task_ams_mapping_info = "";
print_job->task_ams_mapping2 = new_select_ams; print_job->task_ams_mapping2 = new_select_ams;
if (calib_infos.size() == 1 && (calib_infos[0].select_ams == VIRTUAL_AMS_MAIN_ID_STR || calib_infos[0].select_ams == VIRTUAL_AMS_DEPUTY_ID_STR)) {
print_job->task_use_ams = false; print_job->task_use_ams = false;
} for (const CalibInfo& calib_info : calib_infos) {
else { if (calib_info.select_ams != VIRTUAL_AMS_MAIN_ID_STR && calib_info.select_ams != VIRTUAL_AMS_DEPUTY_ID_STR) {
print_job->task_use_ams = true; print_job->task_use_ams = true;
break;
}
} }
CalibMode cali_mode = calib_infos[0].params.mode; CalibMode cali_mode = calib_infos[0].params.mode;