From ec2ee96ef51e3852e4817a48759c7e51a2394fe2 Mon Sep 17 00:00:00 2001 From: tao wang Date: Tue, 4 Mar 2025 12:08:54 +0800 Subject: [PATCH] FIX:update load/unload command for n3s Change-Id: Ic4655f368a0ffb0e16139dee1fd1ffc34236e9eb (cherry picked from commit fc32042639cc83cc6876e63b86c944671649955c) --- src/slic3r/GUI/DeviceManager.cpp | 13 ------------- src/slic3r/GUI/DeviceManager.hpp | 1 - 2 files changed, 14 deletions(-) diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp index a6b4baef1e..2878e87003 100644 --- a/src/slic3r/GUI/DeviceManager.cpp +++ b/src/slic3r/GUI/DeviceManager.cpp @@ -2086,19 +2086,6 @@ int MachineObject::command_ams_change_filament(bool load, std::string ams_id, st return this->publish_json(j.dump()); } -int MachineObject::command_ams_change_filament2(int ams_id, int slot_id, int old_temp, int new_temp) -{ - json j; - j["print"]["command"] = "ams_change_filament"; - j["print"]["sequence_id"] = std::to_string(MachineObject::m_sequence_id++); - j["print"]["target"] = ams_id == VIRTUAL_TRAY_MAIN_ID?VIRTUAL_TRAY_DEPUTY_ID:slot_id; - j["print"]["curr_temp"] = old_temp; - j["print"]["tar_temp"] = new_temp; - j["print"]["ams_id"] = ams_id; - j["print"]["slot_id"] = slot_id; - return this->publish_json(j.dump()); -} - int MachineObject::command_ams_user_settings(int ams_id, bool start_read_opt, bool tray_read_opt, bool remain_flag) { json j; diff --git a/src/slic3r/GUI/DeviceManager.hpp b/src/slic3r/GUI/DeviceManager.hpp index b631ccd7bf..9b25258d85 100644 --- a/src/slic3r/GUI/DeviceManager.hpp +++ b/src/slic3r/GUI/DeviceManager.hpp @@ -1124,7 +1124,6 @@ public: // ams controls //int command_ams_switch(int tray_index, int old_temp = 210, int new_temp = 210); int command_ams_change_filament(bool load, std::string ams_id, std::string slot_id, int old_temp = 210, int new_temp = 210); - int command_ams_change_filament2(int ams_id, int slot_id, int old_temp = 210, int new_temp = 210); int command_ams_user_settings(int ams_id, bool start_read_opt, bool tray_read_opt, bool remain_flag = false); int command_ams_switch_filament(bool switch_filament); int command_ams_air_print_detect(bool air_print_detect);