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

ENH: refine ams mapping valid logic 

do not make mapping result valid for empty ams slot
when doing ams mapping

Change-Id: I5f4de0b52884a4c20cf7d0654f2364a61d1fbd3c
Signed-off-by: Stone Li <stone.li@bambulab.com>
This commit is contained in:
Stone Li 2022-11-17 14:46:44 +08:00 committed by Lane.Wei
parent 929a8e3adf
commit 2fad7b816b
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/slic3r/GUI/DeviceManager.cpp
View File

@ -806,7 +806,7 @@ int MachineObject::ams_filament_mapping(std::vector<FilamentInfo> filaments, std
std::vector<FilamentInfo> cache_map_result = result; std::vector<FilamentInfo> cache_map_result = result;
//check ams mapping result //check ams mapping result
if (is_valid_mapping_result(result)) { if (is_valid_mapping_result(result, true)) {
return 0; return 0;
} }
@ -834,7 +834,7 @@ int MachineObject::ams_filament_mapping(std::vector<FilamentInfo> filaments, std
} }
//check order mapping result //check order mapping result
if (is_valid_mapping_result(result)) { if (is_valid_mapping_result(result, true)) {
return 0; return 0;
} }
} catch(...) { } catch(...) {
@ -854,7 +854,7 @@ int MachineObject::ams_filament_mapping(std::vector<FilamentInfo> filaments, std
return 0; return 0;
} }
bool MachineObject::is_valid_mapping_result(std::vector<FilamentInfo>& result) bool MachineObject::is_valid_mapping_result(std::vector<FilamentInfo>& result, bool check_empty_slot)
{ {
bool valid_ams_mapping_result = true; bool valid_ams_mapping_result = true;
if (result.empty()) return false; if (result.empty()) return false;
@ -870,15 +870,17 @@ bool MachineObject::is_valid_mapping_result(std::vector<FilamentInfo>& result)
result[i].tray_id = -1; result[i].tray_id = -1;
valid_ams_mapping_result = false; valid_ams_mapping_result = false;
} else { } else {
int tray_id = result[i].tray_id % 4; if (check_empty_slot) {
auto tray_item = ams_item->second->trayList.find(std::to_string(tray_id)); int tray_id = result[i].tray_id % 4;
if (tray_item == ams_item->second->trayList.end()) { auto tray_item = ams_item->second->trayList.find(std::to_string(tray_id));
result[i].tray_id = -1; if (tray_item == ams_item->second->trayList.end()) {
valid_ams_mapping_result = false;
} else {
if (!tray_item->second->is_exists) {
result[i].tray_id = -1; result[i].tray_id = -1;
valid_ams_mapping_result = false; valid_ams_mapping_result = false;
} else {
if (!tray_item->second->is_exists) {
result[i].tray_id = -1;
valid_ams_mapping_result = false;
}
} }
} }
} }
@ -3139,6 +3141,7 @@ void DeviceManager::on_machine_alive(std::string json_str)
obj->wifi_signal = printer_signal; obj->wifi_signal = printer_signal;
obj->dev_connection_type = connect_type; obj->dev_connection_type = connect_type;
obj->bind_state = bind_state; obj->bind_state = bind_state;
obj->printer_type = MachineObject::parse_printer_type(printer_type_str);
// U0 firmware // U0 firmware
if (obj->dev_connection_type.empty() && obj->bind_state.empty()) if (obj->dev_connection_type.empty() && obj->bind_state.empty())

2
src/slic3r/GUI/DeviceManager.hpp
View File

@ -432,7 +432,7 @@ public:
static bool is_support_ams_mapping_version(std::string module, std::string version); static bool is_support_ams_mapping_version(std::string module, std::string version);
int ams_filament_mapping(std::vector<FilamentInfo> filaments, std::vector<FilamentInfo> &result, std::vector<int> exclude_id = std::vector<int>()); int ams_filament_mapping(std::vector<FilamentInfo> filaments, std::vector<FilamentInfo> &result, std::vector<int> exclude_id = std::vector<int>());
bool is_valid_mapping_result(std::vector<FilamentInfo>& result); bool is_valid_mapping_result(std::vector<FilamentInfo>& result, bool check_empty_slot = false);
// exceed index start with 0 // exceed index start with 0
bool is_mapping_exceed_filament(std::vector<FilamentInfo>& result, int &exceed_index); bool is_mapping_exceed_filament(std::vector<FilamentInfo>& result, int &exceed_index);
void reset_mapping_result(std::vector<FilamentInfo>& result); void reset_mapping_result(std::vector<FilamentInfo>& result);