3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-02-15 08:59:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

FIX: fix the error retract of nozzle change

Browse source 
jira: none
Change-Id: I4773307263cbbca0955dd44bbf046e45d91f1b5f
(cherry picked from commit 0d55524fca6ea1ea4ca6387df8cfb725a90269c9)
This commit is contained in:
zhimin.zeng 2024-12-04 14:33:17 +08:00 • committed by Noisyfox
parent 70c80d6530
commit 6d91d1a2e9
2 changed files with 23 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/libslic3r/GCode.cpp
View file

@ -572,12 +572,7 @@ static std::vector<Vec2d> get_path_of_change_filament(const Print& print)
}
}
std::string nozzle_change_gcode_trans;
if (!tcr.nozzle_change_result.gcode.empty()) {
nozzle_change_gcode_trans = transform_gcode(tcr.nozzle_change_result.gcode, tcr.start_pos, wipe_tower_offset, wipe_tower_rotation);
}
// BBS: increase toolchange count
//BBS: increase toolchange count
gcodegen.m_toolchange_count++;
// BBS: should be placed before toolchange parsing
@ -589,6 +584,23 @@ static std::vector<Vec2d> get_path_of_change_filament(const Print& print)
std::string toolchange_gcode_str;
std::string change_filament_gcode = gcodegen.config().change_filament_gcode.value;
std::string nozzle_change_gcode_trans;
if (!tcr.nozzle_change_result.gcode.empty()) {
// move to start_pos before nozzle change
std::string start_pos_str;
start_pos_str = gcodegen.travel_to(wipe_tower_point_to_object_point(gcodegen, transform_wt_pt(tcr.nozzle_change_result.start_pos) + plate_origin_2d), erMixed,
"Move to nozzle change start pos");
check_add_eol(start_pos_str);
nozzle_change_gcode_trans += start_pos_str;
nozzle_change_gcode_trans += gcodegen.unretract();
nozzle_change_gcode_trans += transform_gcode(tcr.nozzle_change_result.gcode, tcr.nozzle_change_result.start_pos, wipe_tower_offset, wipe_tower_rotation);
gcodegen.set_last_pos(wipe_tower_point_to_object_point(gcodegen, transform_wt_pt(tcr.nozzle_change_result.end_pos) + plate_origin_2d));
gcodegen.m_wipe.reset_path();
for (const Vec2f &wipe_pt : tcr.nozzle_change_result.wipe_path)
gcodegen.m_wipe.path.points.emplace_back(wipe_tower_point_to_object_point(gcodegen, transform_wt_pt(wipe_pt) + plate_origin_2d));
nozzle_change_gcode_trans += gcodegen.retract(true, false);
}
std::string prefix_gcode = lift_gcode_after_printing_object;
if (gcodegen.config().nozzle_diameter.size() > 1) {
prefix_gcode += nozzle_change_gcode_trans;

25
src/libslic3r/GCode/WipeTower.cpp
View file

@ -979,9 +979,6 @@ WipeTower::NozzleChangeResult WipeTower::nozzle_change(int old_filament_id, int
(new_filament_id != (unsigned int) (-1) ? wipe_depth + m_depth_traversed - m_perimeter_width : m_wipe_tower_depth - m_perimeter_width));
Vec2f initial_position = cleaning_box.ld + Vec2f(0.f, m_depth_traversed);
writer.travel(initial_position, 30000);
writer.append("G1 Z" + std::to_string(m_z_pos) + "\n");
writer.append("G1 E2 F1800\n");
writer.set_initial_position(initial_position, m_wipe_tower_width, m_wipe_tower_depth, m_internal_rotation);
const float &xl = cleaning_box.ld.x();
@ -1018,6 +1015,8 @@ WipeTower::NozzleChangeResult WipeTower::nozzle_change(int old_filament_id, int
m_depth_traversed += nozzle_change_line_count * dy;
NozzleChangeResult result;
if (is_tpu_filament(m_current_tool))
{
bool left_to_right = !m_left_to_right;
@ -1042,30 +1041,16 @@ WipeTower::NozzleChangeResult WipeTower::nozzle_change(int old_filament_id, int
}
}
else {
auto float_to_string_with_precision = [](float value, int precision) {
std::ostringstream out;
out << std::fixed << std::setprecision(precision) << value;
return out.str();
};
float wipe_distance = 2;
Vec2f wipe_pos = writer.pos();
result.wipe_path.push_back(writer.pos());
if (m_left_to_right) {
wipe_pos.x() -= wipe_distance;
result.wipe_path.push_back(Vec2f(0, writer.y()));
} else {
wipe_pos.x() += wipe_distance;
result.wipe_path.push_back(Vec2f(m_wipe_tower_width, writer.y()));
}
writer.append("; WIPE_START\n");
writer.extrude_explicit(wipe_pos, -2);
writer.append("; WIPE_END\n");
std::string lift_gcode = "G2 Z" + float_to_string_with_precision(m_z_pos + 0.4, 3) + " I0.86 J0.86 P1 F10000\n";
writer.append(lift_gcode);
}
writer.append("; Nozzle change end\n");
NozzleChangeResult result;
result.start_pos = initial_position;
result.end_pos = writer.pos();
result.gcode = std::move(writer.gcode());