juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-17 02:22:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Revert "NEW: add HMS action to stop AMS drying"

Browse Source 
This reverts commit 60328ef7d1400c19e9895a47d8e98d901d3401fd.
jira: [STUDIO-12372]

Change-Id: I7c2da5fa5a96d9fe00389e80535a9983dd581a2d
(cherry picked from commit 11c9efb2a2562e0a7094e4f3da1fa8af48aa7879)
This commit is contained in:
xin.zhang
2025-06-05 18:17:04 +08:00
committed by Noisyfox
parent 4a02669054
commit 363fe39c83
5 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2316,13 +2316,6 @@ 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,9 +1222,6 @@ 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("#FFFFFE"));
m_button_ok->SetTextColor(wxColour(0xFFFFFE));
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,7 +1123,6 @@ 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()
@@ -1604,7 +1603,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("#FFFFFE"));
m_button_ok->SetTextColor(wxColour(0xFFFFFE));
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,7 +188,6 @@ public:
STOP_BUZZER = 29,
RETRY_PROBLEM_SOLVED = 34,
STOP_DRYING = 35,
ERROR_BUTTON_COUNT
};

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

@@ -4731,10 +4731,6 @@ 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;
}