GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-11 16:19:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

SPE-1872: Fixed actual speed for seam moves and at extrusion/travel/wipe start

Browse Source
This commit is contained in:
enricoturri1966 2024-02-09 14:31:49 +01:00 committed by Lukas Matena
parent feacbc2933
commit e51647b5da
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/libslic3r/GCode/GCodeProcessor.cpp
View File

@ -453,9 +453,16 @@ void GCodeProcessor::TimeMachine::calculate_time(size_t keep_last_n_blocks, floa
continue;
assert(curr_move.actual_feedrate == 0.0f);
const GCodeProcessorResult::MoveVertex& prev_move = result.moves[block.move_id - 1];
GCodeProcessorResult::MoveVertex& prev_move = result.moves[block.move_id - 1];
const bool interpolate = (prev_move.type == curr_move.type);
if (!interpolate &&
prev_move.type != EMoveType::Extrude &&
prev_move.type != EMoveType::Travel &&
prev_move.type != EMoveType::Wipe)
prev_move.actual_feedrate = block.feedrate_profile.entry;
if (block.trapezoid.acceleration_distance() > EPSILON) {
const float t = block.trapezoid.accelerate_until / block.distance;
const Vec3f position = lerp(prev_move.position, curr_move.position, t);
@ -4934,6 +4941,12 @@ void GCodeProcessor::calculate_time(GCodeProcessorResult& result, size_t keep_la
// update move actual speed
result.moves[base_id + new_moves.size()].actual_feedrate = it->actual_feedrate;
inserted_actual_speed_moves_count += new_moves.size();
// synchronize seams actual speed
if (base_id + new_moves.size() + 1 < result.moves.size()) {
GCodeProcessorResult::MoveVertex& move = result.moves[base_id + new_moves.size() + 1];
if (move.type == EMoveType::Seam)
move.actual_feedrate = it->actual_feedrate;
}
new_moves.clear();
}
}