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

FIX: auto cali send failed

Browse Source 
and cannot set cali step to 0.001
jira: STUDIO-14042 & STUDIO-14119

Change-Id: I56ecc70d0413398ecacd1c842f7102e810277cfd
(cherry picked from commit c16925931c642d8e27d739a401148bc94c5f3965)
This commit is contained in:
zhimin.zeng
2025-08-21 14:36:38 +08:00
committed by Noisyfox
parent 7bc01c625d
commit c1e4876793
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,8 +22,8 @@
namespace Slic3r { namespace Slic3r {
namespace GUI { namespace GUI {
const float MIN_PA_K_VALUE = 0.0; const double MIN_PA_K_VALUE = 0.0;
const float MAX_PA_K_VALUE = 2.0; const double MAX_PA_K_VALUE = 2.0;
std::unique_ptr<Worker> CalibUtils::print_worker; std::unique_ptr<Worker> CalibUtils::print_worker;
wxString wxstr_temp_dir = fs::path(fs::temp_directory_path() / "calib").wstring(); wxString wxstr_temp_dir = fs::path(fs::temp_directory_path() / "calib").wstring();
@@ -1805,9 +1805,9 @@ void CalibUtils::send_to_print(const CalibInfo &calib_info, wxString &error_mess
print_job->plate_data = plate_data; print_job->plate_data = plate_data;
print_job->m_print_type = "from_normal"; print_job->m_print_type = "from_normal";
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 = select_ams == "[254]" ? false : true; 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;
@@ -1871,7 +1871,7 @@ void CalibUtils::send_to_print(const std::vector<CalibInfo> &calib_infos, wxStri
} }
auto print_job = std::make_shared<PrintJob>(dev_id); auto print_job = std::make_shared<PrintJob>(dev_id);
print_job->m_dev_ip = obj_->get_dev_ip(); print_job->m_dev_ip = obj_->get_dev_ip();
print_job->m_ftp_folder = obj_->get_ftp_folder(); print_job->m_ftp_folder = obj_->get_ftp_folder();
print_job->m_access_code = obj_->get_access_code(); print_job->m_access_code = obj_->get_access_code();

4
src/slic3r/Utils/CalibUtils.hpp
View File

@@ -10,8 +10,8 @@ class ProgressIndicator;
class Preset; class Preset;
namespace GUI { namespace GUI {
extern const float MIN_PA_K_VALUE; extern const double MIN_PA_K_VALUE;
extern const float MAX_PA_K_VALUE; extern const double MAX_PA_K_VALUE;
class CalibInfo class CalibInfo
{ {