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

Always move Z at travel speed. #1093

Browse Source
This commit is contained in:
Alessandro Ranellucci 2013-04-08 22:23:51 +02:00
parent 6b989203b4
commit 94ed6cd239
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Slic3r/GCode.pm
View File

@ -364,13 +364,13 @@ sub retract {
} }
# prepare moves # prepare moves
$self->speed('retract');
my $retract = [undef, undef, -$length, $comment]; my $retract = [undef, undef, -$length, $comment];
my $lift = ($self->extruder->retract_lift == 0 || defined $params{move_z}) && !$self->lifted my $lift = ($self->extruder->retract_lift == 0 || defined $params{move_z}) && !$self->lifted
? undef ? undef
: [undef, $self->z + $self->extruder->retract_lift, 0, 'lift plate during travel']; : [undef, $self->z + $self->extruder->retract_lift, 0, 'lift plate during travel'];
if (($Slic3r::Config->g0 || $Slic3r::Config->gcode_flavor eq 'mach3') && $params{travel_to}) { if (($Slic3r::Config->g0 || $Slic3r::Config->gcode_flavor eq 'mach3') && $params{travel_to}) {
$self->speed('travel');
if ($lift) { if ($lift) {
# combine lift and retract # combine lift and retract
$lift->[2] = $retract->[2]; $lift->[2] = $retract->[2];
@ -382,6 +382,7 @@ sub retract {
} }
} elsif (($Slic3r::Config->g0 || $Slic3r::Config->gcode_flavor eq 'mach3') && defined $params{move_z}) { } elsif (($Slic3r::Config->g0 || $Slic3r::Config->gcode_flavor eq 'mach3') && defined $params{move_z}) {
# combine Z change and retraction # combine Z change and retraction
$self->speed('travel');
my $travel = [undef, $params{move_z}, $retract->[2], "change layer and $comment"]; my $travel = [undef, $params{move_z}, $retract->[2], "change layer and $comment"];
$gcode .= $self->G0(@$travel); $gcode .= $self->G0(@$travel);
} else { } else {
@ -395,9 +396,11 @@ sub retract {
$gcode .= $self->G1($wipe_path->[$_], undef, $retract->[2] * ($segment_length / $total_wipe_length), $retract->[3] . ";_WIPE"); $gcode .= $self->G1($wipe_path->[$_], undef, $retract->[2] * ($segment_length / $total_wipe_length), $retract->[3] . ";_WIPE");
} }
} else { } else {
$self->speed('retract');
$gcode .= $self->G1(@$retract); $gcode .= $self->G1(@$retract);
} }
if (!$self->lifted) { if (!$self->lifted) {
$self->speed('travel');
if (defined $params{move_z} && $self->extruder->retract_lift > 0) { if (defined $params{move_z} && $self->extruder->retract_lift > 0) {
my $travel = [undef, $params{move_z} + $self->extruder->retract_lift, 0, 'move to next layer (' . $self->layer->id . ') and lift']; my $travel = [undef, $params{move_z} + $self->extruder->retract_lift, 0, 'move to next layer (' . $self->layer->id . ') and lift'];
$gcode .= $self->G0(@$travel); $gcode .= $self->G0(@$travel);

5
t/fill.t
View File

@ -39,6 +39,11 @@ sub scale_points (@) { map [scale $_->[X], scale $_->[Y]], @_ }
$surface->expolygon->rotate(Slic3r::Geometry::deg2rad($angle), [0,0]); $surface->expolygon->rotate(Slic3r::Geometry::deg2rad($angle), [0,0]);
my ($params, @paths) = $filler->fill_surface($surface, flow_spacing => 0.69, density => 0.4); my ($params, @paths) = $filler->fill_surface($surface, flow_spacing => 0.69, density => 0.4);
is scalar @paths, 1, 'one continuous path'; is scalar @paths, 1, 'one continuous path';
use Slic3r::SVG;
Slic3r::SVG::output("fill.svg",
expolygons => [$surface->expolygon],
polylines => [@paths],
);exit;
} }
} }

2
t/retraction.t
View File

@ -52,6 +52,7 @@ my $test = sub {
if !_eq($info->{dist_Z}, -$print->extruders->[$tool]->retract_lift); if !_eq($info->{dist_Z}, -$print->extruders->[$tool]->retract_lift);
$lifted = 0; $lifted = 0;
} }
fail 'move Z at travel speed' if ($args->{F} // $self->F) != $conf->travel_speed * 60;
} }
if ($info->{retracting}) { if ($info->{retracting}) {
$retracted[$tool] = 1; $retracted[$tool] = 1;
@ -89,6 +90,7 @@ my $test = sub {
}; };
$config->set('first_layer_height', $config->layer_height); $config->set('first_layer_height', $config->layer_height);
$config->set('first_layer_speed', '100%');
$config->set('start_gcode', ''); # to avoid dealing with the nozzle lift in start G-code $config->set('start_gcode', ''); # to avoid dealing with the nozzle lift in start G-code
$config->set('retract_length', [1.5]); $config->set('retract_length', [1.5]);
$config->set('retract_before_travel', [3]); $config->set('retract_before_travel', [3]);