From 929a8e3adfd64c211ff04dd74c00ca436d4a8be5 Mon Sep 17 00:00:00 2001 From: Stone Li Date: Wed, 30 Nov 2022 10:06:44 +0800 Subject: [PATCH] FIX: fix calibration bug 1. fix in calibration display error 2. refine ams remain filament settings Change-Id: I2b3d86064707c6732b6f127e08b62baaa0dac0ae Signed-off-by: Stone Li --- src/slic3r/GUI/DeviceManager.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp index 55d9d43be..b5a0810ab 100644 --- a/src/slic3r/GUI/DeviceManager.cpp +++ b/src/slic3r/GUI/DeviceManager.cpp @@ -1096,7 +1096,8 @@ int MachineObject::get_curr_stage_idx() 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) { return true; } 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) { ams_user_setting_hold_count--; } else {