ENH:support checking blacklists for specified models

jira:[none]

Change-Id: Icd88c478a04e8743cdaaa8d670f238b534e40283
(cherry picked from commit c3643fdec9c0fcbceeba71f9ef5cd2de0cf7957d)
This commit is contained in:
tao wang
2025-02-27 19:27:55 +08:00
committed by Noisyfox
parent 385c8a36a1
commit 35bb239a8f
6 changed files with 40 additions and 21 deletions

View File

@@ -548,13 +548,14 @@ void AMSMaterialsSetting::on_select_ok(wxCommandEvent &event)
std::string action;
std::string info;
std::string filamnt_type;
std::string filamnt_name;
it->get_filament_type(filamnt_type);
auto vendor = dynamic_cast<ConfigOptionStrings *>(it->config.option("filament_vendor"));
if (vendor && (vendor->values.size() > 0)) {
std::string vendor_name = vendor->values[0];
DeviceManager::check_filaments_in_blacklist(vendor_name, filamnt_type, ams_id, slot_id, in_blacklist, action, info);
DeviceManager::check_filaments_in_blacklist(obj->printer_type, vendor_name, filamnt_type, ams_id, slot_id, it->name, in_blacklist, action, info);
}
if (in_blacklist) {