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

FIX:fixed obtaining incorrect bits

Browse Source 
jira:[none]

Change-Id: I27a4ae24870276912b69fad1c0285889e749030b
(cherry picked from commit 207d81c76933c5cf2fe2d28ed70ab2d246af2615)
This commit is contained in:
tao wang
2024-12-24 16:18:31 +08:00
committed by Noisyfox
parent caa921976c
commit 09b7d41fe3
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5779,12 +5779,12 @@ void MachineObject::parse_new_info(json print)
int range = (*it_part)["range"].get<int>(); int range = (*it_part)["range"].get<int>();
AirParts part; AirParts part;
part.type = get_flag_bits((*it_part)["id"].get<int>(), 0, 3); part.type = get_flag_bits((*it_part)["id"].get<int>(), 0, 4);
part.id = get_flag_bits((*it_part)["id"].get<int>(), 4, 12); part.id = get_flag_bits((*it_part)["id"].get<int>(), 4, 9);
part.func = (*it_part)["func"].get<int>(); part.func = (*it_part)["func"].get<int>();
part.state = get_flag_bits(state, 0, 8); part.state = get_flag_bits(state, 0, 8);
part.range_start = get_flag_bits(range, 0, 15); part.range_start = get_flag_bits(range, 0, 16);
part.range_end = get_flag_bits(range, 16, 15); part.range_end = get_flag_bits(range, 16, 16);
m_air_duct_data.parts.push_back(part); 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<int>(), 16, 16); chamber_temp_target = get_flag_bits(device["cham_temp"].get<int>(), 16, 16);
} }
if (device.contains("fan")) {
big_fan1_speed = get_flag_bits(device["fan"].get<int>(), 0, 3);
big_fan2_speed = get_flag_bits(device["fan"].get<int>(), 4, 3);
cooling_fan_speed = get_flag_bits(device["fan"].get<int>(), 8, 3);
heatbreak_fan_speed = get_flag_bits(device["fan"].get<int>(), 12, 3);
}
if (device.contains("nozzle")) { if (device.contains("nozzle")) {
json const &nozzle = device["nozzle"]; json const &nozzle = device["nozzle"];