juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-16 10:02:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

ENH: support new feature of AMS

Browse Source 
jira: [STUDIO-14067][STUDIO-14069]
Change-Id: Ib51f9ec6b387418f1817619973e926d3c9494935
(cherry picked from commit e2f63a8d1e3a1ea1f53578c611300ead12052b39)
This commit is contained in:
xin.zhang
2025-08-27 17:30:46 +08:00
committed by Noisyfox
parent 84dd0449b7
commit 27a23a8baf
3 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/slic3r/GUI/StatusPanel.cpp
View File

@@ -3179,15 +3179,16 @@ void StatusPanel::update_ams(MachineObject *obj)
bool is_support_virtual_tray = obj->ams_support_virtual_tray;
bool is_support_filament_backup = obj->is_support_filament_backup;
AMSModel ams_mode = AMSModel::GENERIC_AMS;
if (obj) {
if (obj->get_printer_ams_type() == "f1") { ams_mode = AMSModel::AMS_LITE; }
if (obj->is_security_control_ready())
obj->check_ams_filament_valid();
if (obj && obj->is_security_control_ready()) {
obj->check_ams_filament_valid();
}
if (obj->is_enable_np && obj->GetFilaSystem()->GetAmsList().size() > 0) {
AMSModel ams_mode = AMSModel::GENERIC_AMS;
if ((obj->is_enable_np || obj->is_enable_ams_np) && obj->GetFilaSystem()->GetAmsList().size() > 0) {
ams_mode = AMSModel(obj->GetFilaSystem()->GetAmsList().begin()->second->GetAmsType());
} if (obj->get_printer_ams_type() == "f1") {
ams_mode = AMSModel::AMS_LITE;//STUDIO-14066
}
if (!obj || !obj->is_connected()) {
@@ -3228,7 +3229,6 @@ void StatusPanel::update_ams(MachineObject *obj)
AMSinfo info;
info.ams_id = ams->first;
if (ams->second->IsExist() && info.parse_ams_info(obj, ams->second, obj->GetFilaSystem()->IsDetectRemainEnabled(), obj->is_support_ams_humidity)) {
if (ams_mode == AMSModel::AMS_LITE) { info.ams_type = AMSModel::AMS_LITE; }
ams_info.push_back(info);
}
}