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

Bugfix: double G10 and G11 commands were issued. #2320

Browse Source
This commit is contained in:
Alessandro Ranellucci 2014-11-07 00:26:39 +01:00
parent 8ad200a352
commit fb2d84b5d3
2 changed files with 45 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Slic3r/GCode/Writer.pm
View File

@ -341,19 +341,19 @@ sub retract_for_toolchange {
sub _retract {
my ($self, $length, $restart_extra, $comment) = @_;
if ($self->config->use_firmware_retraction) {
return "G10 ; retract\n";
}
my $gcode = "";
my $dE = $self->_extruder->retract($length, $restart_extra);
if ($dE != 0) {
if ($self->config->use_firmware_retraction) {
$gcode .= "G10 ; retract\n";
} else {
$gcode = sprintf "G1 %s%.5f F%.3f%s\n",
$self->_extrusion_axis,
$self->_extruder->E,
$self->_extruder->retract_speed_mm_min,
$self->_comment($comment);
}
}
$gcode .= "M103 ; extruder off\n"
if $self->config->gcode_flavor eq 'makerware';
@ -369,14 +369,13 @@ sub unretract {
$gcode .= "M101 ; extruder on\n"
if $self->config->gcode_flavor eq 'makerware';
my $dE = $self->_extruder->unretract;
if ($dE != 0) {
if ($self->config->use_firmware_retraction) {
$gcode .= "G11 ; unretract\n";
$gcode .= $self->reset_e;
return $gcode;
}
my $dE = $self->_extruder->unretract;
if ($dE != 0) {
} else {
# use G1 instead of G0 because G0 will blend the restart with the previous travel move
$gcode .= sprintf "G1 %s%.5f F%.3f%s\n",
$self->_extrusion_axis,
@ -384,6 +383,7 @@ sub unretract {
$self->_extruder->retract_speed_mm_min,
$self->_comment($comment);
}
}
return $gcode;
}

25
t/retraction.t
View File

@ -1,4 +1,4 @@
use Test::More tests => 16;
use Test::More tests => 18;
use strict;
use warnings;
@ -159,6 +159,29 @@ use Slic3r::Test qw(_eq);
is $z_restores, 0, 'no lift';
}
{
my $config = Slic3r::Config->new_from_defaults;
$config->set('use_firmware_retraction', 1);
my $print = Slic3r::Test::init_print('20mm_cube', config => $config);
my $retracted = 0;
my $double_retractions = my $double_unretractions = 0;
Slic3r::GCode::Reader->new->parse(Slic3r::Test::gcode($print), sub {
my ($self, $cmd, $args, $info) = @_;
if ($cmd eq 'G10') {
$double_retractions++ if $retracted;
$retracted = 1;
} elsif ($cmd eq 'G11') {
$double_unretractions++ if !$retracted;
$retracted = 0;
}
});
is $double_retractions, 0, 'no double retractions';
is $double_unretractions, 0, 'no double unretractions';
}
{
my $config = Slic3r::Config->new_from_defaults;
$config->set('only_retract_when_crossing_perimeters', 1);