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

Fixed regression causing slowdown_below_layer_time to be ignored. #3515 #3443

Browse source
This commit is contained in:
Alessandro Ranellucci 2016-11-22 22:26:08 +01:00 • committed by bubnikv
parent 9f660738b3
commit 4a84643894
3 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/Slic3r/GCode/CoolingBuffer.pm
View file

@ -63,7 +63,7 @@ sub flush {
* ($elapsed - $self->config->slowdown_below_layer_time) * ($elapsed - $self->config->slowdown_below_layer_time)
/ ($self->config->fan_below_layer_time - $self->config->slowdown_below_layer_time); #/ / ($self->config->fan_below_layer_time - $self->config->slowdown_below_layer_time); #/
} }
Slic3r::debugf " fan = %d%%, speed = %d%%\n", $fan_speed, $speed_factor * 100; Slic3r::debugf " fan = %d%%, speed = %f%%\n", $fan_speed, $speed_factor * 100;
if ($speed_factor < 1) { if ($speed_factor < 1) {
# Adjust feed rate of G1 commands marked with an _EXTRUDE_SET_SPEED # Adjust feed rate of G1 commands marked with an _EXTRUDE_SET_SPEED

3
t/cooling.t
View file

@ -2,13 +2,14 @@ use Test::More;
use strict; use strict;
use warnings; use warnings;
plan tests => 11; plan tests => 12;
BEGIN { BEGIN {
use FindBin; use FindBin;
use lib "$FindBin::Bin/../lib"; use lib "$FindBin::Bin/../lib";
} }
use List::Util qw(first);
use Slic3r; use Slic3r;
use Slic3r::Test; use Slic3r::Test;

16
xs/src/libslic3r/GCode.cpp
View file

@ -986,16 +986,16 @@ GCode::travel_to(const Point &point, ExtrusionRole role, std::string comment)
// use G1 because we rely on paths being straight (G0 may make round paths) // use G1 because we rely on paths being straight (G0 may make round paths)
Lines lines = travel.lines(); Lines lines = travel.lines();
double path_length = 0; for (Lines::const_iterator line = lines.begin(); line != lines.end(); ++line)
for (Lines::const_iterator line = lines.begin(); line != lines.end(); ++line) {
const double line_length = line->length() * SCALING_FACTOR;
path_length += line_length;
gcode += this->writer.travel_to_xy(this->point_to_gcode(line->b), comment); gcode += this->writer.travel_to_xy(this->point_to_gcode(line->b), comment);
}
/* While this makes the estimate more accurate, CoolingBuffer calculates the slowdown
factor on the whole elapsed time but only alters non-travel moves, thus the resulting
time is still shorter than the configured threshold. We could create a new
elapsed_travel_time but we would still need to account for bridges, retractions, wipe etc.
if (this->config.cooling) if (this->config.cooling)
this->elapsed_time += path_length / this->config.get_abs_value("travel_speed"); this->elapsed_time += unscale(travel.length()) / this->config.get_abs_value("travel_speed");
*/
return gcode; return gcode;
} }