From 6da938b660e09a9f05e1ecb1b6f37b9e31562155 Mon Sep 17 00:00:00 2001 From: peachismomo Date: Thu, 24 Sep 2026 01:15:55 +0800 Subject: [PATCH] fix: compilation after merge --- src/slic3r/Utils/OrcaPrinterAgent.cpp | 15 ++++++++------- src/slic3r/Utils/OrcaPrinterAgent.hpp | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/slic3r/Utils/OrcaPrinterAgent.cpp b/src/slic3r/Utils/OrcaPrinterAgent.cpp index 1435c1e13e..afdd16c4c1 100644 --- a/src/slic3r/Utils/OrcaPrinterAgent.cpp +++ b/src/slic3r/Utils/OrcaPrinterAgent.cpp @@ -701,18 +701,19 @@ void OrcaPrinterAgent::set_cloud_agent(std::shared_ptr cloud int OrcaPrinterAgent::send_message(std::string dev_id, std::string json_str, int /*qos*/, int /*flag*/) { return route_send(/*is_lan=*/false, dev_id, json_str); } -int OrcaPrinterAgent::command_ams_refresh_rfid(std::string dev_id, std::string tray_id, int sequence_id, bool lan_mode) +int OrcaPrinterAgent::command_ams_refresh_rfid(std::string dev_id, int ams_id, int tray_id, int sequence_id, bool lan_mode) { - int tray_number = 0; - if (!parse_nonnegative_command_id(tray_id, tray_number)) { - BOOST_LOG_TRIVIAL(warning) << "OrcaPrinterAgent: invalid RFID tray id=" << tray_id; - return BAMBU_NETWORK_ERR_INVALID_HANDLE; - } + (void) ams_id; + // int tray_number = 0; + // if (!parse_nonnegative_command_id(tray_id, tray_number)) { + // BOOST_LOG_TRIVIAL(warning) << "OrcaPrinterAgent: invalid RFID tray id=" << tray_id; + // return BAMBU_NETWORK_ERR_INVALID_HANDLE; + // } nlohmann::json j; j["print"]["command"] = "ams_get_rfid"; j["print"]["sequence_id"] = std::to_string(sequence_id); - j["print"]["tray_id"] = tray_number; + j["print"]["tray_id"] = tray_id; return route_send(lan_mode, dev_id, j.dump()); } diff --git a/src/slic3r/Utils/OrcaPrinterAgent.hpp b/src/slic3r/Utils/OrcaPrinterAgent.hpp index 6fcec1c745..3a32b2e3e3 100644 --- a/src/slic3r/Utils/OrcaPrinterAgent.hpp +++ b/src/slic3r/Utils/OrcaPrinterAgent.hpp @@ -79,7 +79,7 @@ public: int set_on_local_message_fn(OnMessageFn fn) override; int set_queue_on_main_fn(QueueOnMainFn fn) override; - int command_ams_refresh_rfid(std::string dev_id, std::string tray_id, int sequence_id, bool lan_mode) override; + int command_ams_refresh_rfid(std::string dev_id, int ams_id, int tray_id, int sequence_id, bool lan_mode) override; int command_ams_calibrate(std::string dev_id, int ams_id, int sequence_id, bool lan_mode) override; int command_ams_select_tray(std::string dev_id, std::string tray_id, int sequence_id, bool lan_mode) override; int command_start_camera(std::string dev_id) override;