diff --git a/resources/profiles/QIDITechnology.ini b/resources/profiles/QIDITechnology.ini index 8afb830..833811d 100644 --- a/resources/profiles/QIDITechnology.ini +++ b/resources/profiles/QIDITechnology.ini @@ -1128,11 +1128,14 @@ compatible_printers_condition = printer_model=="X-smart 3" and nozzle_diameter[0 # Common printer preset [printer:*common*] autoemit_temperature_commands = 1 +auxiliary_fan = 0 bed_custom_model = bed_custom_texture = bed_shape = 0x0,325x0,325x325,0x325 before_layer_gcode = G92 E0 between_objects_gcode = +chamber_fan = 1 +chamber_temperature = 0 color_change_gcode = M600 cooling_tube_length = 5 cooling_tube_retraction = 91.5 @@ -1211,7 +1214,9 @@ z_offset = 0 [printer:*X-MAX 3*] inherits = *common* printer_model = X-MAX 3 +auxiliary_fan = 1 bed_shape = 0x0,325x0,325x325,0x325 +chamber_temperature = 1 max_print_height = 315 thumbnails = 380x380,210x210 @@ -1234,7 +1239,9 @@ default_print_profile = 0.20mm Fine @X-MAX 3 0.4 nozzle [printer:*X-Plus 3*] inherits = *common* printer_model = X-Plus 3 +auxiliary_fan = 1 bed_shape = 0x0,280x0,280x280,0x280 +chamber_temperature = 1 max_print_height = 270 thumbnails = 380x380,210x210 diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp index 07071d4..a9e703a 100644 --- a/src/libslic3r/Preset.cpp +++ b/src/libslic3r/Preset.cpp @@ -541,7 +541,9 @@ static std::vector s_Preset_printer_options { "cooling_tube_length", "high_current_on_filament_swap", "parking_pos_retraction", "extra_loading_move", "max_print_height", "default_print_profile", "inherits", "remaining_times", "silent_mode", - "machine_limits_usage", "thumbnails", "thumbnails_format" + "machine_limits_usage", "thumbnails", "thumbnails_format", +//Y16 + "chamber_temperature", "auxiliary_fan", "chamber_fan" }; static std::vector s_Preset_sla_print_options { diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 72e472a..ec37930 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -439,6 +439,14 @@ void PrintConfigDef::init_fff_params() def->min = 0; def->max = 300; def->set_default_value(new ConfigOptionInts { 0 }); + +//Y16 + def = this->add("chamber_temperature", coBool); + def->label = L("Chamber Temperature"); + def->tooltip = L("Enable chamber temperature control."); + def->mode = comExpert; + def->set_default_value(new ConfigOptionBool(false)); + //B24 def = this->add("volume_temperature", coInts); def->label = L("Chamber"); @@ -1991,6 +1999,19 @@ void PrintConfigDef::init_fff_params() def->mode = comExpert; def->set_default_value(new ConfigOptionInts { 35 }); +//Y16 + def = this->add("auxiliary_fan", coBool); + def->label = L("Auxiliary Fan"); + def->tooltip = L("Enable rapid cooling fan control."); + def->mode = comExpert; + def->set_default_value(new ConfigOptionBool(false)); + + def = this->add("chamber_fan", coBool); + def->label = L("Chamber Fan"); + def->tooltip = L("Enable chamber fan control."); + def->mode = comExpert; + def->set_default_value(new ConfigOptionBool(false)); + //B15 def = this->add("enable_auxiliary_fan", coInts); def->label = L("Rapid Cooling Fan Speed"); diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp index d7e259d..2f21db7 100644 --- a/src/libslic3r/PrintConfig.hpp +++ b/src/libslic3r/PrintConfig.hpp @@ -770,6 +770,8 @@ PRINT_CONFIG_CLASS_DERIVED_DEFINE( ((ConfigOptionFloatOrPercent, avoid_crossing_perimeters_max_detour)) ((ConfigOptionPoints, bed_shape)) ((ConfigOptionInts, bed_temperature)) + //Y16 + ((ConfigOptionBool, chamber_temperature)) //B24 ((ConfigOptionInts, volume_temperature)) ((ConfigOptionFloat, bridge_acceleration)) @@ -782,10 +784,13 @@ PRINT_CONFIG_CLASS_DERIVED_DEFINE( ((ConfigOptionBool, complete_objects)) ((ConfigOptionFloats, colorprint_heights)) ((ConfigOptionBools, cooling)) + //Y16 + ((ConfigOptionBool, auxiliary_fan)) + ((ConfigOptionBool, chamber_fan)) //B25 - ((ConfigOptionInts, enable_volume_fan)) + ((ConfigOptionInts, enable_volume_fan)) //B15 - ((ConfigOptionInts, enable_auxiliary_fan)) + ((ConfigOptionInts, enable_auxiliary_fan)) ((ConfigOptionFloat, default_acceleration)) ((ConfigOptionInts, disable_fan_first_layers)) //B39 diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index 8deddb1..2391e11 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -2260,6 +2260,8 @@ void TabFilament::toggle_options() { if (!m_active_page) return; +//Y16 + DynamicPrintConfig *printer_config = &wxGetApp().preset_bundle->printers.get_edited_preset().config; if (m_active_page->title() == "Cooling") { @@ -2275,6 +2277,12 @@ void TabFilament::toggle_options() bool dynamic_fan_speeds = m_config->opt_bool("enable_dynamic_fan_speeds", 0); for (int i = 0; i < 4; i++) { toggle_option("overhang_fan_speed_"+std::to_string(i),dynamic_fan_speeds); +//Y16 + bool auxiliary_fan = printer_config->opt_bool("auxiliary_fan"); + toggle_option("enable_auxiliary_fan", auxiliary_fan); + + bool chamber_fan = printer_config->opt_bool("chamber_fan"); + toggle_option("enable_volume_fan", chamber_fan); } } @@ -2300,6 +2308,9 @@ void TabFilament::toggle_options() bool pa = m_config->opt_bool("enable_advance_pressure", 0); toggle_option("advance_pressure", pa); toggle_option("smooth_time", pa); +//Y16 + bool chamber_temp = printer_config->opt_bool("chamber_temperature"); + toggle_option("volume_temperature", chamber_temp); } } @@ -2643,6 +2654,11 @@ void TabPrinter::build_fff() optgroup->append_single_option_line("use_firmware_retraction"); optgroup->append_single_option_line("use_volumetric_e"); optgroup->append_single_option_line("variable_layer_height"); +//Y16 + optgroup = page->new_optgroup(L("Accessory")); + optgroup->append_single_option_line("auxiliary_fan"); + optgroup->append_single_option_line("chamber_fan"); + optgroup->append_single_option_line("chamber_temperature"); const int gcode_field_height = 15; // 150 const int notes_field_height = 25; // 250