From 4f46869ddc380a8cf6b4a6cae4aae9933f3eff43 Mon Sep 17 00:00:00 2001
From: Stewart Allen <sa@grid.space>
Date: Wed, 19 Oct 2022 14:46:28 -0400
Subject: [PATCH] setPrintPoint updates ops object. laser flat uses proper max
 offset. non laser move after laser op ends

---
 src/kiri-mode/cam/ops.js     | 2 ++
 src/kiri-mode/cam/prepare.js | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/kiri-mode/cam/ops.js b/src/kiri-mode/cam/ops.js
index d860783f..1656d0b0 100644
--- a/src/kiri-mode/cam/ops.js
+++ b/src/kiri-mode/cam/ops.js
@@ -66,9 +66,11 @@ class OpLaserOff extends CamOp {
     }
 
     prepare(ops, progress) {
+        const { printPoint, zmax, camOut } = ops;
         this.op.silent = true;
         ops.addGCode(this.op.disable);
         ops.setLasering(false);
+        camOut(printPoint.clone().setZ(zmax), 0);
     }
 }
 
diff --git a/src/kiri-mode/cam/prepare.js b/src/kiri-mode/cam/prepare.js
index fddebebd..1ac7056e 100644
--- a/src/kiri-mode/cam/prepare.js
+++ b/src/kiri-mode/cam/prepare.js
@@ -150,7 +150,7 @@ function prepEach(widget, settings, print, firstPoint, update) {
     }
 
     function setPrintPoint(point) {
-        printPoint = point;
+        ops.printPoint = printPoint = point;
     }
 
     function setSpindle(speed) {
@@ -272,7 +272,7 @@ function prepEach(widget, settings, print, firstPoint, update) {
                 }
             }
             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');
         } else {