Skip to content

Fix two related travel move bugs #513

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

Open
jeffc wants to merge 2 commits into
base: rel-next
Choose a base branch
from
+32 −3
Open

Fix two related travel move bugs #513

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e9ee73
Perform Z-hop + plunge for descending travel transitions within pocke…
jeffc Aug 29, 2026
24c42e0
Force pocket stepovers inside boundaries to G1 cuts
jeffc Aug 29, 2026
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
35 changes: 32 additions & 3 deletions src/kiri/mode/cam/work/prepare.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,9 +584,14 @@ export async function prepare_one(widget, settings, print, firstPoint, update) {
emit = 1;
} else
// otherwise move over before descending
if (deltaZ <= -tolerance) {
if (debug) console.log('over before descend', deltaZ, -tolerance);
layerPush(point.clone().setZ(printPoint.z), 0, 0, tool);
if (deltaZ < Math.min(-tolerance, -0.001)) {
let lift = printPoint.clone();
lift.z += 0.1;
let target = point.clone();
target.z = printPoint.z + 0.1;

layerPush(lift, 0, 0, tool);
layerPush(target, 0, 0, tool);
newLayer();
}
} else
Expand Down Expand Up @@ -626,6 +631,30 @@ export async function prepare_one(widget, settings, print, firstPoint, update) {
}
}
lastTravelBounds = undefined;

// If we are NOT retracting (didn't cross boundaries):
if (!upAndOver) {
if (deltaZ < Math.min(-tolerance, -0.001)) {
// Descending transition within the pocket -> Z-hop
let lift = printPoint.clone();
lift.z += 0.1;
let target = point.clone();
target.z = printPoint.z + 0.1;

layerPush(lift, 0, 0, tool);
layerPush(target, 0, 0, tool);
newLayer();
} else if (deltaXY <= shortCut && deltaZ <= 0 && !lasering) {
// If this is a short move and the deltaZ failed the check
// in the first branch of this conditional (ie, it's not a
// significant z-descent), but it's still either zero
// (in-plane move) or insignificantly negative, that means
// that we're likely making a cut through stock (a stepover
// cut is the best example of this). Since that's still
// going through material, we force a G1 move for this cut.
emit = 1;
}
}
} else
// for longer moves
if (isMove) {
Expand Down