From 6058b18e4395463c548c3aef9b674335dd279d8c Mon Sep 17 00:00:00 2001 From: Stone Li Date: Wed, 5 Jul 2023 20:07:08 +0800 Subject: [PATCH] ENH: modify config for N1 Change-Id: I151eb7ecabb1e5a8a2af95294cc03ffe92f6b660 Signed-off-by: Stone Li --- src/slic3r/GUI/DeviceManager.cpp | 11 ++++++++++- src/slic3r/GUI/DeviceManager.hpp | 2 +- src/slic3r/GUI/StatusPanel.cpp | 6 ++++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp index 78c7f1c766..fe6be8716c 100644 --- a/src/slic3r/GUI/DeviceManager.cpp +++ b/src/slic3r/GUI/DeviceManager.cpp @@ -1977,8 +1977,17 @@ int MachineObject::command_ams_switch_filament(bool switch_filament) return this->publish_json(j.dump()); } -int MachineObject::command_axis_control(std::string axis, double unit, double value, int speed) + +int MachineObject::command_axis_control(std::string axis, double unit, double input_val, int speed) { + double value = input_val; + if (!is_core_xy()) { + if ( axis.compare("Y") == 0 + || axis.compare("Z") == 0) { + value = -1.0 * input_val; + } + } + char cmd[256]; if (axis.compare("X") == 0 || axis.compare("Y") == 0 diff --git a/src/slic3r/GUI/DeviceManager.hpp b/src/slic3r/GUI/DeviceManager.hpp index 8bca80aa45..e2cf64f006 100644 --- a/src/slic3r/GUI/DeviceManager.hpp +++ b/src/slic3r/GUI/DeviceManager.hpp @@ -839,7 +839,7 @@ public: int command_set_printing_option(bool auto_recovery); // axis string is X, Y, Z, E - int command_axis_control(std::string axis, double unit = 1.0f, double value = 1.0f, int speed = 3000); + int command_axis_control(std::string axis, double unit = 1.0f, double input_val = 1.0f, int speed = 3000); // calibration printer bool is_support_command_calibration(); diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp index 7cdbded3cd..f0ba9fcd2f 100644 --- a/src/slic3r/GUI/StatusPanel.cpp +++ b/src/slic3r/GUI/StatusPanel.cpp @@ -2226,6 +2226,12 @@ void StatusPanel::update_misc_ctrl(MachineObject *obj) } } + if (obj->is_core_xy()) { + m_staticText_z_tip->SetLabel(_L("Bed")); + } else { + m_staticText_z_tip->SetLabel("Z"); + } + // update extruder icon update_extruder_status(obj);