mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-19 19:33:47 +00:00
NEW: add HMS action to stop AMS drying
jira: [STUDIO-12372] Change-Id: Ic6a818487fdfdde206b63708303dfe8af6e79dbf (cherry picked from commit 092de0c43f7e3f4702f529c28a637a5b3d78e20a)
This commit is contained in:
@@ -2316,6 +2316,13 @@ int MachineObject::command_ams_control(std::string action)
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int MachineObject::command_ams_drying_stop()
|
||||||
|
{
|
||||||
|
json j;
|
||||||
|
j["print"]["command"] = "auto_stop_ams_dry";
|
||||||
|
j["print"]["sequence_id"] = std::to_string(MachineObject::m_sequence_id++);
|
||||||
|
return this->publish_json(j.dump());
|
||||||
|
}
|
||||||
|
|
||||||
int MachineObject::command_set_chamber_light(LIGHT_EFFECT effect, int on_time, int off_time, int loops, int interval)
|
int MachineObject::command_set_chamber_light(LIGHT_EFFECT effect, int on_time, int off_time, int loops, int interval)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1222,6 +1222,9 @@ public:
|
|||||||
int command_ams_refresh_rfid(std::string tray_id);
|
int command_ams_refresh_rfid(std::string tray_id);
|
||||||
int command_ams_refresh_rfid2(int ams_id, int slot_id);
|
int command_ams_refresh_rfid2(int ams_id, int slot_id);
|
||||||
int command_ams_control(std::string action);
|
int command_ams_control(std::string action);
|
||||||
|
|
||||||
|
int command_ams_drying_stop();
|
||||||
|
|
||||||
int command_set_chamber_light(LIGHT_EFFECT effect, int on_time = 500, int off_time = 500, int loops = 1, int interval = 1000);
|
int command_set_chamber_light(LIGHT_EFFECT effect, int on_time = 500, int off_time = 500, int loops = 1, int interval = 1000);
|
||||||
int command_set_chamber_light2(LIGHT_EFFECT effect, int on_time = 500, int off_time = 500, int loops = 1, int interval = 1000);
|
int command_set_chamber_light2(LIGHT_EFFECT effect, int on_time = 500, int off_time = 500, int loops = 1, int interval = 1000);
|
||||||
int command_set_work_light(LIGHT_EFFECT effect, int on_time = 500, int off_time = 500, int loops = 1, int interval = 1000);
|
int command_set_work_light(LIGHT_EFFECT effect, int on_time = 500, int off_time = 500, int loops = 1, int interval = 1000);
|
||||||
|
|||||||
@@ -153,7 +153,7 @@ UpdatePluginDialog::UpdatePluginDialog(wxWindow* parent /*= nullptr*/)
|
|||||||
auto m_button_ok = new Button(this, _L("OK"));
|
auto m_button_ok = new Button(this, _L("OK"));
|
||||||
m_button_ok->SetBackgroundColor(btn_bg_green);
|
m_button_ok->SetBackgroundColor(btn_bg_green);
|
||||||
m_button_ok->SetBorderColor(*wxWHITE);
|
m_button_ok->SetBorderColor(*wxWHITE);
|
||||||
m_button_ok->SetTextColor(wxColour(0xFFFFFE));
|
m_button_ok->SetTextColor(wxColour("#FFFFFE"));
|
||||||
m_button_ok->SetFont(Label::Body_12);
|
m_button_ok->SetFont(Label::Body_12);
|
||||||
m_button_ok->SetSize(wxSize(FromDIP(58), FromDIP(24)));
|
m_button_ok->SetSize(wxSize(FromDIP(58), FromDIP(24)));
|
||||||
m_button_ok->SetMinSize(wxSize(FromDIP(58), FromDIP(24)));
|
m_button_ok->SetMinSize(wxSize(FromDIP(58), FromDIP(24)));
|
||||||
@@ -1123,6 +1123,7 @@ void PrintErrorDialog::init_button_list()
|
|||||||
init_button(PROBLEM_SOLVED_RESUME, _L("Problem Solved and Resume"));
|
init_button(PROBLEM_SOLVED_RESUME, _L("Problem Solved and Resume"));
|
||||||
init_button(STOP_BUZZER, _L("Stop Buzzer"));
|
init_button(STOP_BUZZER, _L("Stop Buzzer"));
|
||||||
init_button(RETRY_PROBLEM_SOLVED, _L("Retry (problem solved)"));
|
init_button(RETRY_PROBLEM_SOLVED, _L("Retry (problem solved)"));
|
||||||
|
init_button(STOP_DRYING, _L("Stop Drying"));
|
||||||
}
|
}
|
||||||
|
|
||||||
PrintErrorDialog::~PrintErrorDialog()
|
PrintErrorDialog::~PrintErrorDialog()
|
||||||
@@ -1603,7 +1604,7 @@ InputIpAddressDialog::InputIpAddressDialog(wxWindow *parent)
|
|||||||
m_button_ok = new Button(this, _L("Connect"));
|
m_button_ok = new Button(this, _L("Connect"));
|
||||||
m_button_ok->SetBackgroundColor(btn_bg_green);
|
m_button_ok->SetBackgroundColor(btn_bg_green);
|
||||||
m_button_ok->SetBorderColor(*wxWHITE);
|
m_button_ok->SetBorderColor(*wxWHITE);
|
||||||
m_button_ok->SetTextColor(wxColour(0xFFFFFE));
|
m_button_ok->SetTextColor(wxColour("#FFFFFE"));
|
||||||
m_button_ok->SetFont(Label::Body_12);
|
m_button_ok->SetFont(Label::Body_12);
|
||||||
m_button_ok->SetSize(wxSize(FromDIP(58), FromDIP(24)));
|
m_button_ok->SetSize(wxSize(FromDIP(58), FromDIP(24)));
|
||||||
m_button_ok->SetMinSize(wxSize(FromDIP(58), FromDIP(24)));
|
m_button_ok->SetMinSize(wxSize(FromDIP(58), FromDIP(24)));
|
||||||
|
|||||||
@@ -188,6 +188,7 @@ public:
|
|||||||
STOP_BUZZER = 29,
|
STOP_BUZZER = 29,
|
||||||
|
|
||||||
RETRY_PROBLEM_SOLVED = 34,
|
RETRY_PROBLEM_SOLVED = 34,
|
||||||
|
STOP_DRYING = 35,
|
||||||
|
|
||||||
ERROR_BUTTON_COUNT
|
ERROR_BUTTON_COUNT
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -4731,6 +4731,10 @@ void StatusPanel::on_print_error_dlg_btn_clicked(wxCommandEvent& event)
|
|||||||
obj->command_ams_control("resume");
|
obj->command_ams_control("resume");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
case Slic3r::GUI::PrintErrorDialog::STOP_DRYING: {
|
||||||
|
obj->command_ams_drying_stop();
|
||||||
|
break;
|
||||||
|
}
|
||||||
case Slic3r::GUI::PrintErrorDialog::ERROR_BUTTON_COUNT: break;
|
case Slic3r::GUI::PrintErrorDialog::ERROR_BUTTON_COUNT: break;
|
||||||
default: break;
|
default: break;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user