FIX: the n value is not correct when set pa cali value

If it is manual, set it to 0, if it is automatic, use the calibrated value

Change-Id: I7c8737366e0ec0c6c2c17a7ad905cfb34e236fd8
(cherry picked from commit b235b0c8b79b1baf6a393ccfea236e1e650dcb7d)
(cherry picked from commit 298f7b6b9349fdf7fe7f9092e3012188d27b9bf2)
This commit is contained in:
zhimin.zeng 2023-08-04 14:28:31 +08:00 committed by lane.wei
parent 4eb1edea13
commit cefd9876fc
6 changed files with 12 additions and 10 deletions

View file

@ -2036,7 +2036,7 @@ int MachineObject::command_start_pa_calibration(const X1CCalibInfos &pa_data, in
return -1;
}
int MachineObject::command_set_pa_calibration(const std::vector<PACalibResult>& pa_calib_values)
int MachineObject::command_set_pa_calibration(const std::vector<PACalibResult> &pa_calib_values, bool is_auto_cali)
{
CNumericLocalesSetter locales_setter;
@ -2056,8 +2056,10 @@ int MachineObject::command_set_pa_calibration(const std::vector<PACalibResult>&
j["print"]["filaments"][i]["setting_id"] = pa_calib_values[i].setting_id;
j["print"]["filaments"][i]["name"] = pa_calib_values[i].name;
j["print"]["filaments"][i]["k_value"] = std::to_string(pa_calib_values[i].k_value);
// j["print"]["filaments"][i]["n_coef"] = std::to_string(pa_calib_values[i].n_coef);
j["print"]["filaments"][i]["n_coef"] = "0.0";
if (is_auto_cali)
j["print"]["filaments"][i]["n_coef"] = std::to_string(pa_calib_values[i].n_coef);
else
j["print"]["filaments"][i]["n_coef"] = "0.0";
}
BOOST_LOG_TRIVIAL(trace) << "extrusion_cali_set: " << j.dump();