raise zSafe if zTop is above it

This commit is contained in:
Stewart Allen 2026-01-13 22:08:40 -05:00
commit 46df283300

View file

@ -87,7 +87,7 @@ export async function prepare_one(widget, settings, print, firstPoint, update) {
{ alignTop } = settings.controller,
{ camArcEnabled, camArcResolution, camArcTolerance } = process,
{ camDepthFirst, camEaseAngle, camEaseDown } = process,
{ camFastFeed, camFastFeedZ } = process,
{ camFastFeed, camFastFeedZ, camZTop } = process,
{ camStockX, camStockY, camStockZ, camStockIndexed, camStockOffset } = process,
{ camForceZMax, camFullEngage, camInnerFirst, camOriginCenter } = process,
{ camOriginOffX, camOriginOffY, camOriginOffZ, camZClearance } = process,
@ -110,7 +110,7 @@ export async function prepare_one(widget, settings, print, firstPoint, update) {
wmx = wmpos.x,
wmy = wmpos.y,
wmz = !camStockIndexed ? stock.z - boundsZ : alignTop ? 0 : 0,
zSafe = camStockIndexed ? Math.hypot(stock.y, stock.z) / 2 + camZClearance : stockZClear,
zSafe = Math.max(camZTop, camStockIndexed ? Math.hypot(stock.y, stock.z) / 2 + camZClearance : stockZClear),
originx = (camOriginCenter ? 0 : -stock.x / 2) + (camOriginOffX || 0),
originy = (camOriginCenter ? 0 : -stock.y / 2) + (camOriginOffY || 0),
origin = newPoint(originx, originy, zSafe),