AI_Assistant/grid-apps-cmms
Watch
1
0
Fork
You've already forked grid-apps-cmms
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

setPrintPoint updates ops object. laser flat uses proper max offset. non laser move after laser op ends

Browse source
This commit is contained in:
Stewart Allen 2022-10-19 14:46:28 -04:00
commit 4f46869ddc
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/kiri-mode/cam/ops.js
View file

@ -66,9 +66,11 @@ class OpLaserOff extends CamOp {
} }
prepare(ops, progress) { prepare(ops, progress) {
const { printPoint, zmax, camOut } = ops;
this.op.silent = true; this.op.silent = true;
ops.addGCode(this.op.disable); ops.addGCode(this.op.disable);
ops.setLasering(false); ops.setLasering(false);
camOut(printPoint.clone().setZ(zmax), 0);
} }
} }

4
src/kiri-mode/cam/prepare.js
View file

@ -150,7 +150,7 @@ function prepEach(widget, settings, print, firstPoint, update) {
} }
function setPrintPoint(point) { function setPrintPoint(point) {
printPoint = point; ops.printPoint = printPoint = point;
} }
function setSpindle(speed) { function setSpindle(speed) {
@ -272,7 +272,7 @@ function prepEach(widget, settings, print, firstPoint, update) {
} }
} }
if (lasering.flat) { if (lasering.flat) {
point.z = lasering.flatz; point.z = (stock && stock.z ? stock.z : wztop) + lasering.flatz;
} }
print.addOutput(layerOut, point, power, speed, tool, 'laser'); print.addOutput(layerOut, point, power, speed, tool, 'laser');
} else { } else {