Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enhancement: Do not slow down external perimeters to meet minimum layer time #5148

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
d84ff93
POC - Do not slow down external perimeters to meet minimum layer time
igiannakas Apr 25, 2024
db14b13
POC - Do not slow down external perimeters to meet minimum layer time…
igiannakas Apr 25, 2024
20d45ab
Revert "POC - Do not slow down external perimeters to meet minimum la…
igiannakas Apr 25, 2024
cd5fbfb
Merge branch 'SoftFever:main' into POC---Do-not-slow-down-external-pe…
igiannakas Apr 29, 2024
d0b8c5c
Merge branch 'main' into POC---Do-not-slow-down-external-perimeters-t…
igiannakas May 1, 2024
98704a0
Merge branch 'SoftFever:main' into POC---Do-not-slow-down-external-pe…
igiannakas May 1, 2024
e83f5db
Merge branch 'SoftFever:main' into POC---Do-not-slow-down-external-pe…
igiannakas May 3, 2024
8668adc
Merge branch 'SoftFever:main' into POC---Do-not-slow-down-external-pe…
igiannakas May 9, 2024
37686a0
Merge branch 'SoftFever:main' into POC---Do-not-slow-down-external-pe…
igiannakas May 9, 2024
8523b2b
Merge branch 'SoftFever:main' into POC---Do-not-slow-down-external-pe…
igiannakas May 13, 2024
7023322
Merge branch 'main' into POC---Do-not-slow-down-external-perimeters-t…
igiannakas May 17, 2024
6a23058
Merge branch 'main' into POC---Do-not-slow-down-external-perimeters-t…
igiannakas May 20, 2024
371a01a
Merge branch 'SoftFever:main' into POC---Do-not-slow-down-external-pe…
igiannakas May 21, 2024
ff6d411
Merge branch 'main' into POC---Do-not-slow-down-external-perimeters-t…
igiannakas May 22, 2024
621b73b
Merge branch 'SoftFever:main' into POC---Do-not-slow-down-external-pe…
igiannakas May 28, 2024
2bd712f
Merge branch 'main' into POC---Do-not-slow-down-external-perimeters-t…
igiannakas Jun 4, 2024
4e9edf8
Merge branch 'main' into POC---Do-not-slow-down-external-perimeters-t…
igiannakas Jun 5, 2024
88e32a6
Dont slow down external perimeters to meet layer time target v2
igiannakas Jun 5, 2024
f2f051f
Reverted previous implementation
igiannakas Jun 5, 2024
6a62069
Merge branch 'main' into POC---Do-not-slow-down-external-perimeters-t…
igiannakas Jun 5, 2024
f00a5d6
Merge branch 'main' into POC---Do-not-slow-down-external-perimeters-t…
igiannakas Jun 7, 2024
b7d22c6
Merge branch 'SoftFever:main' into POC---Do-not-slow-down-external-pe…
igiannakas Jun 8, 2024
ddc0e1a
Merge branch 'main' into POC---Do-not-slow-down-external-perimeters-t…
igiannakas Jun 9, 2024
b6e868a
UI fixes for dont slow down for layer cooling
igiannakas Jun 10, 2024
74f71c7
Merge branch 'SoftFever:main' into POC---Do-not-slow-down-external-pe…
igiannakas Jun 15, 2024
7519d3b
Merge branch 'main' into POC---Do-not-slow-down-external-perimeters-t…
igiannakas Jun 16, 2024
547dcbe
Merge branch 'main' into POC---Do-not-slow-down-external-perimeters-t…
SoftFever Jun 16, 2024
029b22d
Merge branch 'main' into POC---Do-not-slow-down-external-perimeters-t…
SoftFever Jun 16, 2024
35eeca1
Update dont slow down outer walls naming convention
igiannakas Jun 16, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 14 additions & 1 deletion src/libslic3r/GCode/CoolingBuffer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,9 @@ struct PerExtruderAdjustments
float slow_down_layer_time = 0.f;
// Minimum print speed allowed for this extruder.
float slow_down_min_speed = 0.f;

bool dont_slow_down_outer_wall = false;


// Parsed lines.
std::vector<CoolingLine> lines;
Expand Down Expand Up @@ -330,6 +333,8 @@ std::vector<PerExtruderAdjustments> CoolingBuffer::parse_layer_gcode(const std::
adj.cooling_slow_down_enabled = m_config.slow_down_for_layer_cooling.get_at(extruder_id);
adj.slow_down_layer_time = float(m_config.slow_down_layer_time.get_at(extruder_id));
adj.slow_down_min_speed = float(m_config.slow_down_min_speed.get_at(extruder_id));
// ORCA: To enable dont slow down external perimeters feature per filament (extruder)
adj.dont_slow_down_outer_wall = m_config.dont_slow_down_outer_wall.get_at(extruder_id);
map_extruder_to_per_extruder_adjustment[extruder_id] = i;
}

