From 9dce95d401e8333077db63dbad57bda837d0ce19 Mon Sep 17 00:00:00 2001 From: tao wang Date: Fri, 10 Jan 2025 20:50:51 +0800 Subject: [PATCH] NEW:use new homing command jira:[none] Change-Id: I9d60d0b5c2d0e2cf7ac5c5e4b0dbcf2daf6edbb1 --- src/slic3r/GUI/DeviceManager.cpp | 9 +++++++++ src/slic3r/GUI/DeviceManager.hpp | 3 ++- src/slic3r/GUI/StatusPanel.cpp | 7 ++++++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp index 594813828..f71404b19 100644 --- a/src/slic3r/GUI/DeviceManager.cpp +++ b/src/slic3r/GUI/DeviceManager.cpp @@ -1911,6 +1911,15 @@ int MachineObject::command_go_home() } } +int MachineObject::command_go_home2() +{ + BOOST_LOG_TRIVIAL(info) << "New protocol of command_go_home2"; + json j; + j["print"]["command"] = "back_to_center"; + j["print"]["sequence_id"] = std::to_string(MachineObject::m_sequence_id++); + return this->publish_json(j.dump()); +} + // Old protocol int MachineObject::command_control_fan(int fan_type, int val) { diff --git a/src/slic3r/GUI/DeviceManager.hpp b/src/slic3r/GUI/DeviceManager.hpp index 497192b41..49b55700f 100644 --- a/src/slic3r/GUI/DeviceManager.hpp +++ b/src/slic3r/GUI/DeviceManager.hpp @@ -1069,7 +1069,8 @@ public: int command_xyz_abs(); int command_auto_leveling(); int command_go_home(); - int command_control_fan(int fan_type, int val); // Old protocol + int command_go_home2(); + int command_control_fan(int fan_type, int val); // Old protocol int command_control_fan_new(int fan_id, int val, const CommandCallBack &cb); // New protocol int command_control_air_duct(int mode_id, const CommandCallBack& cb); int command_task_abort(); diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp index afe90f322..1812d8f92 100644 --- a/src/slic3r/GUI/StatusPanel.cpp +++ b/src/slic3r/GUI/StatusPanel.cpp @@ -3846,7 +3846,12 @@ void StatusPanel::on_axis_ctrl_xy(wxCommandEvent &event) axis_go_home_dlg->Bind(EVT_SECONDARY_CHECK_CONFIRM, [this](wxCommandEvent& e) { if (obj) { BOOST_LOG_TRIVIAL(info) << "Axis have go home"; - obj->command_go_home(); + if (obj->is_enable_np) { + obj->command_go_home2(); + } else { + obj->command_go_home(); + } + } }); }