Delect first layer chamber temp

src/libslic3r/GCode.cpp

@@ -1323,9 +1323,6 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato
     // Set extruder(s) temperature before and after start G-code.
     this->_print_first_layer_extruder_temperatures(file, print, start_gcode, initial_extruder_id, false);
 
-    //B24
-    this->_print_first_layer_volume_temperature(file, print, start_gcode, initial_extruder_id, false);
-
     // adds tag for processor
     file.write_format(";%s%s\n", GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Role).c_str(), gcode_extrusion_role_to_string(GCodeExtrusionRole::Custom).c_str());
 
@@ -1417,8 +1414,6 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato
                 this->placeholder_parser().set("current_object_idx", int(finished_objects));
                 std::string between_objects_gcode = this->placeholder_parser_process("between_objects_gcode", print.config().between_objects_gcode.value, initial_extruder_id);
                 // Set first layer bed and extruder temperatures, don't wait for it to reach the temperature.
-                //B24
-                this->_print_first_layer_volume_temperature(file, print, between_objects_gcode, initial_extruder_id, false);
                 this->_print_first_layer_bed_temperature(file, print, between_objects_gcode, initial_extruder_id, false);
                 this->_print_first_layer_extruder_temperatures(file, print, between_objects_gcode, initial_extruder_id, false);
                 file.writeln(between_objects_gcode);
@@ -1935,24 +1930,6 @@ void GCode::_print_first_layer_bed_temperature(GCodeOutputStream &file, Print &p
         file.write(set_temp_gcode);
 }
 
-//B24
-void GCode::_print_first_layer_volume_temperature(GCodeOutputStream &file, Print &print, const std::string &gcode, unsigned int first_printing_extruder_id, bool wait)
-{
-    bool autoemit = print.config().autoemit_temperature_commands;
-    // Initial bed temperature based on the first extruder.
-    int  temp = print.config().first_layer_volume_temperature.get_at(first_printing_extruder_id);
-    // Is the bed temperature set by the provided custom G-code?
-    int  temp_by_gcode     = -1;
-    bool temp_set_by_gcode = custom_gcode_sets_temperature(gcode, 141, 999, false, temp_by_gcode);
-    if (autoemit && temp_set_by_gcode && temp_by_gcode >= 0 && temp_by_gcode < 1000)
-        temp = temp_by_gcode;
-    // Always call m_writer.set_bed_temperature() so it will set the internal "current" state of the bed temp as if
-    // the custom start G-code emited these.
-    std::string set_temp_gcode = m_writer.set_volume_temperature(temp, wait);
-    if (autoemit && ! temp_set_by_gcode)
-        file.write(set_temp_gcode);
-}
-
 // Write 1st layer extruder temperatures into the G-code.
 // Only do that if the start G-code does not already contain any M-code controlling an extruder temperature.
 // M104 - Set Extruder Temperature

src/libslic3r/GCode.hpp

@@ -441,8 +441,6 @@ private:
     void                                print_machine_envelope(GCodeOutputStream &file, Print &print);
     void                                _print_first_layer_bed_temperature(GCodeOutputStream &file, Print &print, const std::string &gcode, unsigned int first_printing_extruder_id, bool wait);
     void                                _print_first_layer_extruder_temperatures(GCodeOutputStream &file, Print &print, const std::string &gcode, unsigned int first_printing_extruder_id, bool wait);
-    //B24
-    void                                _print_first_layer_volume_temperature(GCodeOutputStream &file, Print &print, const std::string &gcode, unsigned int first_printing_extruder_id, bool wait);
 
     // On the first printing layer. This flag triggers first layer speeds.
     bool                                on_first_layer() const { return m_layer != nullptr && m_layer->id() == 0; }

src/libslic3r/Preset.cpp

@@ -508,7 +508,7 @@ static std::vector<std::string> s_Preset_filament_options {
     //B15
     "enable_auxiliary_fan",
     //B24
-    "volume_temperature", "first_layer_volume_temperature",
+    "volume_temperature",
     //B25
     "enable_volume_fan",
     //B26

src/libslic3r/PrintConfig.cpp

@@ -441,7 +441,7 @@ void PrintConfigDef::init_fff_params()
     def->set_default_value(new ConfigOptionInts { 0 });
     //B24
     def = this->add("volume_temperature", coInts);
-    def->label = L("Other layers");
+    def->label = L("Chamber");
     def->tooltip = L("Chamber temperature for layers after the first one. "
                    "Set this to zero to disable bed temperature control commands in the output.");
     def->sidetext = L("°C");
@@ -1329,17 +1329,6 @@ void PrintConfigDef::init_fff_params()
     def->min = 0;
     def->max = 300;
     def->set_default_value(new ConfigOptionInts { 0 });
-    //B24
-    def = this->add("first_layer_volume_temperature", coInts);
-    def->label = L("First layer");
-    def->full_label = L("First layer volume temperature");
-    def->tooltip = L("Chamber temperature for the first layer. Set this to zero to disable "
-                   "bed temperature control commands in the output.");
-    def->sidetext = L("°C");
-    def->min = 0;
-    def->max = 65;
-    def->set_default_value(new ConfigOptionInts { 0 });
-
 
     def = this->add("first_layer_extrusion_width", coFloatOrPercent);
     def->label = L("First layer");

src/libslic3r/PrintConfig.hpp

@@ -802,9 +802,7 @@ PRINT_CONFIG_CLASS_DERIVED_DEFINE(
     ((ConfigOptionStrings,            filament_colour))
     ((ConfigOptionStrings,            filament_notes))
     ((ConfigOptionFloat,              first_layer_acceleration))
-    //B24
     ((ConfigOptionInts,               first_layer_bed_temperature))
-    ((ConfigOptionInts,               first_layer_volume_temperature))
     ((ConfigOptionFloatOrPercent,     first_layer_extrusion_width))
     ((ConfigOptionFloatOrPercent,     first_layer_height))
     ((ConfigOptionFloatOrPercent,     first_layer_speed))

src/slic3r/GUI/Tab.cpp

@@ -2073,10 +2073,7 @@ void TabFilament::build()
         line.append_option(optgroup->get_option("bed_temperature"));
         optgroup->append_line(line);
         //B24
-        line = { L("Chamber"), "" };
+        optgroup->append_single_option_line("volume_temperature");
-        line.append_option(optgroup->get_option("first_layer_volume_temperature"));
-        line.append_option(optgroup->get_option("volume_temperature"));
-        optgroup->append_line(line);
 
     page = add_options_page(L("Cooling"), "cooling");
         std::string category_path = "cooling_127569#";