From f9cc6d1cb26c8864f204dda3b18150fafdfdce38 Mon Sep 17 00:00:00 2001
From: Stewart Allen <sa@grid.space>
Date: Fri, 24 Feb 2023 13:34:13 -0500
Subject: [PATCH] more not perfect slowing of initial level cuts

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

diff --git a/src/kiri-mode/cam/ops.js b/src/kiri-mode/cam/ops.js
index 67c43092..587c563f 100644
--- a/src/kiri-mode/cam/ops.js
+++ b/src/kiri-mode/cam/ops.js
@@ -429,14 +429,15 @@ class OpRough extends CamOp {
             // set winding specified in output
             POLY.setWinding(level, cutdir, false);
             printPoint = poly2polyEmit(level, printPoint, function(poly, index, count) {
+                const factor = count === 1 ? 0.5 : 1;
                 poly.forEachPoint(function(point, pidx, points, offset) {
-                    camOut(point.clone(), offset !== 0);
+                    camOut(point.clone(), offset !== 0, undefined, factor);
                 }, true, index);
             });
             newLayer();
         }
 
-        let index = 0;
+        let total = 0;
         for (let slice of sliceOut) {
             let polys = [], t = [], c = [];
             POLY.flatten(slice.camLines).forEach(function (poly) {
@@ -457,12 +458,12 @@ class OpRough extends CamOp {
             } else {
                 printPoint = poly2polyEmit(polys, printPoint, function(poly, index, count) {
                     poly.forEachPoint(function(point, pidx, points, offset) {
-                        camOut(point.clone(), offset !== 0);
+                        camOut(point.clone(), offset !== 0, undefined, count === 1 ? 0.5 : 1);
                     }, poly.isClosed(), index);
                 }, { swapdir: false });
                 newLayer();
             }
-            progress(++index / sliceOut.length, "routing");
+            progress(++total / sliceOut.length, "routing");
         }
 
         function isNeg(v) {
@@ -943,11 +944,11 @@ class OpLathe extends CamOp {
 
         // move to safe height and reset A axis
         let last = ops.lastPoint();
-        let amax = Math.round(last.a / 360) * 360;
-        camOut(last = last.clone().setZ(zmax), 0);
-        camOut(last = last.clone().setA(amax), 0);
+        let amax = (Math.round(last.a / 360) * 360).round(2);
+        // camOut(last = last.clone().setZ(zmax), 0);
+        // camOut(last = last.clone().setA(amax), 0);
         newLayer();
-        ops.addGCode("G92A0");
+        ops.addGCode([`G0 Z${zmax.round(2)}`,`G0 A${amax}`,"G92 A0"]);
 
         setPrintPoint(last);
     }
diff --git a/src/kiri-mode/cam/prepare.js b/src/kiri-mode/cam/prepare.js
index e764e0d5..211de0c3 100644
--- a/src/kiri-mode/cam/prepare.js
+++ b/src/kiri-mode/cam/prepare.js
@@ -335,7 +335,7 @@ function prepEach(widget, settings, print, firstPoint, update) {
         }
 
         // convert short planar moves to cuts in some cases
-        if (isMove && deltaXY <= moveLen && deltaZ <= 0 && !lasering) {
+        if (!isRough && isMove && deltaXY <= moveLen && deltaZ <= 0 && !lasering) {
             let iscontour = tolerance > 0;
             let isflat = absDeltaZ < 0.001;
             // restrict this to contouring