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

ENH:support setting chamber temperature

Browse source 
Change-Id: Icacd3f248a8f4dbff6c928e666f986c62801eebd
Signed-off-by: Stone Li <stone.li@bambulab.com>
(cherry picked from commit 6074340b1c3bd49b7e767384116fa73e96cd4ba9)
This commit is contained in:
tao wang 2023-07-06 10:53:28 +08:00 • committed by Lane.Wei
parent 3595310b09
commit 8177453d22
4 changed files with 37 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
resources/config.json
View file

@ -79,9 +79,9 @@
{
"display_name": "Bambu Lab X1",
"func": {
"FUNC_CHAMBER_TEMP": false,
"FUNC_VIRTUAL_TYAY": true,
"FUNC_EXTRUSION_CALI": false,
"FUNC_LOCAL_TUNNEL": false
"FUNC_EXTRUSION_CALI": false
},
"model_id": "BL-P002",
"compatible_machine": [ "BL-P001", "C11", "C12"],
@ -92,6 +92,7 @@
{
"display_name": "Bambu Lab X1 Carbon",
"func": {
"FUNC_CHAMBER_TEMP": false,
"FUNC_VIRTUAL_TYAY": true,
"FUNC_EXTRUSION_CALI": false,
"FUNC_LOCAL_TUNNEL": false

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

@ -465,6 +465,7 @@ MachineObject::MachineObject(NetworkAgent* agent, std::string name, std::string
bed_temp = 0.0f;
bed_temp_target = 0.0f;
chamber_temp = 0.0f;
chamber_temp_target = 0;
frame_temp = 0.0f;
/* ams fileds */
@ -1744,6 +1745,12 @@ int MachineObject::command_set_nozzle(int temp)
return this->publish_gcode(gcode_str);
}
int MachineObject::command_set_chamber(int temp)
{
std::string gcode_str = (boost::format("M141 S%1%\n") % temp).str();
return this->publish_gcode(gcode_str);
}
int MachineObject::command_ams_switch(int tray_index, int old_temp, int new_temp)
{
BOOST_LOG_TRIVIAL(trace) << "ams_switch to " << tray_index << " with temp: " << old_temp << ", " << new_temp;
@ -3011,6 +3018,11 @@ int MachineObject::parse_json(std::string payload)
chamber_temp = jj["chamber_temper"].get<float>();
}
}
if (jj.contains("ctt")) {
if (jj["ctt"].is_number()) {
chamber_temp_target = jj["ctt"].get<int>();
}
}
/* signals */
if (jj.contains("link_th_state"))
link_th = jj["link_th_state"].get<std::string>();
@ -5187,6 +5199,22 @@ bool DeviceManager::get_bed_temperature_limit(std::string type_str, int &limit)
return result;
}
bool DeviceManager::get_nozzle_max_temperature(std::string type_str, int& limit)
{
bool result = false;
if (DeviceManager::function_table.contains("printers")) {
for (auto printer : DeviceManager::function_table["printers"]) {
if (printer.contains("model_id") && printer["model_id"].get<std::string>() == type_str) {
if (printer.contains("nozzle_max_temperature")) {
limit = printer["nozzle_max_temperature"].get<int>();
return true;
}
}
}
}
return result;
}
bool DeviceManager::load_functional_config(std::string config_file)
{
std::ifstream json_file(config_file.c_str());

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

@ -556,6 +556,7 @@ public:
float bed_temp;
float bed_temp_target;
float chamber_temp;
int chamber_temp_target;
float frame_temp;
/* cooling */
@ -793,6 +794,7 @@ public:
int command_task_resume();
int command_set_bed(int temp);
int command_set_nozzle(int temp);
int command_set_chamber(int temp);
// ams controls
int command_ams_switch(int tray_index, int old_temp = 210, int new_temp = 210);
int command_ams_change_filament(int tray_id, int old_temp = 210, int new_temp = 210);
@ -958,6 +960,7 @@ public:
static std::vector<std::string> get_resolution_supported(std::string type_str);
static bool get_bed_temperature_limit(std::string type_str, int& limit);
static bool get_nozzle_max_temperature(std::string type_str, int& limit);
static bool load_functional_config(std::string config_file);
static bool load_filaments_blacklist_config(std::string config_file);
static void check_filaments_in_blacklist(std::string tag_vendor, std::string tag_type, bool& in_blacklist, std::string& ac, std::string& info);

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

@ -2295,10 +2295,10 @@ void StatusPanel::update_ams(MachineObject *obj)
m_ams_control->show_auto_refill(false);
}
else {
if (obj->printer_type == "N1") { m_ams_control->SetAmsModel(AMSModel::EXTRA_AMS); }
else { m_ams_control->SetAmsModel(AMSModel::GENERIC_AMS); }
if (obj->printer_type == "N1") { ams_mode = AMSModel::EXTRA_AMS; }
m_ams_control->SetAmsModel(ams_mode, ams_mode);
show_ams_group(true, obj->is_function_supported(PrinterFunction::FUNC_VIRTUAL_TYAY), obj->is_support_filament_edit_virtual_tray);
show_ams_group(true);
if (!obj->m_is_support_show_bak || !is_support_filament_backup || !obj->ams_support_auto_switch_filament_flag) {
m_ams_control->show_auto_refill(false);