Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CURA-11796 Combine the long and short unretracts at nozzle switch #2103

Merged
merged 3 commits into from
Jun 27, 2024
Merged

CURA-11796 Combine the long and short unretracts at nozzle switch #2103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5b5c1bf
Add possibility to do the nozzle switch retract earlier
wawanbreton Jun 24, 2024
7a695da
Merge branch 'main' into CURA-11796_combine_long_and_short_unretract
HellAholic Jun 26, 2024
6247895
Merge branch 'main' into CURA-11796_combine_long_and_short_unretract
HellAholic Jun 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/pathPlanning/GCodePath.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ struct GCodePath
Ratio speed_factor{ 1.0 }; //!< A speed factor that is multiplied with the travel speed. This factor can be used to change the travel speed.
Ratio speed_back_pressure_factor{ 1.0 }; // <! The factor the (non-travel) speed should be multiplied with as a consequence of back pressure compensation.
bool retract{ false }; //!< Whether the path is a move path preceded by a retraction move; whether the path is a retracted move path.
bool retract_for_nozzle_switch{ false }; //! Also retract to prepare for a nozzle switch
bool unretract_before_last_travel_move{ false }; //!< Whether the last move of the path should be preceded by an unretraction. Used to unretract in the last travel move before
//!< an outer wall
bool perform_z_hop{ false }; //!< Whether to perform a z_hop in this path, which is assumed to be a travel path.
Expand Down
9 changes: 8 additions & 1 deletion src/LayerPlan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,8 @@ bool LayerPlan::setExtruder(const size_t extruder_nr)
}
if (end_pos_absolute || last_planned_position_)
{
addTravel(end_pos); // + extruder_offset cause it
GCodePath& path = addTravel(end_pos); // + extruder_offset cause it
path.retract_for_nozzle_switch = true;
}
}
if (extruder_plans_.back().paths_.empty() && extruder_plans_.back().inserts_.empty())
Expand Down Expand Up @@ -2227,6 +2228,12 @@ void LayerPlan::writeGCode(GCodeExport& gcode)
{
retraction_config = path.mesh ? &path.mesh->retraction_wipe_config : retraction_config;
gcode.writeRetraction(retraction_config->retraction_config);
if (path.retract_for_nozzle_switch)
{
constexpr bool force = true;
constexpr bool extruder_switch = true;
gcode.writeRetraction(retraction_config->extruder_switch_retraction_config, force, extruder_switch);
}
insertTempOnTime(extruder_plan.getRetractTime(path), path_idx);
if (path.perform_z_hop)
{
Expand Down
2 changes: 2 additions & 0 deletions src/plugins/converters.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,7 @@ gcode_paths_modify_request::value_type
gcode_path->set_speed_factor(path.speed_factor);
gcode_path->set_speed_back_pressure_factor(path.speed_back_pressure_factor);
gcode_path->set_retract(path.retract);
gcode_path->set_retract_for_nozzle_switch(path.retract_for_nozzle_switch);
gcode_path->set_unretract_before_last_travel_move(path.unretract_before_last_travel_move);
gcode_path->set_perform_z_hop(path.perform_z_hop);
gcode_path->set_perform_prime(path.perform_prime);
Expand Down Expand Up @@ -464,6 +465,7 @@ gcode_paths_modify_response::native_value_type
.speed_factor = gcode_path_msg.speed_factor(),
.speed_back_pressure_factor = gcode_path_msg.speed_back_pressure_factor(),
.retract = gcode_path_msg.retract(),
.retract_for_nozzle_switch = gcode_path_msg.retract_for_nozzle_switch(),
.unretract_before_last_travel_move = gcode_path_msg.unretract_before_last_travel_move(),
.perform_z_hop = gcode_path_msg.perform_z_hop(),
.perform_prime = gcode_path_msg.perform_prime(),
Expand Down
Loading