mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-20 20:03:47 +00:00
Display correct AMS type
This commit is contained in:
@@ -2599,10 +2599,9 @@ void StatusPanel::update_ams(MachineObject *obj)
|
|||||||
|
|
||||||
if (obj) {
|
if (obj) {
|
||||||
if (obj->get_printer_ams_type() == "f1") { ams_mode = AMSModel::AMS_LITE; }
|
if (obj->get_printer_ams_type() == "f1") { ams_mode = AMSModel::AMS_LITE; }
|
||||||
else if(obj->get_printer_ams_type() == "generic") { ams_mode = AMSModel::GENERIC_AMS; }
|
|
||||||
obj->check_ams_filament_valid();
|
obj->check_ams_filament_valid();
|
||||||
}
|
}
|
||||||
|
if (obj->is_enable_np && obj->amsList.size() > 0) { ams_mode = AMSModel(obj->amsList.begin()->second->type); }
|
||||||
if (!obj
|
if (!obj
|
||||||
|| !obj->is_connected()
|
|| !obj->is_connected()
|
||||||
|| obj->amsList.empty()
|
|| obj->amsList.empty()
|
||||||
@@ -2640,6 +2639,7 @@ void StatusPanel::update_ams(MachineObject *obj)
|
|||||||
AMSinfo info;
|
AMSinfo info;
|
||||||
info.ams_id = ams->first;
|
info.ams_id = ams->first;
|
||||||
if (ams->second->is_exists && info.parse_ams_info(obj, ams->second, obj->ams_calibrate_remain_flag, obj->is_support_ams_humidity)) {
|
if (ams->second->is_exists && info.parse_ams_info(obj, ams->second, obj->ams_calibrate_remain_flag, obj->is_support_ams_humidity)) {
|
||||||
|
if (ams_mode == AMSModel::AMS_LITE) { info.ams_type = AMSModel::AMS_LITE; }
|
||||||
ams_info.push_back(info);
|
ams_info.push_back(info);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user