From 3e393df9dfbf9eb7bbab0073ae5ba460ee0426cb Mon Sep 17 00:00:00 2001 From: SoftFever Date: Thu, 10 Aug 2023 22:08:48 +0800 Subject: [PATCH] support chamber temperature per filament #1160 --- resources/profiles/Kingroon/filament/fdm_filament_pla.json | 1 - src/libslic3r/GCode.cpp | 2 +- src/libslic3r/PrintConfig.cpp | 6 +++--- src/libslic3r/PrintConfig.hpp | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/resources/profiles/Kingroon/filament/fdm_filament_pla.json b/resources/profiles/Kingroon/filament/fdm_filament_pla.json index affb020e9..3ba7fdc4f 100644 --- a/resources/profiles/Kingroon/filament/fdm_filament_pla.json +++ b/resources/profiles/Kingroon/filament/fdm_filament_pla.json @@ -5,7 +5,6 @@ "instantiation": "false", "inherits": "fdm_filament_common", "bed_temperature_difference": ["10"], - "chamber_temperature": "0", "close_fan_the_first_x_layers": ["1"], "compatible_printers_condition": "", "compatible_prints": [], diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp index 7a75f873b..fb6750739 100644 --- a/src/libslic3r/GCode.cpp +++ b/src/libslic3r/GCode.cpp @@ -1829,7 +1829,7 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato m_placeholder_parser.set("bed_temperature", new ConfigOptionInts(*bed_temp_opt)); m_placeholder_parser.set("bed_temperature_initial_layer_single", new ConfigOptionInt(first_bed_temp_opt->get_at(initial_extruder_id))); m_placeholder_parser.set("bed_temperature_initial_layer_vector", new ConfigOptionString("")); - m_placeholder_parser.set("chamber_temperature",new ConfigOptionInt(m_config.chamber_temperature)); + m_placeholder_parser.set("chamber_temperature",new ConfigOptionInts(m_config.chamber_temperature)); // SoftFever: support variables `first_layer_temperature` and `first_layer_bed_temperature` m_placeholder_parser.set("first_layer_bed_temperature", new ConfigOptionInts(*first_bed_temp_opt)); diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 6dcef0c91..da45e0e27 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -3368,14 +3368,14 @@ void PrintConfigDef::init_fff_params() def->mode = comAdvanced; def->set_default_value(new ConfigOptionBool(false)); - def = this->add("chamber_temperature", coInt); + def = this->add("chamber_temperature", coInts); def->label = L("Chamber temperature"); def->tooltip = L("Target chamber temperature"); def->sidetext = L("°C"); def->full_label = L("Chamber temperature"); def->min = 0; def->max = max_temp; - def->set_default_value(new ConfigOptionInt(0)); + def->set_default_value(new ConfigOptionInts{0}); def = this->add("nozzle_temperature", coInts); def->label = L("Other layers"); @@ -4550,7 +4550,7 @@ void PrintConfigDef::handle_legacy(t_config_option_key &opt_key, std::string &va } } else if (opt_key == "overhang_fan_threshold" && value == "5%") { value = "10%"; - } + } // Ignore the following obsolete configuration keys: static std::set ignore = { diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp index 7a343e8ab..6dc52d892 100644 --- a/src/libslic3r/PrintConfig.hpp +++ b/src/libslic3r/PrintConfig.hpp @@ -995,7 +995,7 @@ PRINT_CONFIG_CLASS_DERIVED_DEFINE( ((ConfigOptionBool, spiral_mode)) ((ConfigOptionInt, standby_temperature_delta)) ((ConfigOptionInts, nozzle_temperature)) - ((ConfigOptionInt , chamber_temperature)) + ((ConfigOptionInts , chamber_temperature)) ((ConfigOptionBools, wipe)) // BBS ((ConfigOptionInts, bed_temperature_difference))