juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-08-03 00:02:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: the extruder_id of cali is incorrect with N3S

Browse Source 
jira: STUDIO-9888
Change-Id: I25c4a436e322923a247d1c6d3c3de9f0319bb420
(cherry picked from commit 13355ca669229839e8c8943f80cc50533256d0d7)
This commit is contained in:
zhimin.zeng
2025-01-16 10:46:29 +08:00
committed by Noisyfox
parent b733133ef1
commit 125ab80729
5 changed files with 33 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,6 +69,25 @@ wxString get_nozzle_volume_type_name(NozzleVolumeType type)
return wxString();
}
void get_tray_ams_and_slot_id(MachineObject* obj, int in_tray_id, int &ams_id, int &slot_id, int &tray_id)
{
assert(obj);
if (!obj)
return;
if (in_tray_id == VIRTUAL_TRAY_MAIN_ID || in_tray_id == VIRTUAL_TRAY_DEPUTY_ID) {
ams_id = in_tray_id;
slot_id = 0;
tray_id = ams_id;
if (!obj->is_enable_np)
tray_id = VIRTUAL_TRAY_DEPUTY_ID;
} else {
ams_id = in_tray_id / 4;
slot_id = in_tray_id % 4;
tray_id = in_tray_id;
}
}
std::string get_calib_mode_name(CalibMode cali_mode, int stage)
{
switch(cali_mode) {

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

@@ -80,6 +80,8 @@ private:
static void send_to_print(const CalibInfo &calib_info, wxString& error_message, int flow_ratio_mode = 0); // 0: none 1: coarse 2: fine
};
extern void get_tray_ams_and_slot_id(MachineObject* obj, int in_tray_id, int &ams_id, int &slot_id, int &tray_id);
extern void get_default_k_n_value(const std::string &filament_id, float &k, float &n);
extern wxString get_nozzle_volume_type_name(NozzleVolumeType type);