From f4a3ceba2b4885dff3c5df8370be0d4bd611f300 Mon Sep 17 00:00:00 2001 From: "xin.zhang" Date: Tue, 8 Apr 2025 18:27:46 +0800 Subject: [PATCH] FIX: add configured bed leveling option jira: [STUDIO-11412] Change-Id: I999d5f4df34c7b1979a340735abaf275f2574674 (cherry picked from commit 63e6890cc742a861c53a109ba848b69292a1a858) --- resources/printers/BL-P001.json | 2 +- resources/printers/BL-P002.json | 2 +- resources/printers/C11.json | 2 +- resources/printers/C12.json | 2 +- resources/printers/C13.json | 2 +- resources/printers/N1.json | 2 +- resources/printers/N2S.json | 2 +- resources/printers/version.txt | 2 +- src/slic3r/GUI/Calibration.cpp | 2 +- src/slic3r/GUI/DeviceManager.cpp | 6 +++--- src/slic3r/GUI/DeviceManager.hpp | 2 +- src/slic3r/GUI/SelectMachine.cpp | 9 ++++++--- 12 files changed, 19 insertions(+), 16 deletions(-) diff --git a/resources/printers/BL-P001.json b/resources/printers/BL-P001.json index 40f1bf1614..2b5fcd195e 100644 --- a/resources/printers/BL-P001.json +++ b/resources/printers/BL-P001.json @@ -23,7 +23,7 @@ "support_prompt_sound": false, "support_ams_humidity": false, "support_auto_recovery_step_loss": false, - "support_auto_leveling": true, + "support_bed_leveling": 1, "support_update_remain": false, "support_timelapse": true, "support_filament_backup": false, diff --git a/resources/printers/BL-P002.json b/resources/printers/BL-P002.json index 77f990e967..8b3cc0f69e 100644 --- a/resources/printers/BL-P002.json +++ b/resources/printers/BL-P002.json @@ -23,7 +23,7 @@ "support_prompt_sound": false, "support_ams_humidity": false, "support_auto_recovery_step_loss": false, - "support_auto_leveling": true, + "support_bed_leveling": 1, "support_update_remain": false, "support_timelapse": true, "support_filament_backup": false, diff --git a/resources/printers/C11.json b/resources/printers/C11.json index 885eb80d04..7cfb521f04 100644 --- a/resources/printers/C11.json +++ b/resources/printers/C11.json @@ -18,7 +18,7 @@ "support_prompt_sound": false, "support_ams_humidity": true, "support_auto_recovery_step_loss": true, - "support_auto_leveling": true, + "support_bed_leveling": 1, "support_update_remain": true, "support_timelapse": true, "support_filament_backup": true, diff --git a/resources/printers/C12.json b/resources/printers/C12.json index e0a9690050..4eae1d1357 100644 --- a/resources/printers/C12.json +++ b/resources/printers/C12.json @@ -18,7 +18,7 @@ "support_prompt_sound": false, "support_ams_humidity": true, "support_auto_recovery_step_loss": true, - "support_auto_leveling": true, + "support_bed_leveling": 1, "support_update_remain": true, "support_timelapse": true, "support_filament_backup": true, diff --git a/resources/printers/C13.json b/resources/printers/C13.json index b9f67823cb..d01e95257d 100644 --- a/resources/printers/C13.json +++ b/resources/printers/C13.json @@ -24,7 +24,7 @@ "support_prompt_sound": false, "support_ams_humidity": true, "support_auto_recovery_step_loss": true, - "support_auto_leveling": true, + "support_bed_leveling": 1, "support_update_remain": true, "support_timelapse": true, "support_filament_backup": true, diff --git a/resources/printers/N1.json b/resources/printers/N1.json index 842150c42a..d99d2b94a2 100644 --- a/resources/printers/N1.json +++ b/resources/printers/N1.json @@ -19,7 +19,7 @@ "support_prompt_sound": true, "support_ams_humidity": false, "support_auto_recovery_step_loss": true, - "support_auto_leveling": true, + "support_bed_leveling": 1, "support_update_remain": false, "support_timelapse": true, "support_filament_backup": true, diff --git a/resources/printers/N2S.json b/resources/printers/N2S.json index f8f3248e1d..540f1fe013 100644 --- a/resources/printers/N2S.json +++ b/resources/printers/N2S.json @@ -19,7 +19,7 @@ "support_prompt_sound": true, "support_ams_humidity": false, "support_auto_recovery_step_loss": true, - "support_auto_leveling": true, + "support_bed_leveling": 1, "support_update_remain": false, "support_timelapse": true, "support_filament_backup": true, diff --git a/resources/printers/version.txt b/resources/printers/version.txt index 71c8fec3cc..c4d9c69e10 100644 --- a/resources/printers/version.txt +++ b/resources/printers/version.txt @@ -1 +1 @@ -02.00.00.11 \ No newline at end of file +02.00.00.12 \ No newline at end of file diff --git a/src/slic3r/GUI/Calibration.cpp b/src/slic3r/GUI/Calibration.cpp index 28cd189a41..bab6e83130 100644 --- a/src/slic3r/GUI/Calibration.cpp +++ b/src/slic3r/GUI/Calibration.cpp @@ -221,7 +221,7 @@ void CalibrationDialog::update_cali(MachineObject *obj) m_checkbox_list["xcam_cali"]->SetValue(false); } - if(obj->is_support_auto_leveling){ + if(obj->is_support_bed_leveling != 0){ select_bed_leveling->Show(); }else{ select_bed_leveling->Hide(); diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp index 033dfff4fc..a0dd551ec7 100644 --- a/src/slic3r/GUI/DeviceManager.cpp +++ b/src/slic3r/GUI/DeviceManager.cpp @@ -3517,9 +3517,9 @@ int MachineObject::parse_json(std::string payload, bool key_field_only) } } - if (jj.contains("support_auto_leveling")) { - if (jj["support_auto_leveling"].is_boolean()) { - is_support_auto_leveling = jj["support_auto_leveling"].get(); + if (jj.contains("support_bed_leveling")) { + if (jj["support_bed_leveling"].is_number_integer()) { + is_support_bed_leveling = jj["support_bed_leveling"].get(); } } diff --git a/src/slic3r/GUI/DeviceManager.hpp b/src/slic3r/GUI/DeviceManager.hpp index 6843c4665d..f88c8ffbc1 100644 --- a/src/slic3r/GUI/DeviceManager.hpp +++ b/src/slic3r/GUI/DeviceManager.hpp @@ -1056,7 +1056,7 @@ public: bool is_support_show_filament_backup{false};/*the filament is not supported shown in some previous hardware*/ bool is_support_timelapse{false}; bool is_support_update_remain{false}; - bool is_support_auto_leveling{false}; + int is_support_bed_leveling = 0;/*0: false; 1; on/off 2: auto/on/off*/ bool is_support_auto_recovery_step_loss{false}; bool is_support_ams_humidity {false}; bool is_support_prompt_sound{false}; diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index 3c380a9e41..ab202fe103 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -2413,13 +2413,16 @@ void SelectMachineDialog::update_option_opts(MachineObject *obj) m_checkbox_list["timelapse"]->Show(); /*bed_leveling*/ - if (obj->is_enable_np) { + if (obj->is_support_bed_leveling == 2) { + m_checkbox_list["bed_leveling"]->Show(); m_checkbox_list["bed_leveling"]->update_options(ops_auto, _L("This checks the flatness of heatbed. Leveling makes extruded height uniform.\n*Automatic mode: Run a " "leveling check(about 10 seconds). Skip if surface is fine.")); - } else { + } else if (obj->is_support_bed_leveling == 1) { + m_checkbox_list["bed_leveling"]->Show(); m_checkbox_list["bed_leveling"]->update_options(ops_no_auto, _L("This checks the flatness of heatbed. Leveling makes extruded height uniform.")); + } else { + m_checkbox_list["bed_leveling"]->Hide(); } - m_checkbox_list["bed_leveling"]->Show(obj->is_support_auto_leveling); /*nozzle_offset_cali*/ if (obj->is_support_nozzle_offset_cali) {