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

FIX: rstp proto mode & tutk state

Browse source 
Change-Id: I3d8b4a278426644bb716f18d7b8259032d22e444
This commit is contained in:
chunmao.guo 2023-05-17 14:05:23 +08:00 • committed by Lane.Wei
parent eb3a97f55b
commit e4d4ac01d6
5 changed files with 41 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1415,8 +1415,9 @@ void MachineObject::parse_version_func()
}
is_support_remote_tunnel = true;
local_camera_proto = (ota_version->second.sw_ver.compare("01.03.01.04") >= 0
|| (rv1126_version != module_vers.end() && rv1126_version->second.sw_ver.compare("00.00.20.39") >= 0)) ? 2 : 0;
local_camera_proto = (local_rtsp_url.empty() || local_rtsp_url == "disable") ? 0
: boost::algorithm::starts_with(local_rtsp_url, "rtsps") ? 2 : 3;
file_proto = 2;
}
} else if (printer_type == "C11") {
if (firmware_type == PrinterFirmwareType::FIRMWARE_TYPE_ENGINEER) {
@ -2377,6 +2378,18 @@ int MachineObject::get_local_camera_proto()
return local_camera_proto;
}
bool MachineObject::has_local_file_proto()
{
parse_version_func();
return file_proto & 1;
}
bool MachineObject::has_remote_file_proto()
{
parse_version_func();
return file_proto & 2;
}
int MachineObject::publish_json(std::string json_str, int qos)
{
if (is_lan_mode_printer()) {
@ -2961,6 +2974,12 @@ int MachineObject::parse_json(std::string payload)
camera_resolution = jj["ipcam"]["resolution"].get<std::string>();
}
}
if (jj["ipcam"].contains("rtsp_url")) {
local_rtsp_url = jj["ipcam"]["rtsp_url"].get<std::string>();
}
if (jj["ipcam"].contains("tutk_server")) {
tutk_state = jj["ipcam"]["tutk_server"].get<std::string>();
}
}
}
catch (...) {