From af5c58574a99dc66aba08d64dfed4eca757f19cf Mon Sep 17 00:00:00 2001 From: tao wang Date: Fri, 13 Oct 2023 15:36:33 +0800 Subject: [PATCH] ENH:AMS mapping is supported by default jira:[STUDIO-4778] Change-Id: I578d8f5867c38e8dd301860bff695fc06751027c --- src/slic3r/GUI/DeviceManager.cpp | 49 +------------------------------- src/slic3r/GUI/DeviceManager.hpp | 1 - 2 files changed, 1 insertion(+), 49 deletions(-) diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp index bd5f4678c..c015d34a1 100644 --- a/src/slic3r/GUI/DeviceManager.cpp +++ b/src/slic3r/GUI/DeviceManager.cpp @@ -757,54 +757,7 @@ bool MachineObject::can_unload_filament() bool MachineObject::is_support_ams_mapping() { - if (get_printer_series() == PrinterSeries::SERIES_X1) { - AppConfig* config = Slic3r::GUI::wxGetApp().app_config; - if (config) { - if (config->get("check_ams_version") == "0") - return true; - } - bool need_upgrade = false; - if (has_ams()) { - // compare ota version and ams version - auto ota_ver_it = module_vers.find("ota"); - if (ota_ver_it != module_vers.end()) { - if (!MachineObject::is_support_ams_mapping_version("ota", ota_ver_it->second.sw_ver)) { - need_upgrade = true; - } - } - for (int i = 0; i < 4; i++) { - std::string ams_id = (boost::format("ams/%1%") % i).str(); - auto ams_ver_it = module_vers.find(ams_id); - if (ams_ver_it != module_vers.end()) { - if (!MachineObject::is_support_ams_mapping_version("ams", ams_ver_it->second.sw_ver)) { - need_upgrade = true; - } - } - } - } - return !need_upgrade; - } - else { - return true; - } -} - -bool MachineObject::is_support_ams_mapping_version(std::string module, std::string version) -{ - bool result = true; - - if (module == "ota") { - if (version.compare("00.01.04.03") < 0) - return false; - } - else if (module == "ams") { - // omit ams version is empty - if (version.empty()) - return true; - if (version.compare("00.00.04.10") < 0) - return false; - } - return result; + return true; } static float calc_color_distance(wxColour c1, wxColour c2) diff --git a/src/slic3r/GUI/DeviceManager.hpp b/src/slic3r/GUI/DeviceManager.hpp index 7dfea4cbc..a02a5c80e 100644 --- a/src/slic3r/GUI/DeviceManager.hpp +++ b/src/slic3r/GUI/DeviceManager.hpp @@ -507,7 +507,6 @@ public: bool has_ams() { return ams_exist_bits != 0; } bool can_unload_filament(); bool is_support_ams_mapping(); - static bool is_support_ams_mapping_version(std::string module, std::string version); int ams_filament_mapping(std::vector filaments, std::vector &result, std::vector exclude_id = std::vector()); bool is_valid_mapping_result(std::vector& result, bool check_empty_slot = false);