Fixed regression causing small perimeter speed not to be applied anymore. #2365

This commit is contained in:
Alessandro Ranellucci 2014-11-23 19:15:28 +01:00
parent 2c64c3dd5b
commit a1193d28bc

View file

@ -279,24 +279,25 @@ sub _extrude_path {
$e_per_mm = 0 if !$self->writer->extrusion_axis; $e_per_mm = 0 if !$self->writer->extrusion_axis;
# set speed # set speed
my $F; my $F = $speed // -1;
if ($path->role == EXTR_ROLE_PERIMETER) { if (!defined $F) {
$F = $self->config->get_abs_value('perimeter_speed'); if ($path->role == EXTR_ROLE_PERIMETER) {
} elsif ($path->role == EXTR_ROLE_EXTERNAL_PERIMETER) { $F = $self->config->get_abs_value('perimeter_speed');
$F = $self->config->get_abs_value('external_perimeter_speed'); } elsif ($path->role == EXTR_ROLE_EXTERNAL_PERIMETER) {
} elsif ($path->role == EXTR_ROLE_OVERHANG_PERIMETER || $path->role == EXTR_ROLE_BRIDGE) { $F = $self->config->get_abs_value('external_perimeter_speed');
$F = $self->config->get_abs_value('bridge_speed'); } elsif ($path->role == EXTR_ROLE_OVERHANG_PERIMETER || $path->role == EXTR_ROLE_BRIDGE) {
} elsif ($path->role == EXTR_ROLE_FILL) { $F = $self->config->get_abs_value('bridge_speed');
$F = $self->config->get_abs_value('infill_speed'); } elsif ($path->role == EXTR_ROLE_FILL) {
} elsif ($path->role == EXTR_ROLE_SOLIDFILL) { $F = $self->config->get_abs_value('infill_speed');
$F = $self->config->get_abs_value('solid_infill_speed'); } elsif ($path->role == EXTR_ROLE_SOLIDFILL) {
} elsif ($path->role == EXTR_ROLE_TOPSOLIDFILL) { $F = $self->config->get_abs_value('solid_infill_speed');
$F = $self->config->get_abs_value('top_solid_infill_speed'); } elsif ($path->role == EXTR_ROLE_TOPSOLIDFILL) {
} elsif ($path->role == EXTR_ROLE_GAPFILL) { $F = $self->config->get_abs_value('top_solid_infill_speed');
$F = $self->config->get_abs_value('gap_fill_speed'); } elsif ($path->role == EXTR_ROLE_GAPFILL) {
} else { $F = $self->config->get_abs_value('gap_fill_speed');
$F = $speed // -1; } else {
die "Invalid speed" if $F < 0; # $speed == -1 die "Invalid speed";
}
} }
$F *= 60; # convert mm/sec to mm/min $F *= 60; # convert mm/sec to mm/min