ENH: add lift after printing the wipe_tower
and reduce the travel speed inside the wipe_tower jira: none Change-Id: I3b07ee62623e0cdc2f1824f0011f95776020bee1
This commit is contained in:
parent
1b467b13c4
commit
1aad582e08
|
@ -898,6 +898,7 @@ static std::vector<Vec2d> get_path_of_change_filament(const Print& print)
|
||||||
gcodegen.m_wipe.reset_path();
|
gcodegen.m_wipe.reset_path();
|
||||||
for (const Vec2f& wipe_pt : tcr.wipe_path)
|
for (const Vec2f& wipe_pt : tcr.wipe_path)
|
||||||
gcodegen.m_wipe.path.points.emplace_back(wipe_tower_point_to_object_point(gcodegen, transform_wt_pt(wipe_pt) + plate_origin_2d));
|
gcodegen.m_wipe.path.points.emplace_back(wipe_tower_point_to_object_point(gcodegen, transform_wt_pt(wipe_pt) + plate_origin_2d));
|
||||||
|
gcode += gcodegen.retract(false, false, auto_lift_type, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Let the planner know we are traveling between objects.
|
// Let the planner know we are traveling between objects.
|
||||||
|
|
|
@ -2508,7 +2508,7 @@ static WipeTower::ToolChangeResult merge_tcr(WipeTower::ToolChangeResult& first,
|
||||||
WipeTower::ToolChangeResult out = first;
|
WipeTower::ToolChangeResult out = first;
|
||||||
if ((first.end_pos - second.start_pos).norm() > (float)EPSILON) {
|
if ((first.end_pos - second.start_pos).norm() > (float)EPSILON) {
|
||||||
std::string travel_gcode = "G1 X" + Slic3r::float_to_string_decimal_point(second.start_pos.x(), 3)
|
std::string travel_gcode = "G1 X" + Slic3r::float_to_string_decimal_point(second.start_pos.x(), 3)
|
||||||
+ " Y" + Slic3r::float_to_string_decimal_point(second.start_pos.y(), 3) + "\n";
|
+ " Y" + Slic3r::float_to_string_decimal_point(second.start_pos.y(), 3) +"F5400" + "\n";
|
||||||
bool need_insert_travel = true;
|
bool need_insert_travel = true;
|
||||||
if (second.is_tool_change
|
if (second.is_tool_change
|
||||||
&& is_approx(second.start_pos.x(), second.tool_change_start_pos.x())
|
&& is_approx(second.start_pos.x(), second.tool_change_start_pos.x())
|
||||||
|
|
Loading…
Reference in New Issue