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

Fix wrong retraction settings being used #2191

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Fix wrong retraction settings being used #2191

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2bc7601
Fix wrong retraction settings being
wawanbreton Dec 18, 2024
6bd4aa3
Apply clang-format
wawanbreton Dec 18, 2024
7839196
Merge branch 'main' into CURA-12065_fix-retraction-disabled-with-zhop
wawanbreton Dec 20, 2024
9ac0329
Merge branch 'main' into CURA-12065_fix-retraction-disabled-with-zhop
wawanbreton Dec 20, 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
22 changes: 19 additions & 3 deletions src/LayerPlan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2512,8 +2512,24 @@ void LayerPlan::writeGCode(GCodeExport& gcode)
{
ExtruderPlan& extruder_plan = extruder_plans_[extruder_plan_idx];

const RetractionAndWipeConfig* retraction_config
= current_mesh ? &current_mesh->retraction_wipe_config : &storage_.retraction_wipe_config_per_extruder[extruder_plan.extruder_nr_];
auto get_retraction_config = [&extruder_nr, this](std::shared_ptr<const SliceMeshStorage>& mesh) -> std::optional<const RetractionAndWipeConfig*>
{
if (mesh)
{
if (extruder_nr == mesh->settings.get<size_t>("extruder_nr")) [[likely]]
{
return &mesh->retraction_wipe_config;
}

// We are printing a part of a mesh with a different extruder, use this extruder settings instead (mesh-specific settings will be ignored)
return &storage_.retraction_wipe_config_per_extruder[extruder_nr];
}

// We have no mesh yet, a more global config should be used
return std::nullopt;
};

const RetractionAndWipeConfig* retraction_config = get_retraction_config(current_mesh).value_or(&storage_.retraction_wipe_config_per_extruder[extruder_plan.extruder_nr_]);
coord_t z_hop_height = retraction_config->retraction_config.zHop;

if (extruder_nr != extruder_plan.extruder_nr_)
Expand Down Expand Up @@ -2697,7 +2713,7 @@ void LayerPlan::writeGCode(GCodeExport& gcode)

if (path.retract)
{
retraction_config = path.mesh ? &path.mesh->retraction_wipe_config : retraction_config;
retraction_config = get_retraction_config(path.mesh).value_or(retraction_config);
gcode.writeRetraction(retraction_config->retraction_config);
if (path.retract_for_nozzle_switch)
{
Expand Down
Loading