diff --git a/resources/config.json b/resources/config.json index 14dcfdd56..1e9a2acd4 100644 --- a/resources/config.json +++ b/resources/config.json @@ -14,7 +14,7 @@ "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 }, @@ -22,10 +22,36 @@ "bed_temperature_limit": 100, "model_id": "C11", "printer_type": "C11", - "compatible_machine": [ "BL-P001", "BL-P002"], + "compatible_machine": [ "BL-P001", "BL-P002", "C12"], "ftp_folder": "sdcard/", "printer_thumbnail_image": "printer_thumbnail_p1p" }, + { + "display_name": "Bambu Lab P1S", + "func": { + "FUNC_CHAMBER_TEMP": false, + "FUNC_FIRSTLAYER_INSPECT": false, + "FUNC_AI_MONITORING": true, + "FUNC_LIDAR_CALIBRATION": 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_PRINT_ALL": false, + "FUNC_VIRTUAL_TYAY": true, + "FUNC_EXTRUSION_CALI": true + }, + "camera_resolution": [ "720p" ], + "bed_temperature_limit": 100, + "model_id": "C12", + "compatible_machine":["BL-P001", "BL-P002", "C11"], + "printer_type": "C12", + "ftp_folder" : "sdcard/", + "printer_thumbnail_image": "printer_thumbnail_p1p" + }, { "display_name": "Bambu Lab X1", @@ -35,7 +61,7 @@ "FUNC_LOCAL_TUNNEL": false }, "model_id": "BL-P002", - "compatible_machine": [ "BL-P001", "C11"], + "compatible_machine": [ "BL-P001", "C11", "C12"], "camera_resolution": [ "720p", "1080p" ], "printer_type": "3DPrinter-X1", "printer_thumbnail_image": "printer_thumbnail" @@ -48,7 +74,7 @@ "FUNC_LOCAL_TUNNEL": false }, "model_id": "BL-P001", - "compatible_machine": [ "BL-P002", "C11"], + "compatible_machine": [ "BL-P002", "C11", "C12"], "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 24852d758..3779304f5 100644 --- a/src/slic3r/GUI/DeviceManager.cpp +++ b/src/slic3r/GUI/DeviceManager.cpp @@ -422,7 +422,7 @@ PrinterSeries MachineObject::get_printer_series() const { if (printer_type == "BL-P001" || printer_type == "BL-P002") return PrinterSeries::SERIES_X1; - else if (printer_type == "C11") + else if (printer_type == "C11" || printer_type == "C12") return PrinterSeries::SERIES_P1P; else return PrinterSeries::SERIES_P1P; @@ -1450,7 +1450,26 @@ void MachineObject::parse_version_func() else { is_support_mqtt_alive = ota_version->second.sw_ver.compare("01.03.50.01") >= 0; } + } else if (printer_type == "C12") { + is_support_ai_monitoring = true; + is_cloud_print_only = true; + local_camera_proto = 1; + + if (ota_version != module_vers.end()) { + is_support_tunnel_mqtt = (ota_version->second.sw_ver.compare("01.03.50.01") >= 0 || + (esp32_version != module_vers.end() && esp32_version->second.sw_ver.compare("01.05.15.00") >= 0)); + is_support_remote_tunnel = ota_version->second.sw_ver.compare("01.03.50.01") >= 0; + if (lifecycle == PrinterFirmwareType::FIRMWARE_TYPE_PRODUCTION) { + is_support_mqtt_alive = ota_version->second.sw_ver.compare("01.03.50.01") >= 0; + } + else if (lifecycle == PrinterFirmwareType::FIRMWARE_TYPE_ENGINEER) { + is_support_mqtt_alive = ota_version->second.sw_ver.compare("00.06.03.51") >= 0; + } + else { + is_support_mqtt_alive = ota_version->second.sw_ver.compare("01.03.50.01") >= 0; + } } + } } }