mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ENH: support auto calibration for A series 

jira: none
Change-Id: I6340cb8aa8b2fff174859d796ebf8a36effae004
This commit is contained in:
zhimin.zeng 2024-08-01 12:28:07 +08:00 committed by Lane.Wei
parent 49f67b80e5
commit c80a3fc5d1
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/slic3r/GUI/CalibrationWizard.cpp
View File

@ -577,7 +577,7 @@ void PressureAdvanceWizard::on_cali_start()
//std::string error_message; //std::string error_message;
wxString wx_err_string; wxString wx_err_string;
if (m_cali_method == CalibrationMethod::CALI_METHOD_AUTO && curr_obj->get_printer_series() == PrinterSeries::SERIES_X1) { if (m_cali_method == CalibrationMethod::CALI_METHOD_AUTO && (curr_obj->get_printer_series() == PrinterSeries::SERIES_X1 || curr_obj->get_printer_arch() == PrinterArch::ARCH_I3)) {
X1CCalibInfos calib_infos; X1CCalibInfos calib_infos;
for (auto &item : selected_filaments) { for (auto &item : selected_filaments) {
int nozzle_temp = -1; int nozzle_temp = -1;
@ -701,7 +701,7 @@ void PressureAdvanceWizard::on_cali_save()
return; return;
} }
if (curr_obj->get_printer_series() == PrinterSeries::SERIES_X1) { if (curr_obj->get_printer_series() == PrinterSeries::SERIES_X1 || curr_obj->get_printer_arch() == PrinterArch::ARCH_I3) {
if (m_cali_method == CalibrationMethod::CALI_METHOD_AUTO) { if (m_cali_method == CalibrationMethod::CALI_METHOD_AUTO) {
std::vector<PACalibResult> new_pa_cali_results; std::vector<PACalibResult> new_pa_cali_results;
auto save_page = static_cast<CalibrationPASavePage*>(save_step->page); auto save_page = static_cast<CalibrationPASavePage*>(save_step->page);

2
src/slic3r/GUI/CalibrationWizardPage.cpp
View File

@ -57,7 +57,7 @@ CalibrationFilamentMode get_cali_filament_mode(MachineObject* obj, CalibMode mod
if (mode == CalibMode::Calib_PA_Line) { if (mode == CalibMode::Calib_PA_Line) {
if (obj->get_printer_series() == PrinterSeries::SERIES_X1) if (obj->get_printer_series() == PrinterSeries::SERIES_X1 || obj->get_printer_arch() == PrinterArch::ARCH_I3)
return CalibrationFilamentMode::CALI_MODEL_MULITI; return CalibrationFilamentMode::CALI_MODEL_MULITI;
else if (obj->get_printer_series() == PrinterSeries::SERIES_P1P) else if (obj->get_printer_series() == PrinterSeries::SERIES_P1P)
return CalibrationFilamentMode::CALI_MODEL_SINGLE; return CalibrationFilamentMode::CALI_MODEL_SINGLE;

2
src/slic3r/GUI/CalibrationWizardSavePage.cpp
View File

@ -852,7 +852,7 @@ void CalibrationPASavePage::sync_cali_result(MachineObject* obj)
} }
void CalibrationPASavePage::show_panels(CalibrationMethod method, const PrinterSeries printer_ser) { void CalibrationPASavePage::show_panels(CalibrationMethod method, const PrinterSeries printer_ser) {
if (printer_ser == PrinterSeries::SERIES_X1) { if (printer_ser == PrinterSeries::SERIES_X1 || curr_obj->get_printer_arch() == PrinterArch::ARCH_I3) {
if (method == CalibrationMethod::CALI_METHOD_MANUAL) { if (method == CalibrationMethod::CALI_METHOD_MANUAL) {
m_manual_panel->set_pa_cali_method(curr_obj->manual_pa_cali_method); m_manual_panel->set_pa_cali_method(curr_obj->manual_pa_cali_method);
m_manual_panel->Show(); m_manual_panel->Show();

4
src/slic3r/GUI/CalibrationWizardStartPage.cpp
View File

@ -151,7 +151,7 @@ void CalibrationPAStartPage::on_device_connected(MachineObject* obj)
m_action_panel->enable_button(CaliPageActionType::CALI_ACTION_AUTO_CALI, true); m_action_panel->enable_button(CaliPageActionType::CALI_ACTION_AUTO_CALI, true);
m_action_panel->enable_button(CaliPageActionType::CALI_ACTION_MANUAL_CALI, true); m_action_panel->enable_button(CaliPageActionType::CALI_ACTION_MANUAL_CALI, true);
if (obj->get_printer_series() == PrinterSeries::SERIES_X1) { if (obj->get_printer_series() == PrinterSeries::SERIES_X1 || obj->get_printer_arch() == PrinterArch::ARCH_I3) {
m_action_panel->show_button(CaliPageActionType::CALI_ACTION_MANAGE_RESULT, true); m_action_panel->show_button(CaliPageActionType::CALI_ACTION_MANAGE_RESULT, true);
m_action_panel->show_button(CaliPageActionType::CALI_ACTION_AUTO_CALI, true); m_action_panel->show_button(CaliPageActionType::CALI_ACTION_AUTO_CALI, true);
m_action_panel->show_button(CaliPageActionType::CALI_ACTION_MANUAL_CALI, true); m_action_panel->show_button(CaliPageActionType::CALI_ACTION_MANUAL_CALI, true);
@ -173,7 +173,7 @@ void CalibrationPAStartPage::on_device_connected(MachineObject* obj)
m_action_panel->show_button(CaliPageActionType::CALI_ACTION_AUTO_CALI, false); m_action_panel->show_button(CaliPageActionType::CALI_ACTION_AUTO_CALI, false);
} }
} }
else if (obj->get_printer_series() == PrinterSeries::SERIES_P1P || obj->get_printer_arch() == PrinterArch::ARCH_I3) { else if (obj->get_printer_series() == PrinterSeries::SERIES_P1P) {
if (obj->cali_version >= 0) { if (obj->cali_version >= 0) {
m_action_panel->show_button(CaliPageActionType::CALI_ACTION_MANAGE_RESULT, true); m_action_panel->show_button(CaliPageActionType::CALI_ACTION_MANAGE_RESULT, true);
m_action_panel->bind_button(CaliPageActionType::CALI_ACTION_MANAGE_RESULT, false); m_action_panel->bind_button(CaliPageActionType::CALI_ACTION_MANAGE_RESULT, false);