From 06bccab711a055d269dbd92df7888722bcce28dc Mon Sep 17 00:00:00 2001 From: Lukas Matena Date: Thu, 9 Mar 2023 15:54:55 +0100 Subject: [PATCH] Added Mainsail print host --- src/libslic3r/PrintConfig.cpp | 2 ++ src/libslic3r/PrintConfig.hpp | 2 +- src/slic3r/Utils/OctoPrint.hpp | 10 ++++++++++ src/slic3r/Utils/PrintHost.cpp | 1 + 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 1adaa54306..62f9a9a2f3 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -68,6 +68,7 @@ static const t_config_enum_values s_keys_map_PrintHostType { { "prusalink", htPrusaLink }, { "prusaconnect", htPrusaConnect }, { "octoprint", htOctoPrint }, + { "mainsail", htMainSail }, { "duet", htDuet }, { "flashair", htFlashAir }, { "astrobox", htAstroBox }, @@ -1954,6 +1955,7 @@ void PrintConfigDef::init_fff_params() { "prusalink", "PrusaLink" }, { "prusaconnect", "PrusaConnect" }, { "octoprint", "OctoPrint" }, + { "mainsail", "Mainsail/Fluidd" }, { "duet", "Duet" }, { "flashair", "FlashAir" }, { "astrobox", "AstroBox" }, diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp index 3a602b7ac1..265628d782 100644 --- a/src/libslic3r/PrintConfig.hpp +++ b/src/libslic3r/PrintConfig.hpp @@ -44,7 +44,7 @@ enum class MachineLimitsUsage { }; enum PrintHostType { - htPrusaLink, htPrusaConnect, htOctoPrint, htDuet, htFlashAir, htAstroBox, htRepetier, htMKS + htPrusaLink, htPrusaConnect, htOctoPrint, htDuet, htFlashAir, htAstroBox, htRepetier, htMKS, htMainSail }; enum AuthorizationType { diff --git a/src/slic3r/Utils/OctoPrint.hpp b/src/slic3r/Utils/OctoPrint.hpp index fd558eb2ce..82c07f6f45 100644 --- a/src/slic3r/Utils/OctoPrint.hpp +++ b/src/slic3r/Utils/OctoPrint.hpp @@ -139,6 +139,16 @@ protected: void set_http_post_header_args(Http& http, PrintHostPostUploadAction post_action) const override; }; + +class Mainsail : public OctoPrint +{ +public: + Mainsail(DynamicPrintConfig* config) : OctoPrint(config) {} + ~Mainsail() override = default; + + const char* get_name() const override { return "Mainsail/Fluidd"; } +}; + } #endif diff --git a/src/slic3r/Utils/PrintHost.cpp b/src/slic3r/Utils/PrintHost.cpp index c8f0e34bca..5cb3187150 100644 --- a/src/slic3r/Utils/PrintHost.cpp +++ b/src/slic3r/Utils/PrintHost.cpp @@ -54,6 +54,7 @@ PrintHost* PrintHost::get_print_host(DynamicPrintConfig *config) case htPrusaLink: return new PrusaLink(config); case htPrusaConnect: return new PrusaConnect(config); case htMKS: return new MKS(config); + case htMainSail: return new Mainsail(config); default: return nullptr; } } else {