3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-08 07:27:41 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

ENH:synchronize different codes

Browse source 
Change-Id: I011b39ee85eecbb9da99d1c4fe1f2875267acc32
This commit is contained in:
tao wang 2023-05-25 16:51:01 +08:00 • committed by Lane.Wei
parent f97261bca9
commit 2d8ddca1d6
12 changed files with 50 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/slic3r/GUI/DeviceManager.hpp
View file

@ -452,9 +452,8 @@ public:
std::string dev_name;
std::string dev_ip;
std::string dev_id;
bool local_use_ssl { false };
bool local_use_ssl_for_mqtt { false };
bool local_use_ssl_for_ftp { false };
bool local_use_ssl_for_mqtt { true };
bool local_use_ssl_for_ftp { true };
float nozzle_diameter { 0.0f };
std::string dev_connection_type; /* lan | cloud */
std::string connection_type() { return dev_connection_type; }
@ -598,6 +597,7 @@ public:
int upgrade_display_state = 0; // 0 : upgrade unavailable, 1: upgrade idle, 2: upgrading, 3: upgrade_finished
int upgrade_display_hold_count = 0;
PrinterFirmwareType firmware_type; // engineer|production
PrinterFirmwareType lifecycle;
std::string upgrade_progress;
std::string upgrade_message;
std::string upgrade_status;
@ -614,6 +614,7 @@ public:
std::vector<FirmwareInfo> firmware_list;
std::string get_firmware_type_str();
std::string get_lifecycle_type_str();
bool is_in_upgrading();
bool is_upgrading_avalable();
int get_upgrade_percent();