mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: is_support_remote_tunnel P1P >= 01.03.00.00 

Change-Id: I97e7a38f7bd3d42f61fb4c56b3757b36805a28bf
This commit is contained in:
chunmao.guo 2023-04-10 20:20:21 +08:00 committed by Lane.Wei
parent f40851ff31
commit b5663b25c9
3 changed files with 52 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
resources/config.json
View File

@ -1,54 +1,52 @@
{ {
"printers": [ "printers": [
{ {
"display_name": "Bambu Lab P1P", "display_name": "Bambu Lab P1P",
"func": { "func": {
"FUNC_CHAMBER_TEMP": false, "FUNC_CHAMBER_TEMP": false,
"FUNC_FIRSTLAYER_INSPECT": false, "FUNC_FIRSTLAYER_INSPECT": false,
"FUNC_AI_MONITORING": false, "FUNC_AI_MONITORING": false,
"FUNC_BUILDPLATE_MARKER_DETECT": false, "FUNC_BUILDPLATE_MARKER_DETECT": false,
"FUNC_FLOW_CALIBRATION": false, "FUNC_FLOW_CALIBRATION": false,
"FUNC_MONITORING": false, "FUNC_MONITORING": false,
"FUNC_MEDIA_FILE": false, "FUNC_MEDIA_FILE": false,
"FUNC_REMOTE_TUNNEL": false, "FUNC_VIRTUAL_CAMERA": false,
"FUNC_LOCAL_TUNNEL": true, "FUNC_PRINT_WITHOUT_SD": false,
"FUNC_VIRTUAL_CAMERA" : false, "FUNC_ALTER_RESOLUTION": false,
"FUNC_PRINT_WITHOUT_SD": false, "FUNC_CHAMBER_FAN": false,
"FUNC_ALTER_RESOLUTION": false, "FUNC_PRINT_ALL": false,
"FUNC_CHAMBER_FAN" : false, "FUNC_EXTRUSION_CALI": true
"FUNC_EXTRUSION_CALI": true,
"FUNC_PRINT_ALL" : false
},
"camera_resolution":["720p"],
"bed_temperature_limit": 100,
"model_id": "C11",
"printer_type": "C11",
"ftp_folder" : "sdcard/",
"printer_thumbnail_image": "printer_thumbnail_p1p"
}, },
{ "camera_resolution": [ "720p" ],
"display_name": "Bambu Lab X1", "bed_temperature_limit": 100,
"func": { "model_id": "C11",
"FUNC_VIRTUAL_TYAY" : true, "printer_type": "C11",
"FUNC_EXTRUSION_CALI": false, "ftp_folder" : "sdcard/",
"FUNC_LOCAL_TUNNEL": false "printer_thumbnail_image": "printer_thumbnail_p1p"
}, },
"model_id": "BL-P002", {
"camera_resolution":["720p","1080p"], "display_name": "Bambu Lab X1",
"printer_type": "3DPrinter-X1", "func": {
"printer_thumbnail_image": "printer_thumbnail" "FUNC_VIRTUAL_TYAY" : true,
"FUNC_EXTRUSION_CALI": false,
"FUNC_LOCAL_TUNNEL": false
}, },
{ "model_id": "BL-P002",
"display_name": "Bambu Lab X1 Carbon", "camera_resolution":["720p","1080p"],
"func": { "printer_type": "3DPrinter-X1",
"FUNC_VIRTUAL_TYAY" : true, "printer_thumbnail_image": "printer_thumbnail"
"FUNC_EXTRUSION_CALI": false, },
"FUNC_LOCAL_TUNNEL": false {
}, "display_name": "Bambu Lab X1 Carbon",
"model_id": "BL-P001", "func": {
"camera_resolution":["720p","1080p"], "FUNC_VIRTUAL_TYAY" : true,
"printer_type": "3DPrinter-X1-Carbon", "FUNC_EXTRUSION_CALI": false,
"printer_thumbnail_image": "printer_thumbnail" "FUNC_LOCAL_TUNNEL": false
} },
"model_id": "BL-P001",
"camera_resolution":["720p","1080p"],
"printer_type": "3DPrinter-X1-Carbon",
"printer_thumbnail_image": "printer_thumbnail"
}
] ]
} }

6
src/slic3r/GUI/DeviceManager.cpp
View File

@ -1394,6 +1394,7 @@ void MachineObject::parse_version_func()
else { else {
local_use_ssl = ota_version->second.sw_ver.compare("01.03.01.04") >= 0; local_use_ssl = ota_version->second.sw_ver.compare("01.03.01.04") >= 0;
} }
is_support_remote_tunnel = true;
} }
} else if (printer_type == "C11") { } else if (printer_type == "C11") {
if (firmware_type == PrinterFirmwareType::FIRMWARE_TYPE_ENGINEER) if (firmware_type == PrinterFirmwareType::FIRMWARE_TYPE_ENGINEER)
@ -1404,6 +1405,7 @@ void MachineObject::parse_version_func()
is_cloud_print_only = true; is_cloud_print_only = true;
if (ota_version != module_vers.end()) { if (ota_version != module_vers.end()) {
is_support_send_to_sdcard = ota_version->second.sw_ver.compare("01.02.00.00") >= 0; 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;
} }
if (esp32_version != module_vers.end()) { if (esp32_version != module_vers.end()) {
ams_support_auto_switch_filament_flag = esp32_version->second.sw_ver.compare("00.03.11.50") >= 0; ams_support_auto_switch_filament_flag = esp32_version->second.sw_ver.compare("00.03.11.50") >= 0;
@ -2256,7 +2258,9 @@ bool MachineObject::is_function_supported(PrinterFunction func)
func_name = "FUNC_MEDIA_FILE"; func_name = "FUNC_MEDIA_FILE";
break; break;
case FUNC_REMOTE_TUNNEL: case FUNC_REMOTE_TUNNEL:
func_name = "FUNC_REMOTE_TUNNEL"; parse_version_func();
if (!is_support_remote_tunnel)
return false;
break; break;
case FUNC_LOCAL_TUNNEL: case FUNC_LOCAL_TUNNEL:
func_name = "FUNC_LOCAL_TUNNEL"; func_name = "FUNC_LOCAL_TUNNEL";

1
src/slic3r/GUI/DeviceManager.hpp
View File

@ -632,6 +632,7 @@ public:
std::string camera_resolution = ""; std::string camera_resolution = "";
bool xcam_first_layer_inspector { false }; bool xcam_first_layer_inspector { false };
int xcam_first_layer_hold_count = 0; int xcam_first_layer_hold_count = 0;
bool is_support_remote_tunnel{false};
bool xcam_ai_monitoring{ false }; bool xcam_ai_monitoring{ false };
int xcam_ai_monitoring_hold_count = 0; int xcam_ai_monitoring_hold_count = 0;