GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-14 05:15:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

#442 fix "cooling" setting not completely nuked

Browse Source
This commit is contained in:
supermerill 2020-09-07 09:21:46 +02:00
parent 4c70ad7970
commit 1d1b1f0715
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libslic3r/GCode.cpp
View File

@ -1456,7 +1456,7 @@ void GCode::_do_export(Print &print, FILE *file)
this->print_machine_envelope(file, print); this->print_machine_envelope(file, print);
// Disable fan. // Disable fan.
if ( (! print.config().cooling.get_at(initial_extruder_id) || print.config().disable_fan_first_layers.get_at(initial_extruder_id)) if ( print.config().disable_fan_first_layers.get_at(initial_extruder_id)
&& config().gcode_flavor != gcfKlipper) && config().gcode_flavor != gcfKlipper)
_write(file, m_writer.set_fan(0, true)); _write(file, m_writer.set_fan(0, true));

2
src/libslic3r/GCode/CoolingBuffer.cpp
View File

@ -312,7 +312,7 @@ std::vector<PerExtruderAdjustments> CoolingBuffer::parse_layer_gcode(const std::
PerExtruderAdjustments &adj = per_extruder_adjustments[i]; PerExtruderAdjustments &adj = per_extruder_adjustments[i];
uint16_t extruder_id = extruders[i].id(); uint16_t extruder_id = extruders[i].id();
adj.extruder_id = extruder_id; adj.extruder_id = extruder_id;
adj.cooling_slow_down_enabled = config.cooling.get_at(extruder_id); adj.cooling_slow_down_enabled = config.slowdown_below_layer_time.get_at(extruder_id) > 0;
adj.slowdown_below_layer_time = float(config.slowdown_below_layer_time.get_at(extruder_id)); adj.slowdown_below_layer_time = float(config.slowdown_below_layer_time.get_at(extruder_id));
adj.min_print_speed = float(config.min_print_speed.get_at(extruder_id)); adj.min_print_speed = float(config.min_print_speed.get_at(extruder_id));
adj.max_speed_reduction = float(config.max_speed_reduction.get_at(extruder_id) / 100); adj.max_speed_reduction = float(config.max_speed_reduction.get_at(extruder_id) / 100);

14
src/slic3r/GUI/Preset.cpp
View File

@ -572,11 +572,15 @@ const std::vector<std::string>& Preset::filament_options()
"filament_toolchange_part_fan_speed", "filament_toolchange_part_fan_speed",
"filament_dip_insertion_speed", "filament_dip_insertion_speed",
"filament_dip_extraction_speed", //skinnydip params end "filament_dip_extraction_speed", //skinnydip params end
"temperature", "first_layer_temperature", "bed_temperature", "first_layer_bed_temperature", "fan_always_on", "cooling", "min_fan_speed", "temperature", "first_layer_temperature", "bed_temperature", "first_layer_bed_temperature",
"max_fan_speed", "bridge_fan_speed" "cooling",
, "top_fan_speed" "fan_always_on",
, "disable_fan_first_layers" "min_fan_speed",
, "fan_below_layer_time", "max_fan_speed",
"bridge_fan_speed",
"top_fan_speed",
"disable_fan_first_layers",
"fan_below_layer_time",
"slowdown_below_layer_time", "slowdown_below_layer_time",
"max_speed_reduction", "max_speed_reduction",
"min_print_speed", "min_print_speed",

3
src/slic3r/GUI/Tab.cpp
View File

@ -1889,8 +1889,7 @@ void TabFilament::update()
this->update_volumetric_flow_preset_hints(); this->update_volumetric_flow_preset_hints();
Layout(); Layout();
bool cooling = m_config->opt_bool("cooling", 0); bool fan_always_on = m_config->opt_bool("fan_always_on", 0);
bool fan_always_on = cooling || m_config->opt_bool("fan_always_on", 0);
//get_field("max_fan_speed")->toggle(m_config->opt_int("fan_below_layer_time", 0) > 0); //get_field("max_fan_speed")->toggle(m_config->opt_int("fan_below_layer_time", 0) > 0);
Field* min_print_speed_field = get_field("min_print_speed"); Field* min_print_speed_field = get_field("min_print_speed");