juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-28 03:11:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: compilation after merge

Browse Source
This commit is contained in:
peachismomo
2026-09-24 01:15:55 +08:00
parent 2dcdf49185
commit 6da938b660
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/slic3r/Utils/OrcaPrinterAgent.cpp
+8 -7
View File
@@ -701,18 +701,19 @@ void OrcaPrinterAgent::set_cloud_agent(std::shared_ptr<ICloudServiceAgent> cloud
int OrcaPrinterAgent::send_message(std::string dev_id, std::string json_str, int /*qos*/, int /*flag*/) 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); } { 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; (void) ams_id;
if (!parse_nonnegative_command_id(tray_id, tray_number)) { // int tray_number = 0;
BOOST_LOG_TRIVIAL(warning) << "OrcaPrinterAgent: invalid RFID tray id=" << tray_id; // if (!parse_nonnegative_command_id(tray_id, tray_number)) {
return BAMBU_NETWORK_ERR_INVALID_HANDLE; // BOOST_LOG_TRIVIAL(warning) << "OrcaPrinterAgent: invalid RFID tray id=" << tray_id;
} // return BAMBU_NETWORK_ERR_INVALID_HANDLE;
// }
nlohmann::json j; nlohmann::json j;
j["print"]["command"] = "ams_get_rfid"; j["print"]["command"] = "ams_get_rfid";
j["print"]["sequence_id"] = std::to_string(sequence_id); 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()); return route_send(lan_mode, dev_id, j.dump());
} }
src/slic3r/Utils/OrcaPrinterAgent.hpp
+1 -1
View File
@@ -79,7 +79,7 @@ public:
int set_on_local_message_fn(OnMessageFn fn) override; int set_on_local_message_fn(OnMessageFn fn) override;
int set_queue_on_main_fn(QueueOnMainFn 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_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_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; int command_start_camera(std::string dev_id) override;