3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-27 00:24:00 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ENH: waiting for printer ack in printing job

Browse source 
JIRA: STUDIO-4175

Change-Id: I94c26497979d7ffecebf378a4c4bc244914491fd
Signed-off-by: Stone Li <stone.li@bambulab.com>
This commit is contained in:
Stone Li 2023-09-11 15:55:00 +08:00 • committed by Lane.Wei
parent 38b86616ce
commit 2ff4173db3
9 changed files with 101 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/slic3r/GUI/DeviceManager.cpp
View file

@ -1645,6 +1645,7 @@ int MachineObject::command_control_fan_val(FanType fan_type, int val)
int MachineObject::command_task_abort()
{
BOOST_LOG_TRIVIAL(trace) << "command_task_abort: ";
json j;
j["print"]["command"] = "stop";
j["print"]["param"] = "";
@ -1653,6 +1654,18 @@ int MachineObject::command_task_abort()
return this->publish_json(j.dump(), 1);
}
int MachineObject::command_task_cancel(std::string job_id)
{
BOOST_LOG_TRIVIAL(trace) << "command_task_cancel: " << job_id;
json j;
j["print"]["command"] = "stop";
j["print"]["param"] = "";
j["print"]["job_id"] = job_id;
j["print"]["sequence_id"] = std::to_string(MachineObject::m_sequence_id++);
return this->publish_json(j.dump(), 1);
}
int MachineObject::command_task_pause()
{
json j;
@ -2460,6 +2473,7 @@ void MachineObject::reset()
nozzle_diameter = 0.0f;
network_wired = false;
dev_connection_name = "";
job_id_ = "";
// reset print_json
json empty_j;
@ -3064,6 +3078,10 @@ int MachineObject::parse_json(std::string payload)
if (jj.contains("gcode_state")) {
this->set_print_state(jj["gcode_state"].get<std::string>());
}
if (jj.contains("job_id")) {
this->job_id_ = jj["job_id"].get<std::string>();
}
if (jj.contains("queue_number")) {
this->queue_number = jj["queue_number"].get<int>();
} else {
@ -4010,6 +4028,15 @@ int MachineObject::parse_json(std::string payload)
t["signal"] = this->wifi_signal;
m_agent->track_event("ack_cmd_gcode_line", t.dump());
}
} else if (jj["command"].get<std::string>() == "project_prepare") {
//ack of project file
BOOST_LOG_TRIVIAL(info) << "parse_json, ack of project_prepare = " << j.dump(4);
if (m_agent) {
if (jj.contains("job_id")) {
this->job_id_ = jj["job_id"].get<std::string>();
}
}
} else if (jj["command"].get<std::string>() == "project_file") {
//ack of project file
BOOST_LOG_TRIVIAL(debug) << "parse_json, ack of project_file = " << j.dump(4);
@ -4020,7 +4047,6 @@ int MachineObject::parse_json(std::string payload)
t["signal"] = this->wifi_signal;
m_agent->track_event("ack_cmd_project_file", t.dump());
}
std::string result;
if (jj.contains("result")) {
result = jj["result"].get<std::string>();