From 836aee23e990d35b93b3c1dec232c1b7dc8dce50 Mon Sep 17 00:00:00 2001
From: Stewart Allen <stewart@neuron.com>
Date: Wed, 5 Feb 2020 13:59:18 -0500
Subject: [PATCH] fix left/right cutout tab width. hide extrusion for cam mode

---
 js/kiri-driver-cam.js               |  2 +-
 js/kiri.js                          |  3 ++-
 js/license.js                       |  2 +-
 web/kiri/filter/CAM/Sienci.LongMill | 24 ++++++++++++++++++++++++
 4 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 web/kiri/filter/CAM/Sienci.LongMill

diff --git a/js/kiri-driver-cam.js b/js/kiri-driver-cam.js
index 3f59c337..6069bf01 100644
--- a/js/kiri-driver-cam.js
+++ b/js/kiri-driver-cam.js
@@ -742,7 +742,7 @@ var gs_kiri_cam = exports;
             const outside = 10000,
                 width = (tabWidth + toolDiam) / 2,
                 // horizontal top cut
-                htl = { x: -outside, y: tabWidth / 2 },
+                htl = { x: -outside, y: width },
                 htr = { x: -htl.x, y: htl.y },
                 // horizontal bottom cut
                 hbl = { x: htl.x, y: -htl.y },
diff --git a/js/kiri.js b/js/kiri.js
index fc4a0667..d5948bc5 100644
--- a/js/kiri.js
+++ b/js/kiri.js
@@ -2645,7 +2645,7 @@ self.kiri.license = exports.LICENSE;
             finishing: UC.newGroup("finishing", null, {modes:CAM}),
             finishingTool: UC.newSelectField("tool", {modes:CAM}),
             finishingSpindle: UC.newInput("spindle rpm", {title:"spindle speed rpm", convert:UC.toInt, modes:CAM}),
-            finishingOver: UC.newInput("step over", {title:"0.05 - 1.0\npercentage of\ntool diameter", convert:UC.toFloat, bound:UC.bound(0.05,1.0), modes:CAM}),
+            finishingOver: UC.newInput("step over", {title:"0.05 - 1.0\npercentage of\ntool diameter\nfor linear XY", convert:UC.toFloat, bound:UC.bound(0.05,1.0), modes:CAM}),
             finishingDown: UC.newInput("step down", {title:"step down depth\nfor each pass\nin millimeters\n0 to disable", convert:UC.toFloat, modes:CAM}),
             finishingAngle: UC.newInput("max angle", {title:"angles greater than this\nare considered vertical", convert:UC.toFloat, bound:UC.bound(45,90), modes:CAM}),
             finishingSpeed: UC.newInput("feed rate", {title:"max speed while cutting\nmillimeters / minute", convert:UC.toInt, modes:CAM}),
@@ -3267,6 +3267,7 @@ self.kiri.license = exports.LICENSE;
 
                 // hide spindle fields when device doens't support it
                 [
+                 UI.setDeviceExtrusion,
                  UI.roughingSpindle,
                  UI.finishingSpindle,
                  UI.drillSpindle
diff --git a/js/license.js b/js/license.js
index c8905e4d..bfca5adf 100644
--- a/js/license.js
+++ b/js/license.js
@@ -1,7 +1,7 @@
 var exports = {
     COPYRIGHT:"Copyright (C) 2014-2019 Stewart Allen <sa@grid.space> - All Rights Reserved",
     LICENSE:"See the license.md file included with the source distribution",
-    VERSION:"1.5.0"
+    VERSION:"1.5.1"
 };
 if (!module) var module = {};
 module.exports = exports;
diff --git a/web/kiri/filter/CAM/Sienci.LongMill b/web/kiri/filter/CAM/Sienci.LongMill
new file mode 100644
index 00000000..e0324842
--- /dev/null
+++ b/web/kiri/filter/CAM/Sienci.LongMill
@@ -0,0 +1,24 @@
+{
+    "file-ext": "nc",
+    "token-space": " ",
+    "strip-comments": true,
+    "pre":[
+        "G21 ; set units to MM (required)",
+        "G90 ; absolute position mode (required)",
+		"G0 F6000 ; default rapid move speed",
+		"G1 F1500 ; default cutting speed"
+    ],
+    "post":[
+        "M30 ; program end"
+    ],
+    "tool-change":[
+        "M6 T{tool} ; change tool to '{tool_name}'"
+    ],
+	"dwell":[
+		"G4 P{time} ; dwell for {time}ms"
+	],
+	"settings": {
+		"bed_width": 760,
+		"bed_depth": 760
+	}
+}