mirror of
https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git
synced 2025-08-01 20:10:37 +08:00
SPE-2275: Fixed export of M73 CXX lines to gcode
This commit is contained in:
parent
dfdc407fd6
commit
ec8efbd444
@ -320,11 +320,9 @@ void GCodeProcessor::TimeMachine::calculate_time(GCodeProcessorResult& result, P
|
|||||||
// detect actual speed moves required to render toolpaths using actual speed
|
// detect actual speed moves required to render toolpaths using actual speed
|
||||||
if (mode == PrintEstimatedStatistics::ETimeMode::Normal) {
|
if (mode == PrintEstimatedStatistics::ETimeMode::Normal) {
|
||||||
GCodeProcessorResult::MoveVertex& curr_move = result.moves[block.move_id];
|
GCodeProcessorResult::MoveVertex& curr_move = result.moves[block.move_id];
|
||||||
if (curr_move.type != EMoveType::Extrude &&
|
if (curr_move.type == EMoveType::Extrude ||
|
||||||
curr_move.type != EMoveType::Travel &&
|
curr_move.type == EMoveType::Travel ||
|
||||||
curr_move.type != EMoveType::Wipe)
|
curr_move.type == EMoveType::Wipe) {
|
||||||
continue;
|
|
||||||
|
|
||||||
assert(curr_move.actual_feedrate == 0.0f);
|
assert(curr_move.actual_feedrate == 0.0f);
|
||||||
|
|
||||||
GCodeProcessorResult::MoveVertex& prev_move = result.moves[block.move_id - 1];
|
GCodeProcessorResult::MoveVertex& prev_move = result.moves[block.move_id - 1];
|
||||||
@ -404,6 +402,7 @@ void GCodeProcessor::TimeMachine::calculate_time(GCodeProcessorResult& result, P
|
|||||||
std::nullopt
|
std::nullopt
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
}
|
||||||
g1_times_cache.push_back({ block.g1_line_id, block.remaining_internal_g1_lines, float(time) });
|
g1_times_cache.push_back({ block.g1_line_id, block.remaining_internal_g1_lines, float(time) });
|
||||||
// update times for remaining time to printer stop placeholders
|
// update times for remaining time to printer stop placeholders
|
||||||
auto it_stop_time = std::lower_bound(stop_times.begin(), stop_times.end(), block.g1_line_id,
|
auto it_stop_time = std::lower_bound(stop_times.begin(), stop_times.end(), block.g1_line_id,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user