diff --git a/src/slic3r/GUI/DeviceErrorDialog.hpp b/src/slic3r/GUI/DeviceErrorDialog.hpp index a08135bf38..1363f494a6 100644 --- a/src/slic3r/GUI/DeviceErrorDialog.hpp +++ b/src/slic3r/GUI/DeviceErrorDialog.hpp @@ -4,6 +4,7 @@ #include #include #include +#include #include #include "GUI_Utils.hpp" diff --git a/src/slic3r/plugin/pluginTypes/printerAgent/PrinterAgentPluginCapability.hpp b/src/slic3r/plugin/pluginTypes/printerAgent/PrinterAgentPluginCapability.hpp index 635dd60181..33ad211b9c 100644 --- a/src/slic3r/plugin/pluginTypes/printerAgent/PrinterAgentPluginCapability.hpp +++ b/src/slic3r/plugin/pluginTypes/printerAgent/PrinterAgentPluginCapability.hpp @@ -51,6 +51,7 @@ public: int ping_bind(std::string ping_code) override = 0; int bind(std::string dev_ip, std::string dev_id, + std::string dev_model, std::string sec_link, std::string timezone, bool improved, @@ -60,6 +61,7 @@ public: // pybind11 override directly; the trampoline wraps it (the Python plugin returns a // (result, ticket) tuple), so it stays pure here like the rest. int request_bind_ticket(std::string* ticket) override = 0; + int get_hms_snapshot(std::string dev_id, std::string file_name, std::function callback) override = 0; int set_server_callback(OnServerErrFn fn) override = 0; int start_print(PrintParams params, OnUpdateStatusFn update_fn, WasCancelledFn cancel_fn, OnWaitFn wait_fn) override = 0; int start_local_print_with_record(PrintParams params, diff --git a/src/slic3r/plugin/pluginTypes/printerAgent/PrinterAgentPluginCapabilityTrampoline.hpp b/src/slic3r/plugin/pluginTypes/printerAgent/PrinterAgentPluginCapabilityTrampoline.hpp index f9193a0f03..226ea04650 100644 --- a/src/slic3r/plugin/pluginTypes/printerAgent/PrinterAgentPluginCapabilityTrampoline.hpp +++ b/src/slic3r/plugin/pluginTypes/printerAgent/PrinterAgentPluginCapabilityTrampoline.hpp @@ -121,11 +121,11 @@ public: ::Slic3r::PluginAuditManager::AuditMode::Loading, [] {}, PYBIND11_OVERRIDE_PURE, int, PrinterAgentPluginCapability, ping_bind, ping_code); } - int bind(std::string dev_ip, std::string dev_id, std::string sec_link, std::string timezone, bool improved, OnUpdateStatusFn update_fn) override + int bind(std::string dev_ip, std::string dev_id, std::string dev_model, std::string sec_link, std::string timezone, bool improved, OnUpdateStatusFn update_fn) override { ORCA_PY_OVERRIDE_AUDITED( ::Slic3r::PluginAuditManager::AuditMode::Loading, [] {}, PYBIND11_OVERRIDE_PURE, int, PrinterAgentPluginCapability, bind, dev_ip, dev_id, - sec_link, timezone, improved, update_fn); + dev_model, sec_link, timezone, improved, update_fn); } int unbind(std::string dev_id) override @@ -155,6 +155,13 @@ public: update_fn, cancel_fn); } + int get_hms_snapshot(std::string dev_id, std::string file_name, std::function callback) override + { + ORCA_PY_OVERRIDE_AUDITED( + ::Slic3r::PluginAuditManager::AuditMode::Loading, [] {}, PYBIND11_OVERRIDE_PURE, int, PrinterAgentPluginCapability, get_hms_snapshot, dev_id, + file_name, callback); + } + int set_server_callback(OnServerErrFn fn) override { ORCA_PY_OVERRIDE_AUDITED(