NEW: support send gcode to third-party printer

Thanks SoftForever for your works to support
sending a gcode file to third-party printer

Change-Id: I3cba43c8bd878f1f1c2fd5fae202ed4d922e8727
Signed-off-by: Stone Li <stone.li@bambulab.com>

src/libslic3r/Preset.cpp

@@ -2,6 +2,7 @@
 
 #include "Exception.hpp"
 #include "Preset.hpp"
+#include "PresetBundle.hpp"
 #include "AppConfig.hpp"
 
 #ifdef _MSC_VER
@@ -643,6 +644,26 @@ std::string Preset::get_filament_type(std::string &display_filament_type)
     return config.get_filament_type(display_filament_type);
 }
 
+bool Preset::is_bbl_vendor_preset(PresetBundle *preset_bundle)
+{
+    bool is_bbl_vendor_preset = true;
+    if (preset_bundle) {
+        auto config = &preset_bundle->printers.get_edited_preset().config;
+        std::string vendor_name;
+        for (auto vendor_profile : preset_bundle->vendors) {
+            for (auto vendor_model : vendor_profile.second.models)
+                if (vendor_model.name == config->opt_string("printer_model"))
+                {
+                    vendor_name = vendor_profile.first;
+                    break;
+                }
+        }
+        if (!vendor_name.empty())
+            is_bbl_vendor_preset = vendor_name.compare("BBL") == 0 ? true : false;
+    }
+    return is_bbl_vendor_preset;
+}
+
 static std::vector<std::string> s_Preset_print_options {
     "layer_height", "initial_layer_print_height", "wall_loops", "slice_closing_radius", "spiral_mode",
     "top_shell_layers", "top_shell_thickness", "bottom_shell_layers", "bottom_shell_thickness",
@@ -725,7 +746,11 @@ static std::vector<std::string> s_Preset_printer_options {
     "silent_mode",
     // BBS
     "scan_first_layer", "machine_load_filament_time", "machine_unload_filament_time", "machine_pause_gcode",
-    "nozzle_type", "auxiliary_fan", "nozzle_volume"
+    "nozzle_type", "auxiliary_fan", "nozzle_volume",
+    //SoftFever
+    "host_type", "print_host", "printhost_apikey", 
+    "printhost_cafile","printhost_port","printhost_authorization_type",
+    "printhost_user", "printhost_password", "printhost_ssl_ignore_revoke"
 };
 
 static std::vector<std::string> s_Preset_sla_print_options {
@@ -2525,6 +2550,16 @@ static std::vector<std::string> s_PhysicalPrinter_opts {
     "preset_name", // temporary option to compatibility with older Slicer
     "preset_names",
     "printer_technology",
+    "host_type",
+    "print_host",
+    "printhost_apikey",
+    "printhost_cafile",
+    "printhost_port",
+    "printhost_authorization_type",
+    // HTTP digest authentization (RFC 2617)
+    "printhost_user",
+    "printhost_password",
+    "printhost_ssl_ignore_revoke"
 };
 
 const std::vector<std::string>& PhysicalPrinter::printer_options()

src/libslic3r/Preset.hpp

@@ -297,6 +297,8 @@ public:
     // special for upport G and Support W
     std::string get_filament_type(std::string &display_filament_type);
 
+    bool is_bbl_vendor_preset(PresetBundle *m_preset_bundle);
+
     static const std::vector<std::string>&  print_options();
     static const std::vector<std::string>&  filament_options();
     // Printer options contain the nozzle options.

src/libslic3r/PrintConfig.cpp

@@ -72,6 +72,23 @@ static t_config_enum_values s_keys_map_PrinterTechnology {
 };
 CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(PrinterTechnology)
 
+static t_config_enum_values s_keys_map_PrintHostType{
+    { "prusalink",      htPrusaLink },
+    { "octoprint",      htOctoPrint },
+    //{ "duet",           htDuet },
+    //{ "flashair",       htFlashAir },
+    //{ "astrobox",       htAstroBox },
+    //{ "repetier",       htRepetier },
+    //{ "mks",            htMKS }
+};
+CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(PrintHostType)
+
+static t_config_enum_values s_keys_map_AuthorizationType{
+    { "key",            atKeyPassword },
+    { "user",           atUserPassword }
+};
+CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(AuthorizationType)
+
 static t_config_enum_values s_keys_map_GCodeFlavor {
     { "marlin",         gcfMarlinLegacy },
     { "reprap",         gcfRepRapSprinter },
@@ -343,6 +360,83 @@ void PrintConfigDef::init_common_params()
     def->mode = comDevelop;
     def->set_default_value(new ConfigOptionStrings());
 
+    def = this->add("print_host", coString);
+    def->label = L("Hostname, IP or URL");
+    def->tooltip = L("Slic3r can upload G-code files to a printer host. This field should contain "
+        "the hostname, IP address or URL of the printer host instance. "
+        "Print host behind HAProxy with basic auth enabled can be accessed by putting the user name and password into the URL "
+        "in the following format: https://username:password@your-octopi-address/");
+    def->mode = comAdvanced;
+    def->cli = ConfigOptionDef::nocli;
+    def->set_default_value(new ConfigOptionString(""));
+
+    def = this->add("printhost_apikey", coString);
+    def->label = L("API Key / Password");
+    def->tooltip = L("Slic3r can upload G-code files to a printer host. This field should contain "
+        "the API Key or the password required for authentication.");
+    def->mode = comAdvanced;
+    def->cli = ConfigOptionDef::nocli;
+    def->set_default_value(new ConfigOptionString(""));
+
+    def = this->add("printhost_port", coString);
+    def->label = L("Printer");
+    def->tooltip = L("Name of the printer");
+    def->gui_type = ConfigOptionDef::GUIType::select_open;
+    def->mode = comAdvanced;
+    def->cli = ConfigOptionDef::nocli;
+    def->set_default_value(new ConfigOptionString(""));
+
+    def = this->add("printhost_cafile", coString);
+    def->label = L("HTTPS CA File");
+    def->tooltip = L("Custom CA certificate file can be specified for HTTPS OctoPrint connections, in crt/pem format. "
+        "If left blank, the default OS CA certificate repository is used.");
+    def->mode = comAdvanced;
+    def->cli = ConfigOptionDef::nocli;
+    def->set_default_value(new ConfigOptionString(""));
+
+    // Options used by physical printers
+
+    def = this->add("printhost_user", coString);
+    def->label = L("User");
+    //    def->tooltip = L("");
+    def->mode = comAdvanced;
+    def->cli = ConfigOptionDef::nocli;
+    def->set_default_value(new ConfigOptionString(""));
+
+    def = this->add("printhost_password", coString);
+    def->label = L("Password");
+    //    def->tooltip = L("");
+    def->mode = comAdvanced;
+    def->cli = ConfigOptionDef::nocli;
+    def->set_default_value(new ConfigOptionString(""));
+
+    // Only available on Windows.
+    def = this->add("printhost_ssl_ignore_revoke", coBool);
+    def->label = L("Ignore HTTPS certificate revocation checks");
+    def->tooltip = L("Ignore HTTPS certificate revocation checks in case of missing or offline distribution points. "
+        "One may want to enable this option for self signed certificates if connection fails.");
+    def->mode = comAdvanced;
+    def->cli = ConfigOptionDef::nocli;
+    def->set_default_value(new ConfigOptionBool(false));
+
+    def = this->add("preset_names", coStrings);
+    def->label = L("Printer preset names");
+    def->tooltip = L("Names of presets related to the physical printer");
+    def->mode = comAdvanced;
+    def->set_default_value(new ConfigOptionStrings());
+
+    def = this->add("printhost_authorization_type", coEnum);
+    def->label = L("Authorization Type");
+    //    def->tooltip = L("");
+    def->enum_keys_map = &ConfigOptionEnum<AuthorizationType>::get_enum_values();
+    def->enum_values.push_back("key");
+    def->enum_values.push_back("user");
+    def->enum_labels.push_back(L("API key"));
+    def->enum_labels.push_back(L("HTTP digest"));
+    def->mode = comAdvanced;
+    def->cli = ConfigOptionDef::nocli;
+    def->set_default_value(new ConfigOptionEnum<AuthorizationType>(atKeyPassword));
+
     // temporary workaround for compatibility with older Slicer
     {
         def = this->add("preset_name", coString);
@@ -1686,6 +1780,29 @@ void PrintConfigDef::init_fff_params()
     def->mode = comDevelop;
     def->set_default_value(new ConfigOptionFloats { 0.4 });
 
+    def = this->add("host_type", coEnum);
+    def->label = L("Host Type");
+    def->tooltip = L("Slic3r can upload G-code files to a printer host. This field must contain "
+        "the kind of the host.");
+    def->enum_keys_map = &ConfigOptionEnum<PrintHostType>::get_enum_values();
+    def->enum_values.push_back("prusalink");
+    def->enum_values.push_back("octoprint");
+    //def->enum_values.push_back("duet");
+    //def->enum_values.push_back("flashair");
+    //def->enum_values.push_back("astrobox");
+    //def->enum_values.push_back("repetier");
+    //def->enum_values.push_back("mks");
+    def->enum_labels.push_back("PrusaLink");
+    def->enum_labels.push_back("OctoPrint");
+    //def->enum_labels.push_back("Duet");
+    //def->enum_labels.push_back("FlashAir");
+    //def->enum_labels.push_back("AstroBox");
+    //def->enum_labels.push_back("Repetier");
+    //def->enum_labels.push_back("MKS");
+    def->mode = comAdvanced;
+    def->cli = ConfigOptionDef::nocli;
+    def->set_default_value(new ConfigOptionEnum<PrintHostType>(htOctoPrint));
+
     def = this->add("nozzle_volume", coFloat);
     def->label = L("Nozzle volume");
     def->tooltip = L("Volume of nozzle between the cutter and the end of nozzle");

src/libslic3r/PrintConfig.hpp

@@ -42,6 +42,14 @@ enum class FuzzySkinType {
     All,
 };
 
+enum PrintHostType {
+    htPrusaLink, htOctoPrint, htDuet, htFlashAir, htAstroBox, htRepetier, htMKS
+};
+
+enum AuthorizationType {
+    atKeyPassword, atUserPassword
+};
+
 #define HAS_LIGHTNING_INFILL 0
 
 enum InfillPattern : int {
@@ -253,6 +261,9 @@ CONFIG_OPTION_ENUM_DECLARE_STATIC_MAPS(BedType)
 CONFIG_OPTION_ENUM_DECLARE_STATIC_MAPS(DraftShield)
 CONFIG_OPTION_ENUM_DECLARE_STATIC_MAPS(ForwardCompatibilitySubstitutionRule)
 
+CONFIG_OPTION_ENUM_DECLARE_STATIC_MAPS(PrintHostType)
+CONFIG_OPTION_ENUM_DECLARE_STATIC_MAPS(AuthorizationType)
+
 #undef CONFIG_OPTION_ENUM_DECLARE_STATIC_MAPS
 
 // Defines each and every confiuration option of Slic3r, including the properties of the GUI dialogs.