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

ENH: Cancel the ramming for the last layer 

if it exceeds the print height

jira: none
Change-Id: I427d6a0718f2a65ab2e59af448ee1a613c488596
This commit is contained in:
jiangkai.zhao 2025-03-19 11:31:48 +08:00 committed by lane.wei
parent 4b368cb2ec
commit e76a46159d
2 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/libslic3r/GCode/WipeTower.cpp
View File

@ -1516,7 +1516,8 @@ WipeTower::WipeTower(const PrintConfig& config, int plate_idx, Vec3d plate_origi
m_used_fillet(config.prime_tower_fillet_wall.value),
m_extra_spacing((float)config.prime_tower_infill_gap.value/100.f),
m_tower_framework(config.prime_tower_enable_framework.value),
m_max_speed((float)config.prime_tower_max_speed.value*60.f)
m_max_speed((float)config.prime_tower_max_speed.value*60.f),
m_printable_height(config.extruder_printable_height.values)
{
// Read absolute value of first layer speed, if given as percentage,
// it is taken over following default. Speeds from config are not
@ -1560,6 +1561,7 @@ WipeTower::WipeTower(const PrintConfig& config, int plate_idx, Vec3d plate_origi
? Vec2f(bed_points.front().x(), bed_points.front().y())
: Vec2f::Zero();
flat_ironing = config.nozzle_diameter.values.size() > 1;//Only used for dual extrusion
m_last_layer_id.resize(config.nozzle_diameter.size(), -1);
}
@ -2789,7 +2791,9 @@ WipeTower::ToolChangeResult WipeTower::tool_change_new(size_t new_tool, bool sol
{
m_nozzle_change_result.gcode.clear();
if (!m_filament_map.empty() && new_tool < m_filament_map.size() && m_filament_map[m_current_tool] != m_filament_map[new_tool]) {
m_nozzle_change_result = nozzle_change_new(m_current_tool, new_tool, solid_nozzlechange);
//If it is the last layer and exceeds the printable height, cancel ramming
if (is_valid_last_layer(m_current_tool))
m_nozzle_change_result = nozzle_change_new(m_current_tool, new_tool, solid_nozzlechange);
}
size_t old_tool = m_current_tool;
@ -3593,6 +3597,18 @@ void WipeTower::reset_block_status()
block.last_nozzle_change_id = -1;
}
}
void WipeTower::set_nozzle_last_layer_id()
{
for (int idx = 0; idx < m_plan.size(); idx++) {
auto &info = m_plan[idx];
for(int i =0 ; i<info.tool_changes.size();i++) {
int old_tool = info.tool_changes[i].old_tool;
int new_tool = info.tool_changes[i].new_tool;
if (old_tool >= 0) m_last_layer_id[m_filament_map[old_tool] - 1] = idx;
m_last_layer_id[m_filament_map[new_tool] - 1] = idx;
}
}
}
void WipeTower::update_all_layer_depth(float wipe_tower_depth)
{
@ -3804,6 +3820,7 @@ void WipeTower::plan_tower_new()
}
update_all_layer_depth(max_depth);
set_nozzle_last_layer_id();
m_rib_length = std::max({m_rib_length, sqrt(m_wipe_tower_depth * m_wipe_tower_depth + m_wipe_tower_width * m_wipe_tower_width)});
m_rib_length += m_extra_rib_length;
m_rib_length = std::max(0.f, m_rib_length);
@ -3896,9 +3913,7 @@ void WipeTower::generate_new(std::vector<std::vector<WipeTower::ToolChangeResult
reset_block_status();
m_cur_layer_id = index++;
set_layer(layer.z, layer.height, 0, false, layer.z == m_plan.back().z);
if (m_layer_info->depth < m_perimeter_width) continue;
if (m_wipe_tower_blocks.size() == 1) {
if (m_layer_info->depth < m_wipe_tower_depth - m_perimeter_width) {
// align y shift to perimeter width
@ -3920,9 +3935,9 @@ void WipeTower::generate_new(std::vector<std::vector<WipeTower::ToolChangeResult
int candidate_id = -1;
for (size_t idx = 0; idx < layer.tool_changes.size(); ++idx) {
if (idx == 0) {
if (layer.tool_changes[idx].old_tool == wall_filament)
if (layer.tool_changes[idx].old_tool == wall_filament && is_valid_last_layer(layer.tool_changes[idx].old_tool))
return wall_filament;
else if (m_filpar[layer.tool_changes[idx].old_tool].category == m_filpar[wall_filament].category) {
else if (m_filpar[layer.tool_changes[idx].old_tool].category == m_filpar[wall_filament].category &&is_valid_last_layer(layer.tool_changes[idx].old_tool)) {
candidate_id = layer.tool_changes[idx].old_tool;
}
}
@ -4020,7 +4035,8 @@ void WipeTower::generate_new(std::vector<std::vector<WipeTower::ToolChangeResult
if (finish_layer_filament == -1) {
finish_layer_filament = wall_idx;
}
// Cancel the block of the last layer
if (!is_valid_last_layer(finish_layer_filament)) continue;
ToolChangeResult finish_block_tcr;
if (interface_solid || (block.solid_infill[m_cur_layer_id] && block.filament_adhesiveness_category != m_filament_categories[finish_layer_filament])) {
interface_solid = interface_solid && !((block.solid_infill[m_cur_layer_id] && block.filament_adhesiveness_category != m_filament_categories[finish_layer_filament]));//noly reduce speed when
@ -4476,4 +4492,11 @@ bool WipeTower::need_thick_bridge_flow(float pos_y) const {
return false;
}
bool WipeTower::is_valid_last_layer(int tool) const
{
int nozzle_id = m_filament_map[tool]-1;
if (tool >= 0 && tool < m_filament_map.size() && m_last_layer_id[nozzle_id]==m_cur_layer_id && m_z_pos > m_printable_height[nozzle_id]) return false;
return true;
}
} // namespace Slic3r

6
src/libslic3r/GCode/WipeTower.hpp
View File

@ -240,7 +240,6 @@ public:
// Calculate extrusion flow from desired line width, nozzle diameter, filament diameter and layer_height:
m_extrusion_flow = extrusion_flow(layer_height);
// Advance m_layer_info iterator, making sure we got it right
while (!m_plan.empty() && m_layer_info->z < print_z - WT_EPSILON && m_layer_info+1 != m_plan.end())
++m_layer_info;
@ -390,6 +389,7 @@ public:
void plan_tower_new();
void generate_wipe_tower_blocks();
void update_all_layer_depth(float wipe_tower_depth);
void set_nozzle_last_layer_id();
ToolChangeResult tool_change_new(size_t new_tool, bool solid_change = false, bool solid_nozzlechange=false);
NozzleChangeResult nozzle_change_new(int old_filament_id, int new_filament_id, bool solid_change = false);
@ -431,7 +431,7 @@ private:
float m_travel_speed = 0.f;
float m_first_layer_speed = 0.f;
size_t m_first_layer_idx = size_t(-1);
std::vector<int> m_last_layer_id;
std::vector<double> m_filaments_change_length;
size_t m_cur_layer_id;
NozzleChangeResult m_nozzle_change_result;
@ -497,7 +497,9 @@ private:
float m_max_speed = 5400.f; // the maximum printing speed on the prime tower.
std::vector<Vec2f> m_wall_skip_points;
std::map<float,Polylines> m_outer_wall;
std::vector<double> m_printable_height;
bool is_first_layer() const { return size_t(m_layer_info - m_plan.begin()) == m_first_layer_idx; }
bool is_valid_last_layer(int tool) const;
// Calculates length of extrusion line to extrude given volume
float volume_to_length(float volume, float line_width, float layer_height) const {