juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-17 02:22:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX:Fixed incorrect printer status

Browse Source 
jira:[fixed device issue ]

Change-Id: Ibab8db09854adca1e80acaf3831c6e4191e137c7
(cherry picked from commit 0572d811780ac406214665af7748e4ba8243bdc8)
(cherry picked from commit b60cdcfed85b1dc89c23ee21cb613e5be86eb14d)
This commit is contained in:
tao wang
2024-12-10 17:29:43 +08:00
committed by Noisyfox
parent 2ec35f9dad
commit bf247fba0f
5 changed files with 66 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1648,8 +1648,6 @@ int MachineObject::command_select_extruder(int id)
{
BOOST_LOG_TRIVIAL(info) << "select_extruder";
nozzle_selected_count = HOLD_COUNT_MAX;
json j;
j["print"]["sequence_id"] = std::to_string(MachineObject::m_sequence_id++);
j["print"]["command"] = "select_extruder";
@@ -1907,8 +1905,6 @@ int MachineObject::command_set_nozzle_new(int nozzle_id, int temp)
{
BOOST_LOG_TRIVIAL(info) << "set_nozzle_temp";
nozzle_selected_count = HOLD_COUNT_MAX;
json j;
j["print"]["sequence_id"] = std::to_string(MachineObject::m_sequence_id++);
j["print"]["command"] = "set_nozzle_temp";
@@ -5430,7 +5426,7 @@ void MachineObject::converse_to_duct(bool is_suppt_part_fun, bool is_suppt_aux_f
m_air_duct_data.curren_mode = -1; //def mode
if (is_suppt_part_fun) {
if (is_suppt_part_fun) {
AirParts part_fan;
part_fan.type = int(AirDuctType::AIR_FAN_TYPE);
part_fan.id = int(AIR_FUN::FAN_COOLING_0_AIRDOOR);
@@ -5834,7 +5830,12 @@ void MachineObject::parse_new_info(json print)
extder_data.target_extder_id = get_flag_bits(extruder["state"].get<int>(), 8, 4);
extder_data.switch_extder_state = (ExtruderSwitchState) get_flag_bits(extruder["state"].get<int>(), 12, 3);
if (extder_data.switch_extder_state != ExtruderSwitchState::ES_SWITCHING && extder_data.target_extder_id == extder_data.current_extder_id) {
flag_update_nozzle = true;
}
extder_data.current_loading_extder_id = get_flag_bits(extruder["state"].get<int>(), 15, 4);
extder_data.current_busy_for_loading = get_flag_bits(extruder["state"].get<int>(), 19);
for (auto it = extruder["info"].begin(); it != extruder["info"].end(); it++) {