3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-16 11:17:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' into new-flow

Browse source
This commit is contained in:
Alessandro Ranellucci 2012-07-06 20:06:09 +02:00
commit 4f6934bab8
3 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lib/Slic3r/GCode.pm
View file

@ -242,10 +242,7 @@ sub retract {
# reset extrusion distance during retracts
# this makes sure we leave sufficient precision in the firmware
if (!$Slic3r::use_relative_e_distances && $Slic3r::gcode_flavor !~ /^(?:mach3|makerbot)$/) {
$gcode .= "G92 " . $Slic3r::extrusion_axis . "0\n" if $Slic3r::extrusion_axis;
$self->extrusion_distance(0);
}
$gcode .= $self->reset_e if $Slic3r::gcode_flavor !~ /^(?:mach3|makerbot)$/;
return $gcode;
}
@ -267,6 +264,14 @@ sub unretract {
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 {
my $self = shift;
my ($acceleration) = @_;
@ -377,7 +382,10 @@ sub set_tool {
return "" if $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 {