From 2cb691d3d8aca3f91a8f5123d97c4aedbcc46214 Mon Sep 17 00:00:00 2001
From: Stewart Allen <stewart.allen@gmail.com>
Date: Tue, 8 Dec 2020 23:27:34 -0500
Subject: [PATCH] fix o=tools hotkey. add more animation resolutions. change
 move clear distance based on tool type

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

diff --git a/src/kiri/init.js b/src/kiri/init.js
index 4dbefe29..701b5d95 100644
--- a/src/kiri/init.js
+++ b/src/kiri/init.js
@@ -391,7 +391,7 @@
             case cca('g'): // CAM animate
                 API.function.animate();
                 break;
-            case cca('o'): // manual rotation
+            case cca('O'): // manual rotation
                 rotateInputSelection();
                 break;
             case cca('r'): // recent files
diff --git a/src/kiri/main.js b/src/kiri/main.js
index a1a11555..2c309338 100644
--- a/src/kiri/main.js
+++ b/src/kiri/main.js
@@ -178,7 +178,11 @@
             { name: "200" },
             { name: "300" },
             { name: "400" },
-            { name: "500" }
+            { name: "500" },
+            { name: "600" },
+            { name: "700" },
+            { name: "800" },
+            { name: "900" }
         ],
         trace: [
             { name: "follow" },
diff --git a/src/mode/cam/animate.js b/src/mode/cam/animate.js
index e867059d..d4885c0b 100644
--- a/src/mode/cam/animate.js
+++ b/src/mode/cam/animate.js
@@ -319,6 +319,7 @@ self.kiri.loader.push(function() {
 
     function checkStash(send) {
         if (!skipMode && skipStash.length) {
+            // merge & compress stash stack
             skipStash.forEach(mesh_update => {
                 send.data({ id: 0, mesh_update }, [ mesh_update.buffer ]);
             });
diff --git a/src/mode/cam/prepare.js b/src/mode/cam/prepare.js
index 3a33e5fc..6a2608f7 100644
--- a/src/mode/cam/prepare.js
+++ b/src/mode/cam/prepare.js
@@ -85,6 +85,7 @@
             printPoint,
             isNewMode,
             tool,
+            toolType,
             toolDiam,
             toolDiamMove,
             feedRate,
@@ -118,8 +119,9 @@
         function setTool(toolID, feed, plunge) {
             if (toolID !== lastTool) {
                 tool = new CAM.Tool(settings, toolID);
+                toolType = tool.getType();
                 toolDiam = tool.fluteDiameter();
-                toolDiamMove = toolDiam; // TODO validate w/ multiple models
+                toolDiamMove = toolType === 'endmill' ? toolDiam : tolerance;
                 lastTool = toolID;
             }
             feedRate = feed;