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

ENH: add calibration and unload filament 

define new command for calibration and unload filament

Change-Id: I834680740b4052d5719193a40945ca2704a3d858
Signed-off-by: Stone Li <stone.li@bambulab.com>
(cherry picked from commit c742fb5feb26938152858c44056d809fe18ce742)
Signed-off-by: Stone Li <stone.li@bambulab.com>
This commit is contained in:
Stone Li 2022-08-01 15:26:59 +08:00 committed by Lane.Wei
parent b5a21e6520
commit d54461413f
2 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1412,22 +1412,39 @@ int MachineObject::command_axis_control(std::string axis, double unit, double va
int MachineObject::command_start_calibration() int MachineObject::command_start_calibration()
{ {
// fixed gcode file if (printer_type == "BL-P001"
json j; || printer_type == "BL-P002") {
j["print"]["command"] = "gcode_file"; // fixed gcode file
j["print"]["param"] = "/usr/etc/print/auto_cali_for_user.gcode"; json j;
j["print"]["sequence_id"] = std::to_string(MachineObject::m_sequence_id++); j["print"]["command"] = "gcode_file";
return this->publish_json(j.dump()); j["print"]["param"] = "/usr/etc/print/auto_cali_for_user.gcode";
j["print"]["sequence_id"] = std::to_string(MachineObject::m_sequence_id++);
return this->publish_json(j.dump());
} else {
json j;
j["print"]["command"] = "calibration";
j["print"]["sequence_id"] = std::to_string(MachineObject::m_sequence_id++);
return this->publish_json(j.dump());
}
} }
int MachineObject::command_unload_filament() int MachineObject::command_unload_filament()
{ {
// fixed gcode file if (printer_type == "BL-P001"
json j; || printer_type == "BL-P002") {
j["print"]["command"] = "gcode_file"; // fixed gcode file
j["print"]["param"] = "/usr/etc/print/filament_unload.gcode"; json j;
j["print"]["sequence_id"] = std::to_string(MachineObject::m_sequence_id++); j["print"]["command"] = "gcode_file";
return this->publish_json(j.dump()); j["print"]["param"] = "/usr/etc/print/filament_unload.gcode";
j["print"]["sequence_id"] = std::to_string(MachineObject::m_sequence_id++);
return this->publish_json(j.dump());
}
else {
json j;
j["print"]["command"] = "unload_filament";
j["print"]["sequence_id"] = std::to_string(MachineObject::m_sequence_id++);
return this->publish_json(j.dump());
}
} }

12
src/slic3r/GUI/Monitor.cpp
View File

@ -210,12 +210,6 @@ MonitorPanel::~MonitorPanel()
m_hms_panel = new HMSPanel(m_tabpanel); m_hms_panel = new HMSPanel(m_tabpanel);
m_tabpanel->AddPage(m_hms_panel, _L("HMS"),"", false); m_tabpanel->AddPage(m_hms_panel, _L("HMS"),"", false);
#if !BBL_RELEASE_TO_PUBLIC
m_debug_panel = new DebugPanel(m_tabpanel);
m_tabpanel->AddPage(m_debug_panel, _L("Debug"), "", false);
#endif
m_initialized = true; m_initialized = true;
show_status((int)MonitorStatus::MONITOR_NO_PRINTER); show_status((int)MonitorStatus::MONITOR_NO_PRINTER);
} }
@ -436,12 +430,6 @@ void MonitorPanel::update_all()
if (m_upgrade_panel->IsShown()) { if (m_upgrade_panel->IsShown()) {
m_upgrade_panel->update(obj); m_upgrade_panel->update(obj);
} }
#if !BBL_RELEASE_TO_PUBLIC
if (m_debug_panel->IsShown()) {
m_debug_panel->update(obj);
}
#endif
} }
bool MonitorPanel::Show(bool show) bool MonitorPanel::Show(bool show)