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

New --retract-lift option to lift Z while doing travel moves. #25

Browse source
This commit is contained in:
Alessandro Ranellucci 2011-11-07 15:58:47 +01:00
parent 71a44e253c
commit b4e268efad
5 changed files with 27 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/Slic3r/Config.pm
View file

@ -116,6 +116,10 @@ our $Options = {
label => 'Minimum travel after retraction (mm)',
type => 'f',
},
'retract_lift' => {
label => 'Lift Z (mm)',
type => 'f',
},
# skirt options
'skirts' => {

21
lib/Slic3r/Extruder.pm
View file

@ -8,6 +8,7 @@ has 'flow_ratio' => (is => 'rw', default => sub {1});
has 'extrusion_distance' => (is => 'rw', default => sub {0} );
has 'retracted' => (is => 'rw', default => sub {1} ); # this spits out some plastic at start
has 'lifted' => (is => 'rw', default => sub {0} );
has 'last_pos' => (is => 'rw', default => sub { [0,0] } );
has 'last_f' => (is => 'rw', default => sub {0});
has 'dec' => (is => 'ro', default => sub { 3 } );
@ -43,7 +44,7 @@ sub move_z {
my $gcode = "";
$gcode .= $self->retract;
$gcode .= $self->retract(dont_lift => 1);
$gcode .= $self->G1(undef, $z, 0, 'move to next layer');
return $gcode;
@ -119,12 +120,19 @@ sub extrude {
sub retract {
my $self = shift;
my %params = @_;
return "" unless $Slic3r::retract_length > 0
&& !$self->retracted;
$self->retracted(1);
my $gcode = $self->G1(undef, undef, -$Slic3r::retract_length, "retract");
unless ($params{dont_lift} || $Slic3r::retract_lift == 0) {
$gcode .= $self->G1(undef, $self->z + $Slic3r::retract_lift, 0, 'lift plate during retraction');
$self->lifted(1);
}
# reset extrusion distance during retracts
# this makes sure we leave sufficient precision in the firmware
if (!$Slic3r::use_relative_e_distances) {
@ -138,8 +146,17 @@ sub retract {
sub unretract {
my $self = shift;
$self->retracted(0);
return $self->G1(undef, undef, ($Slic3r::retract_length + $Slic3r::retract_restart_extra),
my $gcode = "";
if ($self->lifted) {
$gcode .= $self->G1(undef, $self->z - $Slic3r::retract_lift, 0, 'restore layer Z');
$self->lifted(0);
}
$gcode .= $self->G1(undef, undef, ($Slic3r::retract_length + $Slic3r::retract_restart_extra),
"compensate retraction");
return $gcode;
}
sub G1 {

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

@ -37,7 +37,7 @@ sub new {
),
retract => Slic3r::GUI::OptionsGroup->new($self,
title => 'Retraction',
options => [qw(retract_length retract_speed retract_restart_extra retract_before_travel)],
options => [qw(retract_length retract_lift retract_speed retract_restart_extra retract_before_travel)],
),
skirt => Slic3r::GUI::OptionsGroup->new($self,
title => 'Skirt',