FIX: modify for get pa cali result

jira: none
Change-Id: I3c57ccaac3b7e73e0b2eb0e26678635478480298
(cherry picked from commit 6bf39690517f9e25de895bf52673d3a4a7b77255)
This commit is contained in:
zhimin.zeng
2024-11-12 09:18:40 +08:00
committed by Noisyfox
parent b4f1ef06a2
commit 92972879f5
7 changed files with 20 additions and 34 deletions

View File

@@ -207,7 +207,9 @@ wxString generate_nozzle_id(NozzleVolumeType nozzle_type, const std::string& dia
nozzle_id += "H";
break;
}
default: break;
default:
nozzle_id += "H";
break;
}
nozzle_id += "00";
nozzle_id += "-";
@@ -2282,7 +2284,8 @@ int MachineObject::command_get_pa_calibration_tab(const PACalibExtruderInfo &cal
j["print"]["command"] = "extrusion_cali_get";
j["print"]["sequence_id"] = std::to_string(MachineObject::m_sequence_id++);
j["print"]["filament_id"] = calib_info.filament_id;
j["print"]["extruder_id"] = calib_info.extruder_id;
if (calib_info.use_extruder_id)
j["print"]["extruder_id"] = calib_info.extruder_id;
if (calib_info.use_nozzle_volume_type)
j["print"]["nozzle_id"] = generate_nozzle_id(calib_info.nozzle_volume_type, to_string_nozzle_diameter(calib_info.nozzle_diameter)).ToStdString();
j["print"]["nozzle_diameter"] = to_string_nozzle_diameter(calib_info.nozzle_diameter);