ENH: Improve some details for pa calib

Change-Id: I5d4e1b6a3385f28b616989e2a23cfda627eb79d8
(cherry picked from commit 01827ef8ede395d4bed856585e9ef6b316ee1d2c)
This commit is contained in:
zhimin.zeng 2023-06-05 09:25:43 +08:00 committed by Lane.Wei
parent 2d3f1c7d92
commit 6ea3259d05
5 changed files with 89 additions and 66 deletions

View file

@ -1618,11 +1618,13 @@ bool PressureAdvanceWizard::start_calibration(std::vector<int> tray_ids)
for (int tray_id : tray_ids) {
X1CCalibInfos::X1CCalibInfo calib_info;
calib_info.tray_id = tray_id;
calib_info.nozzle_diameter = dynamic_cast<ConfigOptionFloats *>(m_printer_preset->config.option("nozzle_diameter"))->get_at(0);
calib_info.filament_id = m_filament_preset->filament_id;
calib_info.setting_id = m_filament_preset->setting_id;
calib_info.bed_temp = bed_temp;
calib_info.nozzle_temp = nozzle_temp;
calib_info.max_volumetric_speed = max_volumetric_speed;
calib_infos.calib_infos.push_back(calib_info);
calib_infos.calib_datas.push_back(calib_info);
}
std::string error_message;
CalibUtils::calib_PA(calib_infos, error_message);
@ -2064,11 +2066,13 @@ bool FlowRateWizard::start_calibration(std::vector<int> tray_ids)
for (int tray_id : tray_ids) {
X1CCalibInfos::X1CCalibInfo calib_info;
calib_info.tray_id = tray_id;
calib_info.nozzle_diameter = dynamic_cast<ConfigOptionFloats *>(m_printer_preset->config.option("nozzle_diameter"))->get_at(0);
calib_info.filament_id = m_filament_preset->filament_id;
calib_info.setting_id = m_filament_preset->setting_id;
calib_info.bed_temp = bed_temp;
calib_info.nozzle_temp = nozzle_temp;
calib_info.max_volumetric_speed = max_volumetric_speed;
calib_infos.calib_infos.push_back(calib_info);
calib_infos.calib_datas.push_back(calib_info);
}
std::string error_message;
CalibUtils::calib_flowrate_X1C(calib_infos, error_message);