Merge remote-tracking branch 'remote/master' into SoftFever

src/libslic3r/PrintConfig.cpp

@@ -230,7 +230,8 @@ static const t_config_enum_values s_keys_map_OverhangFanThreshold = {
 static const t_config_enum_values s_keys_map_BedType = {
     { "Cool Plate",         btPC },
     { "Engineering Plate",  btEP  },
-    { "High Temp Plate",    btPEI  }
+    { "High Temp Plate",    btPEI  },
+    { "Textured PEI Plate",      btPTE }
 };
 CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(BedType)
 
@@ -462,6 +463,16 @@ void PrintConfigDef::init_fff_params()
     def->max = 120;
     def->set_default_value(new ConfigOptionInts{ 45 });
 
+    def             = this->add("textured_plate_temp", coInts);
+    def->label      = L("Other layers");
+    def->tooltip    = L("Bed temperature for layers except the initial one. "
+                     "Value 0 means the filament does not support to print on the Textured PEI Plate");
+    def->sidetext   = L("°C");
+    def->full_label = L("Bed temperature");
+    def->min        = 0;
+    def->max        = 120;
+    def->set_default_value(new ConfigOptionInts{45});
+
     def = this->add("cool_plate_temp_initial_layer", coInts);
     def->label = L("Initial layer");
     def->full_label = L("Initial layer bed temperature");
@@ -492,6 +503,15 @@ void PrintConfigDef::init_fff_params()
     def->max = 120;
     def->set_default_value(new ConfigOptionInts{ 45 });
 
+    def             = this->add("textured_plate_temp_initial_layer", coInts);
+    def->label      = L("Initial layer");
+    def->full_label = L("Initial layer bed temperature");
+    def->tooltip    = L("Bed temperature of the initial layer. "
+                     "Value 0 means the filament does not support to print on the Textured PEI Plate");
+    def->sidetext   = L("°C");
+    def->max        = 0;
+    def->max        = 120;
+    def->set_default_value(new ConfigOptionInts{45});
 
     def = this->add("curr_bed_type", coEnums);
     def->label = L("Bed type");
@@ -501,9 +521,11 @@ void PrintConfigDef::init_fff_params()
     def->enum_values.emplace_back("Cool Plate");
     def->enum_values.emplace_back("Engineering Plate");
     def->enum_values.emplace_back("High Temp Plate");
+    def->enum_values.emplace_back("Textured PEI Plate");
     def->enum_labels.emplace_back(L("Cool Plate"));
     def->enum_labels.emplace_back(L("Engineering Plate"));
     def->enum_labels.emplace_back(L("High Temp Plate"));
+    def->enum_labels.emplace_back(L("Textured PEI Plate"));
     def->set_default_value(new ConfigOptionEnum<BedType>(btPC));
 
     def = this->add("before_layer_change_gcode", coString);
@@ -1091,7 +1113,7 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("Filament price. For statistics only");
     def->sidetext = L("money/kg");
     def->min = 0;
-    def->mode = comDevelop;
+    def->mode = comAdvanced;
     def->set_default_value(new ConfigOptionFloats { 0. });
 
     def = this->add("filament_settings_id", coStrings);
@@ -2000,9 +2022,11 @@ void PrintConfigDef::init_fff_params()
     def->enum_values.push_back("nearest");
     def->enum_values.push_back("aligned");
     def->enum_values.push_back("back");
+    def->enum_values.push_back("random");
     def->enum_labels.push_back(L("Nearest"));
     def->enum_labels.push_back(L("Aligned"));
     def->enum_labels.push_back(L("Back"));
+    def->enum_labels.push_back(L("Random"));
     def->mode = comSimple;
     def->set_default_value(new ConfigOptionEnum<SeamPosition>(spAligned));
 
@@ -2108,10 +2132,12 @@ void PrintConfigDef::init_fff_params()
 
     def = this->add("timelapse_no_toolhead", coBool);
     def->label = L("Timelapse");
-    def->tooltip = L("Record timelapse video of printing without showing toolhead. In this mode "
-                    "the toolhead docks near the excess chute at each layer change, and then "
-                    "a snapshot is taken with the chamber camera. When printing finishes a timelapse "
-                    "video is composed of all the snapshots.");
+    def->tooltip = L("If enabled, a timelapse video will be generated for each print. "
+                     "After each layer is printed, the toolhead will move to the excess chute, "
+                     "and then a snapshot is taken with the chamber camera. "
+                     "All of these snapshots are composed into a timelapse video when printing completes. "
+                     "Since the melt filament may leak from the nozzle during the process of taking a snapshot, "
+                     "prime tower is required for nozzle priming.");
     def->mode = comSimple;
     def->set_default_value(new ConfigOptionBool(false));
 
@@ -2406,8 +2432,7 @@ void PrintConfigDef::init_fff_params()
     def = this->add("independent_support_layer_height", coBool);
     def->label = L("Independent support layer height");
     def->category = L("Support");
-    def->tooltip = L("Support layer uses layer height independent with object layer. This is to support custom support gap,"
-                   "but may cause extra filament switches if support is specified as different extruder with object");
+    def->tooltip = L("Support layer uses layer height independent with object layer. This is to support customizing z-gap and save print time.");
     def->mode = comAdvanced;
     def->set_default_value(new ConfigOptionBool(true));