2e2e4e68d3
The recent GCode writer changes which put the speed changes on a line of their own have caused the layer time slowdown to be ignored by the regex in CoolingBuffer.pm. Fixes: #3134
82 lines
3.2 KiB
Perl
82 lines
3.2 KiB
Perl
package Slic3r::GCode::CoolingBuffer;
|
|
use Moo;
|
|
|
|
has 'config' => (is => 'ro', required => 1); # Slic3r::Config::Print
|
|
has 'gcodegen' => (is => 'ro', required => 1);
|
|
has 'gcode' => (is => 'rw', default => sub {""});
|
|
has 'elapsed_time' => (is => 'rw', default => sub {0});
|
|
has 'layer_id' => (is => 'rw');
|
|
has 'last_z' => (is => 'rw', default => sub { {} }); # obj_id => z (basically a 'last seen' table)
|
|
has 'min_print_speed' => (is => 'lazy');
|
|
|
|
sub _build_min_print_speed {
|
|
my $self = shift;
|
|
return 60 * $self->config->min_print_speed;
|
|
}
|
|
|
|
sub append {
|
|
my $self = shift;
|
|
my ($gcode, $obj_id, $layer_id, $print_z) = @_;
|
|
|
|
my $return = "";
|
|
if (exists $self->last_z->{$obj_id} && $self->last_z->{$obj_id} != $print_z) {
|
|
$return = $self->flush;
|
|
}
|
|
|
|
$self->layer_id($layer_id);
|
|
$self->last_z->{$obj_id} = $print_z;
|
|
$self->gcode($self->gcode . $gcode);
|
|
$self->elapsed_time($self->elapsed_time + $self->gcodegen->elapsed_time);
|
|
$self->gcodegen->set_elapsed_time(0);
|
|
|
|
return $return;
|
|
}
|
|
|
|
sub flush {
|
|
my $self = shift;
|
|
|
|
my $gcode = $self->gcode;
|
|
my $elapsed = $self->elapsed_time;
|
|
$self->gcode("");
|
|
$self->elapsed_time(0);
|
|
$self->last_z({}); # reset the whole table otherwise we would compute overlapping times
|
|
|
|
my $fan_speed = $self->config->fan_always_on ? $self->config->min_fan_speed : 0;
|
|
my $speed_factor = 1;
|
|
if ($self->config->cooling) {
|
|
Slic3r::debugf "Layer %d estimated printing time: %d seconds\n", $self->layer_id, $elapsed;
|
|
if ($elapsed < $self->config->slowdown_below_layer_time) {
|
|
$fan_speed = $self->config->max_fan_speed;
|
|
$speed_factor = $elapsed / $self->config->slowdown_below_layer_time;
|
|
} elsif ($elapsed < $self->config->fan_below_layer_time) {
|
|
$fan_speed = $self->config->max_fan_speed - ($self->config->max_fan_speed - $self->config->min_fan_speed)
|
|
* ($elapsed - $self->config->slowdown_below_layer_time)
|
|
/ ($self->config->fan_below_layer_time - $self->config->slowdown_below_layer_time); #/
|
|
}
|
|
Slic3r::debugf " fan = %d%%, speed = %d%%\n", $fan_speed, $speed_factor * 100;
|
|
|
|
if ($speed_factor < 1) {
|
|
$gcode =~ s/^(?=.*?;_EXTRUDE_SET_SPEED)(?!.*?;_WIPE)(?<!;_BRIDGE_FAN_START\n)(G1\sF)(\d+(?:\.\d+)?)/
|
|
my $new_speed = $2 * $speed_factor;
|
|
$1 . sprintf("%.3f", $new_speed < $self->min_print_speed ? $self->min_print_speed : $new_speed)
|
|
/gexm;
|
|
}
|
|
}
|
|
$fan_speed = 0 if $self->layer_id < $self->config->disable_fan_first_layers;
|
|
$gcode = $self->gcodegen->writer->set_fan($fan_speed) . $gcode;
|
|
|
|
# bridge fan speed
|
|
if (!$self->config->cooling || $self->config->bridge_fan_speed == 0 || $self->layer_id < $self->config->disable_fan_first_layers) {
|
|
$gcode =~ s/^;_BRIDGE_FAN_(?:START|END)\n//gm;
|
|
} else {
|
|
$gcode =~ s/^;_BRIDGE_FAN_START\n/ $self->gcodegen->writer->set_fan($self->config->bridge_fan_speed, 1) /gmex;
|
|
$gcode =~ s/^;_BRIDGE_FAN_END\n/ $self->gcodegen->writer->set_fan($fan_speed, 1) /gmex;
|
|
}
|
|
$gcode =~ s/;_WIPE//g;
|
|
$gcode =~ s/;_EXTRUDE_SET_SPEED//g;
|
|
|
|
return $gcode;
|
|
}
|
|
|
|
1;
|