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

ENH: modify the start pos of wall for wipe tower 

and modify the overlap of wall and infill for wipe tower
jira:none

Change-Id: I0d1355c718e2bd1efea6d898f793f5869476ab12
This commit is contained in:
zhimin.zeng 2024-10-09 15:19:46 +08:00 committed by Lane.Wei
parent 14eb79ab9a
commit 4db196b11f
2 changed files with 44 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,6 +14,7 @@
namespace Slic3r namespace Slic3r
{ {
static const double wipe_tower_wall_infill_overlap = 0.0;
inline float align_round(float value, float base) inline float align_round(float value, float base)
{ {
@ -795,12 +796,30 @@ WipeTower::ToolChangeResult WipeTower::tool_change(size_t tool, bool extrude_per
box_coordinates wt_box(Vec2f(0.f, (m_current_shape == SHAPE_REVERSED) ? m_layer_info->toolchanges_depth() - m_layer_info->depth : 0.f), box_coordinates wt_box(Vec2f(0.f, (m_current_shape == SHAPE_REVERSED) ? m_layer_info->toolchanges_depth() - m_layer_info->depth : 0.f),
m_wipe_tower_width, m_layer_info->depth + m_perimeter_width); m_wipe_tower_width, m_layer_info->depth + m_perimeter_width);
// align the perimeter // align the perimeter
Vec2f pos = initial_position;
switch (m_cur_layer_id % 4){
case 0:
pos = wt_box.ld;
break;
case 1:
pos = wt_box.rd;
break;
case 2:
pos = wt_box.ru;
break;
case 3:
pos = wt_box.lu;
break;
default: break;
}
writer.set_initial_position(pos, m_wipe_tower_width, m_wipe_tower_depth, m_internal_rotation);
wt_box = align_perimeter(wt_box); wt_box = align_perimeter(wt_box);
writer.rectangle(wt_box); writer.rectangle(wt_box);
writer.travel(initial_position);
} }
if (first_toolchange_to_nonsoluble) { {
writer.travel(Vec2f(0, 0)); writer.travel(Vec2f(0, 0));
writer.travel(initial_position); writer.travel(initial_position);
} }
@ -1101,9 +1120,9 @@ void WipeTower::toolchange_Wipe(
} }
if (m_left_to_right) if (m_left_to_right)
writer.extrude(xr + 0.25f * m_perimeter_width, writer.y(), wipe_speed); writer.extrude(xr + wipe_tower_wall_infill_overlap * m_perimeter_width, writer.y(), wipe_speed);
else else
writer.extrude(xl - 0.25f * m_perimeter_width, writer.y(), wipe_speed); writer.extrude(xl - wipe_tower_wall_infill_overlap * m_perimeter_width, writer.y(), wipe_speed);
// BBS: recover the flow in non-bridging area // BBS: recover the flow in non-bridging area
if (need_change_flow) { if (need_change_flow) {
@ -1594,10 +1613,11 @@ void WipeTower::generate(std::vector<std::vector<WipeTower::ToolChangeResult>> &
used = 0.f; used = 0.f;
m_old_temperature = -1; // reset last temperature written in the gcode m_old_temperature = -1; // reset last temperature written in the gcode
int index = 0;
std::vector<WipeTower::ToolChangeResult> layer_result; std::vector<WipeTower::ToolChangeResult> layer_result;
for (auto layer : m_plan) for (auto layer : m_plan)
{ {
m_cur_layer_id = index++;
set_layer(layer.z, layer.height, 0, false/*layer.z == m_plan.front().z*/, layer.z == m_plan.back().z); set_layer(layer.z, layer.height, 0, false/*layer.z == m_plan.front().z*/, layer.z == m_plan.back().z);
// BBS // BBS
//m_internal_rotation += 180.f; //m_internal_rotation += 180.f;

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

@ -300,7 +300,7 @@ private:
float m_travel_speed = 0.f; float m_travel_speed = 0.f;
float m_first_layer_speed = 0.f; float m_first_layer_speed = 0.f;
size_t m_first_layer_idx = size_t(-1); size_t m_first_layer_idx = size_t(-1);
size_t m_cur_layer_id;
// G-code generator parameters. // G-code generator parameters.
// BBS: remove useless config // BBS: remove useless config
//float m_cooling_tube_retraction = 0.f; //float m_cooling_tube_retraction = 0.f;