From eaca2bd0ed641c141f0ec8a99adba53d3df5701a Mon Sep 17 00:00:00 2001 From: tao wang Date: Tue, 22 Aug 2023 14:48:23 +0800 Subject: [PATCH] ENH:delete U0 firmware functions Change-Id: I6a65f41224e346023989bd1f097d4bf1b069f907 --- src/slic3r/GUI/DeviceManager.cpp | 10 ---------- src/slic3r/GUI/DeviceManager.hpp | 1 - src/slic3r/GUI/StatusPanel.cpp | 5 ----- src/slic3r/GUI/StatusPanel.hpp | 1 - 4 files changed, 17 deletions(-) diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp index df1dbc4cc..b99ae8159 100644 --- a/src/slic3r/GUI/DeviceManager.cpp +++ b/src/slic3r/GUI/DeviceManager.cpp @@ -711,16 +711,6 @@ bool MachineObject::can_unload_filament() return result; } -bool MachineObject::is_U0_firmware() -{ - auto ota_ver_it = module_vers.find("ota"); - if (ota_ver_it != module_vers.end()) { - if (ota_ver_it->second.sw_ver.compare("00.01.04.00") < 0) - return true; - } - return false; -} - bool MachineObject::is_support_ams_mapping() { if (get_printer_series() == PrinterSeries::SERIES_X1) { diff --git a/src/slic3r/GUI/DeviceManager.hpp b/src/slic3r/GUI/DeviceManager.hpp index aa24b322f..0c90e1a81 100644 --- a/src/slic3r/GUI/DeviceManager.hpp +++ b/src/slic3r/GUI/DeviceManager.hpp @@ -504,7 +504,6 @@ public: void _parse_ams_status(int ams_status); bool has_ams() { return ams_exist_bits != 0; } bool can_unload_filament(); - bool is_U0_firmware(); bool is_support_ams_mapping(); static bool is_support_ams_mapping_version(std::string module, std::string version); diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp index 4a11d4efa..ca4fd50df 100644 --- a/src/slic3r/GUI/StatusPanel.cpp +++ b/src/slic3r/GUI/StatusPanel.cpp @@ -3782,11 +3782,6 @@ void StatusPanel::set_print_finish_status(bool is_finish) { void StatusPanel::set_hold_count(int& count) { - if (obj) { - if (obj->is_U0_firmware()) { - count = COMMAND_TIMEOUT_U0; - } - } count = COMMAND_TIMEOUT; } diff --git a/src/slic3r/GUI/StatusPanel.hpp b/src/slic3r/GUI/StatusPanel.hpp index 5f289e820..ea611ee2d 100644 --- a/src/slic3r/GUI/StatusPanel.hpp +++ b/src/slic3r/GUI/StatusPanel.hpp @@ -34,7 +34,6 @@ class StepIndicator; -#define COMMAND_TIMEOUT_U0 15 #define COMMAND_TIMEOUT 5 namespace Slic3r {