juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-16 18:12:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

NEW:add fan control

Browse Source 
Change-Id: I3b5c7cf638306aaac81459c2f25e37008a5a8a2f
This commit is contained in:
tao wang
2022-12-07 10:46:15 +08:00
committed by Lane.Wei
parent 59773eee02
commit b61da88d51
24 changed files with 1240 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -364,6 +364,7 @@ MachineObject::MachineObject(NetworkAgent* agent, std::string name, std::string
cooling_fan_speed = 0;
big_fan1_speed = 0;
big_fan2_speed = 0;
fan_gear = 0;
/* printing */
mc_print_stage = 0;
@@ -1379,6 +1380,13 @@ int MachineObject::command_control_fan(FanType fan_type, bool on_off)
return this->publish_gcode(gcode);
}
int MachineObject::command_control_fan_val(FanType fan_type, int val)
{
std::string gcode = (boost::format("M106 P%1% S%2% \n") % (int)fan_type % (val)).str();
return this->publish_gcode(gcode);
}
int MachineObject::command_task_abort()
{
json j;
@@ -2322,7 +2330,13 @@ int MachineObject::parse_json(std::string payload)
wifi_signal = jj["wifi_signal"].get<std::string>();
/* cooling */
if (jj.contains("cooling_fan_speed")) {
if (jj.contains("fan_gear")) {
fan_gear = jj["fan_gear"].get<std::uint32_t>();
big_fan2_speed = (int)((fan_gear & 0x00FF0000) >> 16);
big_fan1_speed = (int)((fan_gear & 0x0000FF00) >> 8);
cooling_fan_speed= (int)((fan_gear & 0x000000FF) >> 0);
}
/* if (jj.contains("cooling_fan_speed")) {
cooling_fan_speed = stoi(jj["cooling_fan_speed"].get<std::string>());
}
if (jj.contains("big_fan1_speed")) {
@@ -2330,7 +2344,7 @@ int MachineObject::parse_json(std::string payload)
}
if (jj.contains("big_fan2_speed")) {
big_fan2_speed = stoi(jj["big_fan2_speed"].get<std::string>());
}
}*/
if (jj.contains("heatbreak_fan_speed")) {
heatbreak_fan_speed = stoi(jj["heatbreak_fan_speed"].get<std::string>());
}