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

Reset E and compensate retraction after changing extruder

Browse source
This commit is contained in:
Alessandro Ranellucci 2012-07-06 19:57:58 +02:00
parent 96574e601f
commit 3c00573805
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/Slic3r/GCode.pm
View file

@ -247,10 +247,7 @@ sub retract {
# 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
if (!$Slic3r::use_relative_e_distances && $Slic3r::gcode_flavor !~ /^(?:mach3|makerbot)$/) { $gcode .= $self->reset_e if $Slic3r::gcode_flavor !~ /^(?:mach3|makerbot)$/;
$gcode .= "G92 " . $Slic3r::extrusion_axis . "0\n" if $Slic3r::extrusion_axis;
$self->extrusion_distance(0);
}
return $gcode; return $gcode;
} }
@ -272,6 +269,14 @@ sub unretract {
return $gcode; return $gcode;
} }
sub reset_e {
my $self = shift;
$self->extrusion_distance(0);
return "G92 %s0%s\n", $Slic3r::extrusion_axis, ($Slic3r::gcode_comments ? ' ; reset extrusion distance' : '')
if $Slic3r::extrusion_axis && !$Slic3r::use_relative_e_distances;
}
sub set_acceleration { sub set_acceleration {
my $self = shift; my $self = shift;
my ($acceleration) = @_; my ($acceleration) = @_;
@ -382,7 +387,10 @@ sub set_tool {
return "" if $self->extruder_idx == $tool; return "" if $self->extruder_idx == $tool;
$self->extruder_idx($tool); $self->extruder_idx($tool);
return $self->retract . sprintf "T%d%s\n", $tool, ($Slic3r::gcode_comments ? ' ; change tool' : ''); return $self->retract
. sprintf "T%d%s\n", $tool, ($Slic3r::gcode_comments ? ' ; change tool' : '')
. $self->reset_e
. $self->unretract;
} }
sub set_fan { sub set_fan {

3
lib/Slic3r/Print.pm
View file

@ -530,8 +530,7 @@ sub write_gcode {
print $fh "G90 ; use absolute coordinates\n"; print $fh "G90 ; use absolute coordinates\n";
print $fh "G21 ; set units to millimeters\n"; print $fh "G21 ; set units to millimeters\n";
if ($Slic3r::gcode_flavor =~ /^(?:reprap|teacup)$/) { if ($Slic3r::gcode_flavor =~ /^(?:reprap|teacup)$/) {
printf $fh "G92 %s0 ; reset extrusion distance\n", $Slic3r::extrusion_axis printf $fh $gcodegen->reset_e;
if $Slic3r::extrusion_axis && !$Slic3r::use_relative_e_distances;
if ($Slic3r::gcode_flavor =~ /^(?:reprap|makerbot)$/) { if ($Slic3r::gcode_flavor =~ /^(?:reprap|makerbot)$/) {
if ($Slic3r::use_relative_e_distances) { if ($Slic3r::use_relative_e_distances) {
print $fh "M83 ; use relative distances for extrusion\n"; print $fh "M83 ; use relative distances for extrusion\n";