From eb071f30f89d6c5d7dadb84d48500af6c69019aa Mon Sep 17 00:00:00 2001 From: Ian Chua Date: Tue, 22 Sep 2026 15:49:22 +0800 Subject: [PATCH] fix: re-implement missing commands on BBLPrinterAgent (cherry picked from commit 9a7e925790cd7b2b348b1705e8bf04d5129c9b1d) --- src/slic3r/Utils/BBLPrinterAgent.cpp | 56 ---------------------------- src/slic3r/Utils/BBLPrinterAgent.hpp | 6 +-- 2 files changed, 1 insertion(+), 61 deletions(-) diff --git a/src/slic3r/Utils/BBLPrinterAgent.cpp b/src/slic3r/Utils/BBLPrinterAgent.cpp index 948d6a0f2d..072f2d3226 100644 --- a/src/slic3r/Utils/BBLPrinterAgent.cpp +++ b/src/slic3r/Utils/BBLPrinterAgent.cpp @@ -204,62 +204,6 @@ int BBLPrinterAgent::command_ams_select_tray(std::string dev_id, std::string tra return publish(dev_id, j, lan_mode); } -int BBLPrinterAgent::command_xyz_abs(std::string dev_id, int sequence_id, bool lan_mode) -{ - nlohmann::json j; - j["print"]["command"] = "gcode_line"; - j["print"]["param"] = "G90 \n"; - j["print"]["sequence_id"] = std::to_string(sequence_id); - return publish(dev_id, j, lan_mode); -} - -int BBLPrinterAgent::command_auto_leveling(std::string dev_id, int sequence_id, bool lan_mode) -{ - nlohmann::json j; - j["print"]["command"] = "gcode_line"; - j["print"]["param"] = "G29 \n"; - j["print"]["sequence_id"] = std::to_string(sequence_id); - return publish(dev_id, j, lan_mode); -} - -int BBLPrinterAgent::command_go_home(std::string dev_id, bool is_printing, bool supports_mqtt_homing, int sequence_id, bool lan_mode) -{ - nlohmann::json j; - j["print"]["sequence_id"] = std::to_string(sequence_id); - if (supports_mqtt_homing) { - j["print"]["command"] = "back_to_center"; - return publish(dev_id, j, lan_mode); - } - - j["print"]["command"] = "gcode_line"; - j["print"]["param"] = is_printing ? "G28 X\n" : "G28 \n"; - return publish(dev_id, j, lan_mode); -} - -int BBLPrinterAgent::command_set_bed(std::string dev_id, int temp, bool supports_mqtt_bed_ctrl, int sequence_id, bool lan_mode) -{ - nlohmann::json j; - j["print"]["sequence_id"] = std::to_string(sequence_id); - if (supports_mqtt_bed_ctrl) { - j["print"]["command"] = "set_bed_temp"; - j["print"]["temp"] = temp; - return publish(dev_id, j, lan_mode); - } - - j["print"]["command"] = "gcode_line"; - j["print"]["param"] = (boost::format("M140 S%1%\n") % temp).str(); - return publish(dev_id, j, lan_mode); -} - -int BBLPrinterAgent::command_set_nozzle(std::string dev_id, int temp, int sequence_id, bool lan_mode) -{ - nlohmann::json j; - j["print"]["command"] = "gcode_line"; - j["print"]["param"] = (boost::format("M104 S%1%\n") % temp).str(); - j["print"]["sequence_id"] = std::to_string(sequence_id); - return publish(dev_id, j, lan_mode); -} - int BBLPrinterAgent::command_axis_control(std::string dev_id, std::string axis, double unit, double input_val, int speed, bool is_core_xy, bool supports_mqtt_axis_control, int sequence_id, bool lan_mode) { diff --git a/src/slic3r/Utils/BBLPrinterAgent.hpp b/src/slic3r/Utils/BBLPrinterAgent.hpp index 1bd7bdf3e0..f2e9a1d28f 100644 --- a/src/slic3r/Utils/BBLPrinterAgent.hpp +++ b/src/slic3r/Utils/BBLPrinterAgent.hpp @@ -36,13 +36,9 @@ public: int command_ams_refresh_rfid(std::string dev_id, std::string 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_xyz_abs(std::string dev_id, int sequence_id, bool lan_mode) override; - int command_auto_leveling(std::string dev_id, int sequence_id, bool lan_mode) override; - int command_go_home(std::string dev_id, bool is_printing, bool supports_mqtt_homing, int sequence_id, bool lan_mode) override; - int command_set_bed(std::string dev_id, int temp, bool supports_mqtt_bed_ctrl, int sequence_id, bool lan_mode) override; - int command_set_nozzle(std::string dev_id, int temp, int sequence_id, bool lan_mode) override; int command_axis_control(std::string dev_id, std::string axis, double unit, double input_val, int speed, bool is_core_xy, bool supports_mqtt_axis_control, int sequence_id, bool lan_mode) override; + std::string default_lan_username() const override { return "bblp"; } int connect_printer(std::string dev_id, std::string dev_ip, std::string username, std::string password, bool use_ssl) override; int disconnect_printer() override; int send_message_to_printer(std::string dev_id, std::string json_str, int qos, int flag) override;