diff options
| author | bubnikv <bubnikv@gmail.com> | 2018-07-16 18:07:49 +0300 |
|---|---|---|
| committer | bubnikv <bubnikv@gmail.com> | 2018-07-16 18:07:49 +0300 |
| commit | 6dc1bf5c08b7935dfbc55d35dea31148d09732f8 (patch) | |
| tree | 862e4d4149e6cd7fceb03208c3f3bcbfa1625301 /xs/src/slic3r/Utils/OctoPrint.hpp | |
| parent | 0bbd1dbc4f80ee4909f84d91931c13d757ba0af7 (diff) | |
| parent | d99b484ac6e67f00666530a1d7b78e7506e2ce6c (diff) | |
Merge branch 'master' into stable
Diffstat (limited to 'xs/src/slic3r/Utils/OctoPrint.hpp')
| -rw-r--r-- | xs/src/slic3r/Utils/OctoPrint.hpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/xs/src/slic3r/Utils/OctoPrint.hpp b/xs/src/slic3r/Utils/OctoPrint.hpp index 744b4fcc1..1e2098ae3 100644 --- a/xs/src/slic3r/Utils/OctoPrint.hpp +++ b/xs/src/slic3r/Utils/OctoPrint.hpp @@ -17,7 +17,8 @@ public: OctoPrint(DynamicPrintConfig *config); bool test(wxString &curl_msg) const; - bool send_gcode(const std::string &filename, bool print = false) const; + // Send gcode file to octoprint, filename is expected to be in UTF-8 + bool send_gcode(const std::string &filename) const; private: std::string host; std::string apikey; @@ -25,7 +26,7 @@ private: void set_auth(Http &http) const; std::string make_url(const std::string &path) const; - static wxString format_error(std::string error, unsigned status); + static wxString format_error(const std::string &body, const std::string &error, unsigned status); }; |