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

Fix speed math for wipe, which was causing too fast retraction. Includes regression test. #1468

Browse source
This commit is contained in:
Alessandro Ranellucci 2013-10-13 17:04:47 +02:00
parent bc0b9e1b72
commit 4c2c31b554
3 changed files with 22 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/Slic3r/GCode.pm
View file

@ -485,19 +485,23 @@ sub retract {
: [undef, $self->z + $self->extruder->retract_lift, 0, 'lift plate during travel'];
# check that we have a positive wipe length
if ($wipe_path && (my $total_wipe_length = $wipe_path->length)) {
$self->speed('travel');
if ($wipe_path) {
$self->speed($self->speeds->{travel} * 0.8);
# subdivide the retraction
my $retracted = 0;
for (1 .. $#$wipe_path) {
my $segment_length = $wipe_path->[$_-1]->distance_to($wipe_path->[$_]);
$retracted += my $e = $retract->[2] * ($segment_length / $total_wipe_length);
$gcode .= $self->G1($wipe_path->[$_], undef, $e, $retract->[3] . ";_WIPE");
foreach my $line (@{$wipe_path->lines}) {
my $segment_length = $line->length;
# reduce retraction length a bit to avoid effective retraction speed to be greater than the configured one
# due to rounding
my $e = $retract->[2] * ($segment_length / $self->extruder->scaled_wipe_distance) * 0.95;
$retracted += $e;
$gcode .= $self->G1($line->b, undef, $e, $retract->[3] . ";_WIPE");
}
if ($retracted > $retract->[2]) {
# if we retracted less than we had to, retract the remainder
# TODO: add regression test
$self->speed('retract');
$gcode .= $self->G1(undef, undef, $retract->[2] - $retracted, $comment);
}
} else {