Rename standby_temperature to ooze_prevention. #1523

This commit is contained in:
Alessandro Ranellucci 2013-11-15 16:01:15 +01:00
parent 5e78f8a0b0
commit beb7939e22
7 changed files with 28 additions and 17 deletions

View file

@ -275,9 +275,9 @@ sub init_extruders {
));
}
# enforce tall skirt if using standby_temperature
# NOTE: this is not idempotent (i.e. switching standby_temperature off will not revert skirt settings)
if ($self->config->standby_temperature) {
# enforce tall skirt if using ooze_prevention
# NOTE: this is not idempotent (i.e. switching ooze_prevention off will not revert skirt settings)
if ($self->config->ooze_prevention && @{$self->extruders} > 1) {
$self->config->set('skirt_height', 9999999999);
$self->config->set('skirts', 1) if $self->config->skirts == 0;
}
@ -574,7 +574,7 @@ EOF
sub make_skirt {
my $self = shift;
return unless $Slic3r::Config->skirts > 0
|| ($Slic3r::Config->standby_temperature && @{$self->extruders} > 1);
|| ($Slic3r::Config->ooze_prevention && @{$self->extruders} > 1);
# collect points from all layers contained in skirt height
my @points = ();
@ -744,7 +744,7 @@ sub write_gcode {
return if $Slic3r::Config->start_gcode =~ /M(?:109|104)/i;
for my $t (0 .. $#{$self->extruders}) {
my $temp = $self->extruders->[$t]->first_layer_temperature;
$temp += $self->config->standby_temperature_delta if $self->config->standby_temperature;
$temp += $self->config->standby_temperature_delta if $self->config->ooze_prevention;
printf $fh $gcodegen->set_temperature($temp, $wait, $t) if $temp > 0;
}
};
@ -801,7 +801,7 @@ sub write_gcode {
}
# calculate wiping points if needed
if ($self->config->standby_temperature) {
if ($self->config->ooze_prevention) {
my $outer_skirt = Slic3r::Polygon->new(@{convex_hull([ map $_->pp, map @$_, @{$self->skirt} ])});
my @skirts = ();
foreach my $extruder (@{$self->extruders}) {