From b5663b25c995541f73f5a473def6a347cd663ca7 Mon Sep 17 00:00:00 2001 From: "chunmao.guo" Date: Mon, 10 Apr 2023 20:20:21 +0800 Subject: [PATCH] FIX: is_support_remote_tunnel P1P >= 01.03.00.00 Change-Id: I97e7a38f7bd3d42f61fb4c56b3757b36805a28bf --- resources/config.json | 94 ++++++++++++++++---------------- src/slic3r/GUI/DeviceManager.cpp | 6 +- src/slic3r/GUI/DeviceManager.hpp | 1 + 3 files changed, 52 insertions(+), 49 deletions(-) diff --git a/resources/config.json b/resources/config.json index e0a5acfa6..f7c1e3f79 100644 --- a/resources/config.json +++ b/resources/config.json @@ -1,54 +1,52 @@ { "printers": [ - { - "display_name": "Bambu Lab P1P", - "func": { - "FUNC_CHAMBER_TEMP": false, - "FUNC_FIRSTLAYER_INSPECT": false, - "FUNC_AI_MONITORING": false, - "FUNC_BUILDPLATE_MARKER_DETECT": false, - "FUNC_FLOW_CALIBRATION": false, - "FUNC_MONITORING": false, - "FUNC_MEDIA_FILE": false, - "FUNC_REMOTE_TUNNEL": false, - "FUNC_LOCAL_TUNNEL": true, - "FUNC_VIRTUAL_CAMERA" : false, - "FUNC_PRINT_WITHOUT_SD": false, - "FUNC_ALTER_RESOLUTION": false, - "FUNC_CHAMBER_FAN" : false, - "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" + { + "display_name": "Bambu Lab P1P", + "func": { + "FUNC_CHAMBER_TEMP": false, + "FUNC_FIRSTLAYER_INSPECT": false, + "FUNC_AI_MONITORING": false, + "FUNC_BUILDPLATE_MARKER_DETECT": false, + "FUNC_FLOW_CALIBRATION": false, + "FUNC_MONITORING": false, + "FUNC_MEDIA_FILE": false, + "FUNC_VIRTUAL_CAMERA": false, + "FUNC_PRINT_WITHOUT_SD": false, + "FUNC_ALTER_RESOLUTION": false, + "FUNC_CHAMBER_FAN": false, + "FUNC_PRINT_ALL": false, + "FUNC_EXTRUSION_CALI": true }, - { - "display_name": "Bambu Lab X1", - "func": { - "FUNC_VIRTUAL_TYAY" : true, - "FUNC_EXTRUSION_CALI": false, - "FUNC_LOCAL_TUNNEL": false - }, - "model_id": "BL-P002", - "camera_resolution":["720p","1080p"], - "printer_type": "3DPrinter-X1", - "printer_thumbnail_image": "printer_thumbnail" + "camera_resolution": [ "720p" ], + "bed_temperature_limit": 100, + "model_id": "C11", + "printer_type": "C11", + "ftp_folder" : "sdcard/", + "printer_thumbnail_image": "printer_thumbnail_p1p" + }, + { + "display_name": "Bambu Lab X1", + "func": { + "FUNC_VIRTUAL_TYAY" : true, + "FUNC_EXTRUSION_CALI": false, + "FUNC_LOCAL_TUNNEL": false }, - { - "display_name": "Bambu Lab X1 Carbon", - "func": { - "FUNC_VIRTUAL_TYAY" : true, - "FUNC_EXTRUSION_CALI": false, - "FUNC_LOCAL_TUNNEL": false - }, - "model_id": "BL-P001", - "camera_resolution":["720p","1080p"], - "printer_type": "3DPrinter-X1-Carbon", - "printer_thumbnail_image": "printer_thumbnail" - } + "model_id": "BL-P002", + "camera_resolution":["720p","1080p"], + "printer_type": "3DPrinter-X1", + "printer_thumbnail_image": "printer_thumbnail" + }, + { + "display_name": "Bambu Lab X1 Carbon", + "func": { + "FUNC_VIRTUAL_TYAY" : true, + "FUNC_EXTRUSION_CALI": false, + "FUNC_LOCAL_TUNNEL": false + }, + "model_id": "BL-P001", + "camera_resolution":["720p","1080p"], + "printer_type": "3DPrinter-X1-Carbon", + "printer_thumbnail_image": "printer_thumbnail" + } ] } diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp index c15eaea9f..a67bd6211 100644 --- a/src/slic3r/GUI/DeviceManager.cpp +++ b/src/slic3r/GUI/DeviceManager.cpp @@ -1394,6 +1394,7 @@ void MachineObject::parse_version_func() else { local_use_ssl = ota_version->second.sw_ver.compare("01.03.01.04") >= 0; } + is_support_remote_tunnel = true; } } else if (printer_type == "C11") { if (firmware_type == PrinterFirmwareType::FIRMWARE_TYPE_ENGINEER) @@ -1404,6 +1405,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_remote_tunnel = ota_version->second.sw_ver.compare("01.02.99.00") >= 0; } if (esp32_version != module_vers.end()) { 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"; break; case FUNC_REMOTE_TUNNEL: - func_name = "FUNC_REMOTE_TUNNEL"; + parse_version_func(); + if (!is_support_remote_tunnel) + return false; break; case FUNC_LOCAL_TUNNEL: func_name = "FUNC_LOCAL_TUNNEL"; diff --git a/src/slic3r/GUI/DeviceManager.hpp b/src/slic3r/GUI/DeviceManager.hpp index 5097d77d2..959d8c3cd 100644 --- a/src/slic3r/GUI/DeviceManager.hpp +++ b/src/slic3r/GUI/DeviceManager.hpp @@ -632,6 +632,7 @@ public: std::string camera_resolution = ""; bool xcam_first_layer_inspector { false }; int xcam_first_layer_hold_count = 0; + bool is_support_remote_tunnel{false}; bool xcam_ai_monitoring{ false }; int xcam_ai_monitoring_hold_count = 0;