From 1b0ee2a953382260b7a53f1bfb4434806cb89e75 Mon Sep 17 00:00:00 2001
From: Stewart Allen <stewart.allen@gmail.com>
Date: Tue, 20 Jun 2023 14:05:07 -0400
Subject: [PATCH] fix bug where drill was using G0

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

diff --git a/src/kiri-mode/cam/ops.js b/src/kiri-mode/cam/ops.js
index 485c48fc..caad2b82 100644
--- a/src/kiri-mode/cam/ops.js
+++ b/src/kiri-mode/cam/ops.js
@@ -1474,7 +1474,6 @@ class OpDrill extends CamOp {
         let { op, state } = this;
         let { settings, widget, addSlices, updateToolDiams } = state;
         let { setTool, setSpindle, setDrill, emitDrills } = ops;
-
         setTool(op.tool, undefined, op.rate);
         setDrill(op.down, op.lift, op.dwell);
         setSpindle(op.spindle);
diff --git a/src/kiri-mode/cam/prepare.js b/src/kiri-mode/cam/prepare.js
index f9560327..98863db1 100644
--- a/src/kiri-mode/cam/prepare.js
+++ b/src/kiri-mode/cam/prepare.js
@@ -169,8 +169,8 @@ function prepEach(widget, settings, print, firstPoint, update) {
             toolDiamMove = toolType === 'endmill' ? toolDiam : tolerance * 2;
             lastTool = toolID;
         }
-        feedRate = feed || feedRate;
-        plungeRate = Math.min(feedRate, plunge || plungeRate || feedRate);
+        feedRate = feed || feedRate || plunge;
+        plungeRate = Math.min(feedRate || plunge, plunge || plungeRate || feedRate);
     }
 
     function setLasering(bool, power = 0) {
@@ -253,7 +253,7 @@ function prepEach(widget, settings, print, firstPoint, update) {
      * @param {number} [tool] tool
      */
     function layerPush(point, emit, speed, tool) {
-        const dz = lastPush ? point.z - lastPush.point.z : 0;
+        const dz = (point && lastPush && lastPush.point) ? point.z - lastPush.point.z : 0;
         if (dz < 0 && speed > plungeRate) {
             speed = plungeRate;
         }