mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NEW:Use new command for chamber temperature settings 

jira:[STUDIO-4296]

Change-Id: Ic70a6f6dc412cde7f6d9d6361f8646df59df56b9
This commit is contained in:
tao wang 2023-08-31 12:25:45 +08:00 committed by Lane.Wei
parent 147b6beecb
commit db6bfca564
1 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1673,16 +1673,12 @@ int MachineObject::command_set_nozzle(int temp)
int MachineObject::command_set_chamber(int temp) int MachineObject::command_set_chamber(int temp)
{ {
std::string gcode_str = (boost::format("M141 S%1%\n") % temp).str(); json j;
try { j["print"]["sequence_id"] = std::to_string(MachineObject::m_sequence_id++);
json j; j["print"]["command"] = "set_ctt";
j["temp_control"] = "chamber_temp"; j["print"]["ctt_val"] = temp;
NetworkAgent* agent = GUI::wxGetApp().getAgent(); return this->publish_json(j.dump(), 1);
if (agent) agent->track_event("printer_control", j.dump());
}
catch (...) {}
return this->publish_gcode(gcode_str);
} }
int MachineObject::command_ams_switch(int tray_index, int old_temp, int new_temp) int MachineObject::command_ams_switch(int tray_index, int old_temp, int new_temp)
@ -2884,6 +2880,30 @@ int MachineObject::parse_json(std::string payload)
if (jj.contains("command")) { if (jj.contains("command")) {
if (jj["command"].get<std::string>() == "ams_change_filament") {
if (jj.contains("errno")) {
if (jj["errno"].is_number()) {
if (jj["errno"].get<int>() == -2) {
wxString text = _L("The current chamber temperature or the target chamber temperature exceeds 45\u2103.In order to avoid extruder clogging,low temperature filament(PLA/PETG/TPU) is not allowed to be loaded.");
GUI::wxGetApp().show_dialog(text);
}
}
}
}
if (jj["command"].get<std::string>() == "set_ctt") {
if (m_agent && is_studio_cmd(sequence_id)) {
if (jj["errno"].is_number()) {
if (jj["errno"].get<int>() == -2) {
wxString text = _L("Low temperature filament(PLA/PETG/TPU) is loaded in the extruder.In order to avoid extruder clogging,it is not allowed to set the chamber temperature above 45\u2103.");
GUI::wxGetApp().show_dialog(text);
}
}
}
}
if (jj["command"].get<std::string>() == "push_status") { if (jj["command"].get<std::string>() == "push_status") {
m_push_count++; m_push_count++;
last_push_time = std::chrono::system_clock::now(); last_push_time = std::chrono::system_clock::now();