mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: pause layer not working 

1.The stored layer height differs too much from the generated layer
height.Use a more direct way to locate the layer

github:5253,5275

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ie2428e700c72386349a4f2d64076c940ac4eea71
This commit is contained in:
xun.zhang 2024-11-15 12:19:50 +08:00 committed by Lane.Wei
parent ae9102c9ba
commit 95f24a906e
1 changed files with 67 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
src/libslic3r/GCode/ToolOrdering.cpp
View File

@ -954,61 +954,84 @@ void ToolOrdering::mark_skirt_layers(const PrintConfig &config, coordf_t max_lay
// BBS: replace model custom gcode with current plate custom gcode // BBS: replace model custom gcode with current plate custom gcode
static CustomGCode::Info custom_gcode_per_print_z; static CustomGCode::Info custom_gcode_per_print_z;
void ToolOrdering::assign_custom_gcodes(const Print &print) void ToolOrdering::assign_custom_gcodes(const Print& print)
{ {
// Only valid for non-sequential print. // Only valid for non-sequential print.
assert(print.config().print_sequence == PrintSequence::ByLayer); assert(print.config().print_sequence == PrintSequence::ByLayer);
custom_gcode_per_print_z = print.model().get_curr_plate_custom_gcodes(); custom_gcode_per_print_z = print.model().get_curr_plate_custom_gcodes();
if (custom_gcode_per_print_z.gcodes.empty()) if (custom_gcode_per_print_z.gcodes.empty())
return; return;
// BBS // BBS
auto num_filaments = unsigned(print.config().filament_diameter.size()); auto num_filaments = unsigned(print.config().filament_diameter.size());
CustomGCode::Mode mode = CustomGCode::Mode mode =
(num_filaments == 1) ? CustomGCode::SingleExtruder : (num_filaments == 1) ? CustomGCode::SingleExtruder :
print.object_extruders().size() == 1 ? CustomGCode::MultiAsSingle : CustomGCode::MultiExtruder; print.object_extruders().size() == 1 ? CustomGCode::MultiAsSingle : CustomGCode::MultiExtruder;
CustomGCode::Mode model_mode = print.model().get_curr_plate_custom_gcodes().mode; CustomGCode::Mode model_mode = print.model().get_curr_plate_custom_gcodes().mode;
std::vector<unsigned char> extruder_printing_above(num_filaments, false); auto custom_gcode_it = custom_gcode_per_print_z.gcodes.rbegin();
auto custom_gcode_it = custom_gcode_per_print_z.gcodes.rbegin(); // Tool changes and color changes will be ignored, if the model's tool/color changes were entered in mm mode and the print is in non mm mode
// Tool changes and color changes will be ignored, if the model's tool/color changes were entered in mm mode and the print is in non mm mode // or vice versa.
// or vice versa. bool ignore_tool_and_color_changes = (mode == CustomGCode::MultiExtruder) != (model_mode == CustomGCode::MultiExtruder);
bool ignore_tool_and_color_changes = (mode == CustomGCode::MultiExtruder) != (model_mode == CustomGCode::MultiExtruder); // If printing on a single extruder machine, make the tool changes trigger color change (M600) events.
// If printing on a single extruder machine, make the tool changes trigger color change (M600) events. bool tool_changes_as_color_changes = mode == CustomGCode::SingleExtruder && model_mode == CustomGCode::MultiAsSingle;
bool tool_changes_as_color_changes = mode == CustomGCode::SingleExtruder && model_mode == CustomGCode::MultiAsSingle;
// take the half of the minimum layer height gap as episilon auto apply_custom_gcode_to_layer = [mode,
double layer_height_episilon = std::numeric_limits<double>::max(); ignore_tool_and_color_changes,
for (auto it_prev = m_layer_tools.begin(), it_next = std::next(m_layer_tools.begin()); it_next != m_layer_tools.end(); it_prev = it_next, ++it_next) tool_changes_as_color_changes,
layer_height_episilon = std::min(layer_height_episilon, it_next->print_z - it_prev->print_z); num_filaments](LayerTools& lt, const std::vector<unsigned char>& extruder_printing_above, const CustomGCode::Item& item)
layer_height_episilon *= 0.5; {
bool color_change = item.type == CustomGCode::ColorChange;
bool tool_change = item.type == CustomGCode::ToolChange;
bool pause_or_custom_gcode = !color_change && !tool_change;
bool apply_color_change = !ignore_tool_and_color_changes &&
// If it is color change, it will actually be useful as the exturder above will print.
// BBS
(color_change ?
mode == CustomGCode::SingleExtruder ||
(item.extruder <= int(num_filaments) && extruder_printing_above[unsigned(item.extruder - 1)]) :
tool_change && tool_changes_as_color_changes);
if (pause_or_custom_gcode || apply_color_change)
lt.custom_gcode = &item;
};
std::unordered_map<int, std::vector<unsigned char>> extruder_print_above_by_layer;
{
std::vector<unsigned char> extruder_printing_above(num_filaments, false);
for (auto iter = m_layer_tools.rbegin(); iter != m_layer_tools.rend(); ++iter) {
for (unsigned int i : iter->extruders)
extruder_printing_above[i] = true;
int layer_idx = iter.base() - m_layer_tools.begin();
extruder_print_above_by_layer.emplace(layer_idx, extruder_printing_above);
}
}
auto it_lt = m_layer_tools.rbegin();
for (auto custom_gcode_it = custom_gcode_per_print_z.gcodes.rbegin(); custom_gcode_it != custom_gcode_per_print_z.gcodes.rend(); ++custom_gcode_it) { for (auto custom_gcode_it = custom_gcode_per_print_z.gcodes.rbegin(); custom_gcode_it != custom_gcode_per_print_z.gcodes.rend(); ++custom_gcode_it) {
if (custom_gcode_it->type == CustomGCode::ToolChange) if (custom_gcode_it->type == CustomGCode::ToolChange)
continue; continue;
for (; it_lt != m_layer_tools.rend(); ++it_lt) {
for (unsigned int i : it_lt->extruders)
extruder_printing_above[i] = true;
if (std::abs(it_lt->print_z - custom_gcode_it->print_z) < layer_height_episilon) {
const CustomGCode::Item &custom_gcode = *custom_gcode_it;
// The custom G-code applies to the current layer.
bool color_change = custom_gcode.type == CustomGCode::ColorChange;
bool tool_change = custom_gcode.type == CustomGCode::ToolChange;
bool pause_or_custom_gcode = ! color_change && ! tool_change;
bool apply_color_change = ! ignore_tool_and_color_changes &&
// If it is color change, it will actually be useful as the exturder above will print.
// BBS
(color_change ?
mode == CustomGCode::SingleExtruder ||
(custom_gcode.extruder <= int(num_filaments) && extruder_printing_above[unsigned(custom_gcode.extruder - 1)]) :
tool_change && tool_changes_as_color_changes);
if (pause_or_custom_gcode || apply_color_change)
it_lt->custom_gcode = &custom_gcode;
++it_lt; auto layer_it_upper = std::upper_bound(m_layer_tools.begin(), m_layer_tools.end(), custom_gcode_it->print_z, [](double z,const LayerTools& lt) {
break; return z < lt.print_z;
} });
int upper_layer_idx = layer_it_upper - m_layer_tools.begin();
if (layer_it_upper == m_layer_tools.begin()) {
apply_custom_gcode_to_layer(*layer_it_upper, extruder_print_above_by_layer[0], *custom_gcode_it);
}
else if (layer_it_upper == m_layer_tools.end()) {
auto layer_it_lower = std::prev(layer_it_upper);
int lower_layer_idx = layer_it_lower - m_layer_tools.begin();
apply_custom_gcode_to_layer(*layer_it_lower, extruder_print_above_by_layer[lower_layer_idx], *custom_gcode_it);
}
else {
auto layer_it_lower = std::prev(layer_it_upper);
int lower_layer_idx = layer_it_lower - m_layer_tools.begin();
double gap_to_lower = std::fabs(custom_gcode_it->print_z - layer_it_lower->print_z);
double gap_to_upper = std::fabs(custom_gcode_it->print_z - layer_it_upper->print_z);
if (gap_to_lower < gap_to_upper)
apply_custom_gcode_to_layer(*layer_it_lower, extruder_print_above_by_layer[lower_layer_idx], *custom_gcode_it);
else
apply_custom_gcode_to_layer(*layer_it_upper, extruder_print_above_by_layer[upper_layer_idx], *custom_gcode_it);
} }
} }
} }