GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-07-14 04:51:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3392 from platsch/lift-z-fix

Browse Source 
Bugfix: use Lift-z option for 2. extruder #3385
This commit is contained in:
Alessandro Ranellucci 2016-11-22 18:57:17 +01:00 committed by GitHub
commit 98bf102f99
2 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
t/retraction.t
View File

@ -1,4 +1,4 @@
use Test::More tests => 22; use Test::More tests => 26;
use strict; use strict;
use warnings; use warnings;
@ -26,6 +26,7 @@ use Slic3r::Test qw(_eq);
my @retracted = (1); # ignore the first travel move from home to first point my @retracted = (1); # ignore the first travel move from home to first point
my @retracted_length = (0); my @retracted_length = (0);
my $lifted = 0; my $lifted = 0;
my $lift_dist = 0; # track lifted distance for toolchanges and extruders with different retract_lift values
my $changed_tool = 0; my $changed_tool = 0;
my $wait_for_toolchange = 0; my $wait_for_toolchange = 0;
Slic3r::GCode::Reader->new->parse(Slic3r::Test::gcode($print), sub { Slic3r::GCode::Reader->new->parse(Slic3r::Test::gcode($print), sub {
@ -48,12 +49,14 @@ use Slic3r::Test qw(_eq);
fail 'only lifting while retracted' if !$retracted[$tool]; fail 'only lifting while retracted' if !$retracted[$tool];
fail 'double lift' if $lifted; fail 'double lift' if $lifted;
$lifted = 1; $lifted = 1;
$lift_dist = $info->{dist_Z};
} }
if ($info->{dist_Z} < 0) { if ($info->{dist_Z} < 0) {
fail 'going down only after lifting' if !$lifted; fail 'going down only after lifting' if !$lifted;
fail 'going down by the same amount of the lift or by the amount needed to get to next layer' fail 'going down by the same amount of the lift or by the amount needed to get to next layer'
if !_eq($info->{dist_Z}, -$print->print->config->get_at('retract_lift', $tool)) if !_eq($info->{dist_Z}, -$lift_dist)
&& !_eq($info->{dist_Z}, -$print->print->config->get_at('retract_lift', $tool) + $conf->layer_height); && !_eq($info->{dist_Z}, -lift_dist + $conf->layer_height);
$lift_dist = 0;
$lifted = 0; $lifted = 0;
} }
fail 'move Z at travel speed' if ($args->{F} // $self->F) != $conf->travel_speed * 60; fail 'move Z at travel speed' if ($args->{F} // $self->F) != $conf->travel_speed * 60;
@ -110,7 +113,7 @@ use Slic3r::Test qw(_eq);
$conf->set('retract_restart_extra', [-1]); $conf->set('retract_restart_extra', [-1]);
ok $test->($conf), "negative restart extra length$descr"; ok $test->($conf), "negative restart extra length$descr";
$conf->set('retract_lift', [1]); $conf->set('retract_lift', [1, 2]);
ok $test->($conf), "lift$descr"; ok $test->($conf), "lift$descr";
}; };
@ -204,7 +207,7 @@ use Slic3r::Test qw(_eq);
{ {
my $config = Slic3r::Config->new_from_defaults; my $config = Slic3r::Config->new_from_defaults;
$config->set('start_gcode', ''); $config->set('start_gcode', '');
$config->set('retract_lift', [3]); $config->set('retract_lift', [3, 4]);
my @lifted_at = (); my @lifted_at = ();
my $test = sub { my $test = sub {
@ -219,19 +222,36 @@ use Slic3r::Test qw(_eq);
}); });
}; };
$config->set('retract_lift_above', [0]); $config->set('retract_lift_above', [0, 0]);
$config->set('retract_lift_below', [0]); $config->set('retract_lift_below', [0, 0]);
$test->(); $test->();
ok !!@lifted_at, 'lift takes place when above/below == 0'; ok !!@lifted_at, 'lift takes place when above/below == 0';
$config->set('retract_lift_above', [5]); $config->set('retract_lift_above', [5, 6]);
$config->set('retract_lift_below', [15]); $config->set('retract_lift_below', [15, 13]);
$test->(); $test->();
ok !!@lifted_at, 'lift takes place when above/below != 0'; ok !!@lifted_at, 'lift takes place when above/below != 0';
ok !(any { $_ < $config->get_at('retract_lift_above', 0) } @lifted_at), ok !(any { $_ < $config->get_at('retract_lift_above', 0) } @lifted_at),
'Z is not lifted below the configured value'; 'Z is not lifted below the configured value';
ok !(any { $_ > $config->get_at('retract_lift_below', 0) } @lifted_at), ok !(any { $_ > $config->get_at('retract_lift_below', 0) } @lifted_at),
'Z is not lifted above the configured value'; 'Z is not lifted above the configured value';
# check lifting with different values for 2. extruder
$config->set('perimeter_extruder', 2);
$config->set('infill_extruder', 2);
$config->set('retract_lift_above', [0, 0]);
$config->set('retract_lift_below', [0, 0]);
$test->();
ok !!@lifted_at, 'lift takes place when above/below == 0 for 2. extruder';
$config->set('retract_lift_above', [5, 6]);
$config->set('retract_lift_below', [15, 13]);
$test->();
ok !!@lifted_at, 'lift takes place when above/below != 0 for 2. extruder';
ok !(any { $_ < $config->get_at('retract_lift_above', 1) } @lifted_at),
'Z is not lifted below the configured value for 2. extruder';
ok !(any { $_ > $config->get_at('retract_lift_below', 1) } @lifted_at),
'Z is not lifted above the configured value for 2. extruder';
} }
__END__ __END__

6
xs/src/libslic3r/GCodeWriter.cpp
View File

@ -501,10 +501,10 @@ GCodeWriter::lift()
// check whether the above/below conditions are met // check whether the above/below conditions are met
double target_lift = 0; double target_lift = 0;
{ {
double above = this->config.retract_lift_above.get_at(0); double above = this->config.retract_lift_above.get_at(this->_extruder->id);
double below = this->config.retract_lift_below.get_at(0); double below = this->config.retract_lift_below.get_at(this->_extruder->id);
if (this->_pos.z >= above && (below == 0 || this->_pos.z <= below)) if (this->_pos.z >= above && (below == 0 || this->_pos.z <= below))
target_lift = this->config.retract_lift.get_at(0); target_lift = this->config.retract_lift.get_at(this->_extruder->id);
} }
if (this->_lifted == 0 && target_lift > 0) { if (this->_lifted == 0 && target_lift > 0) {
this->_lifted = target_lift; this->_lifted = target_lift;