3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accept either absolute or relative values for --bottom-layer-speed. #151

Browse Source
This commit is contained in:
Alessandro Ranellucci 2012-06-06 15:43:54 +02:00
parent aedb6cc35f
commit 91ffb74429
6 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.markdown
View File

@ -131,9 +131,8 @@ The author is Alessandro Ranellucci.
--infill-speed Speed of print moves in mm/s (default: 60)
--solid-infill-speed Speed of print moves for solid surfaces in mm/s (default: 60)
--bridge-speed Speed of bridge print moves in mm/s (default: 60)
--bottom-layer-speed-ratio
Factor to increase/decrease speeds on bottom
layer by (default: 0.3)
--bottom-layer-speed Speed of print moves for bottom layer, expressed either as an absolute
value or as a percentage over normal speeds (default: 30%)
Accuracy options:
--layer-height Layer height in mm (default: 0.4)

2
lib/Slic3r.pm
View File

@ -83,7 +83,7 @@ our $small_perimeter_speed = 30; # mm/s
our $infill_speed = 60; # mm/s
our $solid_infill_speed = 60; # mm/s
our $bridge_speed = 60; # mm/s
our $bottom_layer_speed_ratio = 0.3;
our $bottom_layer_speed = '30%'; # mm/s or %
# acceleration options
our $acceleration = 0;

6
lib/Slic3r/Config.pm
View File

@ -157,9 +157,9 @@ our $Options = {
type => 'f',
aliases => [qw(bridge_feed_rate)],
},
'bottom_layer_speed_ratio' => {
label => 'Bottom layer speed ratio',
cli => 'bottom-layer-speed-ratio=f',
'bottom_layer_speed' => {
label => 'Bottom layer speed (mm/s or %)',
cli => 'bottom-layer-speed=f',
type => 'f',
},

21
lib/Slic3r/Extruder.pm
View File

@ -182,7 +182,11 @@ sub extrude_path {
if ($Slic3r::cooling) {
my $path_time = unscale($path_length) / $self->speeds->{$self->last_speed} * 60;
$path_time /= $Slic3r::bottom_layer_speed_ratio if $self->layer->id == 0;
if ($self->layer->id == 0) {
$path_time = $Slic3r::bottom_layer_speed =~ /^(\d+(?:\.\d+)?)%$/
? $path_time / ($1/100)
: unscale($path_length) / $Slic3r::bottom_layer_speed * 60;
}
$self->elapsed_time($self->elapsed_time + $path_time);
}
@ -318,11 +322,6 @@ sub _Gx {
my ($gcode, $e, $comment) = @_;
my $dec = $self->dec;
# apply the speed reduction for print moves on bottom layer
my $speed_multiplier = $e && $self->layer->id == 0 && $comment !~ /retract/
? $Slic3r::bottom_layer_speed_ratio
: 1;
# determine speed
my $speed = ($e ? $self->speed : 'travel');
@ -335,7 +334,15 @@ sub _Gx {
} elsif ($self->last_speed eq 'bridge') {
$append_bridge_off = 1;
}
$gcode .= sprintf " F%.${dec}f", $self->speeds->{$speed} * $speed_multiplier;
# apply the speed reduction for print moves on bottom layer
my $speed_f = $self->speeds->{$speed};
if ($e && $self->layer->id == 0 && $comment !~ /retract/) {
$speed_f = $Slic3r::bottom_layer_speed =~ /^(\d+(?:\.\d+)?)%$/
? ($speed_f * $1/100)
: $Slic3r::bottom_layer_speed;
}
$gcode .= sprintf " F%.${dec}f", $speed_f;
$self->last_speed($speed);
}

2
lib/Slic3r/GUI/SkeinPanel.pm
View File

@ -36,7 +36,7 @@ sub new {
},
speed => {
title => 'Other speed settings',
options => [qw(travel_speed bottom_layer_speed_ratio)],
options => [qw(travel_speed bottom_layer_speed)],
},
accuracy => {
title => 'Accuracy',

5
slic3r.pl
View File

@ -175,9 +175,8 @@ $j
--infill-speed Speed of print moves in mm/s (default: $Slic3r::infill_speed)
--solid-infill-speed Speed of print moves for solid surfaces in mm/s (default: $Slic3r::solid_infill_speed)
--bridge-speed Speed of bridge print moves in mm/s (default: $Slic3r::bridge_speed)
--bottom-layer-speed-ratio
Factor to increase/decrease speeds on bottom
layer by (default: $Slic3r::bottom_layer_speed_ratio)
--bottom-layer-speed Speed of print moves for bottom layer, expressed either as an absolute
value or as a percentage over normal speeds (default: $Slic3r::bottom_layer_speed)
Accuracy options:
--layer-height Layer height in mm (default: $Slic3r::layer_height)