GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-16 00:05:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Small adaptation and formatting

Browse Source
This commit is contained in:
Sergey Kovalev 2020-12-29 01:01:39 +07:00
parent 869b8c8c66
commit f1ae74f9d3
4 changed files with 331 additions and 323 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/slic3r/Utils/MKS.cpp
View File

@ -31,14 +31,14 @@ namespace pt = boost::property_tree;
namespace Slic3r { namespace Slic3r {
MKS::MKS(DynamicPrintConfig *config) : MKS::MKS(DynamicPrintConfig* config) :
host(config->opt_string("print_host")), console(config->opt_string("print_host"), "8080") host(config->opt_string("print_host")), console(config->opt_string("print_host"), "8080")
{} {}
const char* MKS::get_name() const { return "MKS"; } const char* MKS::get_name() const { return "MKS"; }
bool MKS::test(wxString &msg) const bool MKS::test(wxString& msg) const
{ {
console.enqueue_cmd("M105"); console.enqueue_cmd("M105");
bool ret = console.run_queue(); bool ret = console.run_queue();
@ -47,22 +47,22 @@ bool MKS::test(wxString &msg) const
} }
return ret; return ret;
} }
wxString MKS::get_test_ok_msg () const wxString MKS::get_test_ok_msg() const
{ {
return _(L("Connection to MKS works correctly.")); return _(L("Connection to MKS works correctly."));
} }
wxString MKS::get_test_failed_msg (wxString &msg) const wxString MKS::get_test_failed_msg(wxString& msg) const
{ {
return GUI::from_u8((boost::format("%s: %s") return GUI::from_u8((boost::format("%s: %s")
% _utf8(L("Could not connect to MKS")) % _utf8(L("Could not connect to MKS"))
% std::string(msg.ToUTF8())).str()); % std::string(msg.ToUTF8())).str());
} }
bool MKS::upload(PrintHostUpload upload_data, ProgressFn prorgess_fn, ErrorFn error_fn) const bool MKS::upload(PrintHostUpload upload_data, ProgressFn prorgess_fn, ErrorFn error_fn) const
{ {
bool res = true; bool res = true;
auto upload_cmd = get_upload_url(upload_data.upload_path.string()); auto upload_cmd = get_upload_url(upload_data.upload_path.string());
@ -83,10 +83,11 @@ bool MKS::upload(PrintHostUpload upload_data, ProgressFn prorgess_fn, ErrorFn er
BOOST_LOG_TRIVIAL(error) << boost::format("MKS: Request completed but error code was received: %1%") % err_code; BOOST_LOG_TRIVIAL(error) << boost::format("MKS: Request completed but error code was received: %1%") % err_code;
error_fn(format_error(body, L("Unknown error occured"), 0)); error_fn(format_error(body, L("Unknown error occured"), 0));
res = false; res = false;
} else if (upload_data.start_print) { }
else if (upload_data.start_print) {
wxString errormsg; wxString errormsg;
res = start_print(errormsg, upload_data.upload_path.string()); res = start_print(errormsg, upload_data.upload_path.string());
if (! res) { if (!res) {
error_fn(std::move(errormsg)); error_fn(std::move(errormsg));
} }
} }
@ -96,7 +97,7 @@ bool MKS::upload(PrintHostUpload upload_data, ProgressFn prorgess_fn, ErrorFn er
error_fn(format_error(body, error, status)); error_fn(format_error(body, error, status));
res = false; res = false;
}) })
.on_progress([&](Http::Progress progress, bool &cancel) { .on_progress([&](Http::Progress progress, bool& cancel) {
prorgess_fn(std::move(progress), cancel); prorgess_fn(std::move(progress), cancel);
if (cancel) { if (cancel) {
// Upload was canceled // Upload was canceled
@ -107,27 +108,30 @@ bool MKS::upload(PrintHostUpload upload_data, ProgressFn prorgess_fn, ErrorFn er
.perform_sync(); .perform_sync();
if (res && upload_data.start_print) { if (res && upload_data.start_print) {
start_print(upload_data.upload_path); wxString msg;
if (!start_print(msg, upload_data.upload_path.string())) {
error_fn(wxString("Can't start printing: ") + msg);
}
} }
return res; return res;
} }
std::string MKS::get_upload_url(const std::string &filename) const std::string MKS::get_upload_url(const std::string& filename) const
{ {
return (boost::format("http://%1%/upload?X-Filename=%2%") return (boost::format("http://%1%/upload?X-Filename=%2%")
% host % host
% Http::url_encode(filename)).str(); % Http::url_encode(filename)).str();
} }
bool MKS::start_print(wxString &msg, const std::string &filename) const bool MKS::start_print(wxString& msg, const std::string& filename) const
{ {
// For some reason printer firmware does not want to respond on gcode commands immediately after file upload. // For some reason printer firmware does not want to respond on gcode commands immediately after file upload.
// So we just introduce artificial delay to workaround it. // So we just introduce artificial delay to workaround it.
// TODO: Inspect reasons // TODO: Inspect reasons
std::this_thread::sleep_for(std::chrono::milliseconds(1500)); std::this_thread::sleep_for(std::chrono::milliseconds(1500));
console.enqueue_cmd("M23 " + upload_data.upload_path.string()); console.enqueue_cmd(std::string("M23 ") + filename);
console.enqueue_cmd("M24"); console.enqueue_cmd("M24");
bool ret = console.run_queue(); bool ret = console.run_queue();
@ -137,15 +141,15 @@ bool MKS::start_print(wxString &msg, const std::string &filename) const
} }
return ret; return ret;
} }
int MKS::get_err_code_from_body(const std::string& body) const int MKS::get_err_code_from_body(const std::string& body) const
{ {
pt::ptree root; pt::ptree root;
std::istringstream iss(body); // wrap returned json to istringstream std::istringstream iss(body); // wrap returned json to istringstream
pt::read_json(iss, root); pt::read_json(iss, root);
return root.get<int>("err", 0); return root.get<int>("err", 0);
} }
} // Slic3r } // Slic3r

26
src/slic3r/Utils/MKS.hpp
View File

@ -9,35 +9,35 @@
namespace Slic3r { namespace Slic3r {
class DynamicPrintConfig; class DynamicPrintConfig;
class Http; class Http;
class MKS : public PrintHost class MKS : public PrintHost
{ {
public: public:
explicit MKS(DynamicPrintConfig *config); explicit MKS(DynamicPrintConfig* config);
~MKS() override = default; ~MKS() override = default;
const char* get_name() const override; const char* get_name() const override;
bool test(wxString &curl_msg) const override; bool test(wxString& curl_msg) const override;
wxString get_test_ok_msg() const override; wxString get_test_ok_msg() const override;
wxString get_test_failed_msg(wxString &msg) const override; wxString get_test_failed_msg(wxString& msg) const override;
bool upload(PrintHostUpload upload_data, ProgressFn prorgess_fn, ErrorFn error_fn) const override; bool upload(PrintHostUpload upload_data, ProgressFn prorgess_fn, ErrorFn error_fn) const override;
bool has_auto_discovery() const override { return false; } bool has_auto_discovery() const override { return false; }
bool can_test() const override { return true; } bool can_test() const override { return true; }
bool can_start_print() const override { return true; } bool can_start_print() const override { return true; }
std::string get_host() const override { return host; } std::string get_host() const override { return host; }
private: private:
std::string host; std::string host;
Utils::TCPConsole console; Utils::TCPConsole console;
std::string get_upload_url(const std::string &filename) const; std::string get_upload_url(const std::string& filename) const;
std::string timestamp_str() const; std::string timestamp_str() const;
bool start_print(wxString &msg, const std::string &filename) const; bool start_print(wxString& msg, const std::string& filename) const;
int get_err_code_from_body(const std::string &body) const; int get_err_code_from_body(const std::string& body) const;
}; };
} }

60
src/slic3r/Utils/TCPConsole.cpp
View File

@ -18,10 +18,10 @@ using boost::asio::steady_timer;
using boost::asio::ip::tcp; using boost::asio::ip::tcp;
namespace Slic3r { namespace Slic3r {
namespace Utils { namespace Utils {
void TCPConsole::transmit_next_command() void TCPConsole::transmit_next_command()
{ {
if (cmd_queue_.empty()) { if (cmd_queue_.empty()) {
io_context_.stop(); io_context_.stop();
return; return;
@ -42,21 +42,21 @@ void TCPConsole::transmit_next_command()
data, data,
boost::bind(&TCPConsole::handle_write, this, _1, _2) boost::bind(&TCPConsole::handle_write, this, _1, _2)
); );
} }
void TCPConsole::wait_next_line() void TCPConsole::wait_next_line()
{ {
boost::asio::async_read_until( boost::asio::async_read_until(
socket_, socket_,
recv_buffer_, recv_buffer_,
newline_, newline_,
boost::bind(&TCPConsole::handle_read, this, _1, _2) boost::bind(&TCPConsole::handle_read, this, _1, _2)
); );
} }
// TODO: Use std::optional here // TODO: Use std::optional here
std::string TCPConsole::extract_next_line() std::string TCPConsole::extract_next_line()
{ {
char linebuf[1024]; char linebuf[1024];
std::istream is(&recv_buffer_); std::istream is(&recv_buffer_);
@ -66,12 +66,12 @@ std::string TCPConsole::extract_next_line()
} }
return ""; return "";
} }
void TCPConsole::handle_read( void TCPConsole::handle_read(
const boost::system::error_code& ec, const boost::system::error_code& ec,
std::size_t bytes_transferred) std::size_t bytes_transferred)
{ {
error_code_ = ec; error_code_ = ec;
if (ec) { if (ec) {
@ -81,7 +81,8 @@ void TCPConsole::handle_read(
% ec.message(); % ec.message();
io_context_.stop(); io_context_.stop();
} else { }
else {
std::string line = extract_next_line(); std::string line = extract_next_line();
boost::trim(line); boost::trim(line);
@ -94,16 +95,17 @@ void TCPConsole::handle_read(
if (line == done_string_) { if (line == done_string_) {
transmit_next_command(); transmit_next_command();
} else { }
else {
wait_next_line(); wait_next_line();
} }
} }
} }
void TCPConsole::handle_write( void TCPConsole::handle_write(
const boost::system::error_code& ec, const boost::system::error_code& ec,
std::size_t) std::size_t)
{ {
error_code_ = ec; error_code_ = ec;
if (ec) { if (ec) {
BOOST_LOG_TRIVIAL(error) << boost::format("TCPConsole: Can't write to %1%:%2%: %3%") BOOST_LOG_TRIVIAL(error) << boost::format("TCPConsole: Can't write to %1%:%2%: %3%")
@ -112,13 +114,14 @@ void TCPConsole::handle_write(
% ec.message(); % ec.message();
io_context_.stop(); io_context_.stop();
} else { }
else {
wait_next_line(); wait_next_line();
} }
} }
void TCPConsole::handle_connect(const boost::system::error_code& ec) void TCPConsole::handle_connect(const boost::system::error_code& ec)
{ {
error_code_ = ec; error_code_ = ec;
if (ec) { if (ec) {
@ -128,7 +131,8 @@ void TCPConsole::handle_connect(const boost::system::error_code& ec)
% ec.message(); % ec.message();
io_context_.stop(); io_context_.stop();
} else { }
else {
BOOST_LOG_TRIVIAL(info) << boost::format("TCPConsole: connected to %1%:%2%") BOOST_LOG_TRIVIAL(info) << boost::format("TCPConsole: connected to %1%:%2%")
% host_name_ % host_name_
% port_name_; % port_name_;
@ -136,10 +140,10 @@ void TCPConsole::handle_connect(const boost::system::error_code& ec)
transmit_next_command(); transmit_next_command();
} }
} }
bool TCPConsole::run_queue() bool TCPConsole::run_queue()
{ {
try { try {
// TODO: Add more resets and initializations after previous run // TODO: Add more resets and initializations after previous run
@ -184,8 +188,8 @@ bool TCPConsole::run_queue()
} }
return true; return true;
} }
} }
} }

34
src/slic3r/Utils/TCPConsole.hpp
View File

@ -8,39 +8,39 @@
#include <boost/asio/streambuf.hpp> #include <boost/asio/streambuf.hpp>
namespace Slic3r { namespace Slic3r {
namespace Utils { namespace Utils {
const char * default_newline = "\n"; const char* default_newline = "\n";
const char * default_done_string = "ok"; const char* default_done_string = "ok";
using boost::asio::ip::tcp; using boost::asio::ip::tcp;
class TCPConsole class TCPConsole
{ {
public: public:
TCPConsole(): resolver_(io_context_), socket_(io_context_), newline_(default_newline), done_string_(default_done_string) {} TCPConsole() : resolver_(io_context_), socket_(io_context_), newline_(default_newline), done_string_(default_done_string) {}
TCPConsole(const std::string &host_name, const std::string &port_name): TCPConsole(const std::string& host_name, const std::string& port_name) :
resolver_(io_context_), socket_(io_context_), newline_(default_newline), done_string_(default_done_string) resolver_(io_context_), socket_(io_context_), newline_(default_newline), done_string_(default_done_string)
{ {
set_remote(host_name, port_name); set_remote(host_name, port_name);
} }
~TCPConsole(){} ~TCPConsole() {}
void set_line_delimiter(const std::string &newline) { void set_line_delimiter(const std::string& newline) {
newline_ = newline; newline_ = newline;
} }
void set_command_done_string(const std::string &done_string) { void set_command_done_string(const std::string& done_string) {
done_string_ = done_string; done_string_ = done_string;
} }
void set_remote(const std::string &host_name, const std::string &port_name) void set_remote(const std::string& host_name, const std::string& port_name)
{ {
host_name_ = host_name; host_name_ = host_name;
port_name_ = port_name; port_name_ = port_name;
} }
bool enqueue_cmd(const std::string &cmd) { bool enqueue_cmd(const std::string& cmd) {
// TODO: Add multithread protection to queue // TODO: Add multithread protection to queue
cmd_queue_.push_back(cmd); cmd_queue_.push_back(cmd);
return true; return true;
@ -51,7 +51,7 @@ public:
return error_code_.message(); return error_code_.message();
} }
private: private:
void handle_connect(const boost::system::error_code& ec); void handle_connect(const boost::system::error_code& ec);
void handle_read(const boost::system::error_code& ec, std::size_t bytes_transferred); void handle_read(const boost::system::error_code& ec, std::size_t bytes_transferred);
void handle_write(const boost::system::error_code& ec, std::size_t bytes_transferred); void handle_write(const boost::system::error_code& ec, std::size_t bytes_transferred);
@ -73,9 +73,9 @@ private:
boost::asio::streambuf recv_buffer_; boost::asio::streambuf recv_buffer_;
boost::system::error_code error_code_; boost::system::error_code error_code_;
}; };
} // Utils } // Utils
} // Slic3r } // Slic3r
#endif #endif