pengo1998/OrcaSlicer-bambulab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Octoprint (#796)

Browse Source 
* Octoprint: GUI for CA file, improvements

* Octoprint: Add GUI for Bonjour lookup, bugfixes

* Octoprint: Bonjour browser: Cleanup Perl interaction

* Octoprint: Bonjour: Perform several broadcast, UI fixes

* Octoprint: Add files to localization list

* Http: Disable CA File setting on SSL backends that don't support it
This commit is contained in:
Vojtech Kral
2018-03-15 18:06:26 +01:00
committed by bubnikv
parent 8d4b603572
commit c88d2780ce
21 changed files with 1587 additions and 1341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
xs/src/slic3r/Utils/OctoPrint.hpp
View File

@@ -2,8 +2,8 @@
#define slic3r_OctoPrint_hpp_
#include <string>
#include <wx/string.h>
// #include "Http.hpp" // XXX: ?
namespace Slic3r {
@@ -16,8 +16,7 @@ class OctoPrint
public:
OctoPrint(DynamicPrintConfig *config);
std::string test() const;
// XXX: style
bool test(wxString &curl_msg) const;
void send_gcode(int windowId, int completeEvt, int errorEvt, const std::string &filename, bool print = false) const;
private:
std::string host;
@@ -26,7 +25,7 @@ private:
void set_auth(Http &http) const;
std::string make_url(const std::string &path) const;
static std::string format_error(std::string error, unsigned status);
static wxString format_error(std::string error, unsigned status);
};