mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: fix calibration bug 

1. fix in calibration display error
2. refine ams remain filament settings

Change-Id: I2b3d86064707c6732b6f127e08b62baaa0dac0ae
Signed-off-by: Stone Li <stone.li@bambulab.com>
This commit is contained in:
Stone Li 2022-11-30 10:06:44 +08:00 committed by Lane.Wei
parent ba8015e455
commit 929a8e3adf
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1096,7 +1096,8 @@ int MachineObject::get_curr_stage_idx()
bool MachineObject::is_in_calibration() bool MachineObject::is_in_calibration()
{ {
if (boost::contains(m_gcode_file, "auto_cali_for_user.gcode") // gcode file: auto_cali_for_user.gcode or auto_cali_for_user_param
if (boost::contains(m_gcode_file, "auto_cali_for_user")
&& stage_curr != 0) { && stage_curr != 0) {
return true; return true;
} else { } else {
@ -2530,7 +2531,8 @@ int MachineObject::parse_json(std::string payload)
} }
} }
if (jj["ams"].contains("insert_flag") || jj["ams"].contains("power_on_flag")) { if (jj["ams"].contains("insert_flag") || jj["ams"].contains("power_on_flag")
|| jj["ams"].contains("calibrate_remain_flag")) {
if (ams_user_setting_hold_count > 0) { if (ams_user_setting_hold_count > 0) {
ams_user_setting_hold_count--; ams_user_setting_hold_count--;
} else { } else {