From 7fe0ee091f21bc7d2afa6ebab6852bfbe58a4eec Mon Sep 17 00:00:00 2001 From: "chunmao.guo" Date: Tue, 10 Jan 2023 14:55:09 +0800 Subject: [PATCH] FIX: [STUDIO-1908] add printer cert and version compatible Change-Id: I6aef8c1169952a0b541516ab3a0d7de2d3e213b3 (cherry picked from commit b0bbb571c7c54e81cd52262d334eb1463c3550e7) --- resources/cert/printer.cer | 21 +++++++++++++++++++++ resources/config.json | 3 +-- src/slic3r/GUI/DeviceManager.cpp | 9 ++++----- 3 files changed, 26 insertions(+), 7 deletions(-) create mode 100644 resources/cert/printer.cer diff --git a/resources/cert/printer.cer b/resources/cert/printer.cer new file mode 100644 index 000000000..782926984 --- /dev/null +++ b/resources/cert/printer.cer @@ -0,0 +1,21 @@ +-----BEGIN CERTIFICATE----- +MIIDZTCCAk2gAwIBAgIUV1FckwXElyek1onFnQ9kL7Bk4N8wDQYJKoZIhvcNAQEL +BQAwQjELMAkGA1UEBhMCQ04xIjAgBgNVBAoMGUJCTCBUZWNobm9sb2dpZXMgQ28u +LCBMdGQxDzANBgNVBAMMBkJCTCBDQTAeFw0yMjA0MDQwMzQyMTFaFw0zMjA0MDEw +MzQyMTFaMEIxCzAJBgNVBAYTAkNOMSIwIAYDVQQKDBlCQkwgVGVjaG5vbG9naWVz +IENvLiwgTHRkMQ8wDQYDVQQDDAZCQkwgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IB +DwAwggEKAoIBAQDL3pnDdxGOk5Z6vugiT4dpM0ju+3Xatxz09UY7mbj4tkIdby4H +oeEdiYSZjc5LJngJuCHwtEbBJt1BriRdSVrF6M9D2UaBDyamEo0dxwSaVxZiDVWC +eeCPdELpFZdEhSNTaT4O7zgvcnFsfHMa/0vMAkvE7i0qp3mjEzYLfz60axcDoJLk +p7n6xKXI+cJbA4IlToFjpSldPmC+ynOo7YAOsXt7AYKY6Glz0BwUVzSJxU+/+VFy +/QrmYGNwlrQtdREHeRi0SNK32x1+bOndfJP0sojuIrDjKsdCLye5CSZIvqnbowwW +1jRwZgTBR29Zp2nzCoxJYcU9TSQp/4KZuWNVAgMBAAGjUzBRMB0GA1UdDgQWBBSP +NEJo3GdOj8QinsV8SeWr3US+HjAfBgNVHSMEGDAWgBSPNEJo3GdOj8QinsV8SeWr +3US+HjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQABlBIT5ZeG +fgcK1LOh1CN9sTzxMCLbtTPFF1NGGA13mApu6j1h5YELbSKcUqfXzMnVeAb06Htu +3CoCoe+wj7LONTFO++vBm2/if6Jt/DUw1CAEcNyqeh6ES0NX8LJRVSe0qdTxPJuA +BdOoo96iX89rRPoxeed1cpq5hZwbeka3+CJGV76itWp35Up5rmmUqrlyQOr/Wax6 +itosIzG0MfhgUzU51A2P/hSnD3NDMXv+wUY/AvqgIL7u7fbDKnku1GzEKIkfH8hm +Rs6d8SCU89xyrwzQ0PR853irHas3WrHVqab3P+qNwR0YirL0Qk7Xt/q3O1griNg2 +Blbjg3obpHo9 +-----END CERTIFICATE----- diff --git a/resources/config.json b/resources/config.json index c3957b877..555c8891a 100644 --- a/resources/config.json +++ b/resources/config.json @@ -19,8 +19,7 @@ "FUNC_AUTO_SWITCH_FILAMENT": false, "FUNC_CHAMBER_FAN" : false, "FUNC_EXTRUSION_CALI": true, - "FUNC_PRINT_ALL" : false, - "FUNC_SEND_TO_SDCARD": false + "FUNC_PRINT_ALL" : false }, "camera_resolution":["720p"], "bed_temperature_limit": 100, diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp index b44569104..6c94362bf 100644 --- a/src/slic3r/GUI/DeviceManager.cpp +++ b/src/slic3r/GUI/DeviceManager.cpp @@ -1333,12 +1333,11 @@ void MachineObject::parse_version_func() is_support_ai_monitoring = true; is_support_ams_humidity = true; } - if (ota_version->second.sw_ver.compare("01.03.00.00") <= 0) { - local_use_ssl = false; - } else { - local_use_ssl = true; - } + local_use_ssl = ota_version->second.sw_ver.compare("01.03.01.02") >= 0; } + } else if (printer_type == "C11") { + local_use_ssl = true; + is_support_send_to_sdcard = ota_version->second.sw_ver.compare("01.02.00.00") >= 0; } }