mirror of
https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git
synced 2025-08-03 06:50:39 +08:00
Fix retract only if travel is long enough and add wipe
This commit is contained in:
parent
b2e8580fd8
commit
8f192b67b5
@ -2143,8 +2143,8 @@ std::string GCodeGenerator::get_layer_change_gcode(const Vec3d& from, const Vec3
|
|||||||
)};
|
)};
|
||||||
|
|
||||||
std::string travel_gcode;
|
std::string travel_gcode;
|
||||||
if (this->m_config.retract_before_travel.get_at(extruder_id) > xy_path.length()) {
|
if (this->m_config.retract_before_travel.get_at(extruder_id) < (to - from).norm()) {
|
||||||
travel_gcode += this->writer().retract();
|
travel_gcode += this->retract_and_wipe();
|
||||||
}
|
}
|
||||||
Vec3d previous_point{this->point_to_gcode(travel.front())};
|
Vec3d previous_point{this->point_to_gcode(travel.front())};
|
||||||
for (const Vec3crd& point : tcb::span{travel}.subspan(1)) {
|
for (const Vec3crd& point : tcb::span{travel}.subspan(1)) {
|
||||||
@ -3036,7 +3036,7 @@ std::string GCodeGenerator::travel_to_first_position(const Vec3crd& point) {
|
|||||||
if (!this->last_position ||
|
if (!this->last_position ||
|
||||||
EXTRUDER_CONFIG(retract_before_travel) <
|
EXTRUDER_CONFIG(retract_before_travel) <
|
||||||
(this->point_to_gcode(*this->last_position) - gcode_point.head<2>()).norm()) {
|
(this->point_to_gcode(*this->last_position) - gcode_point.head<2>()).norm()) {
|
||||||
gcode += this->writer().retract();
|
gcode += this->retract_and_wipe();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
this->last_position = point.head<2>();
|
this->last_position = point.head<2>();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user