3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-12-28 02:10:30 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

NEW: add HMS action to stop AMS drying

Browse source 
jira: [STUDIO-12372]
Change-Id: Ic6a818487fdfdde206b63708303dfe8af6e79dbf
(cherry picked from commit 092de0c43f7e3f4702f529c28a637a5b3d78e20a)
This commit is contained in:
xin.zhang 2025-05-26 14:44:24 +08:00 • committed by Noisyfox
parent ad6681fa9d
commit d44ad07cfa
5 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2316,6 +2316,13 @@ int MachineObject::command_ams_control(std::string action)
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)
{

3
src/slic3r/GUI/DeviceManager.hpp
View file

@ -1222,6 +1222,9 @@ public:
int command_ams_refresh_rfid(std::string tray_id);
int command_ams_refresh_rfid2(int ams_id, int slot_id);
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_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);

5
src/slic3r/GUI/ReleaseNote.cpp
View file

@ -153,7 +153,7 @@ UpdatePluginDialog::UpdatePluginDialog(wxWindow* parent /*= nullptr*/)
auto m_button_ok = new Button(this, _L("OK"));
m_button_ok->SetBackgroundColor(btn_bg_green);
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->SetSize(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(STOP_BUZZER, _L("Stop Buzzer"));
init_button(RETRY_PROBLEM_SOLVED, _L("Retry (problem solved)"));
init_button(STOP_DRYING, _L("Stop Drying"));
}
PrintErrorDialog::~PrintErrorDialog()
@ -1603,7 +1604,7 @@ InputIpAddressDialog::InputIpAddressDialog(wxWindow *parent)
m_button_ok = new Button(this, _L("Connect"));
m_button_ok->SetBackgroundColor(btn_bg_green);
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->SetSize(wxSize(FromDIP(58), FromDIP(24)));
m_button_ok->SetMinSize(wxSize(FromDIP(58), FromDIP(24)));

1
src/slic3r/GUI/ReleaseNote.hpp
View file

@ -188,6 +188,7 @@ public:
STOP_BUZZER = 29,
RETRY_PROBLEM_SOLVED = 34,
STOP_DRYING = 35,
ERROR_BUTTON_COUNT
};

4
src/slic3r/GUI/StatusPanel.cpp
View file

@ -4731,6 +4731,10 @@ void StatusPanel::on_print_error_dlg_btn_clicked(wxCommandEvent& event)
obj->command_ams_control("resume");
break;
}
case Slic3r::GUI::PrintErrorDialog::STOP_DRYING: {
obj->command_ams_drying_stop();
break;
}
case Slic3r::GUI::PrintErrorDialog::ERROR_BUTTON_COUNT: break;
default: break;
}