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: printer compatible for tunnel protos

Browse source 
Change-Id: Ic409ad967da43ad696b75a6c97e90e1f70e7610d
This commit is contained in:
chunmao.guo 2023-05-12 08:45:28 +08:00 • committed by Lane.Wei
parent d70a608921
commit 5a7aa74e62
6 changed files with 34 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1367,6 +1367,7 @@ void MachineObject::parse_version_func()
{
auto ota_version = module_vers.find("ota");
auto esp32_version = module_vers.find("esp32");
auto rv1126_version = module_vers.find("rv1126");
if (printer_type == "BL-P001" ||
printer_type == "BL-P002") {
if (ota_version != module_vers.end()) {
@ -1395,6 +1396,8 @@ void MachineObject::parse_version_func()
local_use_ssl = ota_version->second.sw_ver.compare("01.03.01.04") >= 0;
}
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;
}
} else if (printer_type == "C11") {
if (firmware_type == PrinterFirmwareType::FIRMWARE_TYPE_ENGINEER)
@ -1407,6 +1410,8 @@ void MachineObject::parse_version_func()
is_support_send_to_sdcard = ota_version->second.sw_ver.compare("01.02.00.00") >= 0;
is_support_remote_tunnel = ota_version->second.sw_ver.compare("01.02.99.00") >= 0;
}
local_camera_proto = 1;
if (esp32_version != module_vers.end()) {
ams_support_auto_switch_filament_flag = esp32_version->second.sw_ver.compare("00.03.11.50") >= 0;
}
@ -2263,7 +2268,8 @@ bool MachineObject::is_function_supported(PrinterFunction func)
return false;
break;
case FUNC_LOCAL_TUNNEL:
func_name = "FUNC_LOCAL_TUNNEL";
parse_version_func();
if (!local_camera_proto) return false;
break;
case FUNC_PRINT_WITHOUT_SD:
func_name = "FUNC_PRINT_WITHOUT_SD";
@ -2332,6 +2338,12 @@ bool MachineObject::is_camera_busy_off()
return false;
}
int MachineObject::get_local_camera_proto()
{
if (!is_function_supported(PrinterFunction::FUNC_REMOTE_TUNNEL)) return 0;
return local_camera_proto;
}
int MachineObject::publish_json(std::string json_str, int qos)
{
if (is_lan_mode_printer()) {