Expand Down Expand Up @@ -399,7 +404,15 @@ std::vector<PerExtruderAdjustments> CoolingBuffer::parse_layer_gcode(const std::
line.type |= CoolingLine::TYPE_EXTERNAL_PERIMETER;
if (wipe)
line.type |= CoolingLine::TYPE_WIPE;
if (boost::contains(sline, ";_EXTRUDE_SET_SPEED") && ! wipe) {

// ORCA: Dont slowdown external perimeters for layer time feature
// use the adjustment pointer to ensure the value for the current extruder (filament) is used.
bool adjust_external = true;
if(adjustment->dont_slow_down_outer_wall && external_perimeter) adjust_external = false;

// ORCA: Dont slowdown external perimeters for layer time works by not marking the external perimeter as adjustable,
// hence the slowdown algorithm ignores it.
if (boost::contains(sline, ";_EXTRUDE_SET_SPEED") && ! wipe && adjust_external) {
line.type |= CoolingLine::TYPE_ADJUSTABLE;
active_speed_modifier = adjustment->lines.size();
}
Expand Down
2 changes: 1 addition & 1 deletion src/libslic3r/Preset.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -825,7 +825,7 @@ static std::vector<std::string> s_Preset_filament_options {
"cool_plate_temp", "eng_plate_temp", "hot_plate_temp", "textured_plate_temp", "cool_plate_temp_initial_layer", "eng_plate_temp_initial_layer", "hot_plate_temp_initial_layer","textured_plate_temp_initial_layer",
// "bed_type",
//BBS:temperature_vitrification
"temperature_vitrification", "reduce_fan_stop_start_freq", "slow_down_for_layer_cooling", "fan_min_speed",
"temperature_vitrification", "reduce_fan_stop_start_freq","dont_slow_down_outer_wall", "slow_down_for_layer_cooling", "fan_min_speed",
"fan_max_speed", "enable_overhang_bridge_fan", "overhang_fan_speed", "overhang_fan_threshold", "close_fan_the_first_x_layers", "full_fan_speed_layer", "fan_cooling_layer_time", "slow_down_layer_time", "slow_down_min_speed",
"filament_start_gcode", "filament_end_gcode",
//exhaust fan control
Expand Down
1 change: 1 addition & 0 deletions src/libslic3r/Print.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ bool Print::invalidate_state_by_config_options(const ConfigOptionResolver & /* n
"extruder_offset",
"filament_flow_ratio",
"reduce_fan_stop_start_freq",
"dont_slow_down_outer_wall",
"fan_cooling_layer_time",
"full_fan_speed_layer",
"fan_kickstart",
Expand Down
9 changes: 9 additions & 0 deletions src/libslic3r/PrintConfig.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1700,6 +1700,15 @@ void PrintConfigDef::init_fff_params()
def->tooltip = L("If enable this setting, part cooling fan will never be stoped and will run at least "
"at minimum speed to reduce the frequency of starting and stoping");
def->set_default_value(new ConfigOptionBools { false });

def = this->add("dont_slow_down_outer_wall", coBools);
def->label = L("Don't slow down outer walls");
def->tooltip = L("If enabled, this setting will ensure external perimeters are not slowed down to meet the minimum layer time. "
"This is particularly helpful in the below scenarios:\n\n "
"1. To avoid changes in shine when printing glossy filaments \n"
"2. To avoid changes in external wall speed which may create slight wall artefacts that appear like z banding \n"
"3. To avoid printing at speeds which cause VFAs (fine artefacts) on the external walls\n\n");
def->set_default_value(new ConfigOptionBools { false });

def = this->add("fan_cooling_layer_time", coFloats);
def->label = L("Layer time");
Expand Down
1 change: 1 addition & 0 deletions src/libslic3r/PrintConfig.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1174,6 +1174,7 @@ PRINT_CONFIG_CLASS_DERIVED_DEFINE(
((ConfigOptionStrings, extruder_colour))
((ConfigOptionPoints, extruder_offset))
((ConfigOptionBools, reduce_fan_stop_start_freq))
((ConfigOptionBools, dont_slow_down_outer_wall))
((ConfigOptionFloats, fan_cooling_layer_time))
((ConfigOptionStrings, filament_colour))
((ConfigOptionBools, activate_air_filtration))
Expand Down
5 changes: 5 additions & 0 deletions src/slic3r/GUI/Tab.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3330,6 +3330,7 @@ void TabFilament::build()
optgroup->append_line(line);
optgroup->append_single_option_line("reduce_fan_stop_start_freq");
optgroup->append_single_option_line("slow_down_for_layer_cooling", "auto-cooling");
optgroup->append_single_option_line("dont_slow_down_outer_wall");
optgroup->append_single_option_line("slow_down_min_speed");

optgroup->append_single_option_line("enable_overhang_bridge_fan", "auto-cooling");
Expand Down Expand Up @@ -3504,6 +3505,10 @@ void TabFilament::toggle_options()
toggle_option(el, has_enable_overhang_bridge_fan);

toggle_option("additional_cooling_fan_speed", cfg.opt_bool("auxiliary_fan"));

// Orca: toggle dont slow down for external perimeters if
bool has_slow_down_for_layer_cooling = m_config->opt_bool("slow_down_for_layer_cooling", 0);
toggle_option("dont_slow_down_outer_wall", has_slow_down_for_layer_cooling);
}
if (m_active_page->title() == L("Filament"))
{
Expand Down