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

Fix fan interactions & hints.

Browse Source 
supermerill/SuperSlicer#1820
This commit is contained in:
supermerill 2021-11-07 18:53:56 +01:00
parent 078fbfc33a
commit b5ae93d202
2 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -774,24 +774,25 @@ std::string CoolingBuffer::apply_layer_cooldown(
//if (EXTRUDER_CONFIG(cooling)) { //if (EXTRUDER_CONFIG(cooling)) {
if (layer_time < slowdown_below_layer_time && fan_below_layer_time > 0) { if (layer_time < slowdown_below_layer_time && fan_below_layer_time > 0) {
// Layer time very short. Enable the fan to a full throttle. // Layer time very short. Enable the fan to a full throttle.
fan_speed_new = max_fan_speed; fan_speed_new = std::max(max_fan_speed, fan_speed_new);
bridge_fan_speed = max_fan_speed; bridge_fan_speed = std::max(max_fan_speed, bridge_fan_speed);
bridge_internal_fan_speed = max_fan_speed; bridge_internal_fan_speed = std::max(max_fan_speed, bridge_internal_fan_speed);
ext_peri_fan_speed = max_fan_speed; ext_peri_fan_speed = std::max(max_fan_speed, ext_peri_fan_speed); // cannot be ovveridden
top_fan_speed = max_fan_speed; //top_fan_speed = std::max(max_fan_speed, top_fan_speed);
} else if (layer_time < fan_below_layer_time) { } else if (layer_time < fan_below_layer_time) {
// Layer time quite short. Enable the fan proportionally according to the current layer time. // Layer time quite short. Enable the fan proportionally according to the current layer time.
assert(layer_time >= slowdown_below_layer_time); assert(layer_time >= slowdown_below_layer_time);
double t = (layer_time - slowdown_below_layer_time) / (fan_below_layer_time - slowdown_below_layer_time); double t = (layer_time - slowdown_below_layer_time) / (fan_below_layer_time - slowdown_below_layer_time);
fan_speed_new = int(floor(t * min_fan_speed + (1. - t) * max_fan_speed) + 0.5); if (fan_speed_new < max_fan_speed)
fan_speed_new = int(floor(t * min_fan_speed + (1. - t) * max_fan_speed) + 0.5);
if (bridge_fan_speed >= 0 && bridge_fan_speed < max_fan_speed) if (bridge_fan_speed >= 0 && bridge_fan_speed < max_fan_speed)
bridge_fan_speed = int(floor(t * bridge_fan_speed + (1. - t) * max_fan_speed) + 0.5); bridge_fan_speed = int(floor(t * bridge_fan_speed + (1. - t) * max_fan_speed) + 0.5);
if (bridge_internal_fan_speed >= 0 && bridge_internal_fan_speed < max_fan_speed) if (bridge_internal_fan_speed >= 0 && bridge_internal_fan_speed < max_fan_speed)
bridge_internal_fan_speed = int(floor(t * bridge_internal_fan_speed + (1. - t) * max_fan_speed) + 0.5); bridge_internal_fan_speed = int(floor(t * bridge_internal_fan_speed + (1. - t) * max_fan_speed) + 0.5);
if (top_fan_speed >= 0 && top_fan_speed < max_fan_speed)
top_fan_speed = int(floor(t * top_fan_speed + (1. - t) * max_fan_speed) + 0.5);
if (ext_peri_fan_speed >= 0 && ext_peri_fan_speed < max_fan_speed) if (ext_peri_fan_speed >= 0 && ext_peri_fan_speed < max_fan_speed)
ext_peri_fan_speed = int(floor(t * ext_peri_fan_speed + (1. - t) * max_fan_speed) + 0.5); ext_peri_fan_speed = int(floor(t * ext_peri_fan_speed + (1. - t) * max_fan_speed) + 0.5);
//if (top_fan_speed >= 0 && top_fan_speed < max_fan_speed) // cannot be ovveridden
// top_fan_speed = int(floor(t * top_fan_speed + (1. - t) * max_fan_speed) + 0.5);
} }
//} //}

20
src/slic3r/GUI/PresetHints.cpp
View File

@ -25,6 +25,7 @@ std::string PresetHints::cooling_description(const Preset &preset)
int bridge_internal_fan_speed = preset.config.opt_int("bridge_internal_fan_speed", 0); int bridge_internal_fan_speed = preset.config.opt_int("bridge_internal_fan_speed", 0);
int ext_peri_fan_speed = preset.config.opt_int("external_perimeter_fan_speed", 0); int ext_peri_fan_speed = preset.config.opt_int("external_perimeter_fan_speed", 0);
int disable_fan_first_layers = preset.config.opt_int("disable_fan_first_layers", 0); int disable_fan_first_layers = preset.config.opt_int("disable_fan_first_layers", 0);
int full_fan_speed_layer = preset.config.opt_int("full_fan_speed_layer", 0);
int slowdown_below_layer_time = preset.config.opt_int("slowdown_below_layer_time", 0); int slowdown_below_layer_time = preset.config.opt_int("slowdown_below_layer_time", 0);
int min_print_speed = int(preset.config.opt_float("min_print_speed", 0) + 0.5); int min_print_speed = int(preset.config.opt_float("min_print_speed", 0) + 0.5);
int max_speed_reduc = int(preset.config.opt_float("max_speed_reduction", 0)); int max_speed_reduc = int(preset.config.opt_float("max_speed_reduction", 0));
@ -69,6 +70,8 @@ std::string PresetHints::cooling_description(const Preset &preset)
out += ", " + (boost::format(_utf8(L("except for the first %1% layers where the fan is disabled"))) % disable_fan_first_layers).str(); out += ", " + (boost::format(_utf8(L("except for the first %1% layers where the fan is disabled"))) % disable_fan_first_layers).str();
else if (disable_fan_first_layers == 1) else if (disable_fan_first_layers == 1)
out += ", " + _utf8(L("except for the first layer where the fan is disabled")); out += ", " + _utf8(L("except for the first layer where the fan is disabled"));
if(full_fan_speed_layer > disable_fan_first_layers + 1 && disable_fan_first_layers > 0)
out += (boost::format(_utf8(L(" and will gradually speed-up to the above speeds over %1% layers"))) % (full_fan_speed_layer - disable_fan_first_layers)).str();
out += "."; out += ".";
} else } else
out += " " + _utf8(L("will be turned off by default.")); out += " " + _utf8(L("will be turned off by default."));
@ -85,7 +88,7 @@ std::string PresetHints::cooling_description(const Preset &preset)
if (ext_peri_fan_speed > max_fan_speed) { if (ext_peri_fan_speed > max_fan_speed) {
out += ", " + (boost::format(_utf8(L("at %1%%% over external perimeters"))) % ext_peri_fan_speed).str(); out += ", " + (boost::format(_utf8(L("at %1%%% over external perimeters"))) % ext_peri_fan_speed).str();
} else if (ext_peri_fan_speed > min_fan_speed) { } else if (ext_peri_fan_speed > min_fan_speed) {
out += ", " + (boost::format(_utf8(L("at %1%%% over external perimeters"))) % ext_peri_fan_speed).str() + " " + L("if it's above the current computed fan speed value"); out += ", " + (boost::format(_utf8(L("between %1%%% %2%%% over external perimeters"))) % ext_peri_fan_speed % max_fan_speed).str();
} }
if (top_fan_speed >= 0) { if (top_fan_speed >= 0) {
out += ", " + (boost::format(_utf8(L("at %1%%% over top fill surfaces"))) % top_fan_speed).str(); out += ", " + (boost::format(_utf8(L("at %1%%% over top fill surfaces"))) % top_fan_speed).str();
@ -93,17 +96,19 @@ std::string PresetHints::cooling_description(const Preset &preset)
if (bridge_fan_speed > max_fan_speed) { if (bridge_fan_speed > max_fan_speed) {
out += ", " + (boost::format(_utf8(L("at %1%%% over bridges"))) % bridge_fan_speed).str(); out += ", " + (boost::format(_utf8(L("at %1%%% over bridges"))) % bridge_fan_speed).str();
} else if (bridge_fan_speed > min_fan_speed) { } else if (bridge_fan_speed > min_fan_speed) {
out += ", " + (boost::format(_utf8(L("at %1%%% over bridges"))) % bridge_fan_speed).str() + " " + L("if it's above the current computed fan speed value"); out += ", " + (boost::format(_utf8(L("between %1%%% %2%%% over bridges"))) % bridge_fan_speed % max_fan_speed).str();
} }
if (bridge_internal_fan_speed > max_fan_speed) { if (bridge_internal_fan_speed > max_fan_speed) {
out += ", " + (boost::format(_utf8(L("at %1%%% over infill bridges"))) % bridge_internal_fan_speed).str(); out += ", " + (boost::format(_utf8(L("at %1%%% over infill bridges"))) % bridge_internal_fan_speed).str();
} else if (bridge_internal_fan_speed > min_fan_speed) { } else if (bridge_internal_fan_speed > min_fan_speed) {
out += ", " + (boost::format(_utf8(L("at %1%%% over infill bridges"))) % bridge_internal_fan_speed).str() + " " + L("if it's above the current computed fan speed value"); out += ", " + (boost::format(_utf8(L("between %1%%% %2%%% over infill bridges"))) % bridge_internal_fan_speed % max_fan_speed).str();
} }
if (disable_fan_first_layers > 1) if (disable_fan_first_layers > 1)
out += " ; " + ((boost::format(_utf8(L("except for the first %1% layers where the fan is disabled"))) % disable_fan_first_layers).str()); out += " ; " + ((boost::format(_utf8(L("except for the first %1% layers where the fan is disabled"))) % disable_fan_first_layers).str());
else if (disable_fan_first_layers == 1) else if (disable_fan_first_layers == 1)
out += " ; "+ _utf8(L("except for the first layer where the fan is disabled")); out += " ; "+ _utf8(L("except for the first layer where the fan is disabled"));
if (full_fan_speed_layer > disable_fan_first_layers + 1 && disable_fan_first_layers > 0)
out += (boost::format(_utf8(L(" and will gradually speed-up to the above speeds over %1% layers"))) % (full_fan_speed_layer - disable_fan_first_layers)).str();
out += "."; out += ".";
} }
@ -116,10 +121,13 @@ std::string PresetHints::cooling_description(const Preset &preset)
% max_fan_speed).str(); % max_fan_speed).str();
if (disable_fan_first_layers > 1) if (disable_fan_first_layers > 1)
out += " (" + (boost::format(_utf8(L("except for the first %1% layers where the fan is disabled"))) % disable_fan_first_layers).str() + ")"; out += " (" + (boost::format(_utf8(L("except for the first %1% layers where the fan is disabled"))) % disable_fan_first_layers).str();
else if (disable_fan_first_layers == 1) else if (disable_fan_first_layers == 1)
out += " (" + _utf8(L("except for the first layer where the fan is disabled")) + ")"; out += " (" + _utf8(L("except for the first layer where the fan is disabled"));
if (full_fan_speed_layer > disable_fan_first_layers + 1 && disable_fan_first_layers > 0)
out += (boost::format(_utf8(L(" and will gradually speed-up to the above speeds over %1% layers"))) % (full_fan_speed_layer - disable_fan_first_layers)).str();
if(disable_fan_first_layers > 0)
out += ")";
out += " and"; out += " and";
} }