3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-01-02 13:00:28 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

FIX: add configured bed leveling option

Browse source 
jira: [STUDIO-11412]
Change-Id: I999d5f4df34c7b1979a340735abaf275f2574674
(cherry picked from commit 63e6890cc742a861c53a109ba848b69292a1a858)
This commit is contained in:
xin.zhang 2025-04-08 18:27:46 +08:00 • committed by Noisyfox
parent b1b82927b2
commit f4a3ceba2b
12 changed files with 19 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/printers/BL-P001.json
View file

@ -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,

2
resources/printers/BL-P002.json
View file

@ -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,

2
resources/printers/C11.json
View file

@ -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,

2
resources/printers/C12.json
View file

@ -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,

2
resources/printers/C13.json
View file

@ -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,

2
resources/printers/N1.json
View file

@ -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,

2
resources/printers/N2S.json
View file

@ -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,

2
resources/printers/version.txt
View file

@ -1 +1 @@
02.00.00.11
02.00.00.12

2
src/slic3r/GUI/Calibration.cpp
View file

@ -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();

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

@ -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<bool>();
if (jj.contains("support_bed_leveling")) {
if (jj["support_bed_leveling"].is_number_integer()) {
is_support_bed_leveling = jj["support_bed_leveling"].get<int>();
}
}

2
src/slic3r/GUI/DeviceManager.hpp
View file

@ -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};

9
src/slic3r/GUI/SelectMachine.cpp
View file

@ -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) {