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

Apply G92 E0 after G11. #2201

Browse Source
This commit is contained in:
Alessandro Ranellucci 2014-08-08 03:23:34 +02:00
parent 956dd319e0
commit 3920a7e8b6
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Slic3r/GCode.pm
View File

@ -464,10 +464,15 @@ sub retract {
# TODO: add regression test # TODO: add regression test
$gcode .= $self->G1(undef, undef, $retract->[2] - $retracted, $self->extruder->retract_speed_mm_min, $comment); $gcode .= $self->G1(undef, undef, $retract->[2] - $retracted, $self->extruder->retract_speed_mm_min, $comment);
} }
$gcode .= $self->reset_e;
} elsif ($self->config->use_firmware_retraction) { } elsif ($self->config->use_firmware_retraction) {
$gcode .= "G10 ; retract\n"; $gcode .= "G10 ; retract\n";
} else { } else {
$gcode .= $self->G1(@$retract); $gcode .= $self->G1(@$retract);
# reset extrusion distance during retracts
# this makes sure we leave sufficient precision in the firmware
$gcode .= $self->reset_e;
} }
if (!$self->lifted) { if (!$self->lifted) {
if (defined $params{move_z} && $self->config->retract_lift->[0] > 0) { if (defined $params{move_z} && $self->config->retract_lift->[0] > 0) {
@ -482,10 +487,6 @@ sub retract {
$self->extruder->set_restart_extra($restart_extra); $self->extruder->set_restart_extra($restart_extra);
$self->lifted($self->config->retract_lift->[0]) if $lift; $self->lifted($self->config->retract_lift->[0]) if $lift;
# reset extrusion distance during retracts
# this makes sure we leave sufficient precision in the firmware
$gcode .= $self->reset_e;
$gcode .= "M103 ; extruder off\n" if $self->config->gcode_flavor eq 'makerware'; $gcode .= "M103 ; extruder off\n" if $self->config->gcode_flavor eq 'makerware';
return $gcode; return $gcode;
@ -506,6 +507,7 @@ sub unretract {
if ($to_unretract) { if ($to_unretract) {
if ($self->config->use_firmware_retraction) { if ($self->config->use_firmware_retraction) {
$gcode .= "G11 ; unretract\n"; $gcode .= "G11 ; unretract\n";
$gcode .= $self->reset_e;
} elsif ($self->config->get_extrusion_axis) { } elsif ($self->config->get_extrusion_axis) {
# use G1 instead of G0 because G0 will blend the restart with the previous travel move # use G1 instead of G0 because G0 will blend the restart with the previous travel move
$gcode .= sprintf "G1 %s%.5f F%.3f", $gcode .= sprintf "G1 %s%.5f F%.3f",