New experimental --g0 option for fast retractions. #51
This commit is contained in:
parent
12b06b0ab0
commit
db35faeabb
@ -40,6 +40,7 @@ our $use_relative_e_distances = 0;
|
|||||||
our $no_extrusion = 0;
|
our $no_extrusion = 0;
|
||||||
our $z_offset = 0;
|
our $z_offset = 0;
|
||||||
our $gcode_arcs = 0;
|
our $gcode_arcs = 0;
|
||||||
|
our $g0 = 0;
|
||||||
|
|
||||||
# filament options
|
# filament options
|
||||||
our $filament_diameter = 3; # mm
|
our $filament_diameter = 3; # mm
|
||||||
|
@ -41,7 +41,7 @@ sub move_z {
|
|||||||
my $gcode = "";
|
my $gcode = "";
|
||||||
|
|
||||||
$gcode .= $self->retract(dont_lift => 1);
|
$gcode .= $self->retract(dont_lift => 1);
|
||||||
$gcode .= $self->G1(undef, $z, 0, 'move to next layer');
|
$gcode .= $self->G0(undef, $z, 0, 'move to next layer');
|
||||||
|
|
||||||
return $gcode;
|
return $gcode;
|
||||||
}
|
}
|
||||||
@ -83,11 +83,11 @@ sub extrude {
|
|||||||
my $distance_from_last_pos = Slic3r::Geometry::distance_between_points($self->last_pos, $path->points->[0]) * $Slic3r::resolution;
|
my $distance_from_last_pos = Slic3r::Geometry::distance_between_points($self->last_pos, $path->points->[0]) * $Slic3r::resolution;
|
||||||
if ($distance_from_last_pos >= $Slic3r::retract_before_travel
|
if ($distance_from_last_pos >= $Slic3r::retract_before_travel
|
||||||
&& ($Slic3r::fill_density == 0 || $distance_from_last_pos >= $Slic3r::flow_width / $Slic3r::fill_density * sqrt(2))) {
|
&& ($Slic3r::fill_density == 0 || $distance_from_last_pos >= $Slic3r::flow_width / $Slic3r::fill_density * sqrt(2))) {
|
||||||
$gcode .= $self->retract;
|
$gcode .= $self->retract(travel_to => $path->points->[0]);
|
||||||
}
|
}
|
||||||
|
|
||||||
# go to first point of extrusion path
|
# go to first point of extrusion path
|
||||||
$gcode .= $self->G1($path->points->[0], undef, 0, "move to first $description point")
|
$gcode .= $self->G0($path->points->[0], undef, 0, "move to first $description point")
|
||||||
if !points_coincide($self->last_pos, $path->points->[0]);
|
if !points_coincide($self->last_pos, $path->points->[0]);
|
||||||
|
|
||||||
# compensate retraction
|
# compensate retraction
|
||||||
@ -121,13 +121,31 @@ sub retract {
|
|||||||
return "" unless $Slic3r::retract_length > 0
|
return "" unless $Slic3r::retract_length > 0
|
||||||
&& !$self->retracted;
|
&& !$self->retracted;
|
||||||
|
|
||||||
$self->retracted(1);
|
# prepare moves
|
||||||
my $gcode = $self->G1(undef, undef, -$Slic3r::retract_length, "retract");
|
my $retract = [undef, undef, -$Slic3r::retract_length, "retract"];
|
||||||
|
my $lift = ($params{dont_lift} || $Slic3r::retract_lift == 0)
|
||||||
|
? undef
|
||||||
|
: [undef, $self->z + $Slic3r::retract_lift, 0, 'lift plate during retraction'];
|
||||||
|
|
||||||
unless ($params{dont_lift} || $Slic3r::retract_lift == 0) {
|
my $gcode = "";
|
||||||
$gcode .= $self->G1(undef, $self->z + $Slic3r::retract_lift, 0, 'lift plate during retraction');
|
if ($Slic3r::g0 && $params{travel_to}) {
|
||||||
$self->lifted(1);
|
if ($lift) {
|
||||||
|
# combine lift and retract
|
||||||
|
$lift->[2] = $retract->[2];
|
||||||
|
$gcode .= $self->G0(@$lift);
|
||||||
|
} else {
|
||||||
|
# combine travel and retract
|
||||||
|
my $travel = [$params{travel_to}, undef, $retract->[2], 'travel and retract'];
|
||||||
|
$gcode .= $self->G0(@$travel);
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
$gcode .= $self->G1(@$retract);
|
||||||
|
if ($lift) {
|
||||||
|
$gcode .= $self->G1(@$lift);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
$self->retracted(1);
|
||||||
|
$self->lifted(1) if $lift;
|
||||||
|
|
||||||
# reset extrusion distance during retracts
|
# reset extrusion distance during retracts
|
||||||
# this makes sure we leave sufficient precision in the firmware
|
# this makes sure we leave sufficient precision in the firmware
|
||||||
@ -155,12 +173,23 @@ sub unretract {
|
|||||||
return $gcode;
|
return $gcode;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
sub G0 {
|
||||||
|
my $self = shift;
|
||||||
|
return $self->G1(@_) if !$Slic3r::g0;
|
||||||
|
return "G0" . $self->G0_G1(@_);
|
||||||
|
}
|
||||||
|
|
||||||
sub G1 {
|
sub G1 {
|
||||||
|
my $self = shift;
|
||||||
|
return "G1" . $self->G0_G1(@_);
|
||||||
|
}
|
||||||
|
|
||||||
|
sub G0_G1 {
|
||||||
my $self = shift;
|
my $self = shift;
|
||||||
my ($point, $z, $e, $comment) = @_;
|
my ($point, $z, $e, $comment) = @_;
|
||||||
my $dec = $self->dec;
|
my $dec = $self->dec;
|
||||||
|
|
||||||
my $gcode = "G1";
|
my $gcode = "";
|
||||||
|
|
||||||
if ($point) {
|
if ($point) {
|
||||||
$gcode .= sprintf " X%.${dec}f Y%.${dec}f",
|
$gcode .= sprintf " X%.${dec}f Y%.${dec}f",
|
||||||
|
@ -30,6 +30,7 @@ GetOptions(
|
|||||||
'no-extrusion' => \$Slic3r::no_extrusion,
|
'no-extrusion' => \$Slic3r::no_extrusion,
|
||||||
'z-offset=f' => \$Slic3r::z_offset,
|
'z-offset=f' => \$Slic3r::z_offset,
|
||||||
'gcode-arcs' => \$Slic3r::gcode_arcs,
|
'gcode-arcs' => \$Slic3r::gcode_arcs,
|
||||||
|
'g0' => \$Slic3r::g0,
|
||||||
|
|
||||||
# filament options
|
# filament options
|
||||||
'filament-diameter=f' => \$Slic3r::filament_diameter,
|
'filament-diameter=f' => \$Slic3r::filament_diameter,
|
||||||
@ -117,7 +118,7 @@ sub usage {
|
|||||||
my ($exit_code) = @_;
|
my ($exit_code) = @_;
|
||||||
|
|
||||||
print <<"EOF";
|
print <<"EOF";
|
||||||
Slic3r is a STL-to-GCODE translator for RepRap 3D printers
|
Slic3r $Slic3r::VERSION is a STL-to-GCODE translator for RepRap 3D printers
|
||||||
written by Alessandro Ranellucci <aar\@cpan.org> - http://slic3r.org/
|
written by Alessandro Ranellucci <aar\@cpan.org> - http://slic3r.org/
|
||||||
|
|
||||||
Usage: slic3r.pl [ OPTIONS ] file.stl
|
Usage: slic3r.pl [ OPTIONS ] file.stl
|
||||||
@ -138,6 +139,8 @@ Usage: slic3r.pl [ OPTIONS ] file.stl
|
|||||||
(+/-, default: $Slic3r::z_offset)
|
(+/-, default: $Slic3r::z_offset)
|
||||||
--gcode-arcs Use G2/G3 commands for native arcs (experimental, not supported
|
--gcode-arcs Use G2/G3 commands for native arcs (experimental, not supported
|
||||||
by all firmwares)
|
by all firmwares)
|
||||||
|
--g0 Use G0 commands for retraction (experimenta, not supported by all
|
||||||
|
firmwares)
|
||||||
|
|
||||||
Filament options:
|
Filament options:
|
||||||
--filament-diameter Diameter in mm of your raw filament (default: $Slic3r::filament_diameter)
|
--filament-diameter Diameter in mm of your raw filament (default: $Slic3r::filament_diameter)
|
||||||
|
Loading…
Reference in New Issue
Block a user