From 09b7d41fe33ba9674c275f958586cac31b6d6b26 Mon Sep 17 00:00:00 2001 From: tao wang Date: Tue, 24 Dec 2024 16:18:31 +0800 Subject: [PATCH] FIX:fixed obtaining incorrect bits jira:[none] Change-Id: I27a4ae24870276912b69fad1c0285889e749030b (cherry picked from commit 207d81c76933c5cf2fe2d28ed70ab2d246af2615) --- src/slic3r/GUI/DeviceManager.cpp | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp index db933574d9..275b3a6dd9 100644 --- a/src/slic3r/GUI/DeviceManager.cpp +++ b/src/slic3r/GUI/DeviceManager.cpp @@ -5779,12 +5779,12 @@ void MachineObject::parse_new_info(json print) int range = (*it_part)["range"].get(); AirParts part; - part.type = get_flag_bits((*it_part)["id"].get(), 0, 3); - part.id = get_flag_bits((*it_part)["id"].get(), 4, 12); + part.type = get_flag_bits((*it_part)["id"].get(), 0, 4); + part.id = get_flag_bits((*it_part)["id"].get(), 4, 9); part.func = (*it_part)["func"].get(); part.state = get_flag_bits(state, 0, 8); - part.range_start = get_flag_bits(range, 0, 15); - part.range_end = get_flag_bits(range, 16, 15); + part.range_start = get_flag_bits(range, 0, 16); + part.range_end = get_flag_bits(range, 16, 16); m_air_duct_data.parts.push_back(part); } @@ -5805,13 +5805,6 @@ void MachineObject::parse_new_info(json print) chamber_temp_target = get_flag_bits(device["cham_temp"].get(), 16, 16); } - if (device.contains("fan")) { - big_fan1_speed = get_flag_bits(device["fan"].get(), 0, 3); - big_fan2_speed = get_flag_bits(device["fan"].get(), 4, 3); - cooling_fan_speed = get_flag_bits(device["fan"].get(), 8, 3); - heatbreak_fan_speed = get_flag_bits(device["fan"].get(), 12, 3); - } - if (device.contains("nozzle")) { json const &nozzle = device["nozzle"];