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

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

44
src/slic3r/GUI/DeviceManager.cpp
View file

@ -1118,6 +1118,17 @@ std::string MachineObject::get_firmware_type_str()
return "engineer";
}
std::string MachineObject::get_lifecycle_type_str()
{
if (lifecycle == PrinterFirmwareType::FIRMWARE_TYPE_ENGINEER)
return "engineer";
else if (lifecycle == PrinterFirmwareType::FIRMWARE_TYPE_PRODUCTION)
return "product";
// return engineer by default;
return "engineer";
}
bool MachineObject::is_in_upgrading()
{
return upgrade_display_state == (int)UpgradingInProgress;
@ -1406,15 +1417,6 @@ void MachineObject::parse_version_func()
is_support_ams_humidity = true;
}
/*if (firmware_type == PrinterFirmwareType::FIRMWARE_TYPE_ENGINEER) {
local_use_ssl_for_mqtt = false;
local_use_ssl_for_ftp = true;
}
else {
local_use_ssl_for_mqtt = ota_version->second.sw_ver.compare("01.03.01.04") >= 0;
local_use_ssl_for_ftp = true;
}*/
if (firmware_type == PrinterFirmwareType::FIRMWARE_TYPE_PRODUCTION) {
local_use_ssl_for_mqtt = ota_version->second.sw_ver.compare("01.03.01.04") >= 0;
}
@ -1430,6 +1432,7 @@ void MachineObject::parse_version_func()
is_cloud_print_only = true;
if (ota_version != module_vers.end()) {
is_support_send_to_sdcard = ota_version->second.sw_ver.compare("01.02.00.00") >= 0;
is_support_ai_monitoring = ota_version->second.sw_ver.compare("01.02.99.00") >= 0;
is_support_remote_tunnel = ota_version->second.sw_ver.compare("01.02.99.00") >= 0;
}
local_camera_proto = 1;
@ -1440,14 +1443,6 @@ void MachineObject::parse_version_func()
} else if (printer_type == "C12") {
is_support_ai_monitoring = true;
is_cloud_print_only = true;
if (firmware_type == PrinterFirmwareType::FIRMWARE_TYPE_ENGINEER) {
local_use_ssl_for_mqtt = false;
local_use_ssl_for_ftp = false;
}
else {
local_use_ssl_for_mqtt = true;
local_use_ssl_for_ftp = true;
}
is_support_remote_tunnel = true;
local_camera_proto = 1;
}
@ -2312,7 +2307,7 @@ int MachineObject::connect(bool is_anonymous, bool use_openssl)
}
if (m_agent) {
try {
return m_agent->connect_printer(dev_id, dev_ip, username, password);
return m_agent->connect_printer(dev_id, dev_ip, username, password, use_openssl);
} catch (...) {
;
}
@ -2937,6 +2932,18 @@ int MachineObject::parse_json(std::string payload)
;
}
try {
if (jj.contains("lifecycle")) {
if (jj["lifecycle"].get<std::string>() == "engineer")
lifecycle = PrinterFirmwareType::FIRMWARE_TYPE_ENGINEER;
else if (jj["lifecycle"].get<std::string>() == "product")
lifecycle = PrinterFirmwareType::FIRMWARE_TYPE_PRODUCTION;
}
}
catch (...) {
;
}
try {
if (jj.contains("lights_report") && jj["lights_report"].is_array()) {
for (auto it = jj["lights_report"].begin(); it != jj["lights_report"].end(); it++) {
@ -4461,7 +4468,6 @@ bool DeviceManager::set_selected_machine(std::string dev_id, bool need_disconnec
}
} else {
it->second->reset();
#if !BBL_RELEASE_TO_PUBLIC
it->second->connect(false, Slic3r::GUI::wxGetApp().app_config->get("enable_ssl_for_mqtt") == "true" ? true : false);
#else