raise zSafe if zTop is above it
This commit is contained in:
parent
8a7b9f9a52
commit
46df283300
1 changed files with 2 additions and 2 deletions
|
|
@ -87,7 +87,7 @@ export async function prepare_one(widget, settings, print, firstPoint, update) {
|
||||||
{ alignTop } = settings.controller,
|
{ alignTop } = settings.controller,
|
||||||
{ camArcEnabled, camArcResolution, camArcTolerance } = process,
|
{ camArcEnabled, camArcResolution, camArcTolerance } = process,
|
||||||
{ camDepthFirst, camEaseAngle, camEaseDown } = process,
|
{ camDepthFirst, camEaseAngle, camEaseDown } = process,
|
||||||
{ camFastFeed, camFastFeedZ } = process,
|
{ camFastFeed, camFastFeedZ, camZTop } = process,
|
||||||
{ camStockX, camStockY, camStockZ, camStockIndexed, camStockOffset } = process,
|
{ camStockX, camStockY, camStockZ, camStockIndexed, camStockOffset } = process,
|
||||||
{ camForceZMax, camFullEngage, camInnerFirst, camOriginCenter } = process,
|
{ camForceZMax, camFullEngage, camInnerFirst, camOriginCenter } = process,
|
||||||
{ camOriginOffX, camOriginOffY, camOriginOffZ, camZClearance } = process,
|
{ camOriginOffX, camOriginOffY, camOriginOffZ, camZClearance } = process,
|
||||||
|
|
@ -110,7 +110,7 @@ export async function prepare_one(widget, settings, print, firstPoint, update) {
|
||||||
wmx = wmpos.x,
|
wmx = wmpos.x,
|
||||||
wmy = wmpos.y,
|
wmy = wmpos.y,
|
||||||
wmz = !camStockIndexed ? stock.z - boundsZ : alignTop ? 0 : 0,
|
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),
|
originx = (camOriginCenter ? 0 : -stock.x / 2) + (camOriginOffX || 0),
|
||||||
originy = (camOriginCenter ? 0 : -stock.y / 2) + (camOriginOffY || 0),
|
originy = (camOriginCenter ? 0 : -stock.y / 2) + (camOriginOffY || 0),
|
||||||
origin = newPoint(originx, originy, zSafe),
|
origin = newPoint(originx, originy, zSafe),
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